Fix multiple crashes listing interfaces

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Update spec to add two previous CVE patches
2024-03-12 16:36:33 +00:00 · 2024-01-25 10:06:24 +00:00 · 2023-07-24 15:28:40 +08:00 · 2023-07-24 14:39:49 +08:00 · 2023-05-07 13:21:49 -04:00 · 2023-01-19 17:46:01 +00:00
17 changed files with 2024 additions and 3195 deletions
@@ -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.*
@@ -2,4 +2,4 @@
 *.rpm
 i686
 x86_64
-libvirt-*.tar.gz
+libvirt-*.tar.xz
@@ -1,206 +0,0 @@
-From: Prerna Saxena <prerna@linux.vnet.ibm.com>
-Date: Tue, 4 Nov 2014 22:51:26 +0530
-Subject: [PATCH] Cpu: Add support for Power LE Architecture.
-
-This adds support for PowerPC Little Endian architecture.,
-and allows libvirt to spawn VMs based on 'ppc64le' architecture.
-
-Signed-off-by: Pradipta Kr. Banerjee <bpradip@in.ibm.com>
-Signed-off-by: Prerna Saxena <prerna@linux.vnet.ibm.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-(cherry picked from commit da636d83dc6b1d070a705786b4daef8644eaca13)
---
- src/conf/domain_conf.c       |  2 +-
- src/cpu/cpu_powerpc.c        |  2 +-
- src/qemu/qemu_capabilities.c |  6 +++---
- src/qemu/qemu_command.c      | 22 +++++++++++-----------
- src/qemu/qemu_domain.c       |  1 +
- src/util/virarch.h           |  3 +++
- 6 files changed, 20 insertions(+), 16 deletions(-)
-
-diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
-index cfdf66c..8aca289 100644
--- a/src/conf/domain_conf.c
-+++ b/src/conf/domain_conf.c
-@@ -9867,7 +9867,7 @@ virDomainVideoDefaultType(const virDomainDef *def)
-             (STREQ(def->os.type, "xen") ||
-              STREQ(def->os.type, "linux")))
-             return VIR_DOMAIN_VIDEO_TYPE_XEN;
-        else if (def->os.arch == VIR_ARCH_PPC64)
-+        else if ARCH_IS_PPC64(def->os.arch)
-             return VIR_DOMAIN_VIDEO_TYPE_VGA;
-         else
-             return VIR_DOMAIN_VIDEO_TYPE_CIRRUS;
-diff --git a/src/cpu/cpu_powerpc.c b/src/cpu/cpu_powerpc.c
-index 67cb9ff..d591c18 100644
--- a/src/cpu/cpu_powerpc.c
-+++ b/src/cpu/cpu_powerpc.c
-@@ -38,7 +38,7 @@
- 
- VIR_LOG_INIT("cpu.cpu_powerpc");
- 
-static const virArch archs[] = { VIR_ARCH_PPC64 };
-+static const virArch archs[] = { VIR_ARCH_PPC64, VIR_ARCH_PPC64LE };
- 
- struct ppc_vendor {
-     char *name;
-diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
-index be4d01f..34d753c 100644
--- a/src/qemu/qemu_capabilities.c
-+++ b/src/qemu/qemu_capabilities.c
-@@ -632,7 +632,7 @@ virQEMUCapsProbeCPUModels(virQEMUCapsPtr qemuCaps, uid_t runUid, gid_t runGid)
-     if (qemuCaps->arch == VIR_ARCH_I686 ||
-         qemuCaps->arch == VIR_ARCH_X86_64) {
-         parse = virQEMUCapsParseX86Models;
-    } else if (qemuCaps->arch == VIR_ARCH_PPC64) {
-+    } else if ARCH_IS_PPC64(qemuCaps->arch) {
-         parse = virQEMUCapsParsePPCModels;
-     } else {
-         VIR_DEBUG("don't know how to parse %s CPU models",
-@@ -2018,7 +2018,7 @@ bool virQEMUCapsHasPCIMultiBus(virQEMUCapsPtr qemuCaps,
-         return true;
- 
-     if (def->os.arch == VIR_ARCH_PPC ||
-        def->os.arch == VIR_ARCH_PPC64) {
-+        ARCH_IS_PPC64(def->os.arch)) {
-         /*
-          * Usage of pci.0 naming:
-          *
-@@ -3600,7 +3600,7 @@ virQEMUCapsSupportsChardev(virDomainDefPtr def,
-         !virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE))
-         return false;
- 
-    if ((def->os.arch == VIR_ARCH_PPC) || (def->os.arch == VIR_ARCH_PPC64)) {
-+    if ((def->os.arch == VIR_ARCH_PPC) || ARCH_IS_PPC64(def->os.arch)) {
-         /* only pseries need -device spapr-vty with -chardev */
-         return (chr->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL &&
-                 chr->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_SPAPRVIO);
-diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
-index aeb4eec..c5c48bf 100644
--- a/src/qemu/qemu_command.c
-+++ b/src/qemu/qemu_command.c
-@@ -713,7 +713,7 @@ qemuSetSCSIControllerModel(virDomainDefPtr def,
-             return -1;
-         }
-     } else {
-        if ((def->os.arch == VIR_ARCH_PPC64) &&
-+        if (ARCH_IS_PPC64(def->os.arch) &&
-             STRPREFIX(def->os.machine, "pseries")) {
-             *model = VIR_DOMAIN_CONTROLLER_MODEL_SCSI_IBMVSCSI;
-         } else if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_SCSI_LSI)) {
-@@ -1260,7 +1260,7 @@ int qemuDomainAssignSpaprVIOAddresses(virDomainDefPtr def,
- 
-     for (i = 0; i < def->nserials; i++) {
-         if (def->serials[i]->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL &&
-            (def->os.arch == VIR_ARCH_PPC64) &&
-+            ARCH_IS_PPC64(def->os.arch) &&
-             STRPREFIX(def->os.machine, "pseries"))
-             def->serials[i]->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_SPAPRVIO;
-         if (qemuAssignSpaprVIOAddress(def, &def->serials[i]->info,
-@@ -1269,7 +1269,7 @@ int qemuDomainAssignSpaprVIOAddresses(virDomainDefPtr def,
-     }
- 
-     if (def->nvram) {
-        if (def->os.arch == VIR_ARCH_PPC64 &&
-+        if (ARCH_IS_PPC64(def->os.arch) &&
-             STRPREFIX(def->os.machine, "pseries"))
-             def->nvram->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_SPAPRVIO;
-         if (qemuAssignSpaprVIOAddress(def, &def->nvram->info,
-@@ -4191,7 +4191,7 @@ qemuBuildUSBControllerDevStr(virDomainDefPtr domainDef,
-     model = def->model;
- 
-     if (model == -1) {
-        if (domainDef->os.arch == VIR_ARCH_PPC64)
-+        if ARCH_IS_PPC64(domainDef->os.arch)
-             model = VIR_DOMAIN_CONTROLLER_MODEL_USB_PCI_OHCI;
-         else
-             model = VIR_DOMAIN_CONTROLLER_MODEL_USB_PIIX3_UHCI;
-@@ -8445,7 +8445,7 @@ qemuBuildCommandLine(virConnectPtr conn,
-                            !qemuDomainMachineIsQ35(def) &&
-                            (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_PIIX3_USB_UHCI) ||
-                             (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_PCI_OHCI) &&
-                             def->os.arch == VIR_ARCH_PPC64))) {
-+                             ARCH_IS_PPC64(def->os.arch)))) {
-                     if (usblegacy) {
-                         virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-                                        _("Multiple legacy USB controllers are "
-@@ -9643,7 +9643,7 @@ qemuBuildCommandLine(virConnectPtr conn,
-     }
- 
-     if (def->nvram) {
-        if (def->os.arch == VIR_ARCH_PPC64 &&
-+        if (ARCH_IS_PPC64(def->os.arch) &&
-             STRPREFIX(def->os.machine, "pseries")) {
-             if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_NVRAM)) {
-                 virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-@@ -9761,7 +9761,7 @@ qemuBuildSerialChrDeviceStr(char **deviceStr,
- {
-     virBuffer cmd = VIR_BUFFER_INITIALIZER;
- 
-    if ((arch == VIR_ARCH_PPC64) && STRPREFIX(machine, "pseries")) {
-+    if (ARCH_IS_PPC64(arch) && STRPREFIX(machine, "pseries")) {
-         if (serial->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL &&
-             serial->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_SPAPRVIO) {
-             virBufferAsprintf(&cmd, "spapr-vty,chardev=char%s",
-@@ -10183,7 +10183,7 @@ qemuParseCommandLineDisk(virDomainXMLOptionPtr xmlopt,
-     if (VIR_ALLOC(def->src) < 0)
-         goto error;
- 
-    if (((dom->os.arch == VIR_ARCH_PPC64) &&
-+    if ((ARCH_IS_PPC64(dom->os.arch) &&
-         dom->os.machine && STRPREFIX(dom->os.machine, "pseries")))
-         def->bus = VIR_DOMAIN_DISK_BUS_SCSI;
-     else
-@@ -10276,7 +10276,7 @@ qemuParseCommandLineDisk(virDomainXMLOptionPtr xmlopt,
-         } else if (STREQ(keywords[i], "if")) {
-             if (STREQ(values[i], "ide")) {
-                 def->bus = VIR_DOMAIN_DISK_BUS_IDE;
-                if (((dom->os.arch == VIR_ARCH_PPC64) &&
-+                if ((ARCH_IS_PPC64(dom->os.arch) &&
-                      dom->os.machine && STRPREFIX(dom->os.machine, "pseries"))) {
-                     virReportError(VIR_ERR_INTERNAL_ERROR,
-                                    _("pseries systems do not support ide devices '%s'"), val);
-@@ -11521,7 +11521,7 @@ qemuParseCommandLine(virCapsPtr qemuCaps,
-             }
-             if (STREQ(arg, "-cdrom")) {
-                 disk->device = VIR_DOMAIN_DISK_DEVICE_CDROM;
-                if (((def->os.arch == VIR_ARCH_PPC64) &&
-+                if ((ARCH_IS_PPC64(def->os.arch) &&
-                     def->os.machine && STRPREFIX(def->os.machine, "pseries")))
-                     disk->bus = VIR_DOMAIN_DISK_BUS_SCSI;
-                 if (VIR_STRDUP(disk->dst, "hdc") < 0)
-@@ -11537,7 +11537,7 @@ qemuParseCommandLine(virCapsPtr qemuCaps,
-                         disk->bus = VIR_DOMAIN_DISK_BUS_IDE;
-                     else
-                         disk->bus = VIR_DOMAIN_DISK_BUS_SCSI;
-                   if (((def->os.arch == VIR_ARCH_PPC64) &&
-+                   if ((ARCH_IS_PPC64(def->os.arch) &&
-                        def->os.machine && STRPREFIX(def->os.machine, "pseries")))
-                        disk->bus = VIR_DOMAIN_DISK_BUS_SCSI;
-                 }
-diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
-index bec7cf2..48e8acf 100644
--- a/src/qemu/qemu_domain.c
-+++ b/src/qemu/qemu_domain.c
-@@ -980,6 +980,7 @@ qemuDomainDefPostParse(virDomainDefPtr def,
-        break;
- 
-     case VIR_ARCH_PPC64:
-+    case VIR_ARCH_PPC64LE:
-         addPCIRoot = true;
-         addDefaultUSBKBD = true;
-         addDefaultUSBMouse = true;
-diff --git a/src/util/virarch.h b/src/util/virarch.h
-index d395e58..3206ce2 100644
--- a/src/util/virarch.h
-+++ b/src/util/virarch.h
-@@ -79,6 +79,9 @@ typedef enum {
-                              (arch) == VIR_ARCH_PPC64LE ||\
-                              (arch) == VIR_ARCH_PPCEMB)
- 
-+# define ARCH_IS_PPC64(arch)  ((arch) == VIR_ARCH_PPC64 ||\
-+                               (arch) == VIR_ARCH_PPC64LE)
-+
- # define ARCH_IS_ARM(arch)  ((arch) == VIR_ARCH_ARMV6L ||\
-                              (arch) == VIR_ARCH_ARMV7L ||\
-                              (arch) == VIR_ARCH_ARMV7B ||\
@@ -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
+
@@ -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
+
@@ -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);
+                }
+             }
+         }
+ 
@@ -1,99 +0,0 @@
-From: Prerna Saxena <prerna@linux.vnet.ibm.com>
-Date: Tue, 4 Nov 2014 22:52:44 +0530
-Subject: [PATCH] PowerPC : Add support for launching VM in 'compat' mode.
-
-PowerISA allows processors to run VMs in binary compatibility ("compat")
-mode supporting an older version of ISA. QEMU has recently added support to
-explicitly denote a VM running in compatibility mode through commit 6d9412ea
-& 8dfa3a5e85. Now, a "compat" mode VM can be run by invoking this qemu
-commandline on a POWER8 host:  -cpu host,compat=power7.
-
-This patch allows libvirt to exploit cpu mode 'host-model' to describe this
-new mode for PowerKVM guests. For example, when a user wants to request a
-power7 vm to run in compatibility mode on a Power8 host, this can be
-described in XML as follows :
-
-  <cpu mode='host-model'>
-    <model>power7</model>
-  </cpu>
-
-Signed-off-by: Prerna Saxena <prerna@linux.vnet.ibm.com>
-Signed-off-by: Li Zhang <zhlcindy@linux.vnet.ibm.com>
-Signed-off-by: Pradipta Kr. Banerjee <bpradip@in.ibm.com>
-Acked-by: Michal Privoznik <mprivozn@redhat.com>
-(cherry picked from commit addce06c9221f948072cd222b56ea9c3f70ec066)
---
- src/conf/cpu_conf.c     |  1 +
- src/cpu/cpu_powerpc.c   | 11 ++---------
- src/qemu/qemu_command.c | 10 +++++++++-
- 3 files changed, 12 insertions(+), 10 deletions(-)
-
-diff --git a/src/conf/cpu_conf.c b/src/conf/cpu_conf.c
-index c09c352..74f0b16 100644
--- a/src/conf/cpu_conf.c
-+++ b/src/conf/cpu_conf.c
-@@ -624,6 +624,7 @@ virCPUDefFormatBuf(virBufferPtr buf,
-         return 0;
- 
-     formatModel = (def->mode == VIR_CPU_MODE_CUSTOM ||
-+                   def->mode == VIR_CPU_MODE_HOST_MODEL ||
-                    (flags & VIR_DOMAIN_XML_UPDATE_CPU));
-     formatFallback = (def->type == VIR_CPU_TYPE_GUEST &&
-                       (def->mode == VIR_CPU_MODE_HOST_MODEL ||
-diff --git a/src/cpu/cpu_powerpc.c b/src/cpu/cpu_powerpc.c
-index d591c18..4ea1835 100644
--- a/src/cpu/cpu_powerpc.c
-+++ b/src/cpu/cpu_powerpc.c
-@@ -562,8 +562,8 @@ ppcUpdate(virCPUDefPtr guest,
- static virCPUDefPtr
- ppcBaseline(virCPUDefPtr *cpus,
-             unsigned int ncpus,
-            const char **models,
-            unsigned int nmodels,
-+            const char **models ATTRIBUTE_UNUSED,
-+            unsigned int nmodels ATTRIBUTE_UNUSED,
-             unsigned int flags)
- {
-     struct ppc_map *map = NULL;
-@@ -583,13 +583,6 @@ ppcBaseline(virCPUDefPtr *cpus,
-         goto error;
-     }
- 
-    if (!cpuModelIsAllowed(model->name, models, nmodels)) {
-        virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-                        _("CPU model %s is not supported by hypervisor"),
-                        model->name);
-        goto error;
-    }
-
-     for (i = 0; i < ncpus; i++) {
-         const struct ppc_vendor *vnd;
- 
-diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
-index c5c48bf..423692e 100644
--- a/src/qemu/qemu_command.c
-+++ b/src/qemu/qemu_command.c
-@@ -6217,7 +6217,9 @@ qemuBuildCpuModelArgStr(virQEMUDriverPtr driver,
-         *hasHwVirt = hasSVM > 0 ? true : false;
-     }
- 
-    if (cpu->mode == VIR_CPU_MODE_HOST_PASSTHROUGH) {
-+    if ((cpu->mode == VIR_CPU_MODE_HOST_PASSTHROUGH) ||
-+        ((cpu->mode == VIR_CPU_MODE_HOST_MODEL) &&
-+          ARCH_IS_PPC64(def->os.arch))) {
-         const char *mode = virCPUModeTypeToString(cpu->mode);
-         if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_CPU_HOST)) {
-             virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-@@ -6232,6 +6234,12 @@ qemuBuildCpuModelArgStr(virQEMUDriverPtr driver,
-             goto cleanup;
-         }
-         virBufferAddLit(buf, "host");
-+
-+        if (ARCH_IS_PPC64(def->os.arch) &&
-+            cpu->mode == VIR_CPU_MODE_HOST_MODEL) {
-+            virBufferAsprintf(buf, ",compat=%s", def->cpu->model);
-+        }
-+
-     } else {
-         if (VIR_ALLOC(guest) < 0)
-             goto cleanup;
@@ -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);
@@ -1,92 +0,0 @@
-From: Prerna Saxena <prerna@linux.vnet.ibm.com>
-Date: Tue, 4 Nov 2014 22:58:33 +0530
-Subject: [PATCH] PowerPC:Improve PVR handling to fall back to cpu generation.
-
-IBM Power processors differ uniquely across generations (such as power6,
-power7, power8). Each generation signifies a new PowerISA version
-that exhibits features unique to that generation.
-The higher 16 bits of PVR for IBM Power processors encode the CPU
-generation, while the CPU chip (sub)version is encoded in lower 16 bits.
-
-For all practical purposes of launching a VM, we care about the
-generation which the vCPU will belong to, and not specifically the chip
-version. This patch updates the libvirt PVR check to reflect this
-relationship. It allows libvirt to select the right CPU generation
-in case the exact match for a a specific CPU is not found.
-Hence, there will no longer be a need to add each PowerPC CPU model to
-cpu_map.xml; just adding entry for the matching ISA generation will
-suffice.
-
-It also contains changes to cpu_map.xml since processor generations
-as understood by QEMU compat mode go as "power6", "power7" or "power8"
-[Reference : QEMU commit 8dfa3a5e85 ]
-
-Signed-off-by: Prerna Saxena <prerna@linux.vnet.ibm.com>
-Signed-off-by: Pradipta Kr. Banerjee <bpradip@in.ibm.com>
-Signed-off-by: Anton Blanchard <anton@samba.org>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-(cherry picked from commit 1e911742287d964055f33ab76d53e673a9b4477f)
---
- src/cpu/cpu_map.xml   | 30 ++++++++++++++++++++++++++++++
- src/cpu/cpu_powerpc.c |  8 ++++++++
- 2 files changed, 38 insertions(+)
-
-diff --git a/src/cpu/cpu_map.xml b/src/cpu/cpu_map.xml
-index d181cd5..4ec49ca 100644
--- a/src/cpu/cpu_map.xml
-+++ b/src/cpu/cpu_map.xml
-@@ -637,5 +637,35 @@
-       <pvr value='0x004b0100'/>
-     </model>
- 
-+    <model name='power6'>
-+      <vendor name='IBM'/>
-+      <compat isa='2.05'/>
-+      <pvr value='0x003e0000'/>
-+    </model>
-+
-+    <model name='power7'>
-+      <vendor name='IBM'/>
-+      <compat isa='2.06'/>
-+      <pvr value='0x003f0000'/>
-+    </model>
-+
-+    <model name='power7+'>
-+      <vendor name='IBM'/>
-+      <compat isa='2.06B'/>
-+      <pvr value='0x004a0000'/>
-+    </model>
-+
-+    <model name='power8e'>
-+      <vendor name='IBM'/>
-+      <compat isa='2.07'/>
-+      <pvr value='0x004b0000'/>
-+    </model>
-+
-+    <model name='power8'>
-+      <vendor name='IBM'/>
-+      <compat isa='2.07'/>
-+      <pvr value='0x004d0000'/>
-+    </model>
-+
-   </arch>
- </cpus>
-diff --git a/src/cpu/cpu_powerpc.c b/src/cpu/cpu_powerpc.c
-index 4ea1835..531868c 100644
--- a/src/cpu/cpu_powerpc.c
-+++ b/src/cpu/cpu_powerpc.c
-@@ -99,6 +99,14 @@ ppcModelFindPVR(const struct ppc_map *map,
-         model = model->next;
-     }
- 
-+    /* PowerPC Processor Version Register is interpreted as follows :
-+     * Higher order 16 bits : Power ISA generation.
-+     * Lower order 16 bits : CPU chip version number.
-+     * If the exact CPU isnt found, return the nearest matching CPU generation
-+     */
-+    if (pvr & 0x0000FFFFul)
-+        return ppcModelFindPVR(map, (pvr & 0xFFFF0000ul));
-+
-     return NULL;
- }
- 
@@ -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
+
@@ -1,41 +0,0 @@
-From: Prerna Saxena <prerna@linux.vnet.ibm.com>
-Date: Tue, 4 Nov 2014 23:00:36 +0530
-Subject: [PATCH] docs: Add documentation for compat mode.
-
-Add documentation to explain how compat-mode can be invoked with libvirt
-running on PowerPC architecture.
-It also mentions that this change is available libvirt 1.2.11 onwards.
-
-Signed-off-by: Prerna Saxena <prerna@linux.vnet.ibm.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-(cherry picked from commit 9265fd19b68d787e478f5e490524da794965a5f1)
---
- docs/formatdomain.html.in | 15 ++++++++++++++-
- 1 file changed, 14 insertions(+), 1 deletion(-)
-
-diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in
-index 12172a4..6c64230 100644
--- a/docs/formatdomain.html.in
-+++ b/docs/formatdomain.html.in
-@@ -1047,7 +1047,20 @@
-           (such as CPUID level) that don't work. Until these issues are fixed,
-           it's a good idea to avoid using <code>host-model</code> and use
-           <code>custom</code> mode with just the CPU model from host
-          capabilities XML.</dd>
-+          capabilities XML.
-+          <span class="since">(Since 1.2.11)</span>. PowerISA allows
-+          processors to run VMs in binary compatibility mode supporting an
-+          older version of ISA.  Libvirt on PowerPC architecture uses the
-+          <code>host-model</code> to signify a guest mode CPU running in
-+          binary compatibility mode. Example:
-+          When a user needs a power7 VM to run in compatibility mode
-+          on a Power8 host, this can be described in XML as follows :
-+<pre>
-+  &lt;cpu mode='host-model'&gt;
-+    &lt;model&gt;power7&lt;/model&gt;
-+  &lt;/cpu&gt;
-+  ...</pre>
-+          </dd>
-           <dt><code>host-passthrough</code></dt>
-           <dd>With this mode, the CPU visible to the guest should be exactly
-           the same as the host CPU even in the aspects that libvirt does not
@@ -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
+
@@ -1,71 +0,0 @@
-From: Prerna Saxena <prerna@linux.vnet.ibm.com>
-Date: Tue, 4 Nov 2014 23:02:15 +0530
-Subject: [PATCH] Test: Add a testcase for PowerPC compat mode cpu
- specification.
-
-This introduces a testcase for PowerPC compat mode cpu specification.
-
-Signed-off-by: Prerna Saxena <prerna@linux.vnet.ibm.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-(cherry picked from commit 12c381114ce362e49cadb730b5faabbc150a8878)
---
- .../qemuxml2argv-pseries-cpu-compat.args             |  8 ++++++++
- .../qemuxml2argv-pseries-cpu-compat.xml              | 20 ++++++++++++++++++++
- tests/qemuxml2argvtest.c                             |  2 ++
- 3 files changed, 30 insertions(+)
- create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-compat.args
- create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-compat.xml
-
-diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-compat.args b/tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-compat.args
-new file mode 100644
-index 0000000..64df406
--- /dev/null
-+++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-compat.args
-@@ -0,0 +1,8 @@
-+LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \
-+QEMU_AUDIO_DRV=none /usr/bin/qemu-system-ppc64 -S -M pseries \
-+-cpu host,compat=power7 \
-+-m 214 -smp 4 -nographic -nodefconfig -nodefaults \
-+-chardev socket,id=charmonitor,path=/tmp/test-monitor,server,nowait \
-+-mon chardev=charmonitor,id=monitor,mode=readline -no-acpi -boot c -usb \
-+-chardev pty,id=charserial0 \
-+-device spapr-vty,chardev=charserial0,reg=0x30000000
-diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-compat.xml b/tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-compat.xml
-new file mode 100644
-index 0000000..e34a8ad
--- /dev/null
-+++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-compat.xml
-@@ -0,0 +1,20 @@
-+<domain type='kvm'>
-+  <name>QEMUGuest1</name>
-+  <memory unit='KiB'>219100</memory>
-+  <currentMemory unit='KiB'>219100</currentMemory>
-+  <vcpu placement='static'>4</vcpu>
-+  <os>
-+    <type arch='ppc64' machine='pseries'>hvm</type>
-+  </os>
-+  <cpu mode='host-model'>
-+    <model>power7</model>
-+  </cpu>
-+  <clock offset='utc'/>
-+  <devices>
-+      <emulator>/usr/bin/qemu-system-ppc64</emulator>
-+      <console type='pty'>
-+        <address type="spapr-vio"/>
-+      </console>
-+      <memballoon model="none"/>
-+  </devices>
-+</domain>
-diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
-index 5539a84..e24d17f 100644
--- a/tests/qemuxml2argvtest.c
-+++ b/tests/qemuxml2argvtest.c
-@@ -1314,6 +1314,8 @@ mymain(void)
-             QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG);
-     DO_TEST("pseries-cpu-exact", QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE,
-             QEMU_CAPS_NODEFCONFIG);
-+    DO_TEST("pseries-cpu-compat", QEMU_CAPS_KVM, QEMU_CAPS_CPU_HOST,
-+            QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG);
-     DO_TEST("disk-ide-drive-split",
-             QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG,
-             QEMU_CAPS_IDE_CD);
@@ -1,126 +0,0 @@
-From: Cole Robinson <crobinso@redhat.com>
-Date: Tue, 28 Apr 2015 17:38:00 -0400
-Subject: [PATCH] polkit: Allow password-less access for 'libvirt' group
-
-Many users, who admin their own machines, want to be able to access
-system libvirtd via tools like virt-manager without having to enter
-a root password. Just google 'virt-manager without password' and
-you'll find many hits. I've read at least 5 blog posts over the years
-describing slightly different ways of achieving this goal.
-
-Let's finally add official support for this.
-
-Install a polkit-1 rules file granting password-less auth for any user
-in the new 'libvirt' group. Create the group on RPM install
-
-https://bugzilla.redhat.com/show_bug.cgi?id=957300
-(cherry picked from commit e94979e901517af9fdde358d7b7c92cc055dd50c)
---
- daemon/Makefile.am   | 13 +++++++++++++
- daemon/libvirt.rules |  9 +++++++++
- libvirt.spec.in      | 15 +++++++++++++--
- 3 files changed, 35 insertions(+), 2 deletions(-)
- create mode 100644 daemon/libvirt.rules
-
-diff --git a/daemon/Makefile.am b/daemon/Makefile.am
-index b95a79d..9c5ea37 100644
--- a/daemon/Makefile.am
-+++ b/daemon/Makefile.am
-@@ -53,6 +53,7 @@ EXTRA_DIST =						\
- 	libvirtd.init.in				\
- 	libvirtd.upstart				\
- 	libvirtd.policy.in				\
-+	libvirt.rules					\
- 	libvirtd.sasl					\
- 	libvirtd.service.in				\
- 	libvirtd.socket.in				\
-@@ -233,6 +234,8 @@ policyauth = auth_admin_keep_session
- else ! WITH_POLKIT0
- policydir = $(datadir)/polkit-1/actions
- policyauth = auth_admin_keep
-+rulesdir = $(datadir)/polkit-1/rules.d
-+rulesfile = libvirt.rules
- endif ! WITH_POLKIT0
- endif WITH_POLKIT
- 
-@@ -263,9 +266,19 @@ if WITH_POLKIT
- install-data-polkit::
- 	$(MKDIR_P) $(DESTDIR)$(policydir)
- 	$(INSTALL_DATA) libvirtd.policy $(DESTDIR)$(policydir)/org.libvirt.unix.policy
-+if ! WITH_POLKIT0
-+	$(MKDIR_P) $(DESTDIR)$(rulesdir)
-+	$(INSTALL_DATA) $(srcdir)/$(rulesfile) $(DESTDIR)$(rulesdir)/50-libvirt.rules
-+endif ! WITH_POLKIT0
-+
- uninstall-data-polkit::
- 	rm -f $(DESTDIR)$(policydir)/org.libvirt.unix.policy
- 	rmdir $(DESTDIR)$(policydir) || :
-+if ! WITH_POLKIT0
-+	rm -f $(DESTDIR)$(rulesdir)/50-libvirt.rules
-+	rmdir $(DESTDIR)$(rulesdir) || :
-+endif ! WITH_POLKIT0
-+
- else ! WITH_POLKIT
- install-data-polkit::
- uninstall-data-polkit::
-diff --git a/daemon/libvirt.rules b/daemon/libvirt.rules
-new file mode 100644
-index 0000000..01a15fa
--- /dev/null
-+++ b/daemon/libvirt.rules
-@@ -0,0 +1,9 @@
-+// Allow any user in the 'libvirt' group to connect to system libvirtd
-+// without entering a password.
-+
-+polkit.addRule(function(action, subject) {
-+    if (action.id == "org.libvirt.unix.manage" &&
-+        subject.isInGroup("libvirt")) {
-+        return polkit.Result.YES;
-+    }
-+});
-diff --git a/libvirt.spec.in b/libvirt.spec.in
-index a84b19d..5de085b 100644
--- a/libvirt.spec.in
-+++ b/libvirt.spec.in
-@@ -1583,9 +1583,9 @@ then
- fi
- 
- %if %{with_libvirtd}
-+%pre daemon
-     %if ! %{with_driver_modules}
-         %if %{with_qemu}
-%pre daemon
-             %if 0%{?fedora} || 0%{?rhel} >= 6
- # We want soft static allocation of well-known ids, as disk images
- # are commonly shared across NFS mounts by id rather than name; see
-@@ -1599,11 +1599,21 @@ if ! getent passwd qemu >/dev/null; then
-     useradd -r -g qemu -G kvm -d / -s /sbin/nologin -c "qemu user" qemu
-   fi
- fi
-exit 0
-             %endif
-         %endif
-     %endif
- 
-+    %if %{with_polkit}
-+        %if 0%{?fedora} || 0%{?rhel} >= 6
-+# 'libvirt' group is just to allow password-less polkit access to
-+# libvirtd. The uid number is irrelevant, so we use dynamic allocation
-+# described at the above link.
-+getent group libvirt >/dev/null || groupadd -r libvirt
-+        %endif
-+    %endif
-+
-+exit 0
-+
- %post daemon
- 
-     %if %{with_network}
-@@ -1919,6 +1929,7 @@ exit 0
-         %if 0%{?fedora} || 0%{?rhel} >= 6
- %{_datadir}/polkit-1/actions/org.libvirt.unix.policy
- %{_datadir}/polkit-1/actions/org.libvirt.api.policy
-+%{_datadir}/polkit-1/rules.d/50-libvirt.rules
-         %else
- %{_datadir}/PolicyKit/policy/org.libvirt.unix.policy
-         %endif
@@ -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)
@@ -1 +1 @@
-b3ffa5e11880acca7fa19a3cca2d6280  libvirt-1.2.9.3.tar.gz
+SHA512 (libvirt-9.0.0.tar.xz) = 135f690f9fe722161c22579166f10a54d52941a371439165fd0e3d391ca7835049a3bcbff33fc81c50153046230db8a5a318d707383bad3141d489d2faa09ecb