From: Marcel Apfelbaum <marcel.a@redhat.com>
To: qemu-devel@nongnu.org
Cc: peter.maydell@linaro.org, famz@redhat.com, stefanha@redhat.com,
mst@redhat.com, alex@alex.org.uk, armbru@redhat.com,
stefano.stabellini@eu.citrix.com, agraf@suse.de,
lcapitulino@redhat.com, aliguori@amazon.com, pbonzini@redhat.com,
afaerber@suse.de, rth@twiddle.net
Subject: [Qemu-devel] [PATCH V2 4/5] hw/ppc: remove QEMUMachine indirection
Date: Mon, 31 Mar 2014 12:26:32 +0300 [thread overview]
Message-ID: <1396257993-4036-5-git-send-email-marcel.a@redhat.com> (raw)
In-Reply-To: <1396257993-4036-1-git-send-email-marcel.a@redhat.com>
No need for QEMUMachine anymore because
its fields are passed to MachineClass.
Signed-off-by: Marcel Apfelbaum <marcel.a@redhat.com>
---
hw/ppc/spapr.c | 26 +++++++++++---------------
1 file changed, 11 insertions(+), 15 deletions(-)
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index a11e121..b4ce950 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -1419,19 +1419,6 @@ static int spapr_kvm_type(const char *vm_type)
exit(1);
}
-static QEMUMachine spapr_machine = {
- .name = "pseries",
- .desc = "pSeries Logical Partition (PAPR compliant)",
- .is_default = 1,
- .init = ppc_spapr_init,
- .reset = ppc_spapr_reset,
- .block_default_type = IF_SCSI,
- .max_cpus = MAX_CPUS,
- .no_parallel = 1,
- .default_boot_order = NULL,
- .kvm_type = spapr_kvm_type,
-};
-
/*
* Implementation of an interface to adjust firmware patch
* for the bootindex property handling.
@@ -1494,7 +1481,17 @@ static void spapr_machine_class_init(ObjectClass *oc, void *data)
MachineClass *mc = MACHINE_CLASS(oc);
FWPathProviderClass *fwc = FW_PATH_PROVIDER_CLASS(oc);
- mc->qemu_machine = data;
+ mc->name = "pseries";
+ mc->desc = "pSeries Logical Partition (PAPR compliant)";
+ mc->is_default = 1;
+ mc->init = ppc_spapr_init;
+ mc->reset = ppc_spapr_reset;
+ mc->block_default_type = IF_SCSI;
+ mc->max_cpus = MAX_CPUS;
+ mc->no_parallel = 1;
+ mc->default_boot_order = NULL;
+ mc->kvm_type = spapr_kvm_type;
+
fwc->get_dev_path = spapr_get_fw_dev_path;
}
@@ -1502,7 +1499,6 @@ static const TypeInfo spapr_machine_info = {
.name = TYPE_SPAPR_MACHINE,
.parent = TYPE_MACHINE,
.class_init = spapr_machine_class_init,
- .class_data = &spapr_machine,
.interfaces = (InterfaceInfo[]) {
{ TYPE_FW_PATH_PROVIDER },
{ }
--
1.8.3.1
next prev parent reply other threads:[~2014-03-31 9:26 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-31 9:26 [Qemu-devel] [PATCH V2 0/5] remove QEMUMachine indirection from MachineClass Marcel Apfelbaum
2014-03-31 9:26 ` [Qemu-devel] [PATCH V2 1/5] hw/boards.h: add QEMUMachine's fields to MachineClass Marcel Apfelbaum
2014-03-31 9:26 ` [Qemu-devel] [PATCH V2 2/5] machine: remove QEMUMachine indirection from MachineClass Marcel Apfelbaum
2014-04-03 16:59 ` Andreas Färber
2014-04-03 17:11 ` Marcel Apfelbaum
2014-04-03 17:36 ` Andreas Färber
2014-04-03 17:40 ` Marcel Apfelbaum
2014-03-31 9:26 ` [Qemu-devel] [PATCH V2 3/5] machine: replace QEMUMachine by MachineClass in accelerator configuration Marcel Apfelbaum
2014-03-31 9:26 ` Marcel Apfelbaum [this message]
2014-04-03 17:25 ` [Qemu-devel] [PATCH V2 4/5] hw/ppc: remove QEMUMachine indirection Andreas Färber
2014-04-03 17:46 ` Marcel Apfelbaum
2014-04-03 17:57 ` Andreas Färber
2014-04-03 18:08 ` Marcel Apfelbaum
2014-03-31 9:26 ` [Qemu-devel] [PATCH V2 5/5] vl.c: Remove QEMUMachine usage Marcel Apfelbaum
2014-04-03 17:09 ` Andreas Färber
2014-04-03 17:12 ` Marcel Apfelbaum
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=1396257993-4036-5-git-send-email-marcel.a@redhat.com \
--to=marcel.a@redhat.com \
--cc=afaerber@suse.de \
--cc=agraf@suse.de \
--cc=alex@alex.org.uk \
--cc=aliguori@amazon.com \
--cc=armbru@redhat.com \
--cc=famz@redhat.com \
--cc=lcapitulino@redhat.com \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=rth@twiddle.net \
--cc=stefanha@redhat.com \
--cc=stefano.stabellini@eu.citrix.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).