search for: add_cmdline_printf

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

NOTE: not for upstream, yet. v1 -> v2: - Remove the dependency on enabling ACPI, since ACPI is now enabled all the time. Rich.

...o begin"); } + /* Can we use DAX? */ +#ifdef __x86_64__ + dax = guestfs_int_qemu_version_ge (data->qemu_data, 2, 6) && + guestfs_int_qemu_supports_device (g, data->qemu_data, "nvdimm"); +#else + dax = false; +#endif + ADD_CMDLINE ("-machine"); ADD_CMDLINE_PRINTF ( #ifdef MACHINE_TYPE MACHINE_TYPE "," + "%s" +#elif __x86_64__ + "pc,%s" +#else + "%s" #endif #ifdef __aarch64__ "gic-version=host," #e...

....c index ee0a855..8521e5a 100644 --- a/src/launch-direct.c +++ b/src/launch-direct.c @@ -563,7 +563,7 @@ launch_direct (guestfs_h *g, void *datav, const char *arg) /* Add the ext2 appliance drive (after all the drives). */ if (has_appliance_drive) { ADD_CMDLINE ("-drive"); - ADD_CMDLINE_PRINTF ("file=%s,snapshot=on,id=appliance,cache=unsafe,if=none", + ADD_CMDLINE_PRINTF ("file=%s,snapshot=on,id=appliance,cache=unsafe,if=none,format=raw", appliance); if (virtio_scsi) { -- 2.5.5

...io-blk. + * virtio-scsi. */ - if (drv->iface && STREQ (drv->iface, "virtio")) /* virtio-blk */ - goto virtio_blk; + if (drv->iface && STREQ (drv->iface, "virtio")) { /* virtio-blk */ + ADD_CMDLINE ("-drive"); + ADD_CMDLINE_PRINTF ("%s,if=none" /* sic */, param); + ADD_CMDLINE ("-device"); + ADD_CMDLINE_PRINTF (VIRTIO_BLK ",drive=hd%zu", i); + } #if defined(__arm__) || defined(__aarch64__) || defined(__powerpc__) else if (drv->iface && STREQ (drv->iface, "id...

...ild_appliance (guestfs_h *g, char **kernel, char **initrd, char **appliance); diff --git a/lib/launch-direct.c b/lib/launch-direct.c index 3d6e72e..f157324 100644 --- a/lib/launch-direct.c +++ b/lib/launch-direct.c @@ -409,8 +409,17 @@ launch_direct (guestfs_h *g, void *datav, const char *arg) ADD_CMDLINE_PRINTF ("%d", g->smp); } - ADD_CMDLINE ("-m"); - ADD_CMDLINE_PRINTF ("%d", g->memsize); + if (guestfs_int_has_spdk_drive(g)) { + ADD_CMDLINE ("-m"); + ADD_CMDLINE ("1G"); + ADD_CMDLINE ("-object"); + ADD_CMDLINE ("me...

...t; --- a/src/launch-direct.c > +++ b/src/launch-direct.c > @@ -563,7 +563,7 @@ launch_direct (guestfs_h *g, void *datav, const char *arg) > /* Add the ext2 appliance drive (after all the drives). */ > if (has_appliance_drive) { > ADD_CMDLINE ("-drive"); > - ADD_CMDLINE_PRINTF ("file=%s,snapshot=on,id=appliance,cache=unsafe,if=none", > + ADD_CMDLINE_PRINTF ("file=%s,snapshot=on,id=appliance,cache=unsafe,if=none,format=raw", > appliance); ACK. If I'm right, it seems we don't need any change in src/launch-libv...

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

..._h *g, void *datav, const char *arg) ADD_CMDLINE ("kvm-pit.lost_tick_policy=discard"); } + /* UEFI (firmware) if required. */ + if (guestfs___get_uefi (g, &uefi_code, &uefi_vars) == -1) + goto cleanup0; + if (uefi_code) { + ADD_CMDLINE ("-drive"); + ADD_CMDLINE_PRINTF ("if=pflash,format=raw,file=%s,readonly", uefi_code); + if (uefi_vars) { + ADD_CMDLINE ("-drive"); + ADD_CMDLINE_PRINTF ("if=pflash,format=raw,file=%s", uefi_vars); + } + } + + /* Kernel, DTB and initrd. */ ADD_CMDLINE ("-kernel"); ADD...

...4 --- a/src/launch-uml.c +++ b/src/launch-uml.c @@ -269,12 +269,14 @@ launch_uml (guestfs_h *g, void *datav, const char *arg) #if 0 /* XXX This could be made to work. */ #ifdef VALGRIND_DAEMON - /* Set up virtio-serial channel for valgrind messages. */ - ADD_CMDLINE ("-chardev"); - ADD_CMDLINE_PRINTF ("file,path=%s/valgrind.log.%d,id=valgrind", - VALGRIND_LOG_PATH, getpid ()); - ADD_CMDLINE ("-device"); - ADD_CMDLINE ("virtserialport,chardev=valgrind,name=org.libguestfs.valgrind"); + if (guestfs_int_get_backend_setting_bool (g, "valgrin...

...d_data (g, g->conn, buf, sizeof buf); - } -#endif } /* Shut down the backend. */ diff --git a/src/launch-uml.c b/src/launch-uml.c index 785548c..6a63b6b 100644 --- a/src/launch-uml.c +++ b/src/launch-uml.c @@ -267,17 +267,6 @@ launch_uml (guestfs_h *g, void *datav, const char *arg) ADD_CMDLINE_PRINTF ("ssl3=fd:%d", dsv[1]); ADD_CMDLINE ("guestfs_channel=/dev/ttyS3"); -#if 0 /* XXX This could be made to work. */ -#ifdef VALGRIND_DAEMON - /* Set up virtio-serial channel for valgrind messages. */ - ADD_CMDLINE ("-chardev"); - ADD_CMDLINE_PRINTF ("file,pat...

Previously posted here: https://www.redhat.com/archives/libguestfs/2015-June/msg00266.html Rich.

...2ms ±5.3ms > Result: 1374.7ms ±5.4ms > > But even theoretically there should not be much difference, because > qcow2 uses a cache to internal tables. Also -drive configured to use the > host cache: > if (has_appliance_drive) { > ADD_CMDLINE ("-drive"); > ADD_CMDLINE_PRINTF ("file=%s,snapshot=on,id=appliance," > "cache=unsafe,if=none,format=raw", > -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming and virtualization blog: http://rwmj.wordpress.com virt-top is 't...

...ail. A giant clusterfuck with - * the qemu command line, again. - */ - if (has_kvm && !force_tcg && qemu_supports (g, data, "-enable-kvm")) - ADD_CMDLINE ("-enable-kvm"); - } - if (g->smp > 1) { ADD_CMDLINE ("-smp"); ADD_CMDLINE_PRINTF ("%d", g->smp); @@ -997,12 +983,12 @@ test_qemu (guestfs_h *g, struct backend_direct_data *data) guestfs_int_cmd_add_arg (cmd3, g->hv); guestfs_int_cmd_add_arg (cmd3, "-display"); guestfs_int_cmd_add_arg (cmd3, "none"); -#ifdef MACHINE_TYPE - guestfs_in...

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

QEMU upstream has broken snapshot=on ... again. These two patches stop using it entirely. Instead we run 'qemu-img create' to create overlay disks as required. Note that the libvirt and UML backends were already doing this: The libvirt backend because <transient/> has never worked, and the UML backend was running uml_mkcow because the UML-equivalent syntax of snapshot=on was

Currently we are unable to properly run guestfsd (the daemon) under valgrind. Attempts to run valgrind inside the appliance have not been successful (see patch 1/7). However we desperately need better valgrind coverage of the daemon, particularly because it is doing a lot of complex parsing of program output. This has been a problem for a long time. A better way to attack this problem is to

This is only lightly tested. In particularly I only tested that the non-secure-boot path still works. I didn't test it on RHEL 7.3 yet because I haven't got enough free disk space for these giant source *.ova files :-( Will try to give that a go later. Rich.

In v2: - Kernel command line parsing now moved to the appliance. - In the captive daemon test, the daemon cleanly shuts down on exit. - Add another btrfs test. Rich.

...al-safe functions such as malloc. */ -#define ADD_CMDLINE(str) \ +#define ADD_CMDLINE(str) \ guestfs_int_add_string (g, &cmdline, (str)) -#define ADD_CMDLINE_STRING_NODUP(str) \ +#define ADD_CMDLINE_STRING_NODUP(str) \ guestfs_int_add_string_nodup (g, &cmdline, (str)) -#define ADD_CMDLINE_PRINTF(fs,...) \ +#define ADD_CMDLINE_PRINTF(fs,...) \ guestfs_int_add_sprintf (g, &cmdline, (fs), ##__VA_ARGS__) ADD_CMDLINE (g->hv); @@ -615,7 +615,7 @@ launch_direct (guestfs_h *g, void *datav, const char *arg) if (!has_kvm || force_tcg) flags |= APPLIANCE_COMMAND_LINE_IS_TCG;...