[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 04/21] arm: virt: Add an abstract ARM virt machine ty
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PULL 04/21] arm: virt: Add an abstract ARM virt machine type |
Date: |
Wed, 16 Mar 2016 17:18:18 +0000 |
From: Wei Huang <address@hidden>
In preparation for future ARM virt machine types, this patch creates
an abstract type for all ARM machines. The current machine type in
QEMU (i.e. "virt") is renamed to "virt-2.6", whose naming scheme is
similar to other architectures. For the purpose of backward compatibility,
"virt" is converted to an alias, pointing to "virt-2.6". With this patch,
"qemu -M ?" lists the following virtual machine types along with others:
virt QEMU 2.6 ARM Virtual Machine (alias of virt-2.6)
virt-2.6 QEMU 2.6 ARM Virtual Machine
Signed-off-by: Wei Huang <address@hidden>
Message-id: address@hidden
Reviewed-by: Peter Maydell <address@hidden>
Signed-off-by: Peter Maydell <address@hidden>
---
hw/arm/virt.c | 23 ++++++++++++++++++-----
1 file changed, 18 insertions(+), 5 deletions(-)
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index 8c6c996..be9bbfb 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -1345,6 +1345,19 @@ static void virt_set_gic_version(Object *obj, const char
*value, Error **errp)
}
}
+static void virt_machine_class_init(ObjectClass *oc, void *data)
+{
+}
+
+static const TypeInfo virt_machine_info = {
+ .name = TYPE_VIRT_MACHINE,
+ .parent = TYPE_MACHINE,
+ .abstract = true,
+ .instance_size = sizeof(VirtMachineState),
+ .class_size = sizeof(VirtMachineClass),
+ .class_init = virt_machine_class_init,
+};
+
static void virt_instance_init(Object *obj)
{
VirtMachineState *vms = VIRT_MACHINE(obj);
@@ -1382,7 +1395,8 @@ static void virt_class_init(ObjectClass *oc, void *data)
{
MachineClass *mc = MACHINE_CLASS(oc);
- mc->desc = "ARM Virtual Machine",
+ mc->desc = "QEMU 2.6 ARM Virtual Machine";
+ mc->alias = "virt";
mc->init = machvirt_init;
/* Start max_cpus at the maximum QEMU supports. We'll further restrict
* it later in machvirt_init, where we have more information about the
@@ -1396,16 +1410,15 @@ static void virt_class_init(ObjectClass *oc, void *data)
}
static const TypeInfo machvirt_info = {
- .name = TYPE_VIRT_MACHINE,
- .parent = TYPE_MACHINE,
- .instance_size = sizeof(VirtMachineState),
+ .name = MACHINE_TYPE_NAME("virt-2.6"),
+ .parent = TYPE_VIRT_MACHINE,
.instance_init = virt_instance_init,
- .class_size = sizeof(VirtMachineClass),
.class_init = virt_class_init,
};
static void machvirt_machine_init(void)
{
+ type_register_static(&virt_machine_info);
type_register_static(&machvirt_info);
}
--
1.9.1
- [Qemu-devel] [PULL 09/21] i.MX: Add the CLK_IPG_HIGH clock, (continued)
- [Qemu-devel] [PULL 09/21] i.MX: Add the CLK_IPG_HIGH clock, Peter Maydell, 2016/03/16
- [Qemu-devel] [PULL 07/21] i.MX: Rename CCM NOCLK to CLK_NONE for naming consistency., Peter Maydell, 2016/03/16
- [Qemu-devel] [PULL 05/21] arm: virt: Move machine class init code to the abstract machine type, Peter Maydell, 2016/03/16
- [Qemu-devel] [PULL 08/21] i.MX: Remove CCM useless clock computation handling., Peter Maydell, 2016/03/16
- [Qemu-devel] [PULL 11/21] i.MX: Add missing descriptions in devices., Peter Maydell, 2016/03/16
- [Qemu-devel] [PULL 21/21] sd: Fix "info qtree" on boards with SD cards, Peter Maydell, 2016/03/16
- [Qemu-devel] [PULL 17/21] bcm2835_aux: add emulation of BCM2835 AUX (aka UART1) block, Peter Maydell, 2016/03/16
- [Qemu-devel] [PULL 19/21] bcm2835_property: implement framebuffer control/configuration properties, Peter Maydell, 2016/03/16
- [Qemu-devel] [PULL 02/21] target-arm: Implement MRS (banked) and MSR (banked) instructions, Peter Maydell, 2016/03/16
- [Qemu-devel] [PULL 12/21] hw/timer: Add ASPEED timer device model, Peter Maydell, 2016/03/16
- [Qemu-devel] [PULL 04/21] arm: virt: Add an abstract ARM virt machine type,
Peter Maydell <=
- [Qemu-devel] [PULL 06/21] i.MX: Allow GPT timer to rollover., Peter Maydell, 2016/03/16
- [Qemu-devel] [PULL 01/21] loader: Fix incorrect parameter name in load_image_mr() macro, Peter Maydell, 2016/03/16
- [Qemu-devel] [PULL 20/21] bcm2835_dma: add emulation of Raspberry Pi DMA controller, Peter Maydell, 2016/03/16
- [Qemu-devel] [PULL 10/21] i.MX: Add i.MX6 CCM and ANALOG device., Peter Maydell, 2016/03/16
- [Qemu-devel] [PULL 13/21] hw/intc: Add (new) ASPEED VIC device model, Peter Maydell, 2016/03/16
- [Qemu-devel] [PULL 18/21] bcm2835_fb: add framebuffer device for Raspberry Pi, Peter Maydell, 2016/03/16
- Re: [Qemu-devel] [PULL 00/21] target-arm queue, Peter Maydell, 2016/03/16
- Re: [Qemu-devel] [PULL 00/21] target-arm queue, Peter Maydell, 2016/03/16