From patchwork Tue Mar 25 14:53:51 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Apfelbaum X-Patchwork-Id: 333675 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id D568A1400A7 for ; Wed, 26 Mar 2014 06:08:05 +1100 (EST) Received: from localhost ([::1]:43596 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WSWGf-0007Fa-Sx for incoming@patchwork.ozlabs.org; Tue, 25 Mar 2014 14:40:09 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52211) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WSWEd-0004gj-Lq for qemu-devel@nongnu.org; Tue, 25 Mar 2014 14:38:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WSWEW-0000t5-NB for qemu-devel@nongnu.org; Tue, 25 Mar 2014 14:38:03 -0400 Received: from mx1.redhat.com ([209.132.183.28]:4203) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WSWEW-0000sp-EX; Tue, 25 Mar 2014 14:37:56 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s2PIbiPf003383 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 25 Mar 2014 14:37:48 -0400 Received: from localhost.tlv.redhat.com (dhcp-4-195.tlv.redhat.com [10.35.4.195]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s2PErPaf026360; Tue, 25 Mar 2014 10:53:53 -0400 From: Marcel Apfelbaum To: qemu-devel@nongnu.org Date: Tue, 25 Mar 2014 16:53:51 +0200 Message-Id: <1395759232-10316-5-git-send-email-marcel.a@redhat.com> In-Reply-To: <1395759232-10316-1-git-send-email-marcel.a@redhat.com> References: <1395759232-10316-1-git-send-email-marcel.a@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: peter.maydell@linaro.org, famz@redhat.com, stefanha@redhat.com, kvm@vger.kernel.org, mst@redhat.com, alex@alex.org.uk, armbru@redhat.com, stefano.stabellini@eu.citrix.com, agraf@suse.de, lcapitulino@redhat.com, qemu-ppc@nongnu.org, aliguori@amazon.com, pbonzini@redhat.com, afaerber@suse.de, rth@twiddle.net Subject: [Qemu-devel] [PATCH 4/5] hw/ppc: remove QEMUMachine indirection X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 }, { }