From: Marcel Apfelbaum Subject: [Qemu-devel] [PATCH 4/5] hw/ppc: remove QEMUMachine indirection Date: Tue, 25 Mar 2014 16:53:51 +0200 Message-ID: <1395759232-10316-5-git-send-email-marcel.a@redhat.com> References: <1395759232-10316-1-git-send-email-marcel.a@redhat.com> Cc: mst@redhat.com, afaerber@suse.de, peter.maydell@linaro.org, pbonzini@redhat.com, agraf@suse.de, lcapitulino@redhat.com, aliguori@amazon.com, stefano.stabellini@eu.citrix.com, armbru@redhat.com, stefanha@redhat.com, alex@alex.org.uk, rth@twiddle.net, famz@redhat.com, qemu-ppc@nongnu.org, kvm@vger.kernel.org To: qemu-devel@nongnu.org Return-path: Received: from mx1.redhat.com ([209.132.183.28]:51367 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753770AbaCYSiA (ORCPT ); Tue, 25 Mar 2014 14:38:00 -0400 In-Reply-To: <1395759232-10316-1-git-send-email-marcel.a@redhat.com> Sender: kvm-owner@vger.kernel.org List-ID: No need for QEMUMachine anymore because its fields are passed to MachineClass. Signed-off-by: Marcel Apfelbaum --- 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..4498fc2 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