From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1j0MNI-0005fX-V0 for mharc-qemu-riscv@gnu.org; Sat, 08 Feb 2020 04:26:04 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60400) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j0MNG-0005aC-LP for qemu-riscv@nongnu.org; Sat, 08 Feb 2020 04:26:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j0MNF-0000cP-Ek for qemu-riscv@nongnu.org; Sat, 08 Feb 2020 04:26:02 -0500 Received: from bilbo.ozlabs.org ([2401:3900:2:1::2]:54295 helo=ozlabs.org) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1j0MN8-0000A0-2O; Sat, 08 Feb 2020 04:25:54 -0500 Received: by ozlabs.org (Postfix, from userid 1007) id 48F6Gd20KLz9sPK; Sat, 8 Feb 2020 20:25:45 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1581153945; bh=6RR1AqCdojKlRABvWytA0f8y/htSmvLgvdjGZEwETaE=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=ijcn8Lloc36esWOFlceEhewFluWObCk8bzULPpfjAzT76Qr+B2MjivWp+5nF0KosD o+b+Fv0ErKZQ1zcQggp2UMFT13b1F2Tjf20xc7l7I/k7bBxIxguF3yZtGWUI0nEeCo 2hoa8PGCObleLRkvV7PHHpMpMjJCUAG/te9F4MBw= Date: Sat, 8 Feb 2020 20:25:36 +1100 From: David Gibson To: Philippe =?iso-8859-1?Q?Mathieu-Daud=E9?= Cc: qemu-devel@nongnu.org, Aleksandar Rikalo , Guan Xuetao , qemu-ppc@nongnu.org, Sagar Karandikar , Christian Borntraeger , Paolo Bonzini , Bastian Koppelmann , Eduardo Habkost , Laurent Vivier , Anthony Green , Richard Henderson , Artyom Tarasenko , qemu-trivial@nongnu.org, Cornelia Huck , Aurelien Jarno , "Edgar E. Iglesias" , Mark Cave-Ayland , qemu-riscv@nongnu.org, "Michael S. Tsirkin" , Aleksandar Markovic , Marek Vasut , Palmer Dabbelt , Michael Walle , Halil Pasic , Marcel Apfelbaum , qemu-s390x@nongnu.org, Richard Henderson , Thomas Huth , Magnus Damm , David Hildenbrand , Chris Wulff , Stafford Horne , Helge Deller , Alistair Francis , Jia Liu , =?iso-8859-1?Q?Marc-Andr=E9?= Lureau Subject: Re: [PATCH v4 3/3] vl: Abort if multiple machines are registered as default Message-ID: <20200208092536.GD219689@umbus.fritz.box> References: <20200207161948.15972-1-philmd@redhat.com> <20200207161948.15972-4-philmd@redhat.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="2iBwrppp/7QCDedR" Content-Disposition: inline In-Reply-To: <20200207161948.15972-4-philmd@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2401:3900:2:1::2 X-BeenThere: qemu-riscv@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Feb 2020 09:26:04 -0000 --2iBwrppp/7QCDedR Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, Feb 07, 2020 at 05:19:48PM +0100, Philippe Mathieu-Daud=E9 wrote: > It would be confusing to have multiple default machines. > Abort if this ever occurs. >=20 > Signed-off-by: Philippe Mathieu-Daud=E9 Reviewed-by: David Gibson > --- > v2: Use assert() instead of human friendly message (Marc-Andr=E9) > v3: Move the check to find_machine() (Michael) >=20 > Cc: Marc-Andr=E9 Lureau > Cc: Laurent Vivier > Cc: Michael S. Tsirkin > --- > vl.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) >=20 > diff --git a/vl.c b/vl.c > index 7dcb0879c4..ebc203af0d 100644 > --- a/vl.c > +++ b/vl.c > @@ -1184,16 +1184,18 @@ static MachineClass *find_machine(const char *nam= e, GSList *machines) > static MachineClass *find_default_machine(GSList *machines) > { > GSList *el; > + MachineClass *default_machineclass =3D NULL; > =20 > for (el =3D machines; el; el =3D el->next) { > MachineClass *mc =3D el->data; > =20 > if (mc->is_default) { > - return mc; > + assert(default_machineclass =3D=3D NULL && "Multiple default= machines"); > + default_machineclass =3D mc; > } > } > =20 > - return NULL; > + return default_machineclass; > } > =20 > static int machine_help_func(QemuOpts *opts, MachineState *machine) --=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 --2iBwrppp/7QCDedR Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEdfRlhq5hpmzETofcbDjKyiDZs5IFAl4+fpAACgkQbDjKyiDZ s5KqoQ//b5icTjA+cBYQdVG7nS2yLMmcdrJyAOdFBPIEZ4DTV94zEbZMriYCZTfQ YdDEIjK6vBFxaD98Br+VqXDuBCj4UuR+EUgiRtEmeRZQ5bIN/T1Bf85imSNBzwiP /2b/wLoVOt0I0f15qC0fPZejL91/XXtrut9jbSzPb82H6qvNJMfGWHQg20ZensOV cNJ9dsPIrKCJGuYCk9KHUnDdeuT+jNfcjaBg19zlZHWB9LuYJi3y1ulI0s15akcW EptBKiQ+KicBfyXoHsa5SCYIa31tL9GR0sBgbDMCvE6TfbGILUzF5g8rJ924gnQu nD4Ae+OAZNP5HVPsNKbwTrCPDc+bQTGxKIZeK8Yq95I1OTzJYFCQVaF0VBeLP6jm JwIWNOSWHAjUtUW0+LLEsKx/f+1+xMOq9BdeI/9IajymvhusNL4S38FcGd/T8iRV sQ1bqXm3ZuB/XcEbXeIttksC1XZyBF5tA4Ds6qCR4gzYNkspEzVLffe4lpE4Flkp ePzhYeANFx7nc/uvi7OBD2hZjUIQXGFpnXFa/bSP5Nnle5EmUvZdtU8JSAAktjHr pn2BsaTifAn4bvhdBaLekQEyhdlG67zRtO3Y3h5isKSmSrnw3POnEJ1PIA7GPOM6 dLAtEDZOzOh2a2d6OrlS+VQC6n2JPgiIAR5EuXSqnWYuFwhVBqU= =rtQm -----END PGP SIGNATURE----- --2iBwrppp/7QCDedR--