[libvirt] [PATCH 2/7] qemu: remove all support for kQEMU

[Daniel P. Berrange]

On Thu, Nov 05, 2015 at 05:04:54PM -0500, John Ferlan wrote:
> 
> 
> On 11/05/2015 12:33 PM, Daniel P. Berrange wrote:
> > The kQEMU accelerator was deleted in QEMU 0.12, so we no
> > longer need to support it in the QEMU driver.
> > 
> > Signed-off-by: Daniel P. Berrange <berrange at redhat.com>
> > ---
> >  src/qemu/qemu_capabilities.c | 18 ------------------
> >  src/qemu/qemu_capabilities.h |  4 ++--
> >  src/qemu/qemu_command.c      | 23 ++---------------------
> >  3 files changed, 4 insertions(+), 41 deletions(-)
> > 
> 
> [...]
> 
> > diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
> > index b883315..0c3cf66 100644
> > --- a/src/qemu/qemu_capabilities.h
> > +++ b/src/qemu/qemu_capabilities.h
> > @@ -33,7 +33,7 @@
> >  /* Internal flags to keep track of qemu command line capabilities */
> 
> Should a comment be left here to indicate an "X_" prior to a capability
> means that was previously checked for, but no longer needs checking;
> however, something must remain in the list due to compat issues.
> 
> Just so some kind soul doesn't come along one day and delete those...

I was still somewhat undecided at exactly what todo here. If we delete
the flags entirely, then in the (admittedly unlikely) event that someone
has libvirt running with QEMU 0.10.x and live updates libvirt, then
libvirtd would refuse to load the /var/run/libvirt/$GUEST.xml file due
to now unknown enum flags.

We have those patches posted a month or so back that let libvirt load
running QEMU's and mark them as "broken", which would solve this problem
in a nice way, letting us delete the flags here.

My second reason for not deleting them is that we've nicely grouped
them into bunches of 5, and deleting them will mess up the grouping!
So if we do decde to delete them, we should purge them in one big
patch at the end, so we only need to do grouping re-arragenemtn
once.

> >  typedef enum {
> >      /* 0 */
> > -    QEMU_CAPS_KQEMU, /* Whether KQEMU is compiled in */
> > +    X_QEMU_CAPS_KQEMU, /* Whether KQEMU is compiled in */
> >      QEMU_CAPS_VNC_COLON, /* VNC takes or address + display */
> >      QEMU_CAPS_NO_REBOOT, /* Is the -no-reboot flag available */
> >      QEMU_CAPS_DRIVE, /* Is the new -drive arg available */
> > @@ -86,7 +86,7 @@ typedef enum {
> >      QEMU_CAPS_PCI_CONFIGFD, /* pci-assign.configfd */
> >      QEMU_CAPS_NODEFCONFIG, /* -nodefconfig */
> >      QEMU_CAPS_BOOT_MENU, /* -boot menu=on support */
> > -    QEMU_CAPS_ENABLE_KQEMU, /* -enable-kqemu flag */
> > +    X_QEMU_CAPS_ENABLE_KQEMU, /* -enable-kqemu flag */
> >  
> >      /* 40 */
> >      QEMU_CAPS_FSDEV, /* -fstype filesystem passthrough */

Regards,
Daniel
-- 
|: http://berrange.com      -o-    http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org              -o-             http://virt-manager.org :|
|: http://autobuild.org       -o-         http://search.cpan.org/~danberr/ :|
|: http://entangle-photo.org       -o-       http://live.gnome.org/gtk-vnc :|