From: Marcel Apfelbaum Subject: [Qemu-devel] [PATCH 5/5] vl.c: Remove QEMUMachine usage Date: Tue, 25 Mar 2014 16:53:52 +0200 Message-ID: <1395759232-10316-6-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]:9464 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753770AbaCYSiB (ORCPT ); Tue, 25 Mar 2014 14:38:01 -0400 In-Reply-To: <1395759232-10316-1-git-send-email-marcel.a@redhat.com> Sender: kvm-owner@vger.kernel.org List-ID: 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 6d6a831..7fb140e 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; @@ -4395,7 +4394,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, -- 1.8.3.1