From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35455) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WVlYw-0007gu-Aw for qemu-devel@nongnu.org; Thu, 03 Apr 2014 13:36:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WVlYo-0004rM-Sd for qemu-devel@nongnu.org; Thu, 03 Apr 2014 13:36:26 -0400 Received: from cantor2.suse.de ([195.135.220.15]:33390 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WVlYo-0004r3-NA for qemu-devel@nongnu.org; Thu, 03 Apr 2014 13:36:18 -0400 Message-ID: <533D9C0F.1050807@suse.de> Date: Thu, 03 Apr 2014 19:36:15 +0200 From: =?UTF-8?B?QW5kcmVhcyBGw6RyYmVy?= MIME-Version: 1.0 References: <1396257993-4036-1-git-send-email-marcel.a@redhat.com> <1396257993-4036-3-git-send-email-marcel.a@redhat.com> <533D9361.9040906@suse.de> <1396545081.24348.46.camel@localhost.localdomain> In-Reply-To: <1396545081.24348.46.camel@localhost.localdomain> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH V2 2/5] machine: remove QEMUMachine indirection from MachineClass List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Marcel Apfelbaum Cc: peter.maydell@linaro.org, famz@redhat.com, stefanha@redhat.com, mst@redhat.com, rth@twiddle.net, stefano.stabellini@eu.citrix.com, qemu-devel@nongnu.org, armbru@redhat.com, agraf@suse.de, alex@alex.org.uk, pbonzini@redhat.com, lcapitulino@redhat.com, aliguori@amazon.com Am 03.04.2014 19:11, schrieb Marcel Apfelbaum: > On Thu, 2014-04-03 at 18:59 +0200, Andreas F=C3=A4rber wrote: >> Am 31.03.2014 11:26, schrieb Marcel Apfelbaum: >>> diff --git a/vl.c b/vl.c >>> index 9975e5a..96155ca 100644 >>> --- a/vl.c >>> +++ b/vl.c >>> @@ -1583,8 +1583,29 @@ MachineState *current_machine; >>> static void machine_class_init(ObjectClass *oc, void *data) >>> { >>> MachineClass *mc =3D MACHINE_CLASS(oc); >>> - >>> - mc->qemu_machine =3D data; >> >> This looks incomplete. You should drop the qemu_machine field from >> boards.h to assure that no one is using it - pseries still is, so 4/5 >> needs to be be squashed into this commit, otherwise the new fields bel= ow >> remain empty for it. > Yes, indeed, otherwise it will break bisection. > I was looking for a way to separate the changes for hw/ppc/spapr.c > into a separate patch. >=20 > Maybe I will leave both assignments (of the qemu_machine pointer and th= e fields) > in this patch and remove it on 5/5 (together with qemu_machine field fr= om=20 > boards.h), leaving the 4/5 as it is? The trouble with 2/5 is that in generic code you start using mc-> fields, which do not get assigned by pseries. So the "mc->... =3D ...;" parts of 4/5 need to go into 2/5, whether you leave qemu_machine assigned or not. Of course I understand your desire to not put everything into one huge commit. Maybe reordering 3/5 before this patch using ->qemu_machine helps? Next prepare QEMUMachineInitArgs for MachineClass (5/5). Then in this step you can drop qemu_machine field as suggested and any ->qemu_machine gets dropped in one big but mechanical change. Regards, Andreas --=20 SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 N=C3=BCrnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imend=C3=B6rffer; HRB 16746 AG N=C3=BC= rnberg