From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39468) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZUZQX-00044C-Rl for qemu-devel@nongnu.org; Wed, 26 Aug 2015 08:03:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZUZQS-0007bF-Vh for qemu-devel@nongnu.org; Wed, 26 Aug 2015 08:03:37 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48501) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZUZQS-0007b5-OS for qemu-devel@nongnu.org; Wed, 26 Aug 2015 08:03:32 -0400 From: "Daniel P. Berrange" Date: Wed, 26 Aug 2015 13:03:14 +0100 Message-Id: <1440590594-5514-8-git-send-email-berrange@redhat.com> In-Reply-To: <1440590594-5514-1-git-send-email-berrange@redhat.com> References: <1440590594-5514-1-git-send-email-berrange@redhat.com> Subject: [Qemu-devel] [PATCH RFC 7/7] machine: register properties against the class instead of object List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Markus Armbruster , =?UTF-8?q?Andreas=20F=C3=A4rber?= This converts the machine base object to register its properties against the class rather than object. Signed-off-by: Daniel P. Berrange --- hw/core/machine.c | 193 +++++++++++++++++++++++++++--------------------------- 1 file changed, 97 insertions(+), 96 deletions(-) diff --git a/hw/core/machine.c b/hw/core/machine.c index ac4654e..0fd80d3 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -300,6 +300,103 @@ static void machine_class_init(ObjectClass *oc, void *data) /* Default 128 MB as guest ram size */ mc->default_ram_size = 128 * M_BYTE; + + object_class_property_add_str(oc, "accel", + machine_get_accel, machine_set_accel, NULL); + object_class_property_set_description(oc, "accel", + "Accelerator list", + NULL); + object_class_property_add_bool(oc, "kernel-irqchip", + NULL, + machine_set_kernel_irqchip, + NULL); + object_class_property_set_description(oc, "kernel-irqchip", + "Use KVM in-kernel irqchip", + NULL); + object_class_property_add(oc, "kvm-shadow-mem", "int", + machine_get_kvm_shadow_mem, + machine_set_kvm_shadow_mem, + NULL, NULL, NULL); + object_class_property_set_description(oc, "kvm-shadow-mem", + "KVM shadow MMU size", + NULL); + object_class_property_add_str(oc, "kernel", + machine_get_kernel, machine_set_kernel, NULL); + object_class_property_set_description(oc, "kernel", + "Linux kernel image file", + NULL); + object_class_property_add_str(oc, "initrd", + machine_get_initrd, machine_set_initrd, NULL); + object_class_property_set_description(oc, "initrd", + "Linux initial ramdisk file", + NULL); + object_class_property_add_str(oc, "append", + machine_get_append, machine_set_append, NULL); + object_class_property_set_description(oc, "append", + "Linux kernel command line", + NULL); + object_class_property_add_str(oc, "dtb", + machine_get_dtb, machine_set_dtb, NULL); + object_class_property_set_description(oc, "dtb", + "Linux kernel device tree file", + NULL); + object_class_property_add_str(oc, "dumpdtb", + machine_get_dumpdtb, + machine_set_dumpdtb, NULL); + object_class_property_set_description(oc, "dumpdtb", + "Dump current dtb to a file and quit", + NULL); + object_class_property_add(oc, "phandle-start", "int", + machine_get_phandle_start, + machine_set_phandle_start, + NULL, NULL, NULL); + object_class_property_set_description(oc, "phandle-start", + "The first phandle ID we may generate dynamically", + NULL); + object_class_property_add_str(oc, "dt-compatible", + machine_get_dt_compatible, + machine_set_dt_compatible, + NULL); + object_class_property_set_description(oc, "dt-compatible", + "Overrides the \"compatible\" property of the dt root node", + NULL); + object_class_property_add_bool(oc, "dump-guest-core", + machine_get_dump_guest_core, + machine_set_dump_guest_core, + NULL); + object_class_property_set_description(oc, "dump-guest-core", + "Include guest memory in a core dump", + NULL); + object_class_property_add_bool(oc, "mem-merge", + machine_get_mem_merge, + machine_set_mem_merge, NULL); + object_class_property_set_description(oc, "mem-merge", + "Enable/disable memory merge support", + NULL); + object_class_property_add_bool(oc, "usb", + machine_get_usb, + machine_set_usb, NULL); + object_class_property_set_description(oc, "usb", + "Set on/off to enable/disable usb", + NULL); + object_class_property_add_str(oc, "firmware", + machine_get_firmware, + machine_set_firmware, NULL); + object_class_property_set_description(oc, "firmware", + "Firmware image", + NULL); + object_class_property_add_bool(oc, "iommu", + machine_get_iommu, + machine_set_iommu, NULL); + object_class_property_set_description(oc, "iommu", + "Set on/off to enable/disable Intel IOMMU (VT-d)", + NULL); + object_class_property_add_bool(oc, "suppress-vmdesc", + machine_get_suppress_vmdesc, + machine_set_suppress_vmdesc, NULL); + object_class_property_set_description(oc, "suppress-vmdesc", + "Set on to disable self-describing migration", + NULL); } static void machine_initfn(Object *obj) @@ -311,102 +408,6 @@ static void machine_initfn(Object *obj) ms->dump_guest_core = true; ms->mem_merge = true; - object_property_add_str(obj, "accel", - machine_get_accel, machine_set_accel, NULL); - object_property_set_description(obj, "accel", - "Accelerator list", - NULL); - object_property_add_bool(obj, "kernel-irqchip", - NULL, - machine_set_kernel_irqchip, - NULL); - object_property_set_description(obj, "kernel-irqchip", - "Use KVM in-kernel irqchip", - NULL); - object_property_add(obj, "kvm-shadow-mem", "int", - machine_get_kvm_shadow_mem, - machine_set_kvm_shadow_mem, - NULL, NULL, NULL); - object_property_set_description(obj, "kvm-shadow-mem", - "KVM shadow MMU size", - NULL); - object_property_add_str(obj, "kernel", - machine_get_kernel, machine_set_kernel, NULL); - object_property_set_description(obj, "kernel", - "Linux kernel image file", - NULL); - object_property_add_str(obj, "initrd", - machine_get_initrd, machine_set_initrd, NULL); - object_property_set_description(obj, "initrd", - "Linux initial ramdisk file", - NULL); - object_property_add_str(obj, "append", - machine_get_append, machine_set_append, NULL); - object_property_set_description(obj, "append", - "Linux kernel command line", - NULL); - object_property_add_str(obj, "dtb", - machine_get_dtb, machine_set_dtb, NULL); - object_property_set_description(obj, "dtb", - "Linux kernel device tree file", - NULL); - object_property_add_str(obj, "dumpdtb", - machine_get_dumpdtb, machine_set_dumpdtb, NULL); - object_property_set_description(obj, "dumpdtb", - "Dump current dtb to a file and quit", - NULL); - object_property_add(obj, "phandle-start", "int", - machine_get_phandle_start, - machine_set_phandle_start, - NULL, NULL, NULL); - object_property_set_description(obj, "phandle-start", - "The first phandle ID we may generate dynamically", - NULL); - object_property_add_str(obj, "dt-compatible", - machine_get_dt_compatible, - machine_set_dt_compatible, - NULL); - object_property_set_description(obj, "dt-compatible", - "Overrides the \"compatible\" property of the dt root node", - NULL); - object_property_add_bool(obj, "dump-guest-core", - machine_get_dump_guest_core, - machine_set_dump_guest_core, - NULL); - object_property_set_description(obj, "dump-guest-core", - "Include guest memory in a core dump", - NULL); - object_property_add_bool(obj, "mem-merge", - machine_get_mem_merge, - machine_set_mem_merge, NULL); - object_property_set_description(obj, "mem-merge", - "Enable/disable memory merge support", - NULL); - object_property_add_bool(obj, "usb", - machine_get_usb, - machine_set_usb, NULL); - object_property_set_description(obj, "usb", - "Set on/off to enable/disable usb", - NULL); - object_property_add_str(obj, "firmware", - machine_get_firmware, - machine_set_firmware, NULL); - object_property_set_description(obj, "firmware", - "Firmware image", - NULL); - object_property_add_bool(obj, "iommu", - machine_get_iommu, - machine_set_iommu, NULL); - object_property_set_description(obj, "iommu", - "Set on/off to enable/disable Intel IOMMU (VT-d)", - NULL); - object_property_add_bool(obj, "suppress-vmdesc", - machine_get_suppress_vmdesc, - machine_set_suppress_vmdesc, NULL); - object_property_set_description(obj, "suppress-vmdesc", - "Set on to disable self-describing migration", - NULL); - /* Register notifier when init is done for sysbus sanity checks */ ms->sysbus_notifier.notify = machine_init_notify; qemu_add_machine_init_done_notifier(&ms->sysbus_notifier); -- 2.4.3