diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-03-17 08:52:58 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-03-17 08:52:58 +0000 |
| commit | 8c4575472494a5dfedfe05e7b58ca9ce3872ad56 (patch) | |
| tree | b56c2fb353dc23b414f7462744048585787857c4 /include | |
| parent | 33616ace9f3da93cbc967761a173d96eb744fcda (diff) | |
| parent | 34294e2f545dae9f020b6d52e3929f4c4e45800c (diff) | |
| download | qemu-8c4575472494a5dfedfe05e7b58ca9ce3872ad56.zip qemu-8c4575472494a5dfedfe05e7b58ca9ce3872ad56.tar.gz qemu-8c4575472494a5dfedfe05e7b58ca9ce3872ad56.tar.bz2 | |
Merge remote-tracking branch 'remotes/ehabkost/tags/machine-pull-request' into staging
Machine Core queue, 2016-03-16
# gpg: Signature made Wed 16 Mar 2016 18:57:34 GMT using RSA key ID 984DC5A6
# gpg: Good signature from "Eduardo Habkost <ehabkost@redhat.com>"
* remotes/ehabkost/tags/machine-pull-request:
module: Rename machine_init() to opts_init()
machine: Use type_init() to register machine classes
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/hw/boards.h | 2 | ||||
| -rw-r--r-- | include/hw/i386/pc.h | 2 | ||||
| -rw-r--r-- | include/qemu/module.h | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/include/hw/boards.h b/include/hw/boards.h index 4b3fdbe..8efce0f 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -181,7 +181,7 @@ struct MachineState { { \ type_register_static(&machine_initfn##_typeinfo); \ } \ - machine_init(machine_initfn##_register_types) + type_init(machine_initfn##_register_types) #define SET_MACHINE_COMPAT(m, COMPAT) \ do { \ diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 8c2bf7f..847d92f 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -858,7 +858,7 @@ bool e820_get_entry(int, uint32_t, uint64_t *, uint64_t *); { \ type_register(&pc_machine_type_##suffix); \ } \ - machine_init(pc_machine_init_##suffix) + type_init(pc_machine_init_##suffix) extern void igd_passthrough_isa_bridge_create(PCIBus *bus, uint16_t gpu_dev_id); #endif diff --git a/include/qemu/module.h b/include/qemu/module.h index 85fafa2..2370708 100644 --- a/include/qemu/module.h +++ b/include/qemu/module.h @@ -41,14 +41,14 @@ static void __attribute__((constructor)) do_qemu_init_ ## function(void) \ typedef enum { MODULE_INIT_BLOCK, - MODULE_INIT_MACHINE, + MODULE_INIT_OPTS, MODULE_INIT_QAPI, MODULE_INIT_QOM, MODULE_INIT_MAX } module_init_type; #define block_init(function) module_init(function, MODULE_INIT_BLOCK) -#define machine_init(function) module_init(function, MODULE_INIT_MACHINE) +#define opts_init(function) module_init(function, MODULE_INIT_OPTS) #define qapi_init(function) module_init(function, MODULE_INIT_QAPI) #define type_init(function) module_init(function, MODULE_INIT_QOM) |