Add patches

polkit: Allow password-less access for 'libvirt' group (bz #957300 )
Rebased to version 1.2.9.3
2015-06-06 11:17:48 -04:00 · 2015-06-06 11:12:12 -04:00 · 2015-04-28 11:58:34 -04:00 · 2015-02-07 22:00:40 -05:00 · 2014-12-02 15:21:18 -05:00 · 2014-11-15 19:42:16 -05:00
18 changed files with 3025 additions and 1619 deletions
@@ -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.*
@@ -2,4 +2,4 @@
 *.rpm
 i686
 x86_64
-libvirt-*.tar.xz
+libvirt-*.tar.gz
@@ -0,0 +1,206 @@
+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 ||\
@@ -1,34 +0,0 @@
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Wed, 5 Aug 2020 10:01:45 +0200
-Subject: [PATCH] util: Fix logic in virFileSetCOW
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-When COW is not explicitly requested to be disabled or enabled, the
-function is supposed to do nothing on non-BTRFS file systems.
-
-Fixes commit 7230bc95aa78379c9ee20cf59394c5fc4305b75b.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1866157
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
-(cherry picked from commit 2edd63a0dbd445112db23596ee0128521e8f1ff5)
---
- src/util/virfile.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/util/virfile.c b/src/util/virfile.c
-index af150421e7..a06e7dfcce 100644
--- a/src/util/virfile.c
-+++ b/src/util/virfile.c
-@@ -4550,7 +4550,7 @@ virFileSetCOW(const char *path,
-     }
- 
-     if (buf.f_type != BTRFS_SUPER_MAGIC) {
-        if (state == VIR_TRISTATE_BOOL_ABSENT) {
-+        if (state != VIR_TRISTATE_BOOL_ABSENT) {
-             virReportSystemError(ENOSYS,
-                                  _("unable to control COW flag on '%s', not btrfs"),
-                                  path);
@@ -0,0 +1,99 @@
+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;
@@ -1,88 +0,0 @@
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Tue, 18 Aug 2020 11:08:15 +0200
-Subject: [PATCH] virdevmapper: Don't cache device-mapper major
-
-The device mapper major is needed in virIsDevMapperDevice() which
-determines whether given device is managed by device-mapper. This
-number is obtained by parsing /proc/devices and then stored in a
-global variable so that the file doesn't have to be parsed again.
-However, as it turns out this logic is flawed - the major number
-is not static and can change as it can be specified as a
-parameter when loading the dm-mod module.
-
-Unfortunately, I was not able to come up with a good solution and
-thus the /proc/devices file is being parsed every time we need
-the device mapper major.
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Peter Krempa <pkrempa@redhat.com>
-Reviewed-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
-Tested-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
-(cherry picked from commit 82bb167f0d15b733b23931205be3488b83cb9ec6)
---
- src/util/virdevmapper.c | 17 +++++------------
- 1 file changed, 5 insertions(+), 12 deletions(-)
-
-diff --git a/src/util/virdevmapper.c b/src/util/virdevmapper.c
-index a471504176..b43dbefa9a 100644
--- a/src/util/virdevmapper.c
-+++ b/src/util/virdevmapper.c
-@@ -46,11 +46,9 @@
- 
- G_STATIC_ASSERT(BUF_SIZE > sizeof(struct dm_ioctl));
- 
-static unsigned int virDMMajor;
-
- 
- static int
-virDevMapperOnceInit(void)
-+virDevMapperGetMajor(unsigned int *major)
- {
-     g_autofree char *buf = NULL;
-     VIR_AUTOSTRINGLIST lines = NULL;
-@@ -69,7 +67,7 @@ virDevMapperOnceInit(void)
- 
-         if (sscanf(lines[i], "%u %ms\n", &maj, &dev) == 2 &&
-             STREQ(dev, DM_NAME)) {
-            virDMMajor = maj;
-+            *major = maj;
-             break;
-         }
-     }
-@@ -85,9 +83,6 @@ virDevMapperOnceInit(void)
- }
- 
- 
-VIR_ONCE_GLOBAL_INIT(virDevMapper);
-
-
- static void *
- virDMIoctl(int controlFD, int cmd, struct dm_ioctl *dm, char **buf)
- {
-@@ -305,9 +300,6 @@ virDevMapperGetTargets(const char *path,
-      * consist of devices or yet another targets. If that's the
-      * case, we have to stop recursion somewhere. */
- 
-    if (virDevMapperInitialize() < 0)
-        return -1;
-
-     if ((controlFD = virDMOpen()) < 0)
-         return -1;
- 
-@@ -319,13 +311,14 @@ bool
- virIsDevMapperDevice(const char *dev_name)
- {
-     struct stat buf;
-+    unsigned int major;
- 
-    if (virDevMapperInitialize() < 0)
-+    if (virDevMapperGetMajor(&major) < 0)
-         return false;
- 
-     if (!stat(dev_name, &buf) &&
-         S_ISBLK(buf.st_mode) &&
-        major(buf.st_rdev) == virDMMajor)
-+        major(buf.st_rdev) == major)
-         return true;
- 
-     return false;
@@ -0,0 +1,92 @@
+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;
+ }
+ 
@@ -1,76 +0,0 @@
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Tue, 18 Aug 2020 11:04:24 +0200
-Subject: [PATCH] virdevmapper: Handle kernel without device-mapper support
-
-In one of my latest patch (v6.6.0~30) I was trying to remove
-libdevmapper use in favor of our own implementation. However, the
-code did not take into account that device mapper can be not
-compiled into the kernel (e.g. be a separate module that's not
-loaded) in which case /proc/devices won't have the device-mapper
-major number and thus virDevMapperGetTargets() and/or
-virIsDevMapperDevice() fails.
-
-However, such failure is safe to ignore, because if device mapper
-is missing then there can't be any multipath devices and thus we
-don't need to allow the deps in CGroups, nor create them in the
-domain private namespace, etc.
-
-Fixes: 22494556542c676d1b9e7f1c1f2ea13ac17e1e3e
-Reported-by: Andrea Bolognani <abologna@redhat.com>
-Reported-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Peter Krempa <pkrempa@redhat.com>
-Reviewed-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
-Tested-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
-(cherry picked from commit feb8564a3cc63bc8f68284063d53ec0d2d81a1cc)
---
- src/util/virdevmapper.c | 20 ++++++++++++++++++--
- 1 file changed, 18 insertions(+), 2 deletions(-)
-
-diff --git a/src/util/virdevmapper.c b/src/util/virdevmapper.c
-index b43dbefa9a..a81e2edee4 100644
--- a/src/util/virdevmapper.c
-+++ b/src/util/virdevmapper.c
-@@ -54,6 +54,9 @@ virDevMapperGetMajor(unsigned int *major)
-     VIR_AUTOSTRINGLIST lines = NULL;
-     size_t i;
- 
-+    if (!virFileExists(CONTROL_PATH))
-+        return -2;
-+
-     if (virFileReadAll(PROC_DEVICES, BUF_SIZE, &buf) < 0)
-         return -1;
- 
-@@ -126,8 +129,13 @@ virDMOpen(void)
- 
-     memset(&dm, 0, sizeof(dm));
- 
-    if ((controlFD = open(CONTROL_PATH, O_RDWR)) < 0)
-+    if ((controlFD = open(CONTROL_PATH, O_RDWR)) < 0) {
-+        if (errno == ENOENT)
-+            return -2;
-+
-+        virReportSystemError(errno, _("Unable to open %s"), CONTROL_PATH);
-         return -1;
-+    }
- 
-     if (!virDMIoctl(controlFD, DM_VERSION, &dm, &tmp)) {
-         virReportSystemError(errno, "%s",
-@@ -300,8 +308,16 @@ virDevMapperGetTargets(const char *path,
-      * consist of devices or yet another targets. If that's the
-      * case, we have to stop recursion somewhere. */
- 
-    if ((controlFD = virDMOpen()) < 0)
-+    if ((controlFD = virDMOpen()) < 0) {
-+        if (controlFD == -2) {
-+            /* The CONTROL_PATH doesn't exist. Probably the
-+             * module isn't loaded, yet. Don't error out, just
-+             * exit. */
-+            return 0;
-+        }
-+
-         return -1;
-+    }
- 
-     return virDevMapperGetTargetsImpl(controlFD, path, devPaths, ttl);
- }
@@ -0,0 +1,41 @@
+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
@@ -1,77 +0,0 @@
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Wed, 19 Aug 2020 13:35:55 +0200
-Subject: [PATCH] virdevmapper: Ignore all errors when opening
- /dev/mapper/control
-
-So far, only ENOENT is ignored (to deal with kernels without
-devmapper). However, as reported on the list, under certain
-scenarios a different error can occur. For instance, when libvirt
-is running inside a container which doesn't have permissions to
-talk to the devmapper. If this is the case, then open() returns
-1 and sets errno=EPERM.
-
-Assuming that multipath devices are fairly narrow use case and
-using them in a restricted container is even more narrow the best
-fix seems to be to ignore all open errors BUT produce a warning
-on failure. To avoid flooding logs with warnings on kernels
-without devmapper the level is reduced to a plain debug message.
-
-Reported-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
-Reviewed-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-(cherry picked from commit 53d9af1e7924757e3b5f661131dd707d7110d094)
---
- src/util/virdevmapper.c | 23 +++++++++++++++--------
- 1 file changed, 15 insertions(+), 8 deletions(-)
-
-diff --git a/src/util/virdevmapper.c b/src/util/virdevmapper.c
-index a81e2edee4..ee2fab5ae3 100644
--- a/src/util/virdevmapper.c
-+++ b/src/util/virdevmapper.c
-@@ -35,9 +35,12 @@
- # include "viralloc.h"
- # include "virstring.h"
- # include "virfile.h"
-+# include "virlog.h"
- 
- # define VIR_FROM_THIS VIR_FROM_STORAGE
- 
-+VIR_LOG_INIT("util.virdevmapper");
-+
- # define PROC_DEVICES "/proc/devices"
- # define DM_NAME "device-mapper"
- # define DEV_DM_DIR "/dev/" DM_DIR
-@@ -130,11 +133,15 @@ virDMOpen(void)
-     memset(&dm, 0, sizeof(dm));
- 
-     if ((controlFD = open(CONTROL_PATH, O_RDWR)) < 0) {
-        if (errno == ENOENT)
-            return -2;
-
-        virReportSystemError(errno, _("Unable to open %s"), CONTROL_PATH);
-        return -1;
-+        /* We can't talk to devmapper. Produce a warning and let
-+         * the caller decide what to do next. */
-+        if (errno == ENOENT) {
-+            VIR_DEBUG("device mapper not available");
-+        } else {
-+            VIR_WARN("unable to open %s: %s",
-+                     CONTROL_PATH, g_strerror(errno));
-+        }
-+        return -2;
-     }
- 
-     if (!virDMIoctl(controlFD, DM_VERSION, &dm, &tmp)) {
-@@ -310,9 +317,9 @@ virDevMapperGetTargets(const char *path,
- 
-     if ((controlFD = virDMOpen()) < 0) {
-         if (controlFD == -2) {
-            /* The CONTROL_PATH doesn't exist. Probably the
-             * module isn't loaded, yet. Don't error out, just
-             * exit. */
-+            /* The CONTROL_PATH doesn't exist or is unusable.
-+             * Probably the module isn't loaded, yet. Don't error
-+             * out, just exit. */
-             return 0;
-         }
- 
@@ -0,0 +1,71 @@
+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,57 +0,0 @@
-From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
-Date: Wed, 4 Nov 2020 12:08:19 +0100
-Subject: [PATCH] util: use g_autofree in virSCSIHostGetUniqueId
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Ján Tomko <jtomko@redhat.com>
-Reviewed-by: Erik Skultety <eskultet@redhat.com>
-(cherry picked from commit 843b70995471c1a20822ee62ff084310066b4b4a)
---
- src/util/virscsihost.c | 16 +++++-----------
- 1 file changed, 5 insertions(+), 11 deletions(-)
-
-diff --git a/src/util/virscsihost.c b/src/util/virscsihost.c
-index 7d8e5299b8..4e6d8f7ad6 100644
--- a/src/util/virscsihost.c
-+++ b/src/util/virscsihost.c
-@@ -46,17 +46,16 @@ int
- virSCSIHostGetUniqueId(const char *sysfs_prefix,
-                        int host)
- {
-    char *sysfs_path = NULL;
-+    g_autofree char *sysfs_path = NULL;
-     char *p = NULL;
-    int ret = -1;
-    char *buf = NULL;
-+    g_autofree char *buf = NULL;
-     int unique_id;
- 
-     sysfs_path = g_strdup_printf("%s/host%d/unique_id",
-                                  sysfs_prefix ? sysfs_prefix : SYSFS_SCSI_HOST_PATH, host);
- 
-     if (virFileReadAll(sysfs_path, 1024, &buf) < 0)
-        goto cleanup;
-+        return -1;
- 
-     if ((p = strchr(buf, '\n')))
-         *p = '\0';
-@@ -65,15 +64,10 @@ virSCSIHostGetUniqueId(const char *sysfs_prefix,
-         virReportError(VIR_ERR_INTERNAL_ERROR,
-                        _("unable to parse unique_id: %s"), buf);
- 
-        goto cleanup;
-+        return -1;
-     }
- 
-    ret = unique_id;
-
- cleanup:
-    VIR_FREE(sysfs_path);
-    VIR_FREE(buf);
-    return ret;
-+    return unique_id;
- }
- 
- 
@@ -0,0 +1,126 @@
+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,56 +0,0 @@
-From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
-Date: Wed, 4 Nov 2020 12:29:07 +0100
-Subject: [PATCH] util: quieten virSCSIHostGetUniqueId
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The only caller of this function ignores failure
-and just sets the unique_id to -1.
-
-Failing to read the file is likely to the device no longer
-being present, not a real error.
-
-Stop reporting errors in this function.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1692100
-
-Signed-off-by: Ján Tomko <jtomko@redhat.com>
-Reviewed-by: Erik Skultety <eskultet@redhat.com>
-(cherry picked from commit 4a56278e770c972dbee7be5842b557de152a586e)
---
- src/util/virscsihost.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/util/virscsihost.c b/src/util/virscsihost.c
-index 4e6d8f7ad6..b1d51b40d3 100644
--- a/src/util/virscsihost.c
-+++ b/src/util/virscsihost.c
-@@ -41,6 +41,8 @@ VIR_LOG_INIT("util.scsi_host");
-  * Read the value of the "scsi_host" unique_id file.
-  *
-  * Returns the value on success or -1 on failure.
-+ *
-+ * No errors are reported.
-  */
- int
- virSCSIHostGetUniqueId(const char *sysfs_prefix,
-@@ -54,16 +56,14 @@ virSCSIHostGetUniqueId(const char *sysfs_prefix,
-     sysfs_path = g_strdup_printf("%s/host%d/unique_id",
-                                  sysfs_prefix ? sysfs_prefix : SYSFS_SCSI_HOST_PATH, host);
- 
-    if (virFileReadAll(sysfs_path, 1024, &buf) < 0)
-+    if (virFileReadAllQuiet(sysfs_path, 1024, &buf) < 0)
-         return -1;
- 
-     if ((p = strchr(buf, '\n')))
-         *p = '\0';
- 
-     if (virStrToLong_i(buf, NULL, 10, &unique_id) < 0) {
-        virReportError(VIR_ERR_INTERNAL_ERROR,
-                       _("unable to parse unique_id: %s"), buf);
-
-+        VIR_DEBUG("unable to parse unique_id: '%s'", buf);
-         return -1;
-     }
- 
@@ -1,46 +0,0 @@
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Tue, 17 Nov 2020 12:56:39 +0100
-Subject: [PATCH] node_device: Use "udev" monitor source
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-In v6.3.0-rc1~67 I've made a switch: instead of listening on udev
-events the nodedev driver started listening for kernel events.
-This was because when a device changes its name (e.g. NICs) we
-will get "move" event with DEVPATH_OLD property set, which we can
-then use to remove the old device and thus keep our internal list
-up to date. The switch to "kernel" source was made because if the
-old NICs naming (eth0, eth1, ...) is enabled (e.g. via
-net.ifnames=0 on the kernel cmd line) then udev overwrites the
-property with the new name making our internal list go out of
-sync. Interestingly, when the od NICs naming is not enabled then
-the DEVPATH_OLD contains the correct value.
-
-But as it turns out, "kernel" source might be missing some other
-important properties, e.g. USB vendor/product IDs. Therefore,
-switch back to "udev" source and wish the best of luck to users
-using the old NICs naming.
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1897625
-Fixes: 9a13704818e4a018723e0ec5b9e97b176f1c8584
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
-(cherry picked from commit 7e67a136dab9034dd3cb2ed76fa90c524c800cde)
---
- src/node_device/node_device_udev.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c
-index ff558efb83..b7fbd42fa1 100644
--- a/src/node_device/node_device_udev.c
-+++ b/src/node_device/node_device_udev.c
-@@ -1878,7 +1878,7 @@ nodeStateInitialize(bool privileged,
- 
-     virObjectLock(priv);
- 
-    priv->udev_monitor = udev_monitor_new_from_netlink(udev, "kernel");
-+    priv->udev_monitor = udev_monitor_new_from_netlink(udev, "udev");
-     if (!priv->udev_monitor) {
-         virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-                        _("udev_monitor_new_from_netlink returned NULL"));
@@ -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 $$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 @@
-SHA512 (libvirt-6.6.0.tar.xz) = 55091addcf43d3c0bdd50f9378b588351181d191272d5a19220a0babe0893c1f6e0f1e41a7f51b8c1fb8e2098236b273e1a18b81573f4008ee3cf65374ba9465
+b3ffa5e11880acca7fa19a3cca2d6280  libvirt-1.2.9.3.tar.gz
Author	SHA1	Message	Date
Cole Robinson	0831c388ec	Add patches	2015-06-06 11:17:48 -04:00
Cole Robinson	b59373e03c	polkit: Allow password-less access for 'libvirt' group (bz #957300 )	2015-06-06 11:12:12 -04:00
Cole Robinson	d617f580c5	Rebased to version 1.2.9.3 Fix getVersion() after installing qemu (bz #1000116) Fix autosocket setup with qemu:///session (bz #1044561, bz #1105274) Ignore storage volumes with non-ascii in names (bz #1066564) Don't generate invalid system nodedev XML (bz #1184131) Fix vhost-user XML (bz #1190842) Fix crash via race when unrefing rpc identity object (bz #1203030) Fix domcapabilities failure with ppc64le (bz #1209948) Fix snapshot-revert with cpu host-passthrough (bz #1030793) Fix starting VM with emulator pinning (bz #1214434) Fix virDomainBlockCopyRebase selinux failure (bz #1214846) Add {Haswell,Broadwell}-noTSX CPU models (bz #1182650) Report original error when QMP probing fails (bz #1178054) Don't lose VMs on libvirtd restart if qemu is uninstalled (bz #1099847) Ignore storage volumes that libvirt can't open (bz #1103308)	2015-04-28 11:58:34 -04:00
Cole Robinson	7415198273	Rebased to version 1.2.9.2 CVE-2014-8131: deadlock and segfault in qemuConnectGetAllDomainStats (bz #1172571) CVE-2015-0236: missing ACL check for the VIR_DOMAIN_XML_SECURE flag in save images and snapshots objects (bz #1185769) CVE-2014-8136: local denial of service in qemu/qemu_driver.c (bz #1176179) Fix crash parsing nbd URIs (bz #1188644) Fix domain startup failing with 'strict' mode in numatune (bz #1168672)	2015-02-07 22:00:40 -05:00
Cole Robinson	0ceadbef50	Don't reject aarch64 + uefi	2014-12-02 15:21:18 -05:00
Cole Robinson	82f2674fae	Rebased to version 1.2.9.1 ppc64le fixes (bz #1163439) Fix caps probing when KVM is disabled (bz #1160318)	2014-11-15 19:42:16 -05:00