Fix QEMU startup timeout/race (rhbz #484649)

Setup DBus threading. Don't allow dbus to call _exit / change SIGPIPE (rhbz #484553)
Fix timeout when autostarting session daemon

.abignore

@@ -1,31 +0,0 @@
-[suppress_function]
-symbol_version_regexp = LIBVIRT_PRIVATE.*
-soname_regexp = libvirt\\.so.*
-
-[suppress_function]
-symbol_version_regexp = LIBVIRT_ADMIN_PRIVATE.*
-soname_regexp = libvirt-admin\\.so.*
-
-[suppress_variable]
-symbol_version_regexp = LIBVIRT_PRIVATE.*
-soname_regexp = libvirt\\.so.*
-
-[suppress_variable]
-symbol_version_regexp = LIBVIRT_ADMIN_PRIVATE.*
-soname_regexp = libvirt-admin\\.so.*
-
-[suppress_function]
-symbol_version_regexp = .*
-soname_regexp = libvirt_storage_.*\\.so.*
-
-[suppress_variable]
-symbol_version_regexp = .*
-soname_regexp = libvirt_storage_.*\\.so.*
-
-[suppress_function]
-symbol_version_regexp = .*
-soname_regexp = libvirt_driver_.*\\.so.*
-
-[suppress_variable]
-symbol_version_regexp = .*
-soname_regexp = libvirt_driver_.*\\.so.*

.cvsignore

@@ -0,0 +1,6 @@
+.build*.log
+*.rpm
+i686
+x86_64
+libvirt-*.tar.gz
+libvirt-0.4.2.tar.gz

.gitignore

@@ -1,5 +0,0 @@
-.build*.log
-*.rpm
-i686
-x86_64
-libvirt-*.tar.xz

0001-build-support-explicitly-disabling-netcf.patch

@@ -1,56 +0,0 @@
-From: Laine Stump <laine@redhat.com>
-Date: Thu, 21 Jan 2021 16:01:06 -0500
-Subject: [PATCH] build: support explicitly disabling netcf
-
-placing "-Dnetcf=disabled" on the meson commandline was ignored,
-meaning that even with that option the build would get WITH_NETCF if
-the netcf-devel package was found - the only way to disable it was to
-uninstall netcf-devel.
-
-This patch adds the small bit of logic to check the netcf meson
-commandline option (in addition to whether netcf-devel is installed)
-before defining WITH_NETCF.
-
-Signed-off-by: Laine Stump <laine@redhat.com>
-Reviewed-by: Neal Gompa <ngompa13@gmail.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-(cherry picked from commit 06169a115d46d8870a96d293c2faf6ea87e71020)
----
- meson.build | 10 ++++++----
- 1 file changed, 6 insertions(+), 4 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index b5164f68ed..e9d6d9f82e 100644
---- a/meson.build
-+++ b/meson.build
-@@ -1155,8 +1155,10 @@ libm_dep = cc.find_library('m', required : false)
- 
- netcf_version = '0.1.8'
- netcf_dep = dependency('netcf', version: '>=' + netcf_version, required: get_option('netcf'))
--if netcf_dep.found()
--  conf.set('WITH_NETCF', 1)
-+if not get_option('netcf').disabled()
-+  if netcf_dep.found()
-+    conf.set('WITH_NETCF', 1)
-+  endif
- endif
- 
- have_gnu_gettext_tools = false
-@@ -1550,7 +1552,7 @@ elif get_option('driver_hyperv').enabled()
-   error('openwsman is required for the Hyper-V driver')
- endif
- 
--if not get_option('driver_interface').disabled() and conf.has('WITH_LIBVIRTD') and (udev_dep.found() or netcf_dep.found())
-+if not get_option('driver_interface').disabled() and conf.has('WITH_LIBVIRTD') and (udev_dep.found() or conf.has('WITH_NETCF'))
-   conf.set('WITH_INTERFACE', 1)
- elif get_option('driver_interface').enabled()
-   error('Requested the Interface driver without netcf or udev and libvirtd support')
-@@ -2362,7 +2364,7 @@ libs_summary = {
-   'libssh': libssh_dep.found(),
-   'libssh2': libssh2_dep.found(),
-   'libutil': libutil_dep.found(),
--  'netcf': netcf_dep.found(),
-+  'netcf': conf.has('WITH_NETCF'),
-   'NLS': have_gnu_gettext_tools,
-   'numactl': numactl_dep.found(),
-   'openwsman': openwsman_dep.found(),

0002-node_device_udev-Serialize-access-to-pci_get_strings.patch

@@ -1,72 +0,0 @@
-From: wangjian <wangjian161@huawei.com>
-Date: Fri, 26 Mar 2021 11:21:16 +0800
-Subject: [PATCH] node_device_udev: Serialize access to pci_get_strings)_
-
-Since the functions provided by libpciaccess are not thread-safe,
-when the udev-event and nodedev-init threads of libvirt call the
-pci_get_strings function provided by libpaciaccess at the same
-time the following can happen:
-
-nodedev-init thread:
-nodeStateInitializeEnumerate ->
-  udevEnumerateDevices->
-    udevProcessDeviceListEntry ->
-      udevAddOneDevice ->
-        udevGetDeviceDetails->
-          udevProcessPCI ->
-            udevTranslatePCIIds ->
-              pci_get_strings -> (libpciaccess)
-                find_device_name ->
-                  populate_vendor ->
-                    d = realloc( vend->devices, (vend->num_devices + 1), * sizeof( struct pci_device_leaf ) );
-                    vend->num_devices++;
-
-udev-event thread:
-udevEventHandleThread ->
-  udevHandleOneDevice ->
-    udevAddOneDevice->
-      udevGetDeviceDetails->
-        udevProcessPCI ->
-          udevTranslatePCIIds ->
-            pci_get_strings -> (libpciaccess)
-              find_device_name ->
-                populate_vendor ->
-                  d = realloc( vend->devices, (vend->num_devices + 1), * sizeof( struct pci_device_leaf ) );
-                  vend->num_devices++;
-
-Signed-off-by: WangJian <wangjian161@huawei.com>
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-(cherry picked from commit 59788a5caea5f292c86e07a31ee2b853d68db87e)
----
- src/node_device/node_device_udev.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c
-index 55a2731681..6f0defe908 100644
---- a/src/node_device/node_device_udev.c
-+++ b/src/node_device/node_device_udev.c
-@@ -328,6 +328,7 @@ udevGenerateDeviceName(struct udev_device *device,
-     return 0;
- }
- 
-+static virMutex pciaccessMutex = VIR_MUTEX_INITIALIZER;
- 
- static int
- udevTranslatePCIIds(unsigned int vendor,
-@@ -346,12 +347,14 @@ udevTranslatePCIIds(unsigned int vendor,
-     m.device_class_mask = 0;
-     m.match_data = 0;
- 
--    /* pci_get_strings returns void */
-+    /* pci_get_strings returns void and unfortunately is not thread safe. */
-+    virMutexLock(&pciaccessMutex);
-     pci_get_strings(&m,
-                     &device_name,
-                     &vendor_name,
-                     NULL,
-                     NULL);
-+    virMutexUnlock(&pciaccessMutex);
- 
-     *vendor_string = g_strdup(vendor_name);
-     *product_string = g_strdup(device_name);

0003-virSetUIDGIDWithCaps-Don-t-drop-CAP_SETPCAP-right-aw.patch

@@ -1,53 +0,0 @@
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Thu, 24 Jun 2021 16:58:09 +0200
-Subject: [PATCH] virSetUIDGIDWithCaps: Don't drop CAP_SETPCAP right away
-
-There are few cases where we execute a virCommand with all caps
-cleared (virCommandClearCaps()). For instance
-dnsmasqCapsRefreshInternal() does just that. This means, that
-after fork() and before exec() the virSetUIDGIDWithCaps() is
-called. But since the caller did not want to change anything,
-just drop capabilities, these are the values of arguments:
-
-  virSetUIDGIDWithCaps (uid=-1, gid=-1, groups=0x0, ngroups=0,
-                        capBits=0, clearExistingCaps=true)
-
-This means that indeed all capabilities will be dropped,
-including CAP_SETPCAP. But this capability controls whether
-capabilities can be set, IOW whether capng_apply() succeeds.
-
-There are two calls of capng_apply() in the function. The
-CAP_SETPCAP is dropped after the first call and thus the other
-call (capng_apply(CAPNG_SELECT_BOUNDS);) fails.
-
-The solution is to keep the capability for as long as needed
-(just like CAP_SETGID and CAP_SETUID) and drop it only at the
-very end (just like CAP_SETGID and CAP_SETUID).
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1949388
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Martin Kletzander <mkletzan@redhat.com>
-(cherry picked from commit 438b50dda8a863fdc988e9ab612f097cc1626e8a)
----
- src/util/virutil.c | 6 ++----
- 1 file changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/src/util/virutil.c b/src/util/virutil.c
-index a0cd0f1bcd..7ae23a7061 100644
---- a/src/util/virutil.c
-+++ b/src/util/virutil.c
-@@ -1202,12 +1202,10 @@ virSetUIDGIDWithCaps(uid_t uid, gid_t gid, gid_t *groups, int ngroups,
-     }
- # ifdef PR_CAPBSET_DROP
-     /* If newer kernel, we need also need setpcap to change the bounding set */
--    if ((capBits || need_setgid || need_setuid) &&
--        !capng_have_capability(CAPNG_EFFECTIVE, CAP_SETPCAP)) {
-+    if (!capng_have_capability(CAPNG_EFFECTIVE, CAP_SETPCAP)) {
-         need_setpcap = true;
--    }
--    if (need_setpcap)
-         capng_update(CAPNG_ADD, CAPNG_EFFECTIVE|CAPNG_PERMITTED, CAP_SETPCAP);
-+    }
- # endif
- 
-     /* Tell system we want to keep caps across uid change */

0004-security-fix-SELinux-label-generation-logic.patch

@@ -1,51 +0,0 @@
-From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
-Date: Mon, 28 Jun 2021 13:09:04 +0100
-Subject: [PATCH] security: fix SELinux label generation logic
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-A process can access a file if the set of MCS categories
-for the file is equal-to *or* a subset-of, the set of
-MCS categories for the process.
-
-If there are two VMs:
-
-  a) svirt_t:s0:c117
-  b) svirt_t:s0:c117,c720
-
-Then VM (b) is able to access files labelled for VM (a).
-
-IOW, we must discard case where the categories are equal
-because that is a subset of many other valid category pairs.
-
-Fixes: https://gitlab.com/libvirt/libvirt/-/issues/153
-CVE-2021-3631
-Reviewed-by: Peter Krempa <pkrempa@redhat.com>
-Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
-(cherry picked from commit 15073504dbb624d3f6c911e85557019d3620fdb2)
----
- src/security/security_selinux.c | 10 +++++++++-
- 1 file changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c
-index 2fc6ef2616..61a871ec3d 100644
---- a/src/security/security_selinux.c
-+++ b/src/security/security_selinux.c
-@@ -389,7 +389,15 @@ virSecuritySELinuxMCSFind(virSecurityManagerPtr mgr,
-         VIR_DEBUG("Try cat %s:c%d,c%d", sens, c1 + catMin, c2 + catMin);
- 
-         if (c1 == c2) {
--            mcs = g_strdup_printf("%s:c%d", sens, catMin + c1);
-+            /*
-+             * A process can access a file if the set of MCS categories
-+             * for the file is equal-to *or* a subset-of, the set of
-+             * MCS categories for the process.
-+             *
-+             * IOW, we must discard case where the categories are equal
-+             * because that is a subset of other category pairs.
-+             */
-+            continue;
-         } else {
-             if (c1 > c2) {
-                 int t = c1;

0005-virSetUIDGIDWithCaps-Set-bounding-capabilities-only-.patch

@@ -1,43 +0,0 @@
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Thu, 22 Jul 2021 14:26:00 +0200
-Subject: [PATCH] virSetUIDGIDWithCaps: Set bounding capabilities only with
- CAP_SETPCAP
-
-In one of my previous patches I've tried to postpone dropping
-CAP_SETPCAP until the very end because it's needed for
-capng_apply(). What I did not realize back then was that we might
-not have the capability to begin with. Because of unknown reasons
-capng_apply() pollutes logs only for CAPNG_SELECT_BOUNDS and not
-for CAPNG_SELECT_CAPS.
-
-Reproducer is really simple: run libvirtd as a regular user.
-During its initialization, libvirtd will spawn some binaries
-(dnsmasq, qemu-*, etc.) and while doing so it will try to drop
-capabilities.
-
-Anyway, let's call capng_apply(CAPNG_SELECT_BOUNDS) only if we
-have the CAP_SETPCAP (which is tracked in need_setpcap variable).
-
-Fixes: 438b50dda8a863fdc988e9ab612f097cc1626e8a
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1924218
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Cole Robinson <crobinso@redhat.com>
-(cherry picked from commit a2476f37a7789eb9315b77bb451f4754ef4ef15b)
----
- src/util/virutil.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/util/virutil.c b/src/util/virutil.c
-index 7ae23a7061..333f99e91d 100644
---- a/src/util/virutil.c
-+++ b/src/util/virutil.c
-@@ -1269,7 +1269,8 @@ virSetUIDGIDWithCaps(uid_t uid, gid_t gid, gid_t *groups, int ngroups,
-      * do this if we failed to get the capability above, so ignore the
-      * return value.
-      */
--    capng_apply(CAPNG_SELECT_BOUNDS);
-+    if (!need_setpcap)
-+        capng_apply(CAPNG_SELECT_BOUNDS);
- 
-     /* Drop the caps that allow setuid/gid (unless they were requested) */
-     if (need_setgid)

0006-qemu_firmware-don-t-error-out-for-unknown-firmware-f.patch

@@ -1,57 +0,0 @@
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 10 May 2021 15:07:09 +0200
-Subject: [PATCH] qemu_firmware: don't error out for unknown firmware features
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-When QEMU introduces new firmware features libvirt will fail until we
-list that feature in our code as well which doesn't sound right.
-
-We should simply ignore the new feature until we add a proper support
-for it.
-
-Reported-by: Laszlo Ersek <lersek@redhat.com>
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Reviewed-by: Peter Krempa <pkrempa@redhat.com>
-Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
-(cherry picked from commit 61d95a1073833ec4323c1ef28e71e913c55aa7b9)
----
- src/qemu/qemu_firmware.c | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/src/qemu/qemu_firmware.c b/src/qemu/qemu_firmware.c
-index 639cff7459..e602de22e3 100644
---- a/src/qemu/qemu_firmware.c
-+++ b/src/qemu/qemu_firmware.c
-@@ -573,6 +573,7 @@ qemuFirmwareFeatureParse(const char *path,
-     virJSONValuePtr featuresJSON;
-     g_autoptr(qemuFirmwareFeature) features = NULL;
-     size_t nfeatures;
-+    size_t nparsed = 0;
-     size_t i;
- 
-     if (!(featuresJSON = virJSONValueObjectGetArray(doc, "features"))) {
-@@ -592,17 +593,16 @@ qemuFirmwareFeatureParse(const char *path,
-         int tmp;
- 
-         if ((tmp = qemuFirmwareFeatureTypeFromString(tmpStr)) <= 0) {
--            virReportError(VIR_ERR_INTERNAL_ERROR,
--                           _("unknown feature %s"),
--                           tmpStr);
--            return -1;
-+            VIR_DEBUG("ignoring unknown QEMU firmware feature '%s'", tmpStr);
-+            continue;
-         }
- 
--        features[i] = tmp;
-+        features[nparsed] = tmp;
-+        nparsed++;
-     }
- 
-     fw->features = g_steal_pointer(&features);
--    fw->nfeatures = nfeatures;
-+    fw->nfeatures = nparsed;
-     return 0;
- }
- 

0007-storage_driver-Unlock-object-on-ACL-fail-in-storageP.patch

@@ -1,33 +0,0 @@
-From: Peter Krempa <pkrempa@redhat.com>
-Date: Wed, 21 Jul 2021 11:22:25 +0200
-Subject: [PATCH] storage_driver: Unlock object on ACL fail in
- storagePoolLookupByTargetPath
-
-'virStoragePoolObjListSearch' returns a locked and refed object, thus we
-must release it on ACL permission failure.
-
-Fixes: 7aa0e8c0cb8
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1984318
-Signed-off-by: Peter Krempa <pkrempa@redhat.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-(cherry picked from commit 447f69dec47e1b0bd15ecd7cd49a9fd3b050fb87)
----
- src/storage/storage_driver.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c
-index 16bc53aa46..2787c1671b 100644
---- a/src/storage/storage_driver.c
-+++ b/src/storage/storage_driver.c
-@@ -1739,8 +1739,10 @@ storagePoolLookupByTargetPath(virConnectPtr conn,
-                                            storagePoolLookupByTargetPathCallback,
-                                            cleanpath))) {
-         def = virStoragePoolObjGetDef(obj);
--        if (virStoragePoolLookupByTargetPathEnsureACL(conn, def) < 0)
-+        if (virStoragePoolLookupByTargetPathEnsureACL(conn, def) < 0) {
-+            virStoragePoolObjEndAPI(&obj);
-             return NULL;
-+        }
- 
-         pool = virGetStoragePool(conn, def->name, def->uuid, NULL, NULL);
-         virStoragePoolObjEndAPI(&obj);

0008-wireshark-Switch-to-tvb_bytes_to_str.patch

@@ -1,81 +0,0 @@
-From 7e299ba649b1288d529c7595c0e6060c9ae0ff2a Mon Sep 17 00:00:00 2001
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Mon, 29 Nov 2021 09:57:49 +0100
-Subject: [PATCH 1/2] wireshark: Switch to tvb_bytes_to_str()
-
-When the dissector sees a byte sequence that is either an opaque
-data (xdr_opaque) or a byte sequence (xdr_bytes) it formats the
-bytes as a hex numbers using our own implementation. But
-wireshark already provides a function for it: tvb_bytes_to_str().
-NB, the reason why it returns a const string is so that callers
-don't try to free it - the string is allocated using an allocator
-which will decide when to free it.
-
-The wireshark formatter was introduced in wireshark commit of
-v1.99.2~479 and thus is present in the version we require at
-least (2.6.0).
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
----
- tools/wireshark/src/packet-libvirt.c | 30 ++++++++--------------------
- 1 file changed, 8 insertions(+), 22 deletions(-)
-
-diff --git a/tools/wireshark/src/packet-libvirt.c b/tools/wireshark/src/packet-libvirt.c
-index f43919b05d..cb922b8070 100644
---- a/tools/wireshark/src/packet-libvirt.c
-+++ b/tools/wireshark/src/packet-libvirt.c
-@@ -158,24 +158,6 @@ dissect_xdr_string(tvbuff_t *tvb, proto_tree *tree, XDR *xdrs, int hf,
-     }
- }
- 
--static const gchar *
--format_xdr_bytes(guint8 *bytes, guint32 length)
--{
--    gchar *buf;
--    guint32 i;
--
--    if (length == 0)
--        return "";
--    buf = wmem_alloc(wmem_packet_scope(), length*2 + 1);
--    for (i = 0; i < length; i++) {
--        /* We know that buf has enough size to contain
--           2 * length + '\0' characters. */
--        g_snprintf(buf, 2*(length - i) + 1, "%02x", bytes[i]);
--        buf += 2;
--    }
--    return buf - length*2;
--}
--
- static gboolean
- dissect_xdr_opaque(tvbuff_t *tvb, proto_tree *tree, XDR *xdrs, int hf,
-                    guint32 size)
-@@ -187,8 +169,10 @@ dissect_xdr_opaque(tvbuff_t *tvb, proto_tree *tree, XDR *xdrs, int hf,
-     val = g_malloc(size);
-     start = xdr_getpos(xdrs);
-     if ((rc = xdr_opaque(xdrs, (caddr_t)val, size))) {
--        proto_tree_add_bytes_format_value(tree, hf, tvb, start, xdr_getpos(xdrs) - start,
--                                          NULL, "%s", format_xdr_bytes(val, size));
-+        gint len = xdr_getpos(xdrs) - start;
-+        const char *s = tvb_bytes_to_str(wmem_packet_scope(), tvb, start, len);
-+
-+        proto_tree_add_bytes_format_value(tree, hf, tvb, start, len, NULL, "%s", s);
-     } else {
-         proto_tree_add_item(tree, hf_libvirt_unknown, tvb, start, -1, ENC_NA);
-     }
-@@ -207,8 +191,10 @@ dissect_xdr_bytes(tvbuff_t *tvb, proto_tree *tree, XDR *xdrs, int hf,
- 
-     start = xdr_getpos(xdrs);
-     if (xdr_bytes(xdrs, (char **)&val, &length, maxlen)) {
--        proto_tree_add_bytes_format_value(tree, hf, tvb, start, xdr_getpos(xdrs) - start,
--                                          NULL, "%s", format_xdr_bytes(val, length));
-+        gint len = xdr_getpos(xdrs) - start;
-+        const char *s = tvb_bytes_to_str(wmem_packet_scope(), tvb, start, len);
-+
-+        proto_tree_add_bytes_format_value(tree, hf, tvb, start, len, NULL, "%s", s);
-         /* Seems I can't call xdr_free() for this case.
-            It will raises SEGV by referencing out of bounds call stack */
-         free(val);
--- 
-2.33.1
-

0009-wireshark-Drop-needless-comment-in-dissect_xdr_bytes.patch

@@ -1,33 +0,0 @@
-From 010613cfd8dae6d85602a84c5c95b2d441e1b3d1 Mon Sep 17 00:00:00 2001
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Mon, 29 Nov 2021 10:20:05 +0100
-Subject: [PATCH 2/2] wireshark: Drop needless comment in dissect_xdr_bytes()
-
-In the dissect_xdr_bytes() there's a comment that the string
-allocated by xdr_bytes() can't be freed using xdr_free(). Well,
-that is expected because xdr_bytes() used plain calloc() AND the
-string is not an XDR struct but plain 'char *' type. Passing it
-to xdr_free() must result in weird things happening.
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
----
- tools/wireshark/src/packet-libvirt.c | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/tools/wireshark/src/packet-libvirt.c b/tools/wireshark/src/packet-libvirt.c
-index cb922b8070..eeacbcdf0e 100644
---- a/tools/wireshark/src/packet-libvirt.c
-+++ b/tools/wireshark/src/packet-libvirt.c
-@@ -195,8 +195,6 @@ dissect_xdr_bytes(tvbuff_t *tvb, proto_tree *tree, XDR *xdrs, int hf,
-         const char *s = tvb_bytes_to_str(wmem_packet_scope(), tvb, start, len);
- 
-         proto_tree_add_bytes_format_value(tree, hf, tvb, start, len, NULL, "%s", s);
--        /* Seems I can't call xdr_free() for this case.
--           It will raises SEGV by referencing out of bounds call stack */
-         free(val);
-         return TRUE;
-     } else {
--- 
-2.33.1
-

Makefile

@@ -0,0 +1,21 @@
+# Makefile for source rpm: libvirt
+# $Id$
+NAME := libvirt
+SPECFILE = $(firstword $(wildcard *.spec))
+
+define find-makefile-common
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+endef
+
+MAKEFILE_COMMON := $(shell $(find-makefile-common))
+
+ifeq ($(MAKEFILE_COMMON),)
+# attempt a checkout
+define checkout-makefile-common
+test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
+endef
+
+MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
+endif
+
+include $(MAKEFILE_COMMON)

branch

@@ -0,0 +1 @@
+F-9

libvirt-0.6.0-autostart-timeout.patch

@@ -0,0 +1,21 @@
+diff -rup libvirt-0.6.0.orig/src/remote_internal.c libvirt-0.6.0.new/src/remote_internal.c
+--- libvirt-0.6.0.orig/src/remote_internal.c	2009-02-18 10:56:34.000000000 +0000
++++ libvirt-0.6.0.new/src/remote_internal.c	2009-02-18 13:35:26.000000000 +0000
+@@ -654,12 +654,13 @@ doRemoteOpen (virConnectPtr conn,
+              */
+             if (errno == ECONNREFUSED &&
+                 flags & VIR_DRV_OPEN_REMOTE_AUTOSTART &&
+-                trials < 5) {
++                trials < 20) {
+                 close(priv->sock);
+                 priv->sock = -1;
+-                if (remoteForkDaemon(conn) == 0) {
++                if (trials > 0 ||
++                    remoteForkDaemon(conn) == 0) {
+                     trials++;
+-                    usleep(5000 * trials * trials);
++                    usleep(1000 * 100 * trials);
+                     goto autostart_retry;
+                 }
+             }
+Only in libvirt-0.6.0.new/src: remote_internal.c~

libvirt-0.6.0-dbus-threads.patch

@@ -0,0 +1,44 @@
+diff -rup libvirt-0.6.0.orig/qemud/qemud.c libvirt-0.6.0.new/qemud/qemud.c
+--- libvirt-0.6.0.orig/qemud/qemud.c	2009-02-18 10:56:34.000000000 +0000
++++ libvirt-0.6.0.new/qemud/qemud.c	2009-02-18 12:52:18.000000000 +0000
+@@ -860,6 +860,10 @@ static struct qemud_server *qemudNetwork
+     if (auth_unix_rw == REMOTE_AUTH_POLKIT ||
+         auth_unix_ro == REMOTE_AUTH_POLKIT) {
+         DBusError derr;
++
++        dbus_connection_set_change_sigpipe(FALSE);
++        dbus_threads_init_default();
++
+         dbus_error_init(&derr);
+         server->sysbus = dbus_bus_get(DBUS_BUS_SYSTEM, &derr);
+         if (!(server->sysbus)) {
+@@ -868,6 +872,7 @@ static struct qemud_server *qemudNetwork
+             dbus_error_free(&derr);
+             goto cleanup;
+         }
++        dbus_connection_set_exit_on_disconnect(server->sysbus, FALSE);
+     }
+ #endif
+ 
+diff -rup libvirt-0.6.0.orig/src/node_device_hal.c libvirt-0.6.0.new/src/node_device_hal.c
+--- libvirt-0.6.0.orig/src/node_device_hal.c	2009-01-16 12:44:22.000000000 +0000
++++ libvirt-0.6.0.new/src/node_device_hal.c	2009-02-18 12:52:48.000000000 +0000
+@@ -685,6 +685,9 @@ static int halDeviceMonitorStartup(void)
+     nodeDeviceLock(driverState);
+ 
+     /* Allocate and initialize a new HAL context */
++    dbus_connection_set_change_sigpipe(FALSE);
++    dbus_threads_init_default();
++
+     dbus_error_init(&err);
+     hal_ctx = libhal_ctx_new();
+     if (hal_ctx == NULL) {
+@@ -696,6 +699,8 @@ static int halDeviceMonitorStartup(void)
+         fprintf(stderr, "%s: dbus_bus_get failed\n", __FUNCTION__);
+         goto failure;
+     }
++    dbus_connection_set_exit_on_disconnect(dbus_conn, FALSE);
++
+     if (!libhal_ctx_set_dbus_connection(hal_ctx, dbus_conn)) {
+         fprintf(stderr, "%s: libhal_ctx_set_dbus_connection failed\n",
+                 __FUNCTION__);

libvirt-0.6.0-qemu-startup.patch

@@ -0,0 +1,109 @@
+diff -rup libvirt-0.6.0.orig/src/qemu_driver.c libvirt-0.6.0.new/src/qemu_driver.c
+--- libvirt-0.6.0.orig/src/qemu_driver.c	2009-01-31 09:04:18.000000000 +0000
++++ libvirt-0.6.0.new/src/qemu_driver.c	2009-02-18 11:15:37.000000000 +0000
+@@ -633,6 +633,7 @@ qemudReadMonitorOutput(virConnectPtr con
+ {
+     int got = 0;
+     buf[0] = '\0';
++    timeout *= 1000; /* poll wants milli seconds */
+ 
+     /* Consume & discard the initial greeting */
+     while (got < (buflen-1)) {
+@@ -694,6 +695,56 @@ qemudReadMonitorOutput(virConnectPtr con
+ 
+ }
+ 
++
++/*
++ * Returns -1 for error, 0 on success
++ */
++static int
++qemudReadLogOutput(virConnectPtr conn,
++                   virDomainObjPtr vm,
++                   int fd,
++                   char *buf,
++                   int buflen,
++                   qemudHandlerMonitorOutput func,
++                   const char *what,
++                   int timeout)
++{
++    int got = 0;
++    int ret;
++    int retries = timeout*10;
++    buf[0] = '\0';
++
++    while (retries) {
++        while((ret = read(fd, buf+got, buflen-got-1)) > 0) {
++            got += ret;
++            buf[got] = '\0';
++            if ((buflen-got-1) == 0) {
++                qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR,
++                                 _("Out of space while reading %s log output"), what);
++                return -1;
++            }
++        }
++
++        if (ret < 0 && errno != EINTR) {
++            virReportSystemError(conn, errno,
++                                 _("Failure while reading %s log output"),
++                                 what);
++            return -1;
++        }
++
++        ret = func(conn, vm, buf, fd);
++        if (ret <= 0)
++            return ret;
++
++        usleep(100*1000);
++        retries--;
++    }
++    if (retries == 0)
++        qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR,
++                         _("Timed out while reading %s log output"), what);
++    return -1;
++}
++
+ static int
+ qemudCheckMonitorPrompt(virConnectPtr conn ATTRIBUTE_UNUSED,
+                         virDomainObjPtr vm,
+@@ -738,7 +789,7 @@ static int qemudOpenMonitor(virConnectPt
+                                    vm, monfd,
+                                    buf, sizeof(buf),
+                                    qemudCheckMonitorPrompt,
+-                                   "monitor", 10000) <= 0)
++                                   "monitor", 10) <= 0)
+             ret = -1;
+         else
+             ret = 0;
+@@ -770,6 +821,7 @@ static int qemudOpenMonitor(virConnectPt
+     return ret;
+ }
+ 
++/* Returns -1 for error, 0 success, 1 continue reading */
+ static int qemudExtractMonitorPath(virConnectPtr conn,
+                                    const char *haystack,
+                                    size_t *offset,
+@@ -873,19 +925,16 @@ static int qemudWaitForMonitor(virConnec
+         < 0)
+         return -1;
+ 
+-    ret = qemudReadMonitorOutput(conn, vm, logfd, buf, sizeof(buf),
+-                                 qemudFindCharDevicePTYs,
+-                                 "console", 3000);
++    ret = qemudReadLogOutput(conn, vm, logfd, buf, sizeof(buf),
++                             qemudFindCharDevicePTYs,
++                             "console", 3);
+     if (close(logfd) < 0)
+         qemudLog(QEMUD_WARN, _("Unable to close logfile: %s\n"),
+                  strerror(errno));
+ 
+-    if (ret == 1) /* Success */
++    if (ret == 0) /* success */
+         return 0;
+ 
+-    if (ret == -1)
+-        return -1;
+-
+     /* Unexpected end of file - inform user of QEMU log data */
+     qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR,
+                      _("unable to start guest: %s"), buf);

libvirt-0.6.0-rpccall.patch

@@ -0,0 +1,70 @@
+diff -rup libvirt-0.6.0.orig/qemud/event.c libvirt-0.6.0.new/qemud/event.c
+--- libvirt-0.6.0.orig/qemud/event.c	2009-02-06 19:30:58.000000000 +0000
++++ libvirt-0.6.0.new/qemud/event.c	2009-02-06 19:30:00.000000000 +0000
+@@ -657,6 +657,8 @@ virPollEventToEventHandleType(int events
+         ret |= VIR_EVENT_HANDLE_WRITABLE;
+     if(events & POLLERR)
+         ret |= VIR_EVENT_HANDLE_ERROR;
++    if(events & POLLNVAL) /* Treat NVAL as error, since libvirt doesn't distinguish */
++        ret |= VIR_EVENT_HANDLE_ERROR;
+     if(events & POLLHUP)
+         ret |= VIR_EVENT_HANDLE_HANGUP;
+     return ret;
+diff -rup libvirt-0.6.0.orig/src/domain_conf.c libvirt-0.6.0.new/src/domain_conf.c
+--- libvirt-0.6.0.orig/src/domain_conf.c	2009-01-31 09:04:17.000000000 +0000
++++ libvirt-0.6.0.new/src/domain_conf.c	2009-02-06 19:30:00.000000000 +0000
+@@ -504,6 +504,7 @@ virDomainObjPtr virDomainAssignDef(virCo
+     domain->state = VIR_DOMAIN_SHUTOFF;
+     domain->def = def;
+     domain->monitor_watch = -1;
++    domain->monitor = -1;
+ 
+     if (VIR_REALLOC_N(doms->objs, doms->count + 1) < 0) {
+         virReportOOMError(conn);
+diff -rup libvirt-0.6.0.orig/src/remote_internal.c libvirt-0.6.0.new/src/remote_internal.c
+--- libvirt-0.6.0.orig/src/remote_internal.c	2009-01-31 09:04:18.000000000 +0000
++++ libvirt-0.6.0.new/src/remote_internal.c	2009-02-06 19:30:00.000000000 +0000
+@@ -6198,17 +6198,17 @@ processCalls(virConnectPtr conn,
+                 continue;
+             virReportSystemError(in_open ? NULL : conn, errno,
+                                  "%s", _("poll on socket failed"));
+-            return -1;
++            goto error;
+         }
+ 
+         if (fds[0].revents & POLLOUT) {
+             if (processCallSend(conn, priv, in_open) < 0)
+-                return -1;
++                goto error;
+         }
+ 
+         if (fds[0].revents & POLLIN) {
+             if (processCallRecv(conn, priv, in_open) < 0)
+-                return -1;
++                goto error;
+         }
+ 
+         /* Iterate through waiting threads and if
+@@ -6259,9 +6259,21 @@ processCalls(virConnectPtr conn,
+         if (fds[0].revents & (POLLHUP | POLLERR)) {
+             errorf(in_open ? NULL : conn, VIR_ERR_INTERNAL_ERROR,
+                    "%s", _("received hangup / error event on socket"));
+-            return -1;
++            goto error;
+         }
+     }
++
++
++error:
++    priv->waitDispatch = thiscall->next;
++    DEBUG("Giving up the buck due to I/O error %d %p %p", thiscall->proc_nr, thiscall, priv->waitDispatch);
++    /* See if someone else is still waiting
++     * and if so, then pass the buck ! */
++    if (priv->waitDispatch) {
++        DEBUG("Passing the buck to %d %p", priv->waitDispatch->proc_nr, priv->waitDispatch);
++        virCondSignal(&priv->waitDispatch->cond);
++    }
++    return -1;
+ }
+ 
+ /*

libvirt-0.6.0-timeout.patch

@@ -0,0 +1,124 @@
+diff -rup libvirt-0.6.0.orig/qemud/event.c libvirt-0.6.0.new/qemud/event.c
+--- libvirt-0.6.0.orig/qemud/event.c	2008-12-22 13:02:54.000000000 +0000
++++ libvirt-0.6.0.new/qemud/event.c	2009-02-06 19:29:28.000000000 +0000
+@@ -68,6 +68,7 @@ struct virEventTimeout {
+ /* State for the main event loop */
+ struct virEventLoop {
+     pthread_mutex_t lock;
++    int running;
+     pthread_t leader;
+     int wakeupfd[2];
+     int handlesCount;
+@@ -521,6 +522,7 @@ int virEventRunOnce(void) {
+     int ret, timeout, nfds;
+ 
+     virEventLock();
++    eventLoop.running = 1;
+     eventLoop.leader = pthread_self();
+     if ((nfds = virEventMakePollFDs(&fds)) < 0) {
+         virEventUnlock();
+@@ -572,7 +574,7 @@ int virEventRunOnce(void) {
+         return -1;
+     }
+ 
+-    eventLoop.leader = 0;
++    eventLoop.running = 0;
+     virEventUnlock();
+     return 0;
+ }
+@@ -611,7 +613,9 @@ int virEventInit(void)
+ static int virEventInterruptLocked(void)
+ {
+     char c = '\0';
+-    if (pthread_self() == eventLoop.leader)
++
++    if (!eventLoop.running ||
++        pthread_self() == eventLoop.leader)
+         return 0;
+ 
+     if (safewrite(eventLoop.wakeupfd[1], &c, sizeof(c)) != sizeof(c))
+diff -rup libvirt-0.6.0.orig/qemud/qemud.c libvirt-0.6.0.new/qemud/qemud.c
+--- libvirt-0.6.0.orig/qemud/qemud.c	2009-01-31 09:04:17.000000000 +0000
++++ libvirt-0.6.0.new/qemud/qemud.c	2009-02-06 19:29:28.000000000 +0000
+@@ -2013,11 +2013,15 @@ static int qemudOneLoop(void) {
+     return 0;
+ }
+ 
+-static void qemudInactiveTimer(int timer ATTRIBUTE_UNUSED, void *data) {
++static void qemudInactiveTimer(int timerid, void *data) {
+     struct qemud_server *server = (struct qemud_server *)data;
+-    DEBUG0("Got inactive timer expiry");
+-    if (!virStateActive()) {
+-        DEBUG0("No state active, shutting down");
++
++    if (virStateActive() ||
++        server->clients) {
++        DEBUG0("Timer expired but still active, not shutting down");
++        virEventUpdateTimeoutImpl(timerid, -1);
++    } else {
++        DEBUG0("Timer expired and inactive, shutting down");
+         server->shutdown = 1;
+     }
+ }
+@@ -2048,9 +2052,18 @@ static void qemudFreeClient(struct qemud
+ static int qemudRunLoop(struct qemud_server *server) {
+     int timerid = -1;
+     int ret = -1, i;
++    int timerActive = 0;
+ 
+     virMutexLock(&server->lock);
+ 
++    if (timeout > 0 &&
++        (timerid = virEventAddTimeoutImpl(-1,
++                                          qemudInactiveTimer,
++                                          server, NULL)) < 0) {
++        VIR_ERROR0(_("Failed to register shutdown timeout"));
++        return -1;
++    }
++
+     if (min_workers > max_workers)
+         max_workers = min_workers;
+ 
+@@ -2071,11 +2084,21 @@ static int qemudRunLoop(struct qemud_ser
+          * if any drivers have active state, if not
+          * shutdown after timeout seconds
+          */
+-        if (timeout > 0 && !virStateActive() && !server->clients) {
+-            timerid = virEventAddTimeoutImpl(timeout*1000,
+-                                             qemudInactiveTimer,
+-                                             server, NULL);
+-            DEBUG("Scheduling shutdown timer %d", timerid);
++        if (timeout > 0) {
++            if (timerActive) {
++                if (server->clients) {
++                    DEBUG("Deactivating shutdown timer %d", timerid);
++                    virEventUpdateTimeoutImpl(timerid, -1);
++                    timerActive = 0;
++                }
++            } else {
++                if (!virStateActive() &&
++                    !server->clients) {
++                    DEBUG("Activating shutdown timer %d", timerid);
++                    virEventUpdateTimeoutImpl(timerid, timeout * 1000);
++                    timerActive = 1;
++                }
++            }
+         }
+ 
+         virMutexUnlock(&server->lock);
+@@ -2129,15 +2152,6 @@ static int qemudRunLoop(struct qemud_ser
+             }
+         }
+ 
+-        /* Unregister any timeout that's active, since we
+-         * just had an event processed
+-         */
+-        if (timerid != -1) {
+-            DEBUG("Removing shutdown timer %d", timerid);
+-            virEventRemoveTimeoutImpl(timerid);
+-            timerid = -1;
+-        }
+-
+         if (server->shutdown) {
+             ret = 0;
+             break;

sources

@@ -1 +1 @@
-SHA512 (libvirt-7.0.0.tar.xz) = dd6db5ec4971cf4c6059795fd81d5a3a889b10740e34c3c92271eda1c683c99df2c8f923398065d8a7c4f987a20eb1da617d5297ba8ea5a31f154412af50c343
+8e0120d5452b37179f682031bf0895ea  libvirt-0.6.0.tar.gz