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. > > 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. > > Reported-by: Tony Krowiak > Signed-off-by: Marcel Apfelbaum > --- > > 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/ > > 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 -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org