From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55108) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WVl99-0007QF-Fe for qemu-devel@nongnu.org; Thu, 03 Apr 2014 13:09:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WVl91-00047U-W8 for qemu-devel@nongnu.org; Thu, 03 Apr 2014 13:09:47 -0400 Received: from cantor2.suse.de ([195.135.220.15]:33016 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WVl91-00047P-PQ for qemu-devel@nongnu.org; Thu, 03 Apr 2014 13:09:39 -0400 Message-ID: <533D95D1.7090603@suse.de> Date: Thu, 03 Apr 2014 19:09:37 +0200 From: =?ISO-8859-15?Q?Andreas_F=E4rber?= MIME-Version: 1.0 References: <1396257993-4036-1-git-send-email-marcel.a@redhat.com> <1396257993-4036-6-git-send-email-marcel.a@redhat.com> In-Reply-To: <1396257993-4036-6-git-send-email-marcel.a@redhat.com> Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH V2 5/5] vl.c: Remove QEMUMachine usage List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Marcel Apfelbaum , qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, famz@redhat.com, stefanha@redhat.com, mst@redhat.com, rth@twiddle.net, stefano.stabellini@eu.citrix.com, armbru@redhat.com, agraf@suse.de, alex@alex.org.uk, pbonzini@redhat.com, lcapitulino@redhat.com, aliguori@amazon.com Am 31.03.2014 11:26, schrieb Marcel Apfelbaum: > All the references of QEMUMachine are already > replaced by MachineClass. >=20 > Signed-off-by: Marcel Apfelbaum > --- > include/hw/boards.h | 7 +++---- > vl.c | 3 +-- > 2 files changed, 4 insertions(+), 6 deletions(-) >=20 > 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" > =20 > +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; This field shouldn't be used in qemu.git any more since you adopted the QOM way of iterating over the types. Could you drop this field as a very first patch, pointing to the commit which obsoleted it? Regards, Andreas > const char *hw_version; > }; > =20 > @@ -63,7 +64,6 @@ int qemu_register_machine(QEMUMachine *m); > OBJECT_CLASS_CHECK(MachineClass, (klass), TYPE_MACHINE) > =20 > typedef struct MachineState MachineState; > -typedef struct MachineClass MachineClass; > =20 > MachineClass *find_default_machine(void); > extern MachineState *current_machine; > @@ -77,7 +77,6 @@ struct MachineClass { > ObjectClass parent_class; > /*< public >*/ > =20 > - 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 =3D NULL; > MachineClass *machine_class; > - QEMUMachine *machine =3D NULL; > const char *cpu_model; > const char *vga_model =3D NULL; > const char *qtest_chrdev =3D NULL; > @@ -4388,7 +4387,7 @@ int main(int argc, char **argv, char **envp) > =20 > qdev_machine_init(); > =20 > - QEMUMachineInitArgs args =3D { .machine =3D machine, > + QEMUMachineInitArgs args =3D { .machine =3D machine_class, > .ram_size =3D ram_size, > .boot_order =3D boot_order, > .kernel_filename =3D kernel_filename, >=20 --=20 SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 N=FCrnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imend=F6rffer; HRB 16746 AG N=FCrnbe= rg