[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 07/21] arm: Rename virt machine class to use MACHINE_
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PULL 07/21] arm: Rename virt machine class to use MACHINE_TYPE_NAME |
Date: |
Sat, 19 Sep 2015 16:43:16 +0200 |
From: Eduardo Habkost <address@hidden>
Machine class names should use the "-machine" suffix to allow
class-name-based machine class lookup to work. Rename the arm virt
machine class using the MACHINE_TYPE_NAME macro.
Signed-off-by: Eduardo Habkost <address@hidden>
Reviewed-by: David Gibson <address@hidden>
Signed-off-by: Andreas Färber <address@hidden>
---
hw/arm/virt.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index e9324f5..fba2595 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -83,7 +83,8 @@ typedef struct {
bool highmem;
} VirtMachineState;
-#define TYPE_VIRT_MACHINE "virt"
+#define VIRT_MACHINE_NAME "virt"
+#define TYPE_VIRT_MACHINE MACHINE_TYPE_NAME(VIRT_MACHINE_NAME)
#define VIRT_MACHINE(obj) \
OBJECT_CHECK(VirtMachineState, (obj), TYPE_VIRT_MACHINE)
#define VIRT_MACHINE_GET_CLASS(obj) \
@@ -1073,7 +1074,7 @@ static void virt_class_init(ObjectClass *oc, void *data)
{
MachineClass *mc = MACHINE_CLASS(oc);
- mc->name = TYPE_VIRT_MACHINE;
+ mc->name = VIRT_MACHINE_NAME;
mc->desc = "ARM Virtual Machine",
mc->init = machvirt_init;
mc->max_cpus = 8;
--
2.1.4
- [Qemu-devel] [PULL 00/21] QOM devices patch queue 2015-09-19, Andreas Färber, 2015/09/19
- [Qemu-devel] [PULL 04/21] machine: MACHINE_TYPE_NAME macro, Andreas Färber, 2015/09/19
- [Qemu-devel] [PULL 03/21] qdev: Do not use slow [*] expansion for GPIO creation, Andreas Färber, 2015/09/19
- [Qemu-devel] [PULL 02/21] qom: Fix invalid error check in property_get_str(), Andreas Färber, 2015/09/19
- [Qemu-devel] [PULL 01/21] qom: Do not reuse errp after a possible error, Andreas Färber, 2015/09/19
- [Qemu-devel] [PULL 05/21] vexpress: Don't set name on abstract class, Andreas Färber, 2015/09/19
- [Qemu-devel] [PULL 06/21] vexpress: Rename machine classes to use MACHINE_TYPE_NAME, Andreas Färber, 2015/09/19
- [Qemu-devel] [PULL 07/21] arm: Rename virt machine class to use MACHINE_TYPE_NAME,
Andreas Färber <=
- [Qemu-devel] [PULL 09/21] s390-virtio: Rename machine class name to use MACHINE_TYPE_NAME, Andreas Färber, 2015/09/19
- [Qemu-devel] [PULL 12/21] machine: Ensure all TYPE_MACHINE subclasses have the right suffix, Andreas Färber, 2015/09/19
- [Qemu-devel] [PULL 10/21] s390: Rename s390-ccw-virtio-2.4 class name to use MACHINE_TYPE_NAME, Andreas Färber, 2015/09/19
- [Qemu-devel] [PULL 08/21] pseries: Rename machine class names to use MACHINE_TYPE_NAME, Andreas Färber, 2015/09/19
- [Qemu-devel] [PULL 11/21] mac99: Use MACHINE_TYPE_NAME to encode class name, Andreas Färber, 2015/09/19
- [Qemu-devel] [PULL 14/21] exynos4: Use EXYNOS4210_NCPUS instead of max_cpus on error message, Andreas Färber, 2015/09/19
- [Qemu-devel] [PULL 13/21] machine: Set MachineClass::name automatically, Andreas Färber, 2015/09/19
- [Qemu-devel] [PULL 15/21] exynos4: Use MachineClass instead of exynos4_machines array, Andreas Färber, 2015/09/19
- [Qemu-devel] [PULL 16/21] exynos4: Declare each QEMUMachine as a separate variable, Andreas Färber, 2015/09/19
- [Qemu-devel] [PULL 17/21] machine: DEFINE_MACHINE() macro, Andreas Färber, 2015/09/19