From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46316) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WkGbU-0004bw-To for qemu-devel@nongnu.org; Tue, 13 May 2014 13:35:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WkGbN-0005u7-Ek for qemu-devel@nongnu.org; Tue, 13 May 2014 13:35:00 -0400 Message-ID: <537257B4.5010708@suse.de> Date: Tue, 13 May 2014 19:34:44 +0200 From: =?ISO-8859-15?Q?Andreas_F=E4rber?= MIME-Version: 1.0 References: <1399473780-20374-1-git-send-email-marcel.a@redhat.com> <1399473780-20374-2-git-send-email-marcel.a@redhat.com> In-Reply-To: <1399473780-20374-2-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 1/4] machine: conversion of QEMUMachineInitArgs to MachineState List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Marcel Apfelbaum , qemu-devel@nongnu.org Cc: mst@redhat.com, aik@ozlabs.ru, lcapitulino@redhat.com, blauwirbel@gmail.com, jcmvbkbc@gmail.com, edgar.iglesias@gmail.com, gxt@mprc.pku.edu.cn, peter.chubb@nicta.com.au, proljc@gmail.com, agraf@suse.de, scottwood@freescale.com, borntraeger@de.ibm.com, hpoussin@reactos.org, aliguori@amazon.com, lersek@redhat.com, mdroth@linux.vnet.ibm.com, chouteau@adacore.com, jan.kiszka@web.de, stefanha@redhat.com, cornelia.huck@de.ibm.com, peter.crosthwaite@xilinx.com, mark.langsdorf@calxeda.com, armbru@redhat.com, michael@walle.cc, qemu-ppc@nongnu.org, pbonzini@redhat.com, aurelien@aurel32.net Am 07.05.2014 16:42, schrieb Marcel Apfelbaum: > Total removal of QEMUMachineInitArgs struct. QEMUMachineInitArgs's fiel= ds > are copied into MachineState. Removed duplicated fields from MachineSta= te. >=20 > All the other changes are only mechanical refactoring, no semantic chan= ges. >=20 > Signed-off-by: Marcel Apfelbaum > --- > - I am perfectly aware that patches touching a lot of files > are not desirable, but this one is a very simple replacement > patch: > QEMUMachineInitArgs -> MachineState > args -> ms > - This is the simplest way to get rid of QEMUMachineInitArgs fast. Agreed. I did stumble over "ms" though - any reason not to name it "machine"? [...] > diff --git a/vl.c b/vl.c > index c4505dc..58673bd 100644 > --- a/vl.c > +++ b/vl.c > @@ -4422,16 +4422,15 @@ int main(int argc, char **argv, char **envp) > =20 > qdev_machine_init(); > =20 > - current_machine->init_args =3D (QEMUMachineInitArgs) { > - .machine =3D machine_class, > - .ram_size =3D ram_size, > - .boot_order =3D boot_order, > - .kernel_filename =3D kernel_filename, > - .kernel_cmdline =3D kernel_cmdline, > - .initrd_filename =3D initrd_filename, > - .cpu_model =3D cpu_model }; > - > - machine_class->init(¤t_machine->init_args); > + current_machine->machine =3D machine_class; > + current_machine->ram_size =3D ram_size; > + current_machine->boot_order =3D boot_order; > + current_machine->kernel_filename =3D kernel_filename; > + current_machine->kernel_cmdline =3D kernel_cmdline; > + current_machine->initrd_filename =3D initrd_filename; > + current_machine->cpu_model =3D cpu_model; > + > + machine_class->init(current_machine); > =20 > audio_init(); > =20 I had already needed to rebase your previous series on that init_args refactoring that came in through trivial; I would propose to simply officially revert that commit before applying this one. Regards, Andreas --=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