From: "Michael S. Tsirkin" <mst@redhat.com>
To: qemu-devel@nongnu.org
Cc: Peter Maydell <peter.maydell@linaro.org>,
Jason Wang <jasowang@redhat.com>,
qemu-ppc@nongnu.org, Alexander Graf <agraf@suse.de>
Subject: [Qemu-devel] [PULL 07/28] spapr: add machine type specific instance init function
Date: Mon, 11 May 2015 14:47:16 +0200 [thread overview]
Message-ID: <1431329108-2605-8-git-send-email-mst@redhat.com> (raw)
In-Reply-To: <1431329108-2605-1-git-send-email-mst@redhat.com>
From: Jason Wang <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>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@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)
--
MST
next prev parent reply other threads:[~2015-05-11 12:47 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-11 12:46 [Qemu-devel] [PULL 00/28] pc, virtio enhancements Michael S. Tsirkin
2015-05-11 12:46 ` [Qemu-devel] [PULL 01/28] acpi-build: close } in comment Michael S. Tsirkin
2015-05-11 12:47 ` [Qemu-devel] [PULL 02/28] hw/i386: Move ACPI header definitions in an arch-independent location Michael S. Tsirkin
2015-05-11 12:47 ` [Qemu-devel] [PULL 03/28] hw/i386/acpi-build: move generic acpi building helpers into dedictated file Michael S. Tsirkin
2015-05-11 12:47 ` [Qemu-devel] [PULL 04/28] vhost-user: Send VHOST_RESET_OWNER on vhost stop Michael S. Tsirkin
2015-05-11 12:47 ` [Qemu-devel] [PULL 05/28] virtio-net: fix the upper bound when trying to delete queues Michael S. Tsirkin
2015-05-11 12:47 ` [Qemu-devel] [PULL 06/28] pc: add 2.4 machine types Michael S. Tsirkin
2015-05-11 12:47 ` Michael S. Tsirkin [this message]
2015-05-11 12:47 ` [Qemu-devel] [PULL 08/28] ppc: spapr: add 2.4 machine type Michael S. Tsirkin
2015-05-11 12:47 ` [Qemu-devel] [PULL 09/28] monitor: replace the magic number 255 with MAX_QUEUE_NUM Michael S. Tsirkin
2015-05-11 12:47 ` [Qemu-devel] [PULL 10/28] monitor: check return value of qemu_find_net_clients_except() Michael S. Tsirkin
2015-05-11 12:47 ` [Qemu-devel] [PULL 11/28] virtio-ccw: using VIRTIO_NO_VECTOR instead of 0 for invalid virtqueue Michael S. Tsirkin
2015-05-11 12:47 ` [Qemu-devel] [PULL 12/28] virtio: introduce vector to virtqueues mapping Michael S. Tsirkin
2015-05-11 12:47 ` [Qemu-devel] [PULL 13/28] virtio-pci: speedup MSI-X masking and unmasking Michael S. Tsirkin
2015-05-11 12:47 ` [Qemu-devel] [PULL 14/28] pci: remove hard-coded bar size in msix_init_exclusive_bar() Michael S. Tsirkin
2015-05-11 12:47 ` [Qemu-devel] [PULL 15/28] virtio: coding style tweak Michael S. Tsirkin
2015-05-11 12:48 ` [Qemu-devel] [PULL 16/28] docs: update documentation for memory hot unplug Michael S. Tsirkin
2015-05-11 12:48 ` [Qemu-devel] [PULL 17/28] acpi, mem-hotplug: add acpi_memory_slot_status() to get MemStatus Michael S. Tsirkin
2015-05-11 12:48 ` [Qemu-devel] [PULL 18/28] acpi, mem-hotplug: add unplug request cb for memory device Michael S. Tsirkin
2015-05-11 12:48 ` [Qemu-devel] [PULL 19/28] acpi, mem-hotplug: add unplug " Michael S. Tsirkin
2015-05-11 12:48 ` [Qemu-devel] [PULL 20/28] acpi: extend aml_field() to support UpdateRule Michael S. Tsirkin
2015-05-11 12:48 ` [Qemu-devel] [PULL 21/28] acpi: fix "Memory device control fields" register Michael S. Tsirkin
2015-05-11 12:48 ` [Qemu-devel] [PULL 22/28] acpi: add hardware implementation for memory hot unplug Michael S. Tsirkin
2015-05-11 12:48 ` [Qemu-devel] [PULL 23/28] qmp-event: add event notification for memory hot unplug error Michael S. Tsirkin
2015-05-11 15:03 ` Eric Blake
2015-05-11 15:17 ` Michael S. Tsirkin
2015-05-11 12:48 ` [Qemu-devel] [PULL 24/28] acpi: add a missing backslash to the \_SB scope Michael S. Tsirkin
2015-05-11 12:48 ` [Qemu-devel] [PULL 25/28] pci: Merge pci_nic_init() into pci_nic_init_nofail() Michael S. Tsirkin
2015-05-11 12:48 ` [Qemu-devel] [PULL 26/28] virtio-net: Move DEFINE_VIRTIO_NET_FEATURES to virtio-net Michael S. Tsirkin
2015-05-11 12:48 ` [Qemu-devel] [PULL 27/28] virtio-scsi: Move DEFINE_VIRTIO_SCSI_FEATURES to virtio-scsi Michael S. Tsirkin
2015-05-11 12:48 ` [Qemu-devel] [PULL 28/28] acpi: update expected files for memory unplug Michael S. Tsirkin
2015-05-12 7:49 ` [Qemu-devel] [PULL 00/28] pc, virtio enhancements Peter Maydell
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=1431329108-2605-8-git-send-email-mst@redhat.com \
--to=mst@redhat.com \
--cc=agraf@suse.de \
--cc=jasowang@redhat.com \
--cc=peter.maydell@linaro.org \
--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).