From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42642) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YdNFk-0000QB-5j for qemu-devel@nongnu.org; Wed, 01 Apr 2015 14:20:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YdNFg-0002rT-5O for qemu-devel@nongnu.org; Wed, 01 Apr 2015 14:20:36 -0400 Received: from mx1.redhat.com ([209.132.183.28]:39519) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YdNFf-0002r5-LK for qemu-devel@nongnu.org; Wed, 01 Apr 2015 14:20:32 -0400 Message-ID: <551C36EE.6060103@redhat.com> Date: Wed, 01 Apr 2015 12:20:30 -0600 From: Eric Blake MIME-Version: 1.0 References: <1427906841-1576-1-git-send-email-marcel@redhat.com> <551C2B0D.7040403@redhat.com> <551C2CAE.9000108@redhat.com> In-Reply-To: <551C2CAE.9000108@redhat.com> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="HnxlF9V0NEhcd6rl2CN7WPN3OBHM3uspw" Subject: Re: [Qemu-devel] [PATCH V2 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) --HnxlF9V0NEhcd6rl2CN7WPN3OBHM3uspw Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 04/01/2015 11:36 AM, Marcel Apfelbaum wrote: > On 04/01/2015 08:29 PM, Eric Blake wrote: >> On 04/01/2015 10:47 AM, Marcel Apfelbaum wrote: >>> Commit 49d2e64 (machine: remove qemu_machine_opts global list) >>> made machine options specific to machine sub-type, leaving >>> the qemu_machine_opts desc array empty. Sadly this is the place >>> qmp_query_command_line_options is looking for supported options. >>> >>> As a fix for for 2.3 the machine_qemu_opts (the generic ones) >>> are restored only for qemu-config scope. >>> We need to find a better fix for 2.4. >>> >>> Reported-by: Tony Krowiak >>> Signed-off-by: Marcel Apfelbaum >>> --- >> >> No longer a strict superset of the Fedora 21 qemu-kvm, which had: >> >> "parameters": [ >> { >> "name": "max-ram-below-4g", >> "name": "kvm-type", >> (remembering that query-command-line-options does things in reverse >> order). I don't think iommu and suppress-vmdesc hurt to add, but we >> shouldn't lose kvm-type or max-ram-below-4g, if those were advertised = at >> the point prior to the QemuOpts conversion. (I didn't actually >> research, though, whether I'm comparing against downstream Fedora >> qemu-kvm patches instead of upstream...) > Hmm, in 2.3 kvm-type and max-ram-below-4g are machine specific. > I only took the ones from hw/core/machine.c that are common to all > machines. > As you said, this approach does the best to not lie to libvirt... And luckily, libvirt is not (currently) looking for either 'kvm-type' or 'max-ram-below-4g'. So, I can live with this, and from the point of view of libvirt's interaction with qemu: Reviewed-by: Eric Blake Tested-by: Eric Blake --=20 Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org --HnxlF9V0NEhcd6rl2CN7WPN3OBHM3uspw 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/ iQEcBAEBCAAGBQJVHDbuAAoJEKeha0olJ0NqceoH/RQ6GtEyI5Vp1F9jfQlK7JLc lG84/N6uBW7fp6JjXJwoFu5cqvUjgRBc7LeXEzecbh11k1hjeEzMsEEKp2Ddh1q1 crAegNUetAMy/dHX8wBp+g00X/yZOCAFta8hP6OYBKaCUptCaqmIro+sJR46C32N DW3ogixGSBxmpTVUyVyWwP5+rgCi2t/4WH1wX8jOKxabwO1603Pj0zKuQWDpZ1rh yoOzsnTi1e013jw/d6flSfdwfRzdN83vQsn4wol7mJL7rO5lgYOcjSEjXmm8ROVk 5cnkyCaJj/6YXc79mhRqhimlDdNuggGKqZ2dvzcehYx9BWaR4LESaSsR9PBdHJU= =S0L6 -----END PGP SIGNATURE----- --HnxlF9V0NEhcd6rl2CN7WPN3OBHM3uspw--