[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 04/16] machine: Add machine_register_compat_props() f
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PULL 04/16] machine: Add machine_register_compat_props() function |
Date: |
Thu, 7 Jul 2016 16:59:10 -0300 |
Move the compat_props handling to core machine code.
Reviewed-by: Marcel Apfelbaum <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Signed-off-by: Eduardo Habkost <address@hidden>
---
hw/core/machine.c | 16 ++++++++++++++++
include/hw/boards.h | 1 +
vl.c | 9 ++-------
3 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/hw/core/machine.c b/hw/core/machine.c
index 8f94301..052517d 100644
--- a/hw/core/machine.c
+++ b/hw/core/machine.c
@@ -560,6 +560,22 @@ static void machine_class_finalize(ObjectClass *klass,
void *data)
}
}
+void machine_register_compat_props(MachineState *machine)
+{
+ MachineClass *mc = MACHINE_GET_CLASS(machine);
+ int i;
+ GlobalProperty *p;
+
+ if (!mc->compat_props) {
+ return;
+ }
+
+ for (i = 0; i < mc->compat_props->len; i++) {
+ p = g_array_index(mc->compat_props, GlobalProperty *, i);
+ qdev_prop_register_global(p);
+ }
+}
+
static const TypeInfo machine_info = {
.name = TYPE_MACHINE,
.parent = TYPE_OBJECT,
diff --git a/include/hw/boards.h b/include/hw/boards.h
index 3ed6155..3e69eca 100644
--- a/include/hw/boards.h
+++ b/include/hw/boards.h
@@ -40,6 +40,7 @@ int machine_kvm_shadow_mem(MachineState *machine);
int machine_phandle_start(MachineState *machine);
bool machine_dump_guest_core(MachineState *machine);
bool machine_mem_merge(MachineState *machine);
+void machine_register_compat_props(MachineState *machine);
/**
* CPUArchId:
diff --git a/vl.c b/vl.c
index ebdeaa0..356713e 100644
--- a/vl.c
+++ b/vl.c
@@ -4448,13 +4448,8 @@ int main(int argc, char **argv, char **envp)
exit (i == 1 ? 1 : 0);
}
- if (machine_class->compat_props) {
- GlobalProperty *p;
- for (i = 0; i < machine_class->compat_props->len; i++) {
- p = g_array_index(machine_class->compat_props, GlobalProperty *,
i);
- qdev_prop_register_global(p);
- }
- }
+ machine_register_compat_props(current_machine);
+
qemu_opts_foreach(qemu_find_opts("global"),
global_init_func, NULL, NULL);
--
2.5.5
- [Qemu-devel] [PULL 00/16] x86 and machine queue, 2016-07-07, Eduardo Habkost, 2016/07/07
- [Qemu-devel] [PULL 01/16] qdev: Don't stop applying globals on first error, Eduardo Habkost, 2016/07/07
- [Qemu-devel] [PULL 02/16] qdev: Eliminate qemu_add_globals() function, Eduardo Habkost, 2016/07/07
- [Qemu-devel] [PULL 04/16] machine: Add machine_register_compat_props() function,
Eduardo Habkost <=
- [Qemu-devel] [PULL 03/16] qdev: GlobalProperty.errp field, Eduardo Habkost, 2016/07/07
- [Qemu-devel] [PULL 05/16] vl: Set errp to &error_abort on machine compat_props, Eduardo Habkost, 2016/07/07
- [Qemu-devel] [PULL 06/16] target-sparc: Use sparc_cpu_parse_features() directly, Eduardo Habkost, 2016/07/07
- [Qemu-devel] [PULL 07/16] target-i386: TCG can support CPUID.07H:EBX.erms, Eduardo Habkost, 2016/07/07
- [Qemu-devel] [PULL 08/16] target-i386: Avoid using locals outside their scope, Eduardo Habkost, 2016/07/07
- [Qemu-devel] [PULL 09/16] cpu: Use CPUClass->parse_features() as convertor to global properties, Eduardo Habkost, 2016/07/07
- [Qemu-devel] [PULL 11/16] pc: Parse CPU features only once, Eduardo Habkost, 2016/07/07
- [Qemu-devel] [PULL 10/16] arm: virt: Parse cpu_model only once, Eduardo Habkost, 2016/07/07
- [Qemu-devel] [PULL 15/16] target-i386: Publish advised value of MSR_IA32_FEATURE_CONTROL via fw_cfg, Eduardo Habkost, 2016/07/07
- [Qemu-devel] [PULL 12/16] target-i386: Show host and VM TSC frequencies on mismatch, Eduardo Habkost, 2016/07/07