From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35689) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bChNa-0003hU-O2 for qemu-devel@nongnu.org; Tue, 14 Jun 2016 01:59:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bChNY-00056E-IH for qemu-devel@nongnu.org; Tue, 14 Jun 2016 01:59:13 -0400 Date: Tue, 14 Jun 2016 07:58:56 +0200 From: Andrew Jones Message-ID: <20160614055856.6ixqhiuezthebact@hawk.localdomain> References: <1465580427-13596-1-git-send-email-drjones@redhat.com> <1465580427-13596-5-git-send-email-drjones@redhat.com> <20160614013037.GG4882@voom.fritz.box> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20160614013037.GG4882@voom.fritz.box> Subject: Re: [Qemu-devel] [PATCH RFC 04/16] hw/core/machine: Introduce pre_init List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: David Gibson Cc: peter.maydell@linaro.org, ehabkost@redhat.com, qemu-devel@nongnu.org, agraf@suse.de, qemu-arm@nongnu.org, qemu-ppc@nongnu.org, pbonzini@redhat.com, imammedo@redhat.com, dgibson@redhat.com On Tue, Jun 14, 2016 at 11:30:37AM +1000, David Gibson wrote: > On Fri, Jun 10, 2016 at 07:40:15PM +0200, Andrew Jones wrote: > > From: Igor Mammedov > > > > Signed-off-by: Igor Mammedov > > Signed-off-by: Andrew Jones > > I think this needs some kind of rationale. > > Since with this patch it is called immediately before ->init, I'm not > really seeing the point of this. Many machines already override ->init, so if we want to move code from vl.c into machine methods, but be sure that they run it now, then we have to invent a pre-init. I (or Igor) can add something like that to the commit message for the next round. Thanks, drew > > > --- > > hw/core/machine.c | 6 ++++++ > > include/hw/boards.h | 1 + > > vl.c | 1 + > > 3 files changed, 8 insertions(+) > > > > diff --git a/hw/core/machine.c b/hw/core/machine.c > > index ccdd5fa3e7728..3dce9020e510a 100644 > > --- a/hw/core/machine.c > > +++ b/hw/core/machine.c > > @@ -368,10 +368,16 @@ static void machine_init_notify(Notifier *notifier, void *data) > > foreach_dynamic_sysbus_device(error_on_sysbus_device, NULL); > > } > > > > +static void machine_pre_init(MachineState *ms) > > +{ > > +} > > + > > static void machine_class_init(ObjectClass *oc, void *data) > > { > > MachineClass *mc = MACHINE_CLASS(oc); > > > > + mc->pre_init = machine_pre_init; > > + > > /* Default 128 MB as guest ram size */ > > mc->default_ram_size = 128 * M_BYTE; > > mc->rom_file_has_mr = true; > > diff --git a/include/hw/boards.h b/include/hw/boards.h > > index d268bd00a9f7d..4e8dc68b07a24 100644 > > --- a/include/hw/boards.h > > +++ b/include/hw/boards.h > > @@ -92,6 +92,7 @@ struct MachineClass { > > const char *alias; > > const char *desc; > > > > + void (*pre_init)(MachineState *state); > > void (*init)(MachineState *state); > > void (*reset)(void); > > void (*hot_add_cpu)(const int64_t id, Error **errp); > > diff --git a/vl.c b/vl.c > > index 8d482cb1bf020..4849dd465d667 100644 > > --- a/vl.c > > +++ b/vl.c > > @@ -4500,6 +4500,7 @@ int main(int argc, char **argv, char **envp) > > current_machine->boot_order = boot_order; > > current_machine->cpu_model = cpu_model; > > > > + machine_class->pre_init(current_machine); > > machine_class->init(current_machine); > > > > realtime_init(); > > -- > David Gibson | I'll have my music baroque, and my code > david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ > | _way_ _around_! > http://www.ozlabs.org/~dgibson