search for: launch_direct

...st char *filename, char (*sockname)[UNIX_PATH_MAX]); extern void guestfs_int_register_backend (const char *name, const struct backend_ops *); diff --git a/src/launch-direct.c b/src/launch-direct.c index 01b7e07..a005bda 100644 --- a/src/launch-direct.c +++ b/src/launch-direct.c @@ -234,6 +234,7 @@ launch_direct (guestfs_h *g, void *datav, const char *arg) struct hv_param *hp; bool has_kvm; int force_tcg; + bool dax; const char *cpu_model; /* At present you must add drives before starting the appliance. In @@ -371,15 +372,29 @@ launch_direct (guestfs_h *g, void *datav, const char *arg)...

...data { }; static int is_openable (guestfs_h *g, const char *path, int flags); -static char *make_appliance_dev (guestfs_h *g, int virtio_scsi); +static char *make_appliance_dev (guestfs_h *g); static void print_qemu_command_line (guestfs_h *g, char **argv); static char * @@ -234,7 +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)...

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.

...\ + } \ + } while (0) + #endif /* GUESTFS_INTERNAL_FRONTEND_H_ */ diff --git a/src/launch-direct.c b/src/launch-direct.c index bb73d19..104809d 100644 --- a/src/launch-direct.c +++ b/src/launch-direct.c @@ -717,6 +717,13 @@ launch_direct (guestfs_h *g, void *datav, const char *arg) goto dup_failed; close (sv[1]); + + /* Close any other file descriptors that we don't want to pass + * to qemu. This prevents file descriptors which didn't have + * O_CLOEXEC set properly from leaking into the...

...ting and analysis. --- lib/launch-direct.c | 15 +++++++++++++++ lib/launch-uml.c | 11 +++++++++++ 2 files changed, 26 insertions(+) diff --git a/lib/launch-direct.c b/lib/launch-direct.c index 8558cde5e..168ee367b 100644 --- a/lib/launch-direct.c +++ b/lib/launch-direct.c @@ -361,6 +361,7 @@ launch_direct (guestfs_h *g, void *datav, const char *arg) const char *cpu_model; CLEANUP_FREE char *append = NULL; CLEANUP_FREE_STRING_LIST char **argv = NULL; + sigset_t sigset; /* At present you must add drives before starting the appliance. In * future when we enable hotplugging you won...

...p the autodetection of its format and save a tiny bit of time. --- src/launch-direct.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/launch-direct.c b/src/launch-direct.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 ("...

https://bugzilla.redhat.com/show_bug.cgi?id=1123007 This is version 2 of the patch which avoids incorrectly closing stderr, so we can still see debug and error messages. Rich.

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

...\ + } \ + } while (0) + #endif /* GUESTFS_INTERNAL_FRONTEND_H_ */ diff --git a/src/launch-direct.c b/src/launch-direct.c index bb73d19..104809d 100644 --- a/src/launch-direct.c +++ b/src/launch-direct.c @@ -717,6 +717,13 @@ launch_direct (guestfs_h *g, void *datav, const char *arg) goto dup_failed; close (sv[1]); + + /* Close any other file descriptors that we don't want to pass + * to qemu. This prevents file descriptors which didn't have + * O_CLOEXEC set properly from leaking into the s...

...perty is specific to x86/x86_64, so add it only on these architectures. --- lib/launch-direct.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/launch-direct.c b/lib/launch-direct.c index bc43dcea2..3b848165c 100644 --- a/lib/launch-direct.c +++ b/lib/launch-direct.c @@ -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...

...extern char *guestfs_int_appliance_command_line (guestfs_h *g, const char *appliance_dev, int flags); #define APPLIANCE_COMMAND_LINE_IS_TCG 1 diff --git a/src/launch-direct.c b/src/launch-direct.c index 25b0349..d0af04d 100644 --- a/src/launch-direct.c +++ b/src/launch-direct.c @@ -284,8 +284,7 @@ launch_direct (guestfs_h *g, void *datav, const char *arg) guestfs_int_launch_send_progress (g, 3); - if (g->verbose) - guestfs_int_print_timestamped_message (g, "begin testing qemu features"); + debug (g, "begin testing qemu features"); /* Get qemu help text and version....

By passing root=UUID=... to supermin, we make the appliance boot process less sensitive to the non-deterministic process of scanning SCSI disks (of which much more to come). This patch should be tested alongside the supermin patch posted here: https://www.redhat.com/archives/libguestfs/2017-April/msg00174.html which in turn requires this supermin patch series:

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

...said). --- src/launch-direct.c | 52 +++++++++++++++++++--------------------------------- 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, &quo...

...aunch-direct.c | 3 +++ > lib/launch-libvirt.c | 10 ++++++++++ > 2 files changed, 13 insertions(+) > > 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 Which version of qemu was...

...gt; +bg_command (char **argv, char **pipef) > +{ Reading this and other similar implementations, for example: - fish/events.c, do_event_handler - fish/fish.c, execute_and_inline and issue_command (which has a comment regarding pipe commands) - src/command.c, run_command - src/launch-direct.c, launch_direct - src/launch-uml.c, launch_uml - daemon/guestfsd.c, commandrf (maybe, since it is in the appliance); other popen usages in daemon/* what about using libpipeline [1] to handle them? While it adds the overhead of a new shared library (although using just libc, and ~55kb in my f19/x86_64 installa...

...rect_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"); } - if (data->qemu_version_major < 1 || - (data->qemu_version_major == 1 && data->qemu_version_minor <= 2)) + if (!guestfs_i...

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