diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/exec/memory.h | 8 | ||||
| -rw-r--r-- | include/exec/ram_addr.h | 4 | ||||
| -rw-r--r-- | include/qemu-common.h | 2 | ||||
| -rw-r--r-- | include/qemu/osdep.h | 4 |
4 files changed, 10 insertions, 8 deletions
diff --git a/include/exec/memory.h b/include/exec/memory.h index ea381d6d4f..072aad2239 100644 --- a/include/exec/memory.h +++ b/include/exec/memory.h @@ -311,11 +311,13 @@ void memory_region_init_io(MemoryRegion *mr, * @owner: the object that tracks the region's reference count * @name: the name of the region. * @size: size of the region. + * @errp: pointer to Error*, to store an error if it happens. */ void memory_region_init_ram(MemoryRegion *mr, struct Object *owner, const char *name, - uint64_t size); + uint64_t size, + Error **errp); #ifdef __linux__ /** @@ -384,13 +386,15 @@ void memory_region_init_alias(MemoryRegion *mr, * @ops: callbacks for write access handling. * @name: the name of the region. * @size: size of the region. + * @errp: pointer to Error*, to store an error if it happens. */ void memory_region_init_rom_device(MemoryRegion *mr, struct Object *owner, const MemoryRegionOps *ops, void *opaque, const char *name, - uint64_t size); + uint64_t size, + Error **errp); /** * memory_region_init_reservation: Initialize a memory region that reserves diff --git a/include/exec/ram_addr.h b/include/exec/ram_addr.h index 6593be1310..cf1d4c7e1f 100644 --- a/include/exec/ram_addr.h +++ b/include/exec/ram_addr.h @@ -26,8 +26,8 @@ ram_addr_t qemu_ram_alloc_from_file(ram_addr_t size, MemoryRegion *mr, bool share, const char *mem_path, Error **errp); ram_addr_t qemu_ram_alloc_from_ptr(ram_addr_t size, void *host, - MemoryRegion *mr); -ram_addr_t qemu_ram_alloc(ram_addr_t size, MemoryRegion *mr); + MemoryRegion *mr, Error **errp); +ram_addr_t qemu_ram_alloc(ram_addr_t size, MemoryRegion *mr, Error **errp); int qemu_get_ram_fd(ram_addr_t addr); void *qemu_get_ram_block_host_ptr(ram_addr_t addr); void *qemu_get_ram_ptr(ram_addr_t addr); diff --git a/include/qemu-common.h b/include/qemu-common.h index bcf7a6ad43..dcb57ab4b9 100644 --- a/include/qemu-common.h +++ b/include/qemu-common.h @@ -105,6 +105,8 @@ static inline char *realpath(const char *path, char *resolved_path) } #endif +void cpu_ticks_init(void); + /* icount */ void configure_icount(QemuOpts *opts, Error **errp); extern int use_icount; diff --git a/include/qemu/osdep.h b/include/qemu/osdep.h index 9dd43fc2db..1565404f7e 100644 --- a/include/qemu/osdep.h +++ b/include/qemu/osdep.h @@ -246,11 +246,7 @@ char *qemu_get_exec_dir(void); * Search the auxiliary vector for @type, returning the value * or 0 if @type is not present. */ -#if defined(CONFIG_GETAUXVAL) || defined(__linux__) unsigned long qemu_getauxval(unsigned long type); -#else -static inline unsigned long qemu_getauxval(unsigned long type) { return 0; } -#endif void qemu_set_tty_echo(int fd, bool echo); |