diff options
| author | Peter Maydell | 2016-03-17 09:52:58 +0100 |
|---|---|---|
| committer | Peter Maydell | 2016-03-17 09:52:58 +0100 |
| commit | 8c4575472494a5dfedfe05e7b58ca9ce3872ad56 (patch) | |
| tree | b56c2fb353dc23b414f7462744048585787857c4 /include/qemu/module.h | |
| parent | Merge remote-tracking branch 'remotes/cody/tags/block-pull-request' into staging (diff) | |
| parent | module: Rename machine_init() to opts_init() (diff) | |
| download | qemu-8c4575472494a5dfedfe05e7b58ca9ce3872ad56.tar.gz qemu-8c4575472494a5dfedfe05e7b58ca9ce3872ad56.tar.xz qemu-8c4575472494a5dfedfe05e7b58ca9ce3872ad56.zip | |
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/qemu/module.h')
| -rw-r--r-- | include/qemu/module.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/qemu/module.h b/include/qemu/module.h index 85fafa2e79..2370708445 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) |