From: David Gibson <david@gibson.dropbear.id.au>
To: agraf@suse.de, afaerber@suse.de
Cc: lvivier@redhat.com, thuth@redhat.com, aik@ozlabs.ru,
qemu-devel@nongnu.org, mdroth@linux.vnet.ibm.com,
qemu-ppc@nongnu.org, bharata@linux.vnet.ibm.com,
David Gibson <david@gibson.dropbear.id.au>
Subject: [Qemu-devel] [PATCH 06/27] spapr: Add sPAPRMachineClass
Date: Thu, 2 Jul 2015 16:23:07 +1000 [thread overview]
Message-ID: <1435818208-11808-7-git-send-email-david@gibson.dropbear.id.au> (raw)
In-Reply-To: <1435818208-11808-1-git-send-email-david@gibson.dropbear.id.au>
Currently although we have an sPAPRMachineState descended from MachineState
we don't have an sPAPRMAchineClass descended from MachineClass. So far it
hasn't been needed, but several upcoming features are going to want it,
so this patch creates a stub implementation.
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
Signed-off-by: Bharata B Rao <bharata@linux.vnet.ibm.com>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
---
hw/ppc/spapr.c | 1 +
include/hw/ppc/spapr.h | 15 +++++++++++++++
2 files changed, 16 insertions(+)
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index 3aeb2ea..0dba32f 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -1808,6 +1808,7 @@ static const TypeInfo spapr_machine_info = {
.abstract = true,
.instance_size = sizeof(sPAPRMachineState),
.instance_init = spapr_machine_initfn,
+ .class_size = sizeof(sPAPRMachineClass),
.class_init = spapr_machine_class_init,
.interfaces = (InterfaceInfo[]) {
{ TYPE_FW_PATH_PROVIDER },
diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h
index 785b094..0aeac50 100644
--- a/include/hw/ppc/spapr.h
+++ b/include/hw/ppc/spapr.h
@@ -15,11 +15,26 @@ typedef struct sPAPREventLogEntry sPAPREventLogEntry;
#define HPTE64_V_HPTE_DIRTY 0x0000000000000040ULL
#define SPAPR_ENTRY_POINT 0x100
+typedef struct sPAPRMachineClass sPAPRMachineClass;
typedef struct sPAPRMachineState sPAPRMachineState;
#define TYPE_SPAPR_MACHINE "spapr-machine"
#define SPAPR_MACHINE(obj) \
OBJECT_CHECK(sPAPRMachineState, (obj), TYPE_SPAPR_MACHINE)
+#define SPAPR_MACHINE_GET_CLASS(obj) \
+ OBJECT_GET_CLASS(sPAPRMachineClass, obj, TYPE_SPAPR_MACHINE)
+#define SPAPR_MACHINE_CLASS(klass) \
+ OBJECT_CLASS_CHECK(sPAPRMachineClass, klass, TYPE_SPAPR_MACHINE)
+
+/**
+ * sPAPRMachineClass:
+ */
+struct sPAPRMachineClass {
+ /*< private >*/
+ MachineClass parent_class;
+
+ /*< public >*/
+};
/**
* sPAPRMachineState:
--
2.4.3
next prev parent reply other threads:[~2015-07-02 6:23 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-02 6:23 [Qemu-devel] [PATCH 00/27] sPAPR updates 2015-07-02 David Gibson
2015-07-02 6:23 ` [Qemu-devel] [PATCH 01/27] spapr: ensure we have at least one XICS server David Gibson
2015-07-02 6:23 ` [Qemu-devel] [PATCH 02/27] pseries: Update SLOF firmware image to qemu-slof-20150429 David Gibson
2015-07-02 6:23 ` [Qemu-devel] [PATCH 03/27] spapr: Merge sPAPREnvironment into sPAPRMachineState David Gibson
2015-07-02 6:23 ` [Qemu-devel] [PATCH 04/27] spapr: Remove obsolete ram_limit field from sPAPRMachineState David Gibson
2015-07-02 6:23 ` [Qemu-devel] [PATCH 05/27] spapr: Remove obsolete entry_point " David Gibson
2015-07-02 6:23 ` David Gibson [this message]
2015-07-02 6:23 ` [Qemu-devel] [PATCH 07/27] spapr_pci: encode missing 64-bit memory address space David Gibson
2015-07-02 6:23 ` [Qemu-devel] [PATCH 08/27] spapr_pci: encode class code including Prog IF register David Gibson
2015-07-02 6:23 ` [Qemu-devel] [PATCH 09/27] spapr_pci: set device node unit address as hex David Gibson
2015-07-02 6:23 ` [Qemu-devel] [PATCH 10/27] spapr_iommu: drop erroneous check in h_put_tce_indirect() David Gibson
2015-07-02 6:23 ` [Qemu-devel] [PATCH 11/27] spapr_iommu: translate sPAPRTCEAccess to IOMMUAccessFlags David Gibson
2015-07-02 6:23 ` [Qemu-devel] [PATCH 12/27] Revert "hw/ppc/spapr_pci.c: Avoid functions not in glib 2.12 (g_hash_table_iter_*)" David Gibson
2015-07-02 6:23 ` [Qemu-devel] [PATCH 13/27] spapr: Consider max_cpus during xics initialization David Gibson
2015-07-02 6:23 ` [Qemu-devel] [PATCH 14/27] spapr: Support ibm, lrdr-capacity device tree property David Gibson
2015-07-02 6:23 ` [Qemu-devel] [PATCH 15/27] cpus: Add a macro to walk CPUs in reverse David Gibson
2015-07-02 6:23 ` [Qemu-devel] [PATCH 16/27] spapr: Reorganize CPU dt generation code David Gibson
2015-07-02 6:23 ` [Qemu-devel] [PATCH 17/27] spapr: Consolidate cpu init code into a routine David Gibson
2015-07-02 6:23 ` [Qemu-devel] [PATCH 18/27] ppc: Update cpu_model in MachineState David Gibson
2015-07-02 6:23 ` [Qemu-devel] [PATCH 19/27] xics_kvm: Don't enable KVM_CAP_IRQ_XICS if already enabled David Gibson
2015-07-02 6:23 ` [Qemu-devel] [PATCH 20/27] spapr_pci: enumerate and add PCI device tree David Gibson
2015-07-02 6:23 ` [Qemu-devel] [PATCH 21/27] spapr_pci: populate ibm,loc-code David Gibson
2015-07-02 6:23 ` [Qemu-devel] [PATCH 22/27] spapr_pci: drop redundant args in spapr_[populate, create]_pci_child_dt David Gibson
2015-07-02 6:23 ` [Qemu-devel] [PATCH 23/27] spapr_vty: lookup should only return valid VTY objects David Gibson
2015-07-02 6:23 ` [Qemu-devel] [PATCH 24/27] spapr-vty: Use TYPE_ definition instead of hardcoding David Gibson
2015-07-02 6:23 ` [Qemu-devel] [PATCH 25/27] sPAPR: Don't enable EEH on emulated PCI devices David Gibson
2015-07-02 6:23 ` [Qemu-devel] [PATCH 26/27] sPAPR: Reenable EEH functionality on reboot David Gibson
2015-07-02 6:23 ` [Qemu-devel] [PATCH 27/27] sPAPR: Clear stale MSIx table during EEH reset David Gibson
2015-07-07 12:39 ` [Qemu-devel] [PATCH 00/27] sPAPR updates 2015-07-02 Alexander Graf
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=1435818208-11808-7-git-send-email-david@gibson.dropbear.id.au \
--to=david@gibson.dropbear.id.au \
--cc=afaerber@suse.de \
--cc=agraf@suse.de \
--cc=aik@ozlabs.ru \
--cc=bharata@linux.vnet.ibm.com \
--cc=lvivier@redhat.com \
--cc=mdroth@linux.vnet.ibm.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.org \
--cc=thuth@redhat.com \
/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).