[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 07/30] hw/arm/virt: introduce DEFINE_VIRT_MACHINE_AS_
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PULL 07/30] hw/arm/virt: introduce DEFINE_VIRT_MACHINE_AS_LATEST |
Date: |
Tue, 14 Jun 2016 15:13:42 +0100 |
From: Andrew Jones <address@hidden>
Create two variants of DEFINE_VIRT_MACHINE. One, just called
DEFINE_VIRT_MACHINE, that does not set properties that only
the latest machine type should have, and another that does.
This will hopefully reduce potential for errors when adding
new versions.
Signed-off-by: Andrew Jones <address@hidden>
Message-id: address@hidden
Reviewed-by: Peter Maydell <address@hidden>
Signed-off-by: Peter Maydell <address@hidden>
---
hw/arm/virt.c | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index 86a1a51..fb032e8 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -99,13 +99,16 @@ typedef struct {
OBJECT_CLASS_CHECK(VirtMachineClass, klass, TYPE_VIRT_MACHINE)
-#define DEFINE_VIRT_MACHINE(major, minor) \
+#define DEFINE_VIRT_MACHINE_LATEST(major, minor, latest) \
static void virt_##major##_##minor##_class_init(ObjectClass *oc, \
void *data) \
{ \
MachineClass *mc = MACHINE_CLASS(oc); \
virt_machine_##major##_##minor##_options(mc); \
mc->desc = "QEMU " # major "." # minor " ARM Virtual Machine"; \
+ if (latest) { \
+ mc->alias = "virt"; \
+ } \
} \
static const TypeInfo machvirt_##major##_##minor##_info = { \
.name = MACHINE_TYPE_NAME("virt-" # major "." # minor), \
@@ -119,6 +122,11 @@ typedef struct {
} \
type_init(machvirt_machine_##major##_##minor##_init);
+#define DEFINE_VIRT_MACHINE_AS_LATEST(major, minor) \
+ DEFINE_VIRT_MACHINE_LATEST(major, minor, true)
+#define DEFINE_VIRT_MACHINE(major, minor) \
+ DEFINE_VIRT_MACHINE_LATEST(major, minor, false)
+
/* RAM limit in GB. Since VIRT_MEM starts at the 1GB mark, this means
* RAM can go up to the 256GB mark, leaving 256GB of the physical
@@ -1483,6 +1491,5 @@ static void virt_2_6_instance_init(Object *obj)
static void virt_machine_2_6_options(MachineClass *mc)
{
- mc->alias = "virt";
}
-DEFINE_VIRT_MACHINE(2, 6)
+DEFINE_VIRT_MACHINE_AS_LATEST(2, 6)
--
1.9.1
- [Qemu-devel] [PULL 17/30] hw/misc: QOM'ify exynos4210_pmu.c, (continued)
- [Qemu-devel] [PULL 17/30] hw/misc: QOM'ify exynos4210_pmu.c, Peter Maydell, 2016/06/14
- [Qemu-devel] [PULL 23/30] i2c: Factor our send() and recv() common logic, Peter Maydell, 2016/06/14
- [Qemu-devel] [PULL 22/30] i2c: implement broadcast write, Peter Maydell, 2016/06/14
- [Qemu-devel] [PULL 29/30] arm: xlnx-zynqmp: Add xlnx-dp and xlnx-dpdma, Peter Maydell, 2016/06/14
- [Qemu-devel] [PULL 30/30] target-arm: Don't permit ARMv8-only Neon insns on ARMv7, Peter Maydell, 2016/06/14
- [Qemu-devel] [PULL 21/30] i2cbus: remove unused dev field, Peter Maydell, 2016/06/14
- [Qemu-devel] [PULL 20/30] hw/sd: QOM'ify pl181.c, Peter Maydell, 2016/06/14
- [Qemu-devel] [PULL 24/30] introduce aux-bus, Peter Maydell, 2016/06/14
- [Qemu-devel] [PULL 03/30] hw/arm/virt-acpi-build: Add PMU IRQ number in ACPI table, Peter Maydell, 2016/06/14
- [Qemu-devel] [PULL 27/30] introduce xlnx-dpdma, Peter Maydell, 2016/06/14
- [Qemu-devel] [PULL 07/30] hw/arm/virt: introduce DEFINE_VIRT_MACHINE_AS_LATEST,
Peter Maydell <=
- [Qemu-devel] [PULL 19/30] hw/dma: QOM'ify pxa2xx_dma.c, Peter Maydell, 2016/06/14
- [Qemu-devel] [PULL 25/30] introduce dpcd module, Peter Maydell, 2016/06/14
- [Qemu-devel] [PULL 26/30] hw/i2c-ddc.c: Implement DDC I2C slave, Peter Maydell, 2016/06/14
- [Qemu-devel] [PULL 28/30] introduce xlnx-dp, Peter Maydell, 2016/06/14