search for: launch_libvirt

.../* This is possible in some really strange situations, such as * guestfsd starts up OK but then qemu immediately exits. Check for diff --git a/src/launch-libvirt.c b/src/launch-libvirt.c index cdc83f4..9f2672d 100644 --- a/src/launch-libvirt.c +++ b/src/launch-libvirt.c @@ -286,8 +286,7 @@ launch_libvirt (guestfs_h *g, void *datav, const char *libvirt_uri) } debug (g, "guest random name = %s", data->name); - if (g->verbose) - guestfs_int_print_timestamped_message (g, "connect to libvirt"); + debug (g, "connect to libvirt"); /* Decode the URI str...

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

In case you configure libguestfs with a custom QEMU, e.g.: $ ./configure [...] QEMU=/path/to/qemu then the libvirt backend did not use to override it, launching the appliance with the default QEMU for libvirt. This does not change the manual emulator overriding using set-hv. Pino Toscano (2): launch: libvirt: get default QEMU from domcapabilities launch: libvirt: fix custom hypervisor

As the start of work to add remote support, I'm taking a close look at the protocol layer in the library. These are some small cleanups. Rich.

...es sure we are unlinking the right sockets. --- src/launch-libvirt.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/launch-libvirt.c b/src/launch-libvirt.c index 185b44b..8a5d93e 100644 --- a/src/launch-libvirt.c +++ b/src/launch-libvirt.c @@ -397,7 +397,6 @@ launch_libvirt (guestfs_h *g, void *datav, const char *libvirt_uri) */ snprintf (data->guestfsd_path, sizeof data->guestfsd_path, "%s/guestfsd.sock", g->tmpdir); - unlink (data->guestfsd_path); set_socket_create_context (g); @@ -424,7 +423,6 @@ launch_libvirt (gue...

...when querying the libvirt domain capabilities. --- lib/launch-libvirt.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/launch-libvirt.c b/lib/launch-libvirt.c index 864eae314..f2cad9300 100644 --- a/lib/launch-libvirt.c +++ b/lib/launch-libvirt.c @@ -431,7 +431,12 @@ launch_libvirt (guestfs_h *g, void *datav, const char *libvirt_uri) if (parse_capabilities (g, capabilities_xml, data) == -1) goto cleanup; - domcapabilities_xml = virConnectGetDomainCapabilities (conn, NULL, NULL, NULL, + domcapabilities_xml = virConnectGetDomainCapabilities (conn, NULL, NULL, +#ifde...

...tatic void drive_free_priv (void *); static void set_socket_create_context (guestfs_h *g); static void clear_socket_create_context (guestfs_h *g); + +#if HAVE_LIBSELINUX static void selinux_warning (guestfs_h *g, const char *func, const char *selinux_op, const char *data); +#endif static int launch_libvirt (guestfs_h *g, const char *libvirt_uri) @@ -1716,6 +1719,7 @@ libvirt_error (guestfs_h *g, const char *fs, ...) free (msg); } +#if HAVE_LIBSELINUX static void selinux_warning (guestfs_h *g, const char *func, const char *selinux_op, const char *data) @@ -1724,6 +1728,7 @@ s...

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:

...virt.so.0 > > #5 0x00007fac56dcbfe2 in callFull.isra.2 () from /lib64/libvirt.so.0 > > #6 0x00007fac56de213d in remoteDomainCreateXML () from > /lib64/libvirt.so.0 > > #7 0x00007fac56d82151 in virDomainCreateXML () from /lib64/libvirt.so.0 > > #8 0x00007fac58acca50 in launch_libvirt () from /lib64/libguestfs.so.0 > > #9 0x00007fac58ac2b2b in guestfs_impl_launch () from > /lib64/libguestfs.so.0 > > #10 0x00007fac58a5eba5 in guestfs_launch () from /lib64/libguestfs.so.0 > > #11 0x00000000004117ca in main () > ... > > libguestfs: [62900ms] launch li...

Use libvirt to set up the user network instead of a custom qemu argument. Note this requires a non-upstream patch being discussed on the libvirt mailing list at the moment. https://bugzilla.redhat.com/show_bug.cgi?id=1075520#c6 Rich.

...t; daemon_accept_sock = socket (AF_UNIX, SOCK_STREAM|SOCK_CLOEXEC, 0); > if (daemon_accept_sock == -1) { > diff --git a/src/launch-libvirt.c b/src/launch-libvirt.c > index 8a5d93e..376bd80 100644 > --- a/src/launch-libvirt.c > +++ b/src/launch-libvirt.c > @@ -395,8 +395,9 @@ launch_libvirt (guestfs_h *g, void *datav, const char *libvirt_uri) > /* Using virtio-serial, we need to create a local Unix domain socket > * for qemu to connect to. > */ > - snprintf (data->guestfsd_path, sizeof data->guestfsd_path, > - "%s/guestfsd.sock", g...

...rom libvirt) */ + struct version libvirt_version; /* libvirt version */ + struct version qemu_version; /* qemu version (from libvirt) */ struct secret *secrets; /* list of secrets */ size_t nr_secrets; char *uefi_code; /* UEFI (firmware) code and variables. */ @@ -253,6 +253,7 @@ launch_libvirt (guestfs_h *g, void *datav, const char *libvirt_uri) int r; uint32_t size; CLEANUP_FREE void *buf = NULL; + unsigned long version_number; params.current_proc_is_root = geteuid () == 0; @@ -262,13 +263,16 @@ launch_libvirt (guestfs_h *g, void *datav, const char *libvirt_uri) re...

...in virNetClientProgramCall () from /lib64/libvirt.so.0 #5 0x00007fac56dcbfe2 in callFull.isra.2 () from /lib64/libvirt.so.0 #6 0x00007fac56de213d in remoteDomainCreateXML () from /lib64/libvirt.so.0 #7 0x00007fac56d82151 in virDomainCreateXML () from /lib64/libvirt.so.0 #8 0x00007fac58acca50 in launch_libvirt () from /lib64/libguestfs.so.0 #9 0x00007fac58ac2b2b in guestfs_impl_launch () from /lib64/libguestfs.so.0 #10 0x00007fac58a5eba5 in guestfs_launch () from /lib64/libguestfs.so.0 #11 0x00000000004117ca in main () Log: 2016-Aug-29 15:02:07 main:1385 Entering main() 2016-Aug-29 15:02:07 main:1393...

...te_context (guestfs_h *g); static void clear_socket_create_context (guestfs_h *g); +static int check_bridge_exists (guestfs_h *g, const char *brname); #if HAVE_LIBSELINUX static void selinux_warning (guestfs_h *g, const char *func, const char *selinux_op, const char *data); @@ -393,6 +394,9 @@ launch_libvirt (guestfs_h *g, void *datav, const char *libvirt_uri) } guestfs_pop_error_handler (g); + if (g->enable_network && check_bridge_exists (g, data->network_bridge) == -1) + goto cleanup; + /* Locate and/or build the appliance. */ TRACE0 (launch_build_libvirt_appliance_sta...

...053658, size_rtn=0x7ffe4c0538e4, size_rtn@entry=0x7ffe4c053634, g=0x7fe6f8e04bd0, g@entry=0x7ffe4c053840) at proto.c:515 #4 guestfs_int_recv_from_daemon (g=g@entry=0x7fe6f8e04bd0, size_rtn=size_rtn@entry=0x7ffe4c0538e4, buf_rtn=buf_rtn@entry=0x7ffe4c053908) at proto.c:611 #5 0x00007fe6f797dae0 in launch_libvirt (g=0x7fe6f8e04bd0, datav=0x7fe6f8e04d90, libvirt_uri=<optimized out>) at launch-libvirt.c:573 #6 0x00007fe6f7973b2b in guestfs_impl_launch (g=g@entry=0x7fe6f8e04bd0) at launch.c:93 #7 0x00007fe6f790fb4d in guestfs_launch (g=0x7fe6f8e04bd0) at actions-3.c:142 #8 0x00007fe6f86e7eda in run_la...

...h *g, void *datav, int check_for_errors) { @@ -2023,23 +2026,14 @@ shutdown_libvirt (guestfs_h *g, void *datav, int check_for_errors) virDomainPtr dom = data->dom; size_t i; int ret = 0; - int flags; /* Note that we can be called back very early in launch (specifically * from launch_libvirt itself), when conn and dom might be NULL. */ - if (dom != NULL) { - flags = check_for_errors ? VIR_DOMAIN_DESTROY_GRACEFUL : 0; - debug (g, "calling virDomainDestroy \"%s\" flags=%s", - data->name, check_for_errors ? "VIR_DOMAIN_DESTROY_GRACEFUL&qu...

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

...ck) == -1) + goto cleanup0; daemon_accept_sock = socket (AF_UNIX, SOCK_STREAM|SOCK_CLOEXEC, 0); if (daemon_accept_sock == -1) { diff --git a/src/launch-libvirt.c b/src/launch-libvirt.c index 8a5d93e..376bd80 100644 --- a/src/launch-libvirt.c +++ b/src/launch-libvirt.c @@ -395,8 +395,9 @@ launch_libvirt (guestfs_h *g, void *datav, const char *libvirt_uri) /* Using virtio-serial, we need to create a local Unix domain socket * for qemu to connect to. */ - snprintf (data->guestfsd_path, sizeof data->guestfsd_path, - "%s/guestfsd.sock", g->tmpdir); + if (gues...

This is, I guess, version 3 of this patch series which adds disk labels and hotplugging (only hot-add implemented so far). The good news is .. it works! Rich.

This is the libguestfs companion patch to: https://www.redhat.com/archives/libguestfs/2013-September/msg00045.html Rich.