From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46568) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YdKOY-0000Hv-4p for qemu-devel@nongnu.org; Wed, 01 Apr 2015 11:17:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YdKOT-00062T-AI for qemu-devel@nongnu.org; Wed, 01 Apr 2015 11:17:30 -0400 Received: from mx1.redhat.com ([209.132.183.28]:34114) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YdKOT-00061g-5G for qemu-devel@nongnu.org; Wed, 01 Apr 2015 11:17:25 -0400 Message-ID: <551C0C02.3050003@redhat.com> Date: Wed, 01 Apr 2015 09:17:22 -0600 From: Eric Blake MIME-Version: 1.0 References: <1427897284-31473-1-git-send-email-marcel@redhat.com> In-Reply-To: <1427897284-31473-1-git-send-email-marcel@redhat.com> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="WgmAwD3VHgAeticadOpnlMpmhk9bJRKv6" Subject: Re: [Qemu-devel] [PATCH for-2.3] util/qemu-config" fix regression of qmp_query_command_line_options List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Marcel Apfelbaum , qemu-devel@nongnu.org Cc: pbonzini@redhat.com, akrowiak@linux.vnet.ibm.com, armbru@redhat.com This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --WgmAwD3VHgAeticadOpnlMpmhk9bJRKv6 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 04/01/2015 08:08 AM, Marcel Apfelbaum wrote: > Commit 49d2e64 (machine: remove qemu_machine_opts global list) made > machine machine options specific to machine sub-type, leaving At the risk of sounding like a machine: s/machine machine/machine/ > the qemu_machine_opts desc array empty. Sadly this is the place > qmp_query_command_line_options is looking for supported options. >=20 > As a fix for for 2.3 the machine_qemu_opts are restored only > for the scope of qemu-config, bringing together all machines s/machines/machines'/ > properties. We need to find a better fix for 2.4. >=20 > Reported-by: Tony Krowiak > Signed-off-by: Marcel Apfelbaum > --- >=20 > I don't like this approach, but I wouldn't want to loose the > 'options per machine type' feature. We'll find something better for 2.4= /=20 >=20 > util/qemu-config.c | 108 +++++++++++++++++++++++++++++++++++++++++++++= ++++++++ > 1 file changed, 108 insertions(+) It's a hack, but it avoids a regression. Reviewed-by: Eric Blake I also tested that query-command-line-options on qemu.git + this patch provided a superset of the options exposed by 2:qemu-system-x86-2.1.3-3.fc21.x86_64 as installed on Fedora 21, while without this patch it had no options. Tested-by: Eric Blake --=20 Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org --WgmAwD3VHgAeticadOpnlMpmhk9bJRKv6 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 Comment: Public key at http://people.redhat.com/eblake/eblake.gpg Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQEcBAEBCAAGBQJVHAwCAAoJEKeha0olJ0NqEaQIAJXXVi/Ne13VfBsAQJkn0uLn GuiGm9kSpRy4h43Oe+tjH35RaTI+NSXrEJlFoZFz0B2TyGs0BzrbLXdtkZlW7HIm z+o2FLRzl/lAaUgojDx28dXvB1AruxBHy3b3hmJbI+aVbIYqC0lEblchJyNDXA8F x/LY5q+HA6fzdxZl4oaPMEoeUvkTayWz3pP5s7pG/K1Jc02bE89suwcDi/yY+hET UWZKkLKwe1i12icAebf1bdAIdXUY0M9QzAV5wzBdrZ+dswSS8UH6oSj7GqGuWjZg sVQpAgTWVQ/eYH5sweVKIO9PJh2T2/FEzXL+x5vpuSoigxAZMHwCZb9bfa8dM7o= =Zukr -----END PGP SIGNATURE----- --WgmAwD3VHgAeticadOpnlMpmhk9bJRKv6--