diff options
author | Michael S. Tsirkin <mst@redhat.com> | 2011-05-05 16:39:47 +0300 |
---|---|---|
committer | Michael S. Tsirkin <mst@redhat.com> | 2011-05-05 16:39:47 +0300 |
commit | 7206a75094a0f026bc81238b5e1faea90ea2c2b5 (patch) | |
tree | 5274ff496f2665487736a4eec23bf76601e4da44 /cpu-common.h | |
parent | b2bf01e00b7cc2cc87a82900f2dee3c070047f4f (diff) | |
parent | 747260898fb23bda2cd76ee8a38ef1298c8a78bd (diff) | |
download | qemu-7206a75094a0f026bc81238b5e1faea90ea2c2b5.tar.gz qemu-7206a75094a0f026bc81238b5e1faea90ea2c2b5.tar.bz2 qemu-7206a75094a0f026bc81238b5e1faea90ea2c2b5.zip |
Merge remote branch 'origin/master' into pci
Conflicts:
exec.c
Diffstat (limited to 'cpu-common.h')
-rw-r--r-- | cpu-common.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cpu-common.h b/cpu-common.h index c239cc0def..6410cccda5 100644 --- a/cpu-common.h +++ b/cpu-common.h @@ -79,14 +79,14 @@ void cpu_unregister_io_memory(int table_address); void cpu_physical_memory_rw(target_phys_addr_t addr, uint8_t *buf, int len, int is_write); static inline void cpu_physical_memory_read(target_phys_addr_t addr, - uint8_t *buf, int len) + void *buf, int len) { cpu_physical_memory_rw(addr, buf, len, 0); } static inline void cpu_physical_memory_write(target_phys_addr_t addr, - const uint8_t *buf, int len) + const void *buf, int len) { - cpu_physical_memory_rw(addr, (uint8_t *)buf, len, 1); + cpu_physical_memory_rw(addr, (void *)buf, len, 1); } void *cpu_physical_memory_map(target_phys_addr_t addr, target_phys_addr_t *plen, |