search for: add_cmdlin

This set of 10 patches removes the need for any vmchannel implementation, although we can still choose to use vmchannel if we want. In this so-called "null vmchannel" configuration, the appliance connects directly to a port on the library. The exact method is described in patch 9/10. This method still requires SLIRP (user mode networking) so it is not a panacea, because recent

...234,6 @@ launch_direct (guestfs_h *g, void *datav, const char *arg) CLEANUP_FREE void *buf = NULL; struct drive *drv; size_t i; - int virtio_scsi; struct hv_param *hp; bool has_kvm; int force_tcg; @@ -336,14 +335,10 @@ launch_direct (guestfs_h *g, void *datav, const char *arg) ADD_CMDLINE (g->hv); /* CVE-2011-4127 mitigation: Disable SCSI ioctls on virtio-blk - * devices. The -global option must exist, but you can pass any - * strings to it so we don't need to check for the specific virtio - * feature. + * devices. */ - if (guestfs_int_qemu_supports (g, da...

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.

...--------------------------- 1 file changed, 19 insertions(+), 33 deletions(-) diff --git a/src/launch-direct.c b/src/launch-direct.c index 44ae9d0..2ffbff1 100644 --- a/src/launch-direct.c +++ b/src/launch-direct.c @@ -376,11 +376,6 @@ launch_direct (guestfs_h *g, void *datav, const char *arg) ADD_CMDLINE ("-display"); ADD_CMDLINE ("none"); -#ifdef MACHINE_TYPE - ADD_CMDLINE ("-M"); - ADD_CMDLINE (MACHINE_TYPE); -#endif - /* See guestfs.pod / gdb */ if (guestfs_int_get_backend_setting_bool (g, "gdb") > 0) { ADD_CMDLINE ("-S"); @...

...is enabled, connect gdb to tcp::1234 to 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__...

...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 (...

...ing. --- src/launch-direct.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/src/launch-direct.c b/src/launch-direct.c index a81d4b3..f1fe92b 100644 --- a/src/launch-direct.c +++ b/src/launch-direct.c @@ -574,19 +574,9 @@ launch_direct (guestfs_h *g, void *datav, const char *arg) ADD_CMDLINE ("-device"); ADD_CMDLINE (VIRTIO_SERIAL); -#if 0 - /* Use virtio-console (a variant form of virtio-serial) for the - * guest's serial console. - */ - ADD_CMDLINE ("-chardev"); - ADD_CMDLINE ("stdio,id=console"); - ADD_CMDLINE ("-device"); -...

...ch-direct.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/src/launch-direct.c b/src/launch-direct.c index a81d4b3..e8450e1 100644 --- a/src/launch-direct.c +++ b/src/launch-direct.c @@ -574,19 +574,9 @@ launch_direct (guestfs_h *g, void *datav, const char *arg) ADD_CMDLINE ("-device"); ADD_CMDLINE (VIRTIO_SERIAL); -#if 0 - /* Use virtio-console (a variant form of virtio-serial) for the - * guest's serial console. - */ - ADD_CMDLINE ("-chardev"); - ADD_CMDLINE ("stdio,id=console"); - ADD_CMDLINE ("-device"); -...

...AC_MSG_RESULT([no]) diff --git a/src/launch-direct.c b/src/launch-direct.c index 8d0d8ce..f45f582 100644 --- a/src/launch-direct.c +++ b/src/launch-direct.c @@ -349,7 +349,8 @@ launch_direct (guestfs_h *g, void *datav, const char *arg) if (qemu_supports (g, data, "-nodefaults")) ADD_CMDLINE ("-nodefaults"); - ADD_CMDLINE ("-nographic"); + ADD_CMDLINE ("-display"); + ADD_CMDLINE ("none"); #ifdef MACHINE_TYPE ADD_CMDLINE ("-M"); @@ -918,7 +919,8 @@ test_qemu (guestfs_h *g, struct backend_direct_data *data) data->qemu_de...

...-direct.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/launch-direct.c b/src/launch-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...

These assorted patches end up with adding virtio-scsi support to libguestfs. It passes libguestfs-test-tool, but I haven't yet tried to run the full set of tests. In theory > 26 devices can be added, but it's likely that certain parts of the daemon will break if you actually try this. This of course needs to be fixed. Thanks Paolo Bonzini for invaluable help. Rich.

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 was here: https://www.redhat.com/archives/libguestfs/2013-August/msg00005.html This now works, to some extent. The main problem now is that devices are named /dev/ubd[a-] which of course confuses everything. I'm thinking it may be easier to add a udev rule to rename them. Rich.

This is a User-Mode Linux backend for libguestfs. You can select it by doing: export LIBGUESTFS_BACKEND=uml export LIBGUESTFS_QEMU=/path/to/vmlinux Note we're reusing the 'qemu' variable in the handle for convenience. QEmu is not involved when using the UML backend. This almost works. UML itself crashes when the daemon tries to connect to the serial port. I suspect it's

...+ src/launch-libvirt.c | 14 ++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/src/launch-direct.c b/src/launch-direct.c index d0af04d..52badc2 100644 --- a/src/launch-direct.c +++ b/src/launch-direct.c @@ -451,6 +451,17 @@ launch_direct (guestfs_h *g, void *datav, const char *arg) ADD_CMDLINE ("-initrd"); ADD_CMDLINE (initrd); + /* Add a random number generator (backend for virtio-rng). This + * isn't strictly necessary but means we won't need to hang around + * when needing entropy. + */ + if (qemu_supports_device (g, data, "virtio-rng-pci"))...

...less you enable it +(see L</guestfs_set_network>). + +=item * + Only supports Linux guests (not Windows, BSD, etc). =item * diff --git a/src/launch.c b/src/launch.c index 1e1ea8e..df78b1a 100644 --- a/src/launch.c +++ b/src/launch.c @@ -410,6 +410,14 @@ guestfs__launch (guestfs_h *g) add_cmdline (g, "-device"); add_cmdline (g, "virtserialport,chardev=channel0,name=org.libguestfs.channel.0"); + /* Enable user networking. */ + if (g->enable_network) { + add_cmdline (g, "-net"); + add_cmdline (g, "user,vlan=0,net=" NETWORK); +...

More comprehensive support for virtio-scsi. Passes all the tests. Rich.

...guestfs_kill_subprocess (g); +#endif /* Run user close callbacks. */ guestfs___call_callbacks_void (g, GUESTFS_EVENT_CLOSE); diff --git a/src/launch.c b/src/launch.c index 1af74b9..4e2fba9 100644 --- a/src/launch.c +++ b/src/launch.c @@ -703,6 +703,16 @@ launch_appliance (guestfs_h *g) add_cmdline (g, "-device"); add_cmdline (g, "virtserialport,chardev=channel0,name=org.libguestfs.channel.0"); +#ifdef VALGRIND_DAEMON + /* Set up virtio-serial channel for valgrind messages. */ + add_cmdline (g, "-chardev"); + snprintf (buf, sizeof buf, "file...

Change 4963be85 re-introduced networking to the appliance, but didn't configure the custom network the appliance expects since we switched to link local addressing. This patch configures QEMU to use the custom network again. --- src/launch.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) -------------- next part -------------- A non-text attachment was scrubbed... Name: