On Thu, Nov 29, 2012 at 12:39:24PM +0000, Daniel P. Berrange wrote:
> On Thu, Nov 29, 2012 at 01:29:38PM +0100, Guido Günther wrote:
> > As of 1a50ba2cb07d8bb2aa724062889deb9efd7ad9e9 we fail to connect to the
> > monitor instead of getting an exit status != 0 from qemu itself. This
> > breaks capabilities probing for the non QMP case.
> > ---
> > src/qemu/qemu_capabilities.c | 4 +++-
> > 1 file changed, 3 insertions(+), 1 deletion(-)
> >
> > diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
> > index d92947f..d6affb9 100644
> > --- a/src/qemu/qemu_capabilities.c
> > +++ b/src/qemu/qemu_capabilities.c
> > @@ -2345,8 +2345,10 @@ qemuCapsInitQMP(qemuCapsPtr caps,
> > goto cleanup;
> > }
> >
> > - if (!(mon = qemuMonitorOpen(NULL, &config, true, &callbacks)))
> > + if (!(mon = qemuMonitorOpen(NULL, &config, true, &callbacks))) {
> > + ret = 0;
> > goto cleanup;
> > + }
> >
> > qemuMonitorLock(mon);
> >
>
> ACK
Pushed. Thanks. This unbreaks libvirt-tck on wheezy:
http://honk.sigxcpu.org:8001/job/libvirt-tck-debian-wheezy-qemu-session/202/
Cheers,
-- Guido
--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list