[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH V7 04/16] ppc: spapr: add 2.4 machine type
From: |
Jason Wang |
Subject: |
[Qemu-devel] [PATCH V7 04/16] ppc: spapr: add 2.4 machine type |
Date: |
Thu, 23 Apr 2015 14:21:37 +0800 |
The following patches will limit the following things to legacy
machine type:
- maximum number of virtqueues for virtio-pci were limited to 64
Cc: Alexander Graf <address@hidden>
Cc: address@hidden
Signed-off-by: Jason Wang <address@hidden>
---
hw/ppc/spapr.c | 31 +++++++++++++++++++++++++++++--
1 file changed, 29 insertions(+), 2 deletions(-)
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index 9e676ef..8e43aa2 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -1825,8 +1825,13 @@ static const TypeInfo spapr_machine_info = {
#define SPAPR_COMPAT_2_1 \
SPAPR_COMPAT_2_2
+static void spapr_compat_2_3(Object *obj)
+{
+}
+
static void spapr_compat_2_2(Object *obj)
{
+ spapr_compat_2_3(obj);
}
static void spapr_compat_2_1(Object *obj)
@@ -1834,6 +1839,12 @@ static void spapr_compat_2_1(Object *obj)
spapr_compat_2_2(obj);
}
+static void spapr_machine_2_3_instance_init(Object *obj)
+{
+ spapr_compat_2_3(obj);
+ spapr_machine_initfn(obj);
+}
+
static void spapr_machine_2_2_instance_init(Object *obj)
{
spapr_compat_2_2(obj);
@@ -1893,14 +1904,29 @@ static void spapr_machine_2_3_class_init(ObjectClass
*oc, void *data)
mc->name = "pseries-2.3";
mc->desc = "pSeries Logical Partition (PAPR compliant) v2.3";
- mc->alias = "pseries";
- mc->is_default = 1;
}
static const TypeInfo spapr_machine_2_3_info = {
.name = TYPE_SPAPR_MACHINE "2.3",
.parent = TYPE_SPAPR_MACHINE,
.class_init = spapr_machine_2_3_class_init,
+ .instance_init = spapr_machine_2_3_instance_init,
+};
+
+static void spapr_machine_2_4_class_init(ObjectClass *oc, void *data)
+{
+ MachineClass *mc = MACHINE_CLASS(oc);
+
+ mc->name = "pseries-2.4";
+ mc->desc = "pSeries Logical Partition (PAPR compliant) v2.4";
+ mc->alias = "pseries";
+ mc->is_default = 1;
+}
+
+static const TypeInfo spapr_machine_2_4_info = {
+ .name = TYPE_SPAPR_MACHINE "2.4",
+ .parent = TYPE_SPAPR_MACHINE,
+ .class_init = spapr_machine_2_4_class_init,
};
static void spapr_machine_register_types(void)
@@ -1909,6 +1935,7 @@ static void spapr_machine_register_types(void)
type_register_static(&spapr_machine_2_1_info);
type_register_static(&spapr_machine_2_2_info);
type_register_static(&spapr_machine_2_3_info);
+ type_register_static(&spapr_machine_2_4_info);
}
type_init(spapr_machine_register_types)
--
2.1.0
- [Qemu-devel] [PATCH V7 00/16] Support more virtio queues, Jason Wang, 2015/04/23
- [Qemu-devel] [PATCH V7 01/16] virtio-net: fix the upper bound when trying to delete queues, Jason Wang, 2015/04/23
- [Qemu-devel] [PATCH V7 02/16] pc: add 2.4 machine types, Jason Wang, 2015/04/23
- [Qemu-devel] [PATCH V7 03/16] spapr: add machine type specific instance init function, Jason Wang, 2015/04/23
- [Qemu-devel] [PATCH V7 04/16] ppc: spapr: add 2.4 machine type,
Jason Wang <=
- [Qemu-devel] [PATCH V7 05/16] monitor: replace the magic number 255 with MAX_QUEUE_NUM, Jason Wang, 2015/04/23
- [Qemu-devel] [PATCH V7 06/16] monitor: check return value of qemu_find_net_clients_except(), Jason Wang, 2015/04/23
- [Qemu-devel] [PATCH V7 07/16] virtio-ccw: using VIRTIO_NO_VECTOR instead of 0 for invalid virtqueue, Jason Wang, 2015/04/23
- [Qemu-devel] [PATCH V7 08/16] virtio: introduce bus specific queue limit, Jason Wang, 2015/04/23