Fix multiple crashes listing interfaces

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>

.abignore

@@ -0,0 +1,31 @@
+[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.*

.gitignore

@@ -2,4 +2,4 @@
 *.rpm
 i686
 x86_64
-libvirt-*.tar.gz
+libvirt-*.tar.xz

0001-Fix-off-by-one-error-in-udevListInterfacesByStatus.patch

@@ -0,0 +1,40 @@
+From 6f3ee0c553bafec957e69df7fc42f83985d55c0f Mon Sep 17 00:00:00 2001
+From: Martin Kletzander <mkletzan@redhat.com>
+Date: Tue, 27 Feb 2024 16:20:12 +0100
+Subject: [PATCH] Fix off-by-one error in udevListInterfacesByStatus
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Ever since this function was introduced in 2012 it could've tried
+filling in an extra interface name.  That was made worse in 2019 when
+the caller functions started accepting NULL arrays of size 0.
+
+This is assigned CVE-2024-1441.
+
+Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
+Reported-by: Alexander Kuznetsov <kuznetsovam@altlinux.org>
+Fixes: 5a33366f5c0b18c93d161bd144f9f079de4ac8ca
+Fixes: d6064e2759a24e0802f363e3a810dc5a7d7ebb15
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit c664015fe3a7bf59db26686e9ed69af011c6ebb8)
+---
+ src/interface/interface_backend_udev.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/interface/interface_backend_udev.c b/src/interface/interface_backend_udev.c
+index ef334f175b..abeb766294 100644
+--- a/src/interface/interface_backend_udev.c
++++ b/src/interface/interface_backend_udev.c
+@@ -222,7 +222,7 @@ udevListInterfacesByStatus(virConnectPtr conn,
+         g_autoptr(virInterfaceDef) def = NULL;
+ 
+         /* Ensure we won't exceed the size of our array */
+-        if (count > names_len)
++        if (count >= names_len)
+             break;
+ 
+         path = udev_list_entry_get_name(dev_entry);
+-- 
+2.43.0
+

0001-Use-qemu-system-i386-as-binary-instead-of-qemu.patch

@@ -1,27 +0,0 @@
-From 37865f1dead1fac2ee34af48f96d19d686296e04 Mon Sep 17 00:00:00 2001
-From: "Richard W.M. Jones" <rjones@redhat.com>
-Date: Thu, 13 Sep 2012 14:37:22 +0100
-Subject: [PATCH] Use 'qemu-system-i386' as binary instead of 'qemu'.
-
----
- src/qemu/qemu_capabilities.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
-index af3b0b2..179b3d2 100644
---- a/src/qemu/qemu_capabilities.c
-+++ b/src/qemu/qemu_capabilities.c
-@@ -244,8 +244,8 @@ static const struct qemu_feature_flags const arch_info_x86_64_flags [] = {
- 
- /* The archicture tables for supported QEMU archs */
- static const struct qemu_arch_info const arch_info_hvm[] = {
--    {  "i686",   32, NULL, "qemu",
--       "qemu-system-x86_64", arch_info_i686_flags, 4 },
-+    {  "i686",   32, NULL, "qemu-system-i386",
-+       NULL, arch_info_i686_flags, 4 },
-     {  "x86_64", 64, NULL, "qemu-system-x86_64",
-        NULL, arch_info_x86_64_flags, 2 },
-     {  "arm",    32, NULL, "qemu-system-arm",    NULL, NULL, 0 },
--- 
-1.7.11.4
-

0001-interface-fix-udev_device_get_sysattr_value-return-v.patch

@@ -0,0 +1,90 @@
+From 13ea81b22cde0a429aa1de8b58655296084ce8d7 Mon Sep 17 00:00:00 2001
+From: Dmitry Frolov <frolov@swemel.ru>
+Date: Tue, 12 Sep 2023 15:56:47 +0300
+Subject: [PATCH] interface: fix udev_device_get_sysattr_value return value
+ check
+
+Reviewing the code I found that return value of function
+udev_device_get_sysattr_value() is dereferenced without a check.
+udev_device_get_sysattr_value() may return NULL by number of reasons.
+
+v2: VIR_DEBUG added, replaced STREQ(NULLSTR()) with STREQ_NULLABLE()
+v3: More checks added, to skip earlier. More verbose VIR_DEBUG.
+
+Signed-off-by: Dmitry Frolov <frolov@swemel.ru>
+Reviewed-by: Martin Kletzander <mkletzan@redhat.com>
+(cherry picked from commit 2ca94317ac642a70921947150ced8acc674ccdc8)
+---
+ src/interface/interface_backend_udev.c | 26 +++++++++++++++++++-------
+ 1 file changed, 19 insertions(+), 7 deletions(-)
+
+diff --git a/src/interface/interface_backend_udev.c b/src/interface/interface_backend_udev.c
+index 54b43fb999..ef334f175b 100644
+--- a/src/interface/interface_backend_udev.c
++++ b/src/interface/interface_backend_udev.c
+@@ -23,6 +23,7 @@
+ #include <dirent.h>
+ #include <libudev.h>
+ 
++#include "virlog.h"
+ #include "virerror.h"
+ #include "virfile.h"
+ #include "datatypes.h"
+@@ -40,6 +41,8 @@
+ 
+ #define VIR_FROM_THIS VIR_FROM_INTERFACE
+ 
++VIR_LOG_INIT("interface.interface_backend_udev");
++
+ struct udev_iface_driver {
+     struct udev *udev;
+     /* pid file FD, ensures two copies of the driver can't use the same root */
+@@ -354,11 +357,20 @@ udevConnectListAllInterfaces(virConnectPtr conn,
+         const char *macaddr;
+         g_autoptr(virInterfaceDef) def = NULL;
+ 
+-        path = udev_list_entry_get_name(dev_entry);
+-        dev = udev_device_new_from_syspath(udev, path);
+-        name = udev_device_get_sysname(dev);
++        if (!(path = udev_list_entry_get_name(dev_entry))) {
++            VIR_DEBUG("Skipping interface, path == NULL");
++            continue;
++        }
++        if (!(dev = udev_device_new_from_syspath(udev, path))) {
++            VIR_DEBUG("Skipping interface '%s', dev == NULL", path);
++            continue;
++        }
++        if (!(name = udev_device_get_sysname(dev))) {
++            VIR_DEBUG("Skipping interface '%s', name == NULL", path);
++            continue;
++        }
+         macaddr = udev_device_get_sysattr_value(dev, "address");
+-        status = STREQ(udev_device_get_sysattr_value(dev, "operstate"), "up");
++        status = STREQ_NULLABLE(udev_device_get_sysattr_value(dev, "operstate"), "up");
+ 
+         def = udevGetMinimalDefForDevice(dev);
+         if (!virConnectListAllInterfacesCheckACL(conn, def)) {
+@@ -962,9 +974,9 @@ udevGetIfaceDef(struct udev *udev, const char *name)
+ 
+     /* MTU */
+     mtu_str = udev_device_get_sysattr_value(dev, "mtu");
+-    if (virStrToLong_ui(mtu_str, NULL, 10, &mtu) < 0) {
++    if (!mtu_str || virStrToLong_ui(mtu_str, NULL, 10, &mtu) < 0) {
+         virReportError(VIR_ERR_INTERNAL_ERROR,
+-                _("Could not parse MTU value '%s'"), mtu_str);
++                       _("Could not parse MTU value '%s'"), NULLSTR(mtu_str));
+         goto error;
+     }
+     ifacedef->mtu = mtu;
+@@ -1087,7 +1099,7 @@ udevInterfaceIsActive(virInterfacePtr ifinfo)
+        goto cleanup;
+ 
+     /* Check if it's active or not */
+-    status = STREQ(udev_device_get_sysattr_value(dev, "operstate"), "up");
++    status = STREQ_NULLABLE(udev_device_get_sysattr_value(dev, "operstate"), "up");
+ 
+     udev_device_unref(dev);
+ 
+-- 
+2.43.0
+

0001-qemuProcessRefreshDisks-Don-t-skip-filling-of-disk-i.patch

@@ -0,0 +1,58 @@
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Thu, 9 Feb 2023 09:40:32 +0100
+Subject: [PATCH] qemuProcessRefreshDisks: Don't skip filling of disk
+ information if tray state didn't change
+Content-type: text/plain
+
+Commit 5ef2582646eb98 added emitting of even when refreshign disk state,
+where it wanted to avoid sending the event if disk state didn't change.
+This was achieved by using 'continue' in the loop filling the
+information. Unfortunately this skips extraction of whether the device
+has a tray which is propagated into internal structures, which in turn
+broke cdrom media change as the code thought there's no tray for the
+device.
+
+Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2166411
+Fixes: 5ef2582646eb98af208ce37355f82bdef39931fa
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Kristina Hanicova <khanicov@redhat.com>
+(cherry picked from commit 86cfe93ef7fdc2d665a2fc88b79af89e7978ba78)
+---
+ src/qemu/qemu_process.c | 11 +++++------
+ 1 file changed, 5 insertions(+), 6 deletions(-)
+
+diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
+index ee9f0784d3..0c408ee547 100644
+--- a/src/qemu/qemu_process.c
++++ b/src/qemu/qemu_process.c
+@@ -8724,16 +8724,13 @@ qemuProcessRefreshDisks(virDomainObj *vm,
+             continue;
+ 
+         if (info->removable) {
+-            virObjectEvent *event = NULL;
++            bool emitEvent = info->tray_open != disk->tray_status;
+             int reason;
+ 
+             if (info->empty)
+                 virDomainDiskEmptySource(disk);
+ 
+             if (info->tray) {
+-                if (info->tray_open == disk->tray_status)
+-                    continue;
+-
+                 if (info->tray_open) {
+                     reason = VIR_DOMAIN_EVENT_TRAY_CHANGE_OPEN;
+                     disk->tray_status = VIR_DOMAIN_DISK_TRAY_OPEN;
+@@ -8742,8 +8739,10 @@ qemuProcessRefreshDisks(virDomainObj *vm,
+                     disk->tray_status = VIR_DOMAIN_DISK_TRAY_CLOSED;
+                 }
+ 
+-                event = virDomainEventTrayChangeNewFromObj(vm, disk->info.alias, reason);
+-                virObjectEventStateQueue(driver->domainEventState, event);
++                if (emitEvent) {
++                    virObjectEvent *event = virDomainEventTrayChangeNewFromObj(vm, disk->info.alias, reason);
++                    virObjectEventStateQueue(driver->domainEventState, event);
++                }
+             }
+         }
+ 

0002-ch-use-CURLOPT_UPLOAD-instead-of-CURLOPT_PUT.patch

@@ -0,0 +1,39 @@
+From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
+Date: Wed, 18 Jan 2023 09:45:52 +0000
+Subject: [PATCH] ch: use CURLOPT_UPLOAD instead of CURLOPT_PUT
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+Content-type: text/plain
+
+The CURLOPT_PUT constant causes a deprecation warning when compiling on
+Alpine Edge.  The docs indicate it is deprecated since 7.2.1
+
+  https://curl.se/libcurl/c/CURLOPT_PUT.html
+
+Since 7.87 the deprecation is now exposed at build time via a compiler
+warning.
+
+We already use CURLOPT_UPLOAD in the ESX driver, so this brings the CH
+driver into line.
+
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
+(cherry picked from commit 9cd70fb25cad171e415fb05a4e01f244304c602e)
+---
+ src/ch/ch_monitor.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/ch/ch_monitor.c b/src/ch/ch_monitor.c
+index 8d8654332f..7b8f0a8077 100644
+--- a/src/ch/ch_monitor.c
++++ b/src/ch/ch_monitor.c
+@@ -660,7 +660,7 @@ virCHMonitorPutNoContent(virCHMonitor *mon, const char *endpoint)
+ 
+     curl_easy_setopt(mon->handle, CURLOPT_UNIX_SOCKET_PATH, mon->socketpath);
+     curl_easy_setopt(mon->handle, CURLOPT_URL, url);
+-    curl_easy_setopt(mon->handle, CURLOPT_PUT, true);
++    curl_easy_setopt(mon->handle, CURLOPT_UPLOAD, 1L);
+     curl_easy_setopt(mon->handle, CURLOPT_HTTPHEADER, NULL);
+ 
+     responseCode = virCHMonitorCurlPerform(mon->handle);

0003-storage-Fix-returning-of-locked-objects-from-virStor.patch

@@ -0,0 +1,56 @@
+From 9a47442366fcf8a7b6d7422016d7bbb6764a1098 Mon Sep 17 00:00:00 2001
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Thu, 13 Jul 2023 16:16:37 +0200
+Subject: [PATCH] storage: Fix returning of locked objects from
+ 'virStoragePoolObjListSearch'
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+CVE-2023-3750
+
+'virStoragePoolObjListSearch' explicitly documents that it's returning
+a pointer to a locked and ref'd pool that maches the lookup function.
+
+This was not the case as in commit 0c4b391e2a9 (released in
+libvirt-8.3.0) the code was accidentally converted to use 'VIR_LOCK_GUARD'
+which auto-unlocked it when leaving the scope, even when the code was
+originally "leaking" the lock.
+
+Revert the corresponding conversion and add a comment that this function
+is intentionally leaking a locked object.
+
+Fixes: 0c4b391e2a9
+Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2221851
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+Signed-off-by: Han Han <hhan@redhat.com>
+---
+ src/conf/virstorageobj.c | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/src/conf/virstorageobj.c b/src/conf/virstorageobj.c
+index 7010e97d61..59fa5da372 100644
+--- a/src/conf/virstorageobj.c
++++ b/src/conf/virstorageobj.c
+@@ -454,11 +454,16 @@ virStoragePoolObjListSearchCb(const void *payload,
+     virStoragePoolObj *obj = (virStoragePoolObj *) payload;
+     struct _virStoragePoolObjListSearchData *data =
+         (struct _virStoragePoolObjListSearchData *)opaque;
+-    VIR_LOCK_GUARD lock = virObjectLockGuard(obj);
+ 
++    virObjectLock(obj);
++
++    /* If we find the matching pool object we must return while the object is
++     * locked as the caller wants to return a locked object. */
+     if (data->searcher(obj, data->opaque))
+         return 1;
+ 
++    virObjectUnlock(obj);
++
+     return 0;
+ }
+ 
+-- 
+2.41.0
+

0004-virpci-Resolve-leak-in-virPCIVirtualFunctionList-cle.patch

@@ -0,0 +1,51 @@
+From 6425a311b8ad19d6f9c0b315bf1d722551ea3585 Mon Sep 17 00:00:00 2001
+From: Tim Shearer <TShearer@adva.com>
+Date: Mon, 1 May 2023 13:15:48 +0000
+Subject: [PATCH] virpci: Resolve leak in virPCIVirtualFunctionList cleanup
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Repeatedly querying an SR-IOV PCI device's capabilities exposes a
+memory leak caused by a failure to free the virPCIVirtualFunction
+array within the parent struct's g_autoptr cleanup.
+
+Valgrind output after getting a single interface's XML description
+1000 times:
+
+==325982== 256,000 bytes in 1,000 blocks are definitely lost in loss record 2,634 of 2,635
+==325982==    at 0x4C3C096: realloc (vg_replace_malloc.c:1437)
+==325982==    by 0x59D952D: g_realloc (in /usr/lib64/libglib-2.0.so.0.5600.4)
+==325982==    by 0x4EE1F52: virReallocN (viralloc.c:52)
+==325982==    by 0x4EE1FB7: virExpandN (viralloc.c:78)
+==325982==    by 0x4EE219A: virInsertElementInternal (viralloc.c:183)
+==325982==    by 0x4EE23B2: virAppendElement (viralloc.c:288)
+==325982==    by 0x4F65D85: virPCIGetVirtualFunctionsFull (virpci.c:2389)
+==325982==    by 0x4F65753: virPCIGetVirtualFunctions (virpci.c:2256)
+==325982==    by 0x505CB75: virNodeDeviceGetPCISRIOVCaps (node_device_conf.c:2969)
+==325982==    by 0x505D181: virNodeDeviceGetPCIDynamicCaps (node_device_conf.c:3099)
+==325982==    by 0x505BC4E: virNodeDeviceUpdateCaps (node_device_conf.c:2677)
+==325982==    by 0x260FCBB2: nodeDeviceGetXMLDesc (node_device_driver.c:355)
+
+Signed-off-by: Tim Shearer <tshearer@adva.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+Signed-off-by: Han Han <hhan@redhat.com>
+---
+ src/util/virpci.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/util/virpci.c b/src/util/virpci.c
+index 9e564e4a4f..cc2b07bbba 100644
+--- a/src/util/virpci.c
++++ b/src/util/virpci.c
+@@ -2245,6 +2245,7 @@ virPCIVirtualFunctionListFree(virPCIVirtualFunctionList *list)
+         g_free(list->functions[i].ifname);
+     }
+ 
++    g_free(list->functions);
+     g_free(list);
+ }
+ 
+-- 
+2.41.0
+

Makefile

@@ -1,21 +0,0 @@
-# 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 $$d/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)

libvirt-dbus.patch

@@ -1,225 +0,0 @@
-Return-Path: alexl@redhat.com
-Received: from zmta04.collab.prod.int.phx2.redhat.com (LHLO
- zmta04.collab.prod.int.phx2.redhat.com) (10.5.81.11) by
- zmail20.collab.prod.int.phx2.redhat.com with LMTP; Tue, 9 Oct 2012 11:26:38
- -0400 (EDT)
-Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23])
-	by zmta04.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id D4096D0927
-	for <alexl@mail.corp.redhat.com>; Tue,  9 Oct 2012 11:26:38 -0400 (EDT)
-Received: from localhost.localdomain (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1])
-	by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q99FQV93016417;
-	Tue, 9 Oct 2012 11:26:33 -0400
-From: Alexander Larsson <alexl@redhat.com>
-To: libvir-list@redhat.com
-Cc: Alexander Larsson <alexl@redhat.com>
-Subject: [PATCH 1/2] virdbus: Add virDBusGetSessionBus helper
-Date: Tue,  9 Oct 2012 17:26:28 +0200
-Message-Id: <1349796389-6122-2-git-send-email-alexl@redhat.com>
-In-Reply-To: <1349796389-6122-1-git-send-email-alexl@redhat.com>
-References: <1349796389-6122-1-git-send-email-alexl@redhat.com>
-X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23
-
-This splits out some common code from virDBusGetSystemBus and
-uses it to implement a new virDBusGetSessionBus helper.
----
- src/libvirt_private.syms |  1 +
- src/util/virdbus.c       | 84 ++++++++++++++++++++++++++++++++++++------------
- src/util/virdbus.h       |  1 +
- 3 files changed, 66 insertions(+), 20 deletions(-)
-
-diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
-index a8c81e7..88f1b2f 100644
---- a/src/libvirt_private.syms
-+++ b/src/libvirt_private.syms
-@@ -1310,6 +1310,7 @@ virConsoleOpen;
- 
- # virdbus.h
- virDBusGetSystemBus;
-+virDBusGetSessionBus;
- 
- 
- # virdomainlist.h
-diff --git a/src/util/virdbus.c b/src/util/virdbus.c
-index 4acce12..2dc7265 100644
---- a/src/util/virdbus.c
-+++ b/src/util/virdbus.c
-@@ -32,40 +32,49 @@
- #ifdef HAVE_DBUS
- 
- static DBusConnection *systembus = NULL;
--static virOnceControl once = VIR_ONCE_CONTROL_INITIALIZER;
--static DBusError dbuserr;
-+static DBusConnection *sessionbus = NULL;
-+static virOnceControl systemonce = VIR_ONCE_CONTROL_INITIALIZER;
-+static virOnceControl sessiononce = VIR_ONCE_CONTROL_INITIALIZER;
-+static DBusError systemdbuserr;
-+static DBusError sessiondbuserr;
- 
- static dbus_bool_t virDBusAddWatch(DBusWatch *watch, void *data);
- static void virDBusRemoveWatch(DBusWatch *watch, void *data);
- static void virDBusToggleWatch(DBusWatch *watch, void *data);
- 
--static void virDBusSystemBusInit(void)
-+static DBusConnection *virDBusBusInit(DBusBusType type, DBusError *dbuserr)
- {
-+    DBusConnection *bus;
-+
-     /* Allocate and initialize a new HAL context */
-     dbus_connection_set_change_sigpipe(FALSE);
-     dbus_threads_init_default();
- 
--    dbus_error_init(&dbuserr);
--    if (!(systembus = dbus_bus_get(DBUS_BUS_SYSTEM, &dbuserr)))
--        return;
-+    dbus_error_init(dbuserr);
-+    if (!(bus = dbus_bus_get(type, dbuserr)))
-+        return NULL;
- 
--    dbus_connection_set_exit_on_disconnect(systembus, FALSE);
-+    dbus_connection_set_exit_on_disconnect(bus, FALSE);
- 
-     /* Register dbus watch callbacks */
--    if (!dbus_connection_set_watch_functions(systembus,
-+    if (!dbus_connection_set_watch_functions(bus,
-                                              virDBusAddWatch,
-                                              virDBusRemoveWatch,
-                                              virDBusToggleWatch,
--                                             NULL, NULL)) {
--        systembus = NULL;
--        return;
-+                                             bus, NULL)) {
-+        return NULL;
-     }
-+    return bus;
- }
- 
-+static void virDBusSystemBusInit(void)
-+{
-+    systembus = virDBusBusInit (DBUS_BUS_SYSTEM, &systemdbuserr);
-+}
- 
- DBusConnection *virDBusGetSystemBus(void)
- {
--    if (virOnce(&once, virDBusSystemBusInit) < 0) {
-+    if (virOnce(&systemonce, virDBusSystemBusInit) < 0) {
-         virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-                        _("Unable to run one time DBus initializer"));
-         return NULL;
-@@ -74,7 +83,7 @@ DBusConnection *virDBusGetSystemBus(void)
-     if (!systembus) {
-         virReportError(VIR_ERR_INTERNAL_ERROR,
-                        _("Unable to get DBus system bus connection: %s"),
--                       dbuserr.message ? dbuserr.message : "watch setup failed");
-+                       systemdbuserr.message ? systemdbuserr.message : "watch setup failed");
-         return NULL;
-     }
- 
-@@ -82,13 +91,45 @@ DBusConnection *virDBusGetSystemBus(void)
- }
- 
- 
-+static void virDBusSessionBusInit(void)
-+{
-+    sessionbus = virDBusBusInit (DBUS_BUS_SESSION, &sessiondbuserr);
-+}
-+
-+DBusConnection *virDBusGetSessionBus(void)
-+{
-+    if (virOnce(&sessiononce, virDBusSessionBusInit) < 0) {
-+        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-+                       _("Unable to run one time DBus initializer"));
-+        return NULL;
-+    }
-+
-+    if (!sessionbus) {
-+        virReportError(VIR_ERR_INTERNAL_ERROR,
-+                       _("Unable to get DBus session bus connection: %s"),
-+                       sessiondbuserr.message ? sessiondbuserr.message : "watch setup failed");
-+        return NULL;
-+    }
-+
-+    return sessionbus;
-+}
-+
-+struct virDBusWatch
-+{
-+    int watch;
-+    DBusConnection *bus;
-+};
-+
- static void virDBusWatchCallback(int fdatch ATTRIBUTE_UNUSED,
-                                  int fd ATTRIBUTE_UNUSED,
-                                  int events, void *opaque)
- {
-     DBusWatch *watch = opaque;
-+    struct virDBusWatch *info;
-     int dbus_flags = 0;
- 
-+    info = dbus_watch_get_data(watch);
-+
-     if (events & VIR_EVENT_HANDLE_READABLE)
-         dbus_flags |= DBUS_WATCH_READABLE;
-     if (events & VIR_EVENT_HANDLE_WRITABLE)
-@@ -100,7 +141,7 @@ static void virDBusWatchCallback(int fdatch ATTRIBUTE_UNUSED,
- 
-     (void)dbus_watch_handle(watch, dbus_flags);
- 
--    while (dbus_connection_dispatch(systembus) == DBUS_DISPATCH_DATA_REMAINS)
-+    while (dbus_connection_dispatch(info->bus) == DBUS_DISPATCH_DATA_REMAINS)
-         /* keep dispatching while data remains */;
- }
- 
-@@ -120,18 +161,13 @@ static int virDBusTranslateWatchFlags(int dbus_flags)
- }
- 
- 
--struct virDBusWatch
--{
--    int watch;
--};
--
- static void virDBusWatchFree(void *data) {
-     struct virDBusWatch *info = data;
-     VIR_FREE(info);
- }
- 
- static dbus_bool_t virDBusAddWatch(DBusWatch *watch,
--                                  void *data ATTRIBUTE_UNUSED)
-+                                   void *data)
- {
-     int flags = 0;
-     int fd;
-@@ -148,6 +184,7 @@ static dbus_bool_t virDBusAddWatch(DBusWatch *watch,
- # else
-     fd = dbus_watch_get_fd(watch);
- # endif
-+    info->bus = (DBusConnection *)data;
-     info->watch = virEventAddHandle(fd, flags,
-                                     virDBusWatchCallback,
-                                     watch, NULL);
-@@ -194,4 +231,11 @@ DBusConnection *virDBusGetSystemBus(void)
-     return NULL;
- }
- 
-+DBusConnection *virDBusGetSessionBus(void)
-+{
-+    virReportError(VIR_ERR_INTERNAL_ERROR,
-+                   "%s", _("DBus support not compiled into this binary"));
-+    return NULL;
-+}
-+
- #endif /* ! HAVE_DBUS */
-diff --git a/src/util/virdbus.h b/src/util/virdbus.h
-index 27dca00..e443fbe 100644
---- a/src/util/virdbus.h
-+++ b/src/util/virdbus.h
-@@ -30,5 +30,6 @@
- # include "internal.h"
- 
- DBusConnection *virDBusGetSystemBus(void);
-+DBusConnection *virDBusGetSessionBus(void);
- 
- #endif /* __VIR_DBUS_H__ */
--- 
-1.7.12.1
-

libvirt-save-with-session.patch

@@ -1,303 +0,0 @@
-Return-Path: alexl@redhat.com
-Received: from zmta06.collab.prod.int.phx2.redhat.com (LHLO
- zmta06.collab.prod.int.phx2.redhat.com) (10.5.81.13) by
- zmail20.collab.prod.int.phx2.redhat.com with LMTP; Tue, 9 Oct 2012 11:26:39
- -0400 (EDT)
-Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23])
-	by zmta06.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id D4A8516044F
-	for <alexl@mail.corp.redhat.com>; Tue,  9 Oct 2012 11:26:39 -0400 (EDT)
-Received: from localhost.localdomain (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1])
-	by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q99FQV94016417;
-	Tue, 9 Oct 2012 11:26:34 -0400
-From: Alexander Larsson <alexl@redhat.com>
-To: libvir-list@redhat.com
-Cc: Alexander Larsson <alexl@redhat.com>
-Subject: [PATCH 2/2] Shut down session libvirtd cleanly
-Date: Tue,  9 Oct 2012 17:26:29 +0200
-Message-Id: <1349796389-6122-3-git-send-email-alexl@redhat.com>
-In-Reply-To: <1349796389-6122-1-git-send-email-alexl@redhat.com>
-References: <1349796389-6122-1-git-send-email-alexl@redhat.com>
-X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23
-
-When the session dies or when the system is going to be shut down
-we save all active VMs and exit libvirtd.
-
-Additionally whenever there is an active domain we hold a
-shutdown inhibitor to avoid shutting down before all the
-VMs are saved.
----
- daemon/libvirtd.c | 244 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 244 insertions(+)
-
-diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c
-index b49acc5..c3bf2ce 100644
---- a/daemon/libvirtd.c
-+++ b/daemon/libvirtd.c
-@@ -98,6 +98,11 @@
- 
- #include "configmake.h"
- 
-+#ifdef HAVE_DBUS
-+# include <dbus/dbus.h>
-+# include "virdbus.h"
-+#endif
-+
- #if HAVE_SASL
- virNetSASLContextPtr saslCtxt = NULL;
- #endif
-@@ -769,6 +774,212 @@ static int daemonSetupSignals(virNetServerPtr srv)
-     return 0;
- }
- 
-+#ifdef HAVE_DBUS
-+
-+static DBusConnection *sessionBus;
-+static DBusConnection *systemBus;
-+static virConnectPtr sessionConnection;
-+static int numActiveDomains;
-+static bool hasInhibit;
-+static bool callingInhibit;
-+static int inhibitFd = -1;
-+
-+static void runSaveAllDomains(void *opaque)
-+{
-+    virNetServerPtr srv = opaque;
-+    int numDomains, i;
-+    int state;
-+    virDomainPtr *domains = NULL;
-+    unsigned int *flags = NULL;
-+
-+    numDomains = virConnectListAllDomains(sessionConnection, &domains,  VIR_CONNECT_LIST_DOMAINS_ACTIVE);
-+    if (numDomains < 0)
-+        goto cleanup;
-+
-+    if (VIR_ALLOC_N(flags, numDomains) < 0) {
-+        virReportOOMError();
-+        goto cleanup;
-+    }
-+
-+    /* First we pause all VMs to make them stop dirtying
-+       pages, etc. We remember if any VMs were paused so
-+       we can restore that on resume. */
-+    for (i = 0 ; i < numDomains ; i++) {
-+        flags[i] = VIR_DOMAIN_SAVE_RUNNING;
-+        if (virDomainGetState (domains[i], &state, NULL, 0) == 0) {
-+            if (state == VIR_DOMAIN_PAUSED) {
-+                flags[i] = VIR_DOMAIN_SAVE_PAUSED;
-+            }
-+        }
-+        virDomainSuspend (domains[i]);
-+    }
-+
-+    /* Then we save the VMs to disk */
-+    for (i = 0 ; i < numDomains ; i++)
-+        virDomainManagedSave (domains[i], flags[i]);
-+
-+    VIR_FREE (domains);
-+    VIR_FREE (flags);
-+
-+ cleanup:
-+    if (domains != NULL) {
-+        for (i = 0 ; i < numDomains ; i++)
-+            virDomainFree (domains[i]);
-+        VIR_FREE (domains);
-+    }
-+    if (flags != NULL)
-+        VIR_FREE (flags);
-+
-+    /* We don't need any shutdown inhibit lock anymore now */
-+    if (inhibitFd != -1) {
-+        if (VIR_CLOSE (inhibitFd) < 0)
-+            virReportSystemError(errno, "%s", _("failed to close file"));
-+        inhibitFd = -1;
-+    }
-+
-+    /* Exit libvirtd cleanly */
-+    virNetServerQuit (srv);
-+}
-+
-+/* We do this in a thread to not block the main loop */
-+static void saveAllDomains(virNetServerPtr srv)
-+{
-+    virThread thr;
-+    virObjectRef(srv);
-+    if (virThreadCreate(&thr, false, runSaveAllDomains, srv) < 0) {
-+        virObjectUnref(srv);
-+    }
-+}
-+
-+static void gotInhibitReply (DBusPendingCall *pending,
-+                             void            *opaque ATTRIBUTE_UNUSED)
-+{
-+    DBusMessage *reply;
-+    int fd;
-+
-+    callingInhibit = false;
-+
-+    reply = dbus_pending_call_steal_reply (pending);
-+    if (reply == NULL)
-+        return;
-+
-+    if (dbus_message_get_args (reply, NULL,
-+                                DBUS_TYPE_UNIX_FD, &fd,
-+                                DBUS_TYPE_INVALID)) {
-+        if (hasInhibit)
-+            inhibitFd = fd;
-+        else {
-+            /* We stopped the last VM since we made the inhibit call */
-+            if (VIR_CLOSE (fd) < 0) {
-+                virReportSystemError(errno, "%s", _("failed to close file"));
-+            }
-+        }
-+    }
-+    dbus_message_unref (reply);
-+}
-+
-+/* As per: http://www.freedesktop.org/wiki/Software/systemd/inhibit */
-+static void callInhibit(const char *what,
-+                        const char *who,
-+                        const char *why,
-+                        const char *mode)
-+{
-+    DBusMessage *message;
-+    DBusPendingCall *pendingReply;
-+
-+    if (systemBus == NULL)
-+        return;
-+
-+    /* Only one outstanding call at a time */
-+    if (callingInhibit)
-+        return;
-+
-+    message = dbus_message_new_method_call ("org.freedesktop.login1",
-+                                            "/org/freedesktop/login1",
-+                                            "org.freedesktop.login1.Manager",
-+                                            "Inhibit");
-+    if (message == NULL)
-+        return;
-+
-+    dbus_message_append_args (message,
-+                              DBUS_TYPE_STRING, &what,
-+                              DBUS_TYPE_STRING, &who,
-+                              DBUS_TYPE_STRING, &why,
-+                              DBUS_TYPE_STRING, &mode,
-+                              DBUS_TYPE_INVALID);
-+
-+    pendingReply = NULL;
-+    if (dbus_connection_send_with_reply (systemBus, message,
-+                                         &pendingReply,
-+                                         25*1000)) {
-+        dbus_pending_call_set_notify (pendingReply,
-+                                      gotInhibitReply,
-+                                      NULL, NULL);
-+        callingInhibit = true;
-+    }
-+    dbus_message_unref (message);
-+}
-+
-+
-+static void numActiveDomainsChanged(void)
-+{
-+    if (numActiveDomains > 0 && !hasInhibit) {
-+        callInhibit("shutdown", _("Libvirt"), _("Virtual machines need to be saved"), "delay");
-+        hasInhibit = true;
-+    } else if (numActiveDomains == 0 && hasInhibit) {
-+        if (inhibitFd != -1) {
-+            if (VIR_CLOSE (inhibitFd) < 0) {
-+                virReportSystemError(errno, "%s", _("failed to close file"));
-+            }
-+            inhibitFd = -1;
-+        }
-+        hasInhibit = false;
-+    }
-+}
-+
-+static int lifecycleEventCallback(virConnectPtr conn ATTRIBUTE_UNUSED,
-+                                  virDomainPtr dom ATTRIBUTE_UNUSED,
-+                                  int event,
-+                                  int detail ATTRIBUTE_UNUSED,
-+                                  void *opaque ATTRIBUTE_UNUSED)
-+{
-+    if (event == VIR_DOMAIN_EVENT_STOPPED)
-+        numActiveDomains--;
-+    else if (event == VIR_DOMAIN_EVENT_STARTED)
-+        numActiveDomains++;
-+
-+    numActiveDomainsChanged();
-+
-+    return 0;
-+}
-+
-+static DBusHandlerResult handleSessionMessageFunc(DBusConnection  *connection ATTRIBUTE_UNUSED,
-+                                                  DBusMessage     *message,
-+                                                  void            *userData)
-+{
-+    virNetServerPtr srv = userData;
-+
-+    if (dbus_message_is_signal(message, DBUS_INTERFACE_LOCAL, "Disconnected")) {
-+        saveAllDomains (srv);
-+    }
-+
-+    return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
-+}
-+
-+static DBusHandlerResult handleSystemMessageFunc(DBusConnection  *connection ATTRIBUTE_UNUSED,
-+                                                 DBusMessage     *message,
-+                                                 void            *userData)
-+{
-+    virNetServerPtr srv = userData;
-+
-+    if (dbus_message_is_signal(message, "org.freedesktop.login1.Manager", "PrepareForShutdown")) {
-+        saveAllDomains (srv);
-+    }
-+
-+    return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
-+}
-+#endif
-+
- static void daemonRunStateInit(void *opaque)
- {
-     virNetServerPtr srv = opaque;
-@@ -785,6 +996,39 @@ static void daemonRunStateInit(void *opaque)
-         return;
-     }
- 
-+#ifdef HAVE_DBUS
-+    /* Tie the non-priviledged libvirtd to the session/shutdown lifecycle */
-+    if (!virNetServerIsPrivileged(srv)) {
-+
-+        sessionBus = virDBusGetSessionBus ();
-+        if (sessionBus != NULL) {
-+            dbus_connection_add_filter(sessionBus,
-+                                       handleSessionMessageFunc, srv, NULL);
-+        }
-+
-+        systemBus = virDBusGetSystemBus ();
-+        if (systemBus != NULL) {
-+            dbus_connection_add_filter(systemBus,
-+                                       handleSystemMessageFunc, srv, NULL);
-+            dbus_bus_add_match(systemBus,
-+                               "type='signal',sender='org.freedesktop.login1', interface='org.freedesktop.login1.Manager'",
-+                               NULL);
-+        }
-+
-+        sessionConnection = virConnectOpen("qemu:///session");
-+        if (sessionConnection != NULL) {
-+            numActiveDomains = virConnectNumOfDomains(sessionConnection);
-+            virConnectDomainEventRegisterAny(sessionConnection,
-+                                             NULL,
-+                                             VIR_DOMAIN_EVENT_ID_LIFECYCLE,
-+                                             VIR_DOMAIN_EVENT_CALLBACK (lifecycleEventCallback),
-+                                             NULL, NULL);
-+            numActiveDomainsChanged();
-+        }
-+
-+    }
-+#endif
-+
-     /* Only now accept clients from network */
-     virNetServerUpdateServices(srv, true);
-     virObjectUnref(srv);
--- 
-1.7.12.1
-

sources

@@ -1 +1 @@
-56078401a10162674dbd98846d0f607d  libvirt-0.10.2.8.tar.gz
+SHA512 (libvirt-9.0.0.tar.xz) = 135f690f9fe722161c22579166f10a54d52941a371439165fd0e3d391ca7835049a3bcbff33fc81c50153046230db8a5a318d707383bad3141d489d2faa09ecb