From patchwork Mon Mar 31 09:26:33 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Apfelbaum X-Patchwork-Id: 335231 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 0C37C140092 for ; Mon, 31 Mar 2014 20:27:38 +1100 (EST) Received: from localhost ([::1]:47794 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WUYVE-0005sG-Jt for incoming@patchwork.ozlabs.org; Mon, 31 Mar 2014 05:27:36 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46643) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WUYUS-0005MH-Mg for qemu-devel@nongnu.org; Mon, 31 Mar 2014 05:26:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WUYUM-0003TI-20 for qemu-devel@nongnu.org; Mon, 31 Mar 2014 05:26:48 -0400 Received: from mx1.redhat.com ([209.132.183.28]:18530) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WUYUL-0003T9-OT for qemu-devel@nongnu.org; Mon, 31 Mar 2014 05:26:41 -0400 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s2V9QXel015896 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 31 Mar 2014 05:26:33 -0400 Received: from localhost.localdomain.com (vpn1-6-252.ams2.redhat.com [10.36.6.252]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s2V9Q7UJ029752; Mon, 31 Mar 2014 05:26:29 -0400 From: Marcel Apfelbaum To: qemu-devel@nongnu.org Date: Mon, 31 Mar 2014 12:26:33 +0300 Message-Id: <1396257993-4036-6-git-send-email-marcel.a@redhat.com> In-Reply-To: <1396257993-4036-1-git-send-email-marcel.a@redhat.com> References: <1396257993-4036-1-git-send-email-marcel.a@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 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, 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 5/5] vl.c: Remove QEMUMachine usage 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 All the references of QEMUMachine are already replaced by MachineClass. Signed-off-by: Marcel Apfelbaum --- include/hw/boards.h | 7 +++---- vl.c | 3 +-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/include/hw/boards.h b/include/hw/boards.h index 7cf1f07..66ee98a 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -7,8 +7,10 @@ #include "hw/qdev.h" #include "qom/object.h" +typedef struct MachineClass MachineClass; + typedef struct QEMUMachineInitArgs { - const QEMUMachine *machine; + const MachineClass *machine; ram_addr_t ram_size; const char *boot_order; const char *kernel_filename; @@ -46,7 +48,6 @@ struct QEMUMachine { const char *default_machine_opts; const char *default_boot_order; GlobalProperty *compat_props; - struct QEMUMachine *next; const char *hw_version; }; @@ -63,7 +64,6 @@ int qemu_register_machine(QEMUMachine *m); OBJECT_CLASS_CHECK(MachineClass, (klass), TYPE_MACHINE) typedef struct MachineState MachineState; -typedef struct MachineClass MachineClass; MachineClass *find_default_machine(void); extern MachineState *current_machine; @@ -77,7 +77,6 @@ struct MachineClass { ObjectClass parent_class; /*< public >*/ - QEMUMachine *qemu_machine; const char *name; const char *alias; const char *desc; diff --git a/vl.c b/vl.c index a4f8a6b..190bd5d 100644 --- a/vl.c +++ b/vl.c @@ -2961,7 +2961,6 @@ int main(int argc, char **argv, char **envp) const char *optarg; const char *loadvm = NULL; MachineClass *machine_class; - QEMUMachine *machine = NULL; const char *cpu_model; const char *vga_model = NULL; const char *qtest_chrdev = NULL; @@ -4388,7 +4387,7 @@ int main(int argc, char **argv, char **envp) qdev_machine_init(); - QEMUMachineInitArgs args = { .machine = machine, + QEMUMachineInitArgs args = { .machine = machine_class, .ram_size = ram_size, .boot_order = boot_order, .kernel_filename = kernel_filename,