summaryrefslogtreecommitdiff
path: root/target-i386
diff options
context:
space:
mode:
authormunkyu.im <munkyu.im@samsung.com>2013-09-12 17:12:24 +0900
committermunkyu.im <munkyu.im@samsung.com>2013-09-12 17:36:48 +0900
commit239cf25a178c286d5b48a000c39e080b3f12467d (patch)
treefad4d0a3f31fd27d6fa1881587e2908853d9bca1 /target-i386
parent7dc365da8bab24a05792967040a522e3533f775e (diff)
downloadqemu-239cf25a178c286d5b48a000c39e080b3f12467d.tar.gz
qemu-239cf25a178c286d5b48a000c39e080b3f12467d.tar.bz2
qemu-239cf25a178c286d5b48a000c39e080b3f12467d.zip
fix compilation error and some warnings
Change-Id: Icd02a6eff474b9f7bb8adf70e57ae7255cc61b5c Signed-off-by: munkyu.im <munkyu.im@samsung.com>
Diffstat (limited to 'target-i386')
-rw-r--r--target-i386/hax-darwin.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/target-i386/hax-darwin.c b/target-i386/hax-darwin.c
index f8850aecd0..be889cd674 100644
--- a/target-i386/hax-darwin.c
+++ b/target-i386/hax-darwin.c
@@ -20,11 +20,11 @@
static char* qemu_strdup(const char *str)
{
- char *ptr;
- size_t len = strlen(str);
- ptr = g_malloc(len + 1);
- memcpy(ptr, str, len+1);
- return ptr;
+ char *ptr;
+ size_t len = strlen(str);
+ ptr = g_malloc(len + 1);
+ memcpy(ptr, str, len+1);
+ return ptr;
}
@@ -65,19 +65,19 @@ int hax_populate_ram(uint64_t va, uint32_t size)
int hax_set_phys_mem(MemoryRegionSection *section)
{
- struct hax_set_ram_info info, *pinfo = &info;
- MemoryRegionSection *mr = section->mr;
+ struct hax_set_ram_info info, *pinfo = &info;
+ MemoryRegion *mr = section->mr;
hwaddr start_addr = section->offset_within_address_space;
- ram_addr_t size = section->size;
+ ram_addr_t size = int128_get64(section->size);
int ret;
- /*We only care for the RAM and ROM*/
+ /*We only care for the RAM and ROM*/
if(!memory_region_is_ram(mr))
- return 0;
-
+ return 0;
+
if ( (start_addr & ~TARGET_PAGE_MASK) || (size & ~TARGET_PAGE_MASK))
{
- dprint("set_phys_mem %x %lx requires page aligned addr and size\n", start_addr, size);
+ dprint("set_phys_mem %llx %lx requires page aligned addr and size\n", start_addr, size);
exit(1);
return -1;
}