search for: qemu_version_major

...--git a/src/launch-direct.c b/src/launch-direct.c index 1b012cf..832b975 100644 --- a/src/launch-direct.c +++ b/src/launch-direct.c @@ -62,7 +62,7 @@ struct backend_direct_data { char *qemu_devices; /* Output of qemu -device ? */ /* qemu version (0, 0 if unable to parse). */ - int qemu_version_major, qemu_version_minor; + struct version qemu_version; int virtio_scsi; /* See function qemu_supports_virtio_scsi */ @@ -420,8 +420,7 @@ launch_direct (guestfs_h *g, void *datav, const char *arg) if (qemu_supports (g, data, "-no-hpet")) { ADD_CMDLINE ("-no-hpet&qu...

...t maj, int min, int mic); I think calling this function "is" is a bit misleading. I think we should have _ge and _le functions (cf my patch). This comparison for example is wrong: > /* qemu 1.1 claims to support virtio-scsi but in reality it's broken. */ > - if (data->qemu_version_major == 1 && data->qemu_version_minor < 2) > + if (!guestfs_int_version_is (&data->qemu_version, 1, 2, 0)) > return 1; However the idea is sound. Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming and virtualiza...

Doing qemu feature detection in the direct backend takes ~100ms because we need to run `qemu -help' and `qemu -devices ?', and each of those interacts with glibc's very slow link loader. Fixing the link loader is really hard. Instead memoize the output of those two commands. This patch series first separates all the code dealing with qemu into a separate module (src/qemu.c) and

...unch-direct.c index 6eaee63..c091732 100644 --- a/src/launch-direct.c +++ b/src/launch-direct.c @@ -491,7 +491,14 @@ launch_direct (guestfs_h *g, void *datav, const char *arg) */ ADD_CMDLINE ("-no-hpet"); #endif - ADD_CMDLINE ("-no-kvm-pit-reinjection"); + if (data->qemu_version_major < 1 || + (data->qemu_version_major == 1 && data->qemu_version_minor <= 2)) + ADD_CMDLINE ("-no-kvm-pit-reinjection"); + else { + /* New non-deprecated way, added in qemu >= 1.3. */ + ADD_CMDLINE ("-global"); + ADD_CMDLINE ("kvm-pit.l...

Hi, this adds an helper version struct, and uses it in the backends (for the libvirt and qemu versions) and inspection code. This also moves common code to that, so it is not repeated in many places. This should help with the small refactoring proposed with https://www.redhat.com/archives/libguestfs/2016-May/msg00070.html Thanks, Pino Toscano (2): src: start unifying version handling

Hi, this adds an helper version struct, and uses it in the backends (for the libvirt and qemu versions) and inspection code. This also moves common code to that, so it is not repeated in many places. This should help with the small refactoring proposed with https://www.redhat.com/archives/libguestfs/2016-May/msg00070.html Thanks, Pino Toscano (2): src: start unifying version handling

...n "is" is a bit misleading. I think > we should have _ge and _le functions (cf my patch). Makes sense, renamed to _ge. > This comparison for example is wrong: > > > /* qemu 1.1 claims to support virtio-scsi but in reality it's broken. */ > > - if (data->qemu_version_major == 1 && data->qemu_version_minor < 2) > > + if (!guestfs_int_version_is (&data->qemu_version, 1, 2, 0)) > > return 1; The older code was basically checking for versions in the interval [1, 2[, while the change turns that into a [0, 2[. Considering the qemu v...

...if not NULL) into the + * major and minor version of qemu, but don't fail if parsing is not + * possible. */ static void parse_qemu_version (guestfs_h *g, struct backend_direct_data *data) @@ -1013,13 +999,13 @@ parse_qemu_version (guestfs_h *g, struct backend_direct_data *data) data->qemu_version_major = 0; data->qemu_version_minor = 0; - if (!data->qemu_version) + if (!data->qemu_help) return; - if (!match2 (g, data->qemu_version, re_major_minor, &major_s, &minor_s)) { + if (!match2 (g, data->qemu_help, re_major_minor, &major_s, &minor_s)) { pars...

NOTE: Not for upstream, yet. This depends on 3 non-upstream patches. - The qemu rework in libguestfs, which in turn depends on what Pino is up to. - Support for '-L ?' in qemu: https://lists.gnu.org/archive/html/qemu-devel/2016-05/threads.html#02596 - Support for bios-fast.bin in qemu: https://lists.gnu.org/archive/html/qemu-devel/2016-05/threads.html#02408 This commit

These patches contain the beginnings of discard (a.k.a. trim or unmap) support. This will allow us to change virt-sparsify to work on disk images in-place (instead of using slow & inefficient copying). The approach used is to add an optional 'discard' parameter to add-drive. It has 3 possible settings: - 'disable' : the default, no discard is done - 'besteffort' :

Error out early if the path to the socket will not fit into sockaddr_un::sun_path, as we will not be able to connect to it. --- src/launch-unix.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/launch-unix.c b/src/launch-unix.c index 740c554..973e14b 100644 --- a/src/launch-unix.c +++ b/src/launch-unix.c @@ -47,6 +47,12 @@ launch_unix (guestfs_h *g, void *datav, const char

This set of patches: - Adds new APIs to support discard in libguestfs. - Adds discard support to virt-format. - Adds discard support to virt-sysprep. - Implements virt-sparsify --in-place. This is now working, after fixing the rather stupid bug in fstrim. I've pushed the ones which were ACKed previously + the fstrim fix. Rich.

Lots of changes since v2, too much to remember or summarize. Please ignore patch 11/11, it's just for my testing. Rich.

This still isn't working at the moment. See: http://marc.info/?t=139457409300003&r=1&w=2 This set of patches: - Adds new APIs to support discard in libguestfs. - Adds discard support to virt-format. - Adds discard support to virt-sysprep. - Implements virt-sparsify --in-place. Rich.