[libvirt] [PATCH 3/3] qemu: recognize -machine accel=kvm when parsing native

[Michal Privoznik]

On 28.08.2013 06:00, Eric Blake wrote:
> In Fedora 19, 'qemu-kvm' is a simple wrapper that calls
> 'qemu-system-x86_64 -machine accel=kvm'.  Attempting
> to use 'virsh qemu-attach $pid' to a machine started as:
> 
> qemu-kvm -cdrom /var/lib/libvirt/images/foo.img \
>  -monitor unix:/tmp/demo,server,nowait -name foo \
>  --uuid cece4f9f-dff0-575d-0e8e-01fe380f12ea
> 
> was failing with:
> error: XML error: No PCI buses available
> 
> because we did not see 'kvm' in the executable name parsed
> from /proc/$pid/cmdline, which in turn led to not setting
> def->os.machine correctly, which in turn led to refusal to
> recognize the pci bus.
> 
> Noticed while investigating https://bugzilla.redhat.com/995312
> although there are still other issues to fix before that bug
> will be completely solved.
> 
> I've concluded that the existing parser code for native-to-xml
> is a horrendous hodge-podge of ad-hoc approaches; I basically
> rewrote the -machine section to be a bit saner.
> 
> * src/qemu/qemu_command.c (qemuParseCommandLine): Don't assume
> -machine argument is always appropriate for os.machine; set
> virtType if accel is present.
> 
> Signed-off-by: Eric Blake <eblake at redhat.com>
> ---
>  src/qemu/qemu_command.c | 57 +++++++++++++++++++++++++++----------------------
>  1 file changed, 32 insertions(+), 25 deletions(-)

ACK

Michal