search for: end_list

Thanks: Cole Robinson, Dan Horak, Thomas Huth. --- lib/launch-libvirt.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/lib/launch-libvirt.c b/lib/launch-libvirt.c index f66c8e0ef..4adb2cfb3 100644 --- a/lib/launch-libvirt.c +++ b/lib/launch-libvirt.c @@ -1359,6 +1359,7 @@ construct_libvirt_xml_devices (guestfs_h *g, return -1; } +#ifndef __s390x__ /*

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

...atav, const char *arg) * when needing entropy. */ if (guestfs_int_qemu_supports_device (g, data->qemu_data, - "virtio-rng-pci")) { + VIRTIO_RNG)) { start_list ("-object") { append_list ("rng-random"); append_list ("filename=/dev/urandom"); append_list ("id=rng0"); } end_list (); start_list ("-device") { - append_list ("virtio-rng-pci"); + append_list (VIRTIO_RNG); append_list ("rng=rng...

...ol.h" #include "qemuopts.h" +int blocksize = 0; + /* Per-handle data. */ struct backend_direct_data { pid_t pid; /* Qemu PID. */ @@ -315,6 +317,8 @@ add_drive (guestfs_h *g, struct backend_direct_data *data, start_list ("-device") { append_list ("scsi-hd"); append_list_format ("drive=hd%zu", i); + append_list_format ("physical_block_size=%d", blocksize); + append_list_format ("logical_block_size=%d", blocksize); if (drv->disk_label) append_list_format ("seria...

...1; > } > > +/** > + * Add the blockio elements of the C<-device> parameter. > + */ > +static int > +add_device_blockio_params (guestfs_h *g, struct qemuopts *qopts, > + struct drive *drv) > +{ > + if (drv->pblocksize) > + append_list_format ("physical_block_size=%d", drv->pblocksize); > + if (drv->lblocksize) > + append_list_format ("logical_block_size=%d", drv->lblocksize); > + > + return 0; > + > + /* This label is called implicitly from the qemuopts macros on error. */ &gt...

...tions(+) diff --git a/lib/launch-direct.c b/lib/launch-direct.c index 47e8f37de..94dd995c6 100644 --- a/lib/launch-direct.c +++ b/lib/launch-direct.c @@ -523,6 +523,9 @@ 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__ + 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 4840...

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.

...ions(+) diff --git a/lib/launch-direct.c b/lib/launch-direct.c index 47e8f37de..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_li...

...tfs_h *g, struct backend_direct_data *data, return -1; } +/** + * Add the blockio elements of the C<-device> parameter. + */ +static int +add_device_blockio_params (guestfs_h *g, struct qemuopts *qopts, + struct drive *drv) +{ + if (drv->pblocksize) + append_list_format ("physical_block_size=%d", drv->pblocksize); + if (drv->lblocksize) + append_list_format ("logical_block_size=%d", drv->lblocksize); + + return 0; + + /* This label is called implicitly from the qemuopts macros on error. */ + qemuopts_error: + perrorf (g,...

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

Unfortunately I was not able to test this because I don't currently have access to a P9 machine. Rich.

...*/ + int blocksize; }; /** diff --git a/lib/launch-direct.c b/lib/launch-direct.c index ee2dcb8..54cd8c6 100644 --- a/lib/launch-direct.c +++ b/lib/launch-direct.c @@ -315,6 +315,12 @@ add_drive (guestfs_h *g, struct backend_direct_data *data, start_list ("-device") { append_list ("scsi-hd"); append_list_format ("drive=hd%zu", i); + if (g->blocksize >= 512 && g->blocksize <= 32768 + && (g->blocksize & (g->blocksize-1)) == 0) + { + append_list_format ("physical_block_size=%d"...

...*/ + int blocksize; }; /** diff --git a/lib/launch-direct.c b/lib/launch-direct.c index ee2dcb8..54cd8c6 100644 --- a/lib/launch-direct.c +++ b/lib/launch-direct.c @@ -315,6 +315,12 @@ add_drive (guestfs_h *g, struct backend_direct_data *data, start_list ("-device") { append_list ("scsi-hd"); append_list_format ("drive=hd%zu", i); + if (g->blocksize >= 512 && g->blocksize <= 32768 + && (g->blocksize & (g->blocksize-1)) == 0) + { + append_list_format ("physical_block_size=%d"...

...25 insertions(+), 7 deletions(-) > > diff --git a/lib/launch-direct.c b/lib/launch-direct.c > index 0be662e25..b9b54857a 100644 > --- a/lib/launch-direct.c > +++ b/lib/launch-direct.c > @@ -592,7 +592,9 @@ launch_direct (guestfs_h *g, void *datav, const char *arg) > append_list ("id=appliance"); > append_list ("cache=unsafe"); > append_list ("if=none"); > +#ifndef APPLIANCE_FMT_AUTO > append_list ("format=raw"); > +#endif > } end_list (); > start_list ("-device") { >...

..., return -1; } +/** + * Add the physical_block_size and logical_block_size elements of the C<-device> + * parameter. + */ +static int +add_device_blocksize_params (guestfs_h *g, struct qemuopts *qopts, + struct drive *drv) +{ + if (drv->blocksize) { + append_list_format ("physical_block_size=%d", drv->blocksize); + append_list_format ("logical_block_size=%d", drv->blocksize); + } + + return 0; + + /* This label is called implicitly from the qemuopts macros on error. */ + qemuopts_error: + perrorf (g, "qemuopts"); +...

..., return -1; } +/** + * Add the physical_block_size and logical_block_size elements of the C<-device> + * parameter. + */ +static int +add_device_blocksize_params (guestfs_h *g, struct qemuopts *qopts, + struct drive *drv) +{ + if (drv->blocksize) { + append_list_format ("physical_block_size=%d", drv->blocksize); + append_list_format ("logical_block_size=%d", drv->blocksize); + } + + return 0; + + /* This label is called implicitly from the qemuopts macros on error. */ + qemuopts_error: + perrorf (g, "qemuopts"); +...

v1 was here: https://www.redhat.com/archives/libguestfs/2020-February/msg00220.html This patch series is a little bit better. It's still a bit of a hack. The _real_ fix for this is outlined in the TODO file (see patch 1) but that requires a lot more work than we could do before 1.42 is released, unless we delay 1.42 for a lot longer. I'm hoping with this to have something which works