search for: guestfs_int_version_g

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

Of course I mean state=off (not <htm state=on>) ... Rich.

Incomplete fix for https://bugzilla.redhat.com/show_bug.cgi?id=1417306 The full fix is waiting for a libvirt change, but this can still go upstream. Rich.

...c index efedf92..db9b9f3 100644 --- a/lib/launch-direct.c +++ b/lib/launch-direct.c @@ -414,10 +414,7 @@ launch_direct (guestfs_h *g, void *datav, const char *arg) if (guestfs_int_qemu_supports (g, data->qemu_data, "-no-hpet")) { ADD_CMDLINE ("-no-hpet"); } - if (!guestfs_int_version_ge (&data->qemu_version, 1, 3, 0)) - ADD_CMDLINE ("-no-kvm-pit-reinjection"); - else { - /* New non-deprecated way, added in qemu >= 1.3. */ + if (guestfs_int_version_ge (&data->qemu_version, 1, 3, 0)) { ADD_CMDLINE ("-global"); ADD_CMDLINE (&quo...

...@ -519,8 +519,10 @@ launch_direct (guestfs_h *g, void *datav, const char *arg) arg ("-rtc", "driftfix=slew"); if (guestfs_int_qemu_supports (g, data->qemu_data, "-no-hpet")) flag ("-no-hpet"); +#if defined(__i386__) || defined(__x86_64__) if (guestfs_int_version_ge (&data->qemu_version, 1, 3, 0)) arg ("-global", "kvm-pit.lost_tick_policy=discard"); +#endif /* UEFI (firmware) if required. */ if (guestfs_int_get_uefi (g, &uefi_code, &uefi_vars, &uefi_flags) == -1) -- 2.13.5

v1 was here: https://www.redhat.com/archives/libguestfs/2018-September/thread.html#00000 v2: - Make conditional on qemu >= 2.11.2 and libvirt >= 4.6.0. - Fix the libvirt XML to match what went upstream. Still untested. Rich.

....e99c33347 100644 --- a/lib/launch-direct.c +++ b/lib/launch-direct.c @@ -523,6 +523,10 @@ launch_direct (guestfs_h *g, void *datav, const char *arg) #ifdef __aarch64__ if (has_kvm && !force_tcg) append_list ("gic-version=host"); +#endif +#ifdef __powerpc64__ + if (guestfs_int_version_ge (&data->qemu_version, 2, 11, 2)) + append_list ("cap-htm=off"); #endif append_list_format ("accel=%s", !force_tcg ? "kvm:tcg" : "tcg"); } end_list (); diff --git a/lib/launch-libvirt.c b/lib/launch-libvirt.c index 48404ef93..1a074fd6c 10...

...tfs_int_version_from_x_y (guestfs_h *g, struct version *v, const char *str); +extern int guestfs_int_version_from_x_y_re (guestfs_h *g, struct version *v, const char *str, const pcre *re); +extern int guestfs_int_version_from_x_y_or_x (guestfs_h *g, struct version *v, const char *str); extern bool guestfs_int_version_ge (const struct version *v, int maj, int min, int mic); +extern bool guestfs_int_version_cmp_ge (const struct version *a, const struct version *b); #define version_init_null(v) guestfs_int_version_from_values (v, 0, 0, 0) +#define version_is_null(v) ((v)->v_major == 0 && (v)->v_minor...

...ackend_direct_data *data, > file = guestfs_int_drive_source_qemu_param (g, &drv->src); > append_list_format ("file=%s", file); > > - if (drv->readonly) > + if (drv->readonly) { > append_list ("snapshot=on"); > + if (guestfs_int_version_ge (&data->qemu_version, 2, 10, 0)) > + append_list ("locking=off"); > + } > append_list_format ("cache=%s", > drv->cachemode ? drv->cachemode : "writeback"); LGTM. IMHO locking=off ought to be used also...

Patches 1 & 2 were posted previously here: https://www.redhat.com/archives/libguestfs/2016-May/msg00134.html Patch 3 is a hack so I can test this using my own version of qemu (the `-L ?' stuff is not upstream). Patch 4 is where the real action takes place: Replace the caching of qemu features in blob-like files with a sqlite database. Probably the best way to approach this patch is to

v1 -> v2: - Rebase on top of Pino's version work. Two patches went upstream, these are the two remaining patches. Note the generation number is still inside the qemu.stat file. We could put it in the filename, I have no particular preference. Rich.

This commit uses -bios bios-fast.bin if available, which basically stops SeaBIOS from trying to do PCI probing during boot, which is a waste of time when using the -kernel option. v1 -> v2: - Rebase on top of Pino's work. This still has 3 dependencies: - The qemu memoization work (v2). - Support for '-L ?' in qemu:

...dard_params (guestfs_h *g, struct backend_direct_data *data, file = guestfs_int_drive_source_qemu_param (g, &drv->src); append_list_format ("file=%s", file); - if (drv->readonly) + if (drv->readonly) { append_list ("snapshot=on"); + if (guestfs_int_version_ge (&data->qemu_version, 2, 10, 0)) + append_list ("locking=off"); + } append_list_format ("cache=%s", drv->cachemode ? drv->cachemode : "writeback"); if (drv->src.format) -- 2.13.2

...file = guestfs_int_drive_source_qemu_param (g, &drv->src); > > append_list_format ("file=%s", file); > > > > - if (drv->readonly) > > + if (drv->readonly) { > > append_list ("snapshot=on"); > > + if (guestfs_int_version_ge (&data->qemu_version, 2, 10, 0)) > > + append_list ("locking=off"); > > Don't we have a way to enumerate supported options? Yes, although it's difficult to do: https://www.redhat.com/archives/libguestfs/2017-September/msg00039.html Rich. > Depend...

v2 -> v3: - Rebase on top of the other patches. Rich.

NB: This requires a qemu patch by Eduardo which is currently awaiting review: https://www.mail-archive.com/qemu-devel@nongnu.org/msg422959.html So not to be applied yet unless that qemu change goes upstream. Rich.

...303,50 +300,6 @@ guestfs_int_qemu_supports_device (guestfs_h *g, return strstr (data->qemu_devices, device_name) != NULL; } -static int -old_or_broken_virtio_scsi (const struct version *qemu_version) -{ - /* qemu 1.1 claims to support virtio-scsi but in reality it's broken. */ - if (!guestfs_int_version_ge (qemu_version, 1, 2, 0)) - return 1; - - return 0; -} - -/** - * Test if qemu supports virtio-scsi. - * - * Returns C<1> = use virtio-scsi, or C<0> = use virtio-blk. - */ -int -guestfs_int_qemu_supports_virtio_scsi (guestfs_h *g, struct qemu_data *data, -...

Currently we have an OCaml library for generating the qemu command line (used only by ‘virt-v2v -o qemu’). However we also generate a qemu command line in ‘lib/launch-direct.c’, and we might in future need to generate a ‘-readconfig’-compatible configuration file if we want to go beyond 10,000 drives for scalability testing. Therefore this patch series reimplements the qemu command line code as

v1 -> v2: - Remove the unnecessary calls to guestfs_int_lazy_make_tmpdir in the final patch. Rich.

Miscellaneous small cleanups in lib/ directory. Rich.