From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57227) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bCdGr-0002DV-OQ for qemu-devel@nongnu.org; Mon, 13 Jun 2016 21:36:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bCdGp-0007EP-NN for qemu-devel@nongnu.org; Mon, 13 Jun 2016 21:36:00 -0400 Date: Tue, 14 Jun 2016 11:30:37 +1000 From: David Gibson Message-ID: <20160614013037.GG4882@voom.fritz.box> References: <1465580427-13596-1-git-send-email-drjones@redhat.com> <1465580427-13596-5-git-send-email-drjones@redhat.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="L+ofChggJdETEG3Y" Content-Disposition: inline In-Reply-To: <1465580427-13596-5-git-send-email-drjones@redhat.com> 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: Andrew Jones Cc: qemu-devel@nongnu.org, qemu-ppc@nongnu.org, qemu-arm@nongnu.org, imammedo@redhat.com, ehabkost@redhat.com, pbonzini@redhat.com, peter.maydell@linaro.org, dgibson@redhat.com, agraf@suse.de --L+ofChggJdETEG3Y Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, Jun 10, 2016 at 07:40:15PM +0200, Andrew Jones wrote: > From: Igor Mammedov >=20 > 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. > --- > hw/core/machine.c | 6 ++++++ > include/hw/boards.h | 1 + > vl.c | 1 + > 3 files changed, 8 insertions(+) >=20 > 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); > } > =20 > +static void machine_pre_init(MachineState *ms) > +{ > +} > + > static void machine_class_init(ObjectClass *oc, void *data) > { > MachineClass *mc =3D MACHINE_CLASS(oc); > =20 > + mc->pre_init =3D machine_pre_init; > + > /* Default 128 MB as guest ram size */ > mc->default_ram_size =3D 128 * M_BYTE; > mc->rom_file_has_mr =3D 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; > =20 > + 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 =3D boot_order; > current_machine->cpu_model =3D cpu_model; > =20 > + machine_class->pre_init(current_machine); > machine_class->init(current_machine); > =20 > realtime_init(); --=20 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 --L+ofChggJdETEG3Y Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAEBAgAGBQJXX148AAoJEGw4ysog2bOS434P/iVmjG8WvQfaauxrKQ2qJFYw wc6Vw/17uKner0roFMU1fwgic2gLrWxKsj90VDc0NO0zRWPjVcYO6J69aptNOzRr 2+myPILXUj8TtCGPlOYE7ynnWVRh4EG7E1yUwxhmt82OzqJDCkoluU4gqLHZpASl vAmgg0+BjNDjJqptMgT3bA0cmQ3Ln6Jeabd2Ifp3oqCCWPxVO8FXjuyWcOqbYrpb F3jrqNDpw+VKWHgJ88R1RhdBH784wt3bDKY/t08VdRveKEUBwvoMZoYK9DkJR1mL gW2ZKO9DjyYltjSYDGkakKnpWCKgafFQB24PA8CU7S8alaXLXuOQw2ykdGxuQA9r dtaRSFx2InAI+H2hKM05wO709ZMUgS/gXgERjeAs+jPpsYJL3xml9h9VSHZyT48b JkNQiT9VChRVgMO9G0LXEKi/MF5bbagOTv2FfLQLbDfyJt05qQ80fZnFefLeCI1v kcdihvdOziRH3q8UGFpPwzoZeq8eACCryF9FJwUujLzD/RlsV4hfbS2wTS+v+v8P JNJI6rdFIdgKZIYGULikY1CTk+kDd2qHqf6tYcSPQTi2gQGmJBVwVuajc8OENlBr LWFZ64uQXUiHJJheU3DVaawItMiaNMOFWmXfOhKNtgnuUeSgt2G8ZHt8eZldaGl5 dgx2R9/IJb7IjSeI9hSt =mCMz -----END PGP SIGNATURE----- --L+ofChggJdETEG3Y--