From: Jason Wang <jasowang@redhat.com>
To: qemu-devel@nongnu.org
Cc: Jason Wang <jasowang@redhat.com>,
qemu-ppc@nongnu.org, Alexander Graf <agraf@suse.de>,
mst@redhat.com
Subject: [Qemu-devel] [PATCH v6 03/16] spapr: add machine type specific instance init function
Date: Fri, 17 Apr 2015 12:48:27 +0800 [thread overview]
Message-ID: <1429246120-29439-4-git-send-email-jasowang@redhat.com> (raw)
In-Reply-To: <1429246120-29439-1-git-send-email-jasowang@redhat.com>
This patches adds machine type specific instance initialization
functions. Those functions will be used by following patches to compat
class properties for legacy machine types.
Cc: Alexander Graf <agraf@suse.de>
Cc: qemu-ppc@nongnu.org
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
hw/ppc/spapr.c | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index 61ddc79..9e676ef 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -1825,6 +1825,27 @@ static const TypeInfo spapr_machine_info = {
#define SPAPR_COMPAT_2_1 \
SPAPR_COMPAT_2_2
+static void spapr_compat_2_2(Object *obj)
+{
+}
+
+static void spapr_compat_2_1(Object *obj)
+{
+ spapr_compat_2_2(obj);
+}
+
+static void spapr_machine_2_2_instance_init(Object *obj)
+{
+ spapr_compat_2_2(obj);
+ spapr_machine_initfn(obj);
+}
+
+static void spapr_machine_2_1_instance_init(Object *obj)
+{
+ spapr_compat_2_1(obj);
+ spapr_machine_initfn(obj);
+}
+
static void spapr_machine_2_1_class_init(ObjectClass *oc, void *data)
{
MachineClass *mc = MACHINE_CLASS(oc);
@@ -1843,6 +1864,7 @@ static const TypeInfo spapr_machine_2_1_info = {
.name = TYPE_SPAPR_MACHINE "2.1",
.parent = TYPE_SPAPR_MACHINE,
.class_init = spapr_machine_2_1_class_init,
+ .instance_init = spapr_machine_2_1_instance_init,
};
static void spapr_machine_2_2_class_init(ObjectClass *oc, void *data)
@@ -1862,6 +1884,7 @@ static const TypeInfo spapr_machine_2_2_info = {
.name = TYPE_SPAPR_MACHINE "2.2",
.parent = TYPE_SPAPR_MACHINE,
.class_init = spapr_machine_2_2_class_init,
+ .instance_init = spapr_machine_2_2_instance_init,
};
static void spapr_machine_2_3_class_init(ObjectClass *oc, void *data)
--
2.1.0
next prev parent reply other threads:[~2015-04-17 4:48 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-17 4:48 [Qemu-devel] [PATCH v6 00/16] Support more virtio queues Jason Wang
2015-04-17 4:48 ` [Qemu-devel] [PATCH v6 01/16] virtio-net: fix the upper bound when trying to delete queues Jason Wang
2015-04-17 4:48 ` [Qemu-devel] [PATCH v6 02/16] pc: add 2.4 machine types Jason Wang
2015-04-17 4:48 ` Jason Wang [this message]
2015-04-17 4:48 ` [Qemu-devel] [PATCH v6 04/16] ppc: spapr: add 2.4 machine type Jason Wang
2015-04-17 4:48 ` [Qemu-devel] [PATCH v6 05/16] monitor: replace the magic number 255 with MAX_QUEUE_NUM Jason Wang
2015-04-17 4:48 ` [Qemu-devel] [PATCH v6 06/16] monitor: check return value of qemu_find_net_clients_except() Jason Wang
2015-04-17 4:48 ` [Qemu-devel] [PATCH v6 07/16] virtio-ccw: using VIRTIO_NO_VECTOR instead of 0 for invalid virtqueue Jason Wang
2015-04-17 11:31 ` Cornelia Huck
2015-04-20 5:27 ` Jason Wang
2015-04-20 5:29 ` Jason Wang
2015-04-17 4:48 ` [Qemu-devel] [PATCH v6 08/16] virtio: introduce bus specific queue limit Jason Wang
2015-04-17 11:40 ` Cornelia Huck
2015-04-17 4:48 ` [Qemu-devel] [PATCH v6 09/16] virtio-ccw: introduce ccw " Jason Wang
2015-04-17 11:46 ` Cornelia Huck
2015-04-20 5:27 ` Jason Wang
2015-04-17 4:48 ` [Qemu-devel] [PATCH v6 10/16] virtio-s390: switch to bus " Jason Wang
2015-04-17 11:49 ` Cornelia Huck
2015-04-17 4:48 ` [Qemu-devel] [PATCH v6 11/16] virtio-mmio: " Jason Wang
2015-04-17 4:48 ` [Qemu-devel] [PATCH v6 12/16] virtio-pci: switch to use " Jason Wang
2015-04-17 4:48 ` [Qemu-devel] [PATCH v6 13/16] virtio: introduce vector to virtqueues mapping Jason Wang
2015-04-17 4:48 ` [Qemu-devel] [PATCH v6 14/16] virtio-pci: speedup MSI-X masking and unmasking Jason Wang
2015-04-17 4:48 ` [Qemu-devel] [PATCH v6 15/16] virtio-pci: increase the maximum number of virtqueues to 513 Jason Wang
2015-04-17 4:48 ` [Qemu-devel] [PATCH v6 16/16] pci: remove hard-coded bar size in msix_init_exclusive_bar() Jason Wang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1429246120-29439-4-git-send-email-jasowang@redhat.com \
--to=jasowang@redhat.com \
--cc=agraf@suse.de \
--cc=mst@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).