Add the second patch for #523158

- Fix restore of qemu guest using raw save format (#523158)

.cvsignore

@@ -0,0 +1,13 @@
+.build*.log
+*.rpm
+i686
+x86_64
+libvirt-*.tar.gz
+libvirt-0.6.0.tar.gz
+libvirt-0.6.1.tar.gz
+libvirt-0.6.2.tar.gz
+libvirt-0.6.3.tar.gz
+libvirt-0.6.4.tar.gz
+libvirt-0.6.5.tar.gz
+libvirt-0.7.0.tar.gz
+libvirt-0.7.1.tar.gz

.gitignore

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

0001-Cpu-Add-support-for-Power-LE-Architecture.patch

@@ -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 ||\

0002-PowerPC-Add-support-for-launching-VM-in-compat-mode.patch

@@ -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;

0003-PowerPC-Improve-PVR-handling-to-fall-back-to-cpu-gen.patch

@@ -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;
- }
- 

0004-docs-Add-documentation-for-compat-mode.patch

@@ -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

0005-Test-Add-a-testcase-for-PowerPC-compat-mode-cpu-spec.patch

@@ -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);

0006-polkit-Allow-password-less-access-for-libvirt-group.patch

@@ -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

Makefile

@@ -4,7 +4,7 @@ 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
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
 endef
 
 MAKEFILE_COMMON := $(shell $(find-makefile-common))

branch

@@ -0,0 +1 @@
+F-12

libvirt-change-logrotate-config-to-weekly.patch

@@ -0,0 +1,34 @@
+From bcd4180124afa20580d720912e2179b3a2f9295a Mon Sep 17 00:00:00 2001
+From: Daniel Veillard <veillard@redhat.com>
+Date: Mon, 5 Oct 2009 17:03:14 +0200
+Subject: [PATCH] 526769 change logrotate config default to weekly
+
+* daemon/libvirtd.logrotate.in: change to weekly rotation of logs,
+  keep a month worth of data and also extend to cover LXC and UML
+  domain logs
+
+(cherry picked from commit 529325bbdd050af89bda5a5c1a01b5553c49a57e)
+
+Fedora-patch: libvirt-change-logrotate-config-to-weekly.patch
+---
+ qemud/libvirtd.logrotate.in |    6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/qemud/libvirtd.logrotate.in b/qemud/libvirtd.logrotate.in
+index 9b42630..093651c 100644
+--- a/qemud/libvirtd.logrotate.in
++++ b/qemud/libvirtd.logrotate.in
+@@ -1,7 +1,7 @@
+-@localstatedir@/log/libvirt/qemu/*.log {
+-        daily
++@localstatedir@/log/libvirt/qemu/*.log @localstatedir@/log/libvirt/uml/*.log @localstatedir@/log/libvirt/lxc/*.log {
++        weekly
+         missingok
+-        rotate 7
++        rotate 4
+         compress
+         delaycompress
+         copytruncate
+-- 
+1.6.2.5
+

libvirt-disable-audio-backend.patch

@@ -0,0 +1,77 @@
+From 4721ceb9b85daabe53804627473b06ced821c695 Mon Sep 17 00:00:00 2001
+From: Daniel P. Berrange <berrange@redhat.com>
+Date: Mon, 14 Sep 2009 11:23:20 +0100
+Subject: [PATCH] Allow control over QEMU audio backend
+
+When using VNC for graphics + keyboard + mouse, we shouldn't
+then use the host OS for audio. Audio should go back over
+VNC.
+
+When using SDL for graphics, we should use the host OS for
+audio since that's where the display is. We need to allow
+certain QEMU env variables to be passed through to guest
+too to allow choice of QEMU audio backend.
+
+* qemud/libvirtd.sysconf: Mention QEMU/SDL audio env vars
+* src/qemu_conf.c: Passthrough QEMU/SDL audio env for SDL display,
+  disable host audio for VNC display
+
+(cherry picked from commit b08e6d38ae7a0ed70300d7d82107f83fddb60f44)
+
+Fedora-patch: libvirt-disable-audio-backend.patch
+---
+ qemud/libvirtd.sysconf |    8 ++++++++
+ src/qemu_conf.c        |   14 ++++++++++++++
+ 2 files changed, 22 insertions(+), 0 deletions(-)
+
+diff --git a/qemud/libvirtd.sysconf b/qemud/libvirtd.sysconf
+index fe4596a..28080a0 100644
+--- a/qemud/libvirtd.sysconf
++++ b/qemud/libvirtd.sysconf
+@@ -7,3 +7,11 @@
+ 
+ # Override Kerberos service keytab for SASL/GSSAPI
+ #KRB5_KTNAME=/etc/libvirt/krb5.tab
++
++# Override the QEMU/SDL default audio driver probing when
++# starting virtual machines using SDL graphics
++#
++# NB these have no effect for VMs using VNC
++#QEMU_AUDIO_DRV=sdl
++#
++#SDL_AUDIODRIVER=pulse
+diff --git a/src/qemu_conf.c b/src/qemu_conf.c
+index f92bcef..0dd0624 100644
+--- a/src/qemu_conf.c
++++ b/src/qemu_conf.c
+@@ -2109,6 +2109,13 @@ int qemudBuildCommandLine(virConnectPtr conn,
+             ADD_ARG_LIT("-k");
+             ADD_ARG_LIT(def->graphics[0]->data.vnc.keymap);
+         }
++
++        /* QEMU implements a VNC extension for providing audio, so we
++         * set the audio backend to none, to prevent it opening the
++         * host OS audio devices since that causes security issues
++         * and is non-sensical when using VNC.
++         */
++        ADD_ENV_LIT("QEMU_AUDIO_DRV=none");
+     } else if ((def->ngraphics == 1) &&
+                def->graphics[0]->type == VIR_DOMAIN_GRAPHICS_TYPE_SDL) {
+         char *xauth = NULL;
+@@ -2131,6 +2138,13 @@ int qemudBuildCommandLine(virConnectPtr conn,
+             ADD_ENV(display);
+         if (def->graphics[0]->data.sdl.fullscreen)
+             ADD_ARG_LIT("-full-screen");
++
++        /* If using SDL for video, then we should just let it
++         * use QEMU's host audio drivers, possibly SDL too
++         * User can set these two before starting libvirtd
++         */
++        ADD_ENV_COPY("QEMU_AUDIO_DRV");
++        ADD_ENV_COPY("SDL_AUDIODRIVER");
+     }
+ 
+     if (def->nvideos) {
+-- 
+1.6.2.5
+

libvirt-fix-device-detach-typo1.patch

@@ -0,0 +1,29 @@
+From 58c38896a67c170063401d8091bae7dca8842923 Mon Sep 17 00:00:00 2001
+From: Jiri Denemark <jdenemar@redhat.com>
+Date: Wed, 23 Sep 2009 18:46:23 +0200
+Subject: [PATCH] Fix a typo in virDiskHasValidPciAddr()
+
+(cherry-picked from commit 3620e3cdcfe56cc4475b5ef1a0a893757240b795)
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Fedora-patch: libvirt-fix-device-detach-typo1.patch
+---
+ src/domain_conf.h |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/domain_conf.h b/src/domain_conf.h
+index 09368d9..d494e54 100644
+--- a/src/domain_conf.h
++++ b/src/domain_conf.h
+@@ -125,7 +125,7 @@ struct _virDomainDiskDef {
+ static inline int
+ virDiskHasValidPciAddr(virDomainDiskDefPtr def)
+ {
+-    return def->pci_addr.domain || def->pci_addr.domain || def->pci_addr.slot;
++    return def->pci_addr.domain || def->pci_addr.bus || def->pci_addr.slot;
+ }
+ 
+ 
+-- 
+1.6.2.5
+

libvirt-fix-device-detach-typo2.patch

@@ -0,0 +1,30 @@
+From 81e967c716ce8c085be8baad9169f7772452d187 Mon Sep 17 00:00:00 2001
+From: Mark McLoughlin <markmc@redhat.com>
+Date: Thu, 24 Sep 2009 08:55:55 +0100
+Subject: [PATCH] Fix a typo in virNetHasValidPciAddr() too
+
+* src/domain_conf.h: check domain/bus/slot, not domain/domain/slot
+
+(cherry-picked from commit 6bfffce91635bb08de601747e94ed1182c0f47eb)
+
+Fedora-patch: libvirt-fix-device-detach-typo2.patch
+---
+ src/domain_conf.h |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/domain_conf.h b/src/domain_conf.h
+index d494e54..7c918a7 100644
+--- a/src/domain_conf.h
++++ b/src/domain_conf.h
+@@ -207,7 +207,7 @@ struct _virDomainNetDef {
+ static inline int
+ virNetHasValidPciAddr(virDomainNetDefPtr def)
+ {
+-    return def->pci_addr.domain || def->pci_addr.domain || def->pci_addr.slot;
++    return def->pci_addr.domain || def->pci_addr.bus || def->pci_addr.slot;
+ }
+ 
+ enum virDomainChrSrcType {
+-- 
+1.6.2.5
+

libvirt-fix-device-detach-typo3.patch

@@ -0,0 +1,30 @@
+From 3a64779ec5a89d38d64e07bca2b11b19e1882d7a Mon Sep 17 00:00:00 2001
+From: Charles Duffy <charles@dyfis.net>
+Date: Thu, 24 Sep 2009 09:00:24 +0100
+Subject: [PATCH] Fix unitialized variable in qemudDomainDetachHostPciDevice()
+
+* src/qemu_driver.c: initialize detach var
+
+(cherry-picked from commit 580ad29288751234bee47ac9f6c04dac1dc529ea)
+
+Fedora-patch: libvirt-fix-device-detach-typo3.patch
+---
+ src/qemu_driver.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/qemu_driver.c b/src/qemu_driver.c
+index 7c7b985..550a59c 100644
+--- a/src/qemu_driver.c
++++ b/src/qemu_driver.c
+@@ -6126,7 +6126,7 @@ static int qemudDomainDetachHostPciDevice(virConnectPtr conn,
+                                           virDomainObjPtr vm,
+                                           virDomainDeviceDefPtr dev)
+ {
+-    virDomainHostdevDefPtr detach;
++    virDomainHostdevDefPtr detach = NULL;
+     char *cmd, *reply;
+     int i, ret;
+     pciDevice *pci;
+-- 
+1.6.2.5
+

libvirt-fix-drv-supports-feature-bogus-error.patch

@@ -0,0 +1,32 @@
+From 7692e1e19487c28454b1e5f6488d5574c70883f2 Mon Sep 17 00:00:00 2001
+From: Chris Lalancette <clalance@redhat.com>
+Date: Mon, 21 Sep 2009 14:53:31 +0200
+Subject: [PATCH] Don't do virSetConnError when virDrvSupportsFeature is successful.
+
+Signed-off-by: Chris Lalancette <clalance@redhat.com>
+Fedora-patch: libvirt-fix-drv-supports-feature-bogus-error.patch
+---
+ src/libvirt.c |    7 +++++--
+ 1 files changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/src/libvirt.c b/src/libvirt.c
+index 4a11688..fa59dc7 100644
+--- a/src/libvirt.c
++++ b/src/libvirt.c
+@@ -1349,8 +1349,11 @@ virDrvSupportsFeature (virConnectPtr conn, int feature)
+     }
+ 
+     ret = VIR_DRV_SUPPORTS_FEATURE (conn->driver, conn, feature);
+-    /* Copy to connection error object for back compatability */
+-    virSetConnError(conn);
++
++    if (ret < 0)
++        /* Copy to connection error object for back compatability */
++        virSetConnError(conn);
++
+     return ret;
+ }
+ 
+-- 
+1.6.2.5
+

libvirt-fix-libvirtd-leak-in-error-reply.patch

@@ -0,0 +1,79 @@
+From 71de8d92f20a9a9ee76d4d5df77ff477f1b7d441 Mon Sep 17 00:00:00 2001
+From: Matthias Bolte <matthias.bolte@googlemail.com>
+Date: Wed, 30 Sep 2009 02:17:27 +0200
+Subject: [PATCH] Fix memory leaks in libvirtd's message processing
+
+Commit 47cab734995fa9521b1df05d37e9978eedd8d3a2 changed the way how
+qemud_client_message objects were reused. Before this commit
+remoteDispatchClientRequest() reused the received message for normal responses
+and to report non-fatal errors. If a fatal error occurred qemudWorker() frees
+the message. After this commit non-fatal errors are reported by
+remoteSerializeReplyError() using a new qemud_client_message object and the
+original message leaks.
+
+To fix this leak the original message has to be freed if
+remoteSerializeReplyError() succeeds. If remoteSerializeReplyError()
+fails the original message is freed in qemudWorker().
+
+* daemon/dispatch.c: free qemud_client_message objects that will not be reused
+  and would leak otherwise, also free the allocated qemud_client_message object
+  in remoteSerializeError() if an error occurs
+
+(cherry-picked from commit c6f1459eb998619ab21a92d9bb87341f26978181)
+
+Fedora-patch: libvirt-fix-libvirtd-leak-in-error-reply.patch
+---
+ qemud/dispatch.c |   15 +++++++++++++--
+ 1 files changed, 13 insertions(+), 2 deletions(-)
+
+diff --git a/qemud/dispatch.c b/qemud/dispatch.c
+index a60f2f4..ddb3215 100644
+--- a/qemud/dispatch.c
++++ b/qemud/dispatch.c
+@@ -191,6 +191,7 @@ remoteSerializeError(struct qemud_client *client,
+ 
+ xdr_error:
+     xdr_destroy(&xdr);
++    VIR_FREE(msg);
+ fatal_error:
+     xdr_free((xdrproc_t)xdr_remote_error,  (char *)rerr);
+     return -1;
+@@ -336,6 +337,7 @@ remoteDispatchClientRequest (struct qemud_server *server,
+                              struct qemud_client *client,
+                              struct qemud_client_message *msg)
+ {
++    int ret;
+     remote_error rerr;
+ 
+     memset(&rerr, 0, sizeof rerr);
+@@ -364,7 +366,12 @@ remoteDispatchClientRequest (struct qemud_server *server,
+     }
+ 
+ error:
+-    return remoteSerializeReplyError(client, &rerr, &msg->hdr);
++    ret = remoteSerializeReplyError(client, &rerr, &msg->hdr);
++
++    if (ret >= 0)
++        VIR_FREE(msg);
++
++    return ret;
+ }
+ 
+ 
+@@ -521,8 +528,12 @@ remoteDispatchClientCall (struct qemud_server *server,
+ rpc_error:
+     /* Semi-bad stuff happened, we can still try to send back
+      * an RPC error message to client */
+-    return remoteSerializeReplyError(client, &rerr, &msg->hdr);
++    rv = remoteSerializeReplyError(client, &rerr, &msg->hdr);
++
++    if (rv >= 0)
++        VIR_FREE(msg);
+ 
++    return rv;
+ 
+ xdr_error:
+     /* Seriously bad stuff happened, so we'll kill off this client
+-- 
+1.6.2.5
+

libvirt-fix-net-hotunplug-double-free.patch

@@ -0,0 +1,46 @@
+From ba585ed6cff624c6c0f1f9801382fd6846466ee0 Mon Sep 17 00:00:00 2001
+From: Mark McLoughlin <markmc@redhat.com>
+Date: Thu, 17 Sep 2009 15:31:08 +0100
+Subject: [PATCH] Fix net/disk hot-unplug segfault
+
+When we hot-unplug the last device, we're currently double-freeing
+the device definition.
+
+Reported by Michal Nowak here:
+
+  https://bugzilla.redhat.com/523953
+
+* src/qemu_driver.c: fix double free
+
+(cherry-picked from commit 8881ae1bf8783006777429403cc543c33187175d)
+
+Fedora-patch: libvirt-fix-net-hotunplug-double-free.patch
+---
+ src/qemu_driver.c |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/qemu_driver.c b/src/qemu_driver.c
+index a65334f..de31581 100644
+--- a/src/qemu_driver.c
++++ b/src/qemu_driver.c
+@@ -5998,7 +5998,7 @@ try_command:
+             /* ignore, harmless */
+         }
+     } else {
+-        VIR_FREE(vm->def->disks[0]);
++        VIR_FREE(vm->def->disks);
+         vm->def->ndisks = 0;
+     }
+     virDomainDiskDefFree(detach);
+@@ -6100,7 +6100,7 @@ qemudDomainDetachNetDevice(virConnectPtr conn,
+             /* ignore, harmless */
+         }
+     } else {
+-        VIR_FREE(vm->def->nets[0]);
++        VIR_FREE(vm->def->nets);
+         vm->def->nnets = 0;
+     }
+     virDomainNetDefFree(detach);
+-- 
+1.6.2.5
+

libvirt-fix-pci-hostdev-hotunplug-leak.patch

@@ -0,0 +1,50 @@
+From 17831d20051f8de8f1f7d661e8a23f4fe67c2153 Mon Sep 17 00:00:00 2001
+From: Mark McLoughlin <markmc@redhat.com>
+Date: Thu, 17 Sep 2009 15:32:45 +0100
+Subject: [PATCH] Fix leak in PCI hostdev hot-unplug
+
+* src/qemu_driver.c: sync the hostdev hot-unplug code with the disk/net
+  code.
+
+(cherry-picked from commit a70da51ff76ed860bfc0cdee2e1d556da997c557)
+
+Fedora-patch: libvirt-fix-pci-hostdev-hotunplug-leak.patch
+---
+ src/qemu_driver.c |   20 +++++++++++++-------
+ 1 files changed, 13 insertions(+), 7 deletions(-)
+
+diff --git a/src/qemu_driver.c b/src/qemu_driver.c
+index de31581..2ddcdc0 100644
+--- a/src/qemu_driver.c
++++ b/src/qemu_driver.c
+@@ -6206,14 +6206,20 @@ static int qemudDomainDetachHostPciDevice(virConnectPtr conn,
+         pciFreeDevice(conn, pci);
+     }
+ 
+-    if (i != --vm->def->nhostdevs)
+-        memmove(&vm->def->hostdevs[i],
+-                &vm->def->hostdevs[i+1],
+-                sizeof(*vm->def->hostdevs) * (vm->def->nhostdevs-i));
+-    if (VIR_REALLOC_N(vm->def->hostdevs, vm->def->nhostdevs) < 0) {
+-        virReportOOMError(conn);
+-        ret = -1;
++    if (vm->def->nhostdevs > 1) {
++        memmove(vm->def->hostdevs + i,
++                vm->def->hostdevs + i + 1,
++                sizeof(*vm->def->hostdevs) *
++                (vm->def->nhostdevs - (i + 1)));
++        vm->def->nhostdevs--;
++        if (VIR_REALLOC_N(vm->def->hostdevs, vm->def->nhostdevs) < 0) {
++            /* ignore, harmless */
++        }
++    } else {
++        VIR_FREE(vm->def->hostdevs);
++        vm->def->nhostdevs = 0;
+     }
++    virDomainHostdevDefFree(detach);
+ 
+     return ret;
+ }
+-- 
+1.6.2.5
+

libvirt-fix-qemu-raw-format-save.patch

@@ -0,0 +1,53 @@
+From f1be5a4714e194a84840343e0937fe62463a18dc Mon Sep 17 00:00:00 2001
+From: Charles Duffy <Charles_Duffy@dell.com>
+Date: Fri, 18 Sep 2009 11:32:35 -0500
+Subject: [PATCH] Prevent attempt to call cat -c during virDomainSave to raw
+
+Fedora-patch: libvirt-fix-qemu-raw-format-save.patch
+---
+ src/qemu_driver.c |   28 ++++++++++++++++++----------
+ 1 files changed, 18 insertions(+), 10 deletions(-)
+
+diff --git a/src/qemu_driver.c b/src/qemu_driver.c
+index 2ddcdc0..7c7b985 100644
+--- a/src/qemu_driver.c
++++ b/src/qemu_driver.c
+@@ -3905,17 +3905,25 @@ static int qemudDomainSave(virDomainPtr dom,
+         goto cleanup;
+     }
+ 
+-    const char *prog = qemudSaveCompressionTypeToString(header.compressed);
+-    if (prog == NULL) {
+-        qemudReportError(dom->conn, dom, NULL, VIR_ERR_INTERNAL_ERROR,
+-                         _("Invalid compress format %d"), header.compressed);
+-        goto cleanup;
+-    }
++    {
++        const char *prog = qemudSaveCompressionTypeToString(header.compressed);
++        const char *args;
+ 
+-    if (STREQ (prog, "raw"))
+-        prog = "cat";
+-    internalret = virAsprintf(&command, "migrate \"exec:"
+-                              "%s -c >> '%s' 2>/dev/null\"", prog, safe_path);
++        if (prog == NULL) {
++            qemudReportError(dom->conn, dom, NULL, VIR_ERR_INTERNAL_ERROR,
++                             _("Invalid compress format %d"), header.compressed);
++            goto cleanup;
++        }
++
++        if (STREQ (prog, "raw")) {
++            prog = "cat";
++            args = "";
++        } else {
++            args = "-c";
++        }
++        internalret = virAsprintf(&command, "migrate \"exec:"
++                                  "%s %s >> '%s' 2>/dev/null\"", prog, args, safe_path);
++    }
+ 
+     if (internalret < 0) {
+         virReportOOMError(dom->conn);
+-- 
+1.6.2.5
+

libvirt-fix-qemu-restore-from-raw1.patch

@@ -0,0 +1,38 @@
+From 0b846a30468a6b4586407f020ccde7bb51afaf98 Mon Sep 17 00:00:00 2001
+From: Daniel P. Berrange <berrange@redhat.com>
+Date: Mon, 12 Oct 2009 20:03:50 +0100
+Subject: [PATCH] Fix QEMU restore from file in raw format
+
+The logic for running the decompression programs was broken in
+commit f238709304f9f6c57204cdd943e542cbae38fa5f, so that for
+non-raw formats the decompression program was never run, and
+for raw formats, it tried to exec an argv[] with initial NULL
+in the program name.
+
+* src/qemu/qemu_driver.c: Fix logic in runing decompression program
+
+(cherry picked from commit 74b379cbd5ba9f472a3a2d5710e497966b1a3a37)
+
+Fedora-patch: libvirt-fix-qemu-restore-from-raw1.patch
+---
+ src/qemu_driver.c |    3 +--
+ 1 files changed, 1 insertions(+), 2 deletions(-)
+
+diff --git a/src/qemu_driver.c b/src/qemu_driver.c
+index 550a59c..0ce403c 100644
+--- a/src/qemu_driver.c
++++ b/src/qemu_driver.c
+@@ -4541,9 +4541,8 @@ static int qemudDomainRestore(virConnectPtr conn,
+             goto cleanup;
+         }
+ 
+-        if (header.compressed != QEMUD_SAVE_FORMAT_RAW)
++        if (header.compressed != QEMUD_SAVE_FORMAT_RAW) {
+             intermediate_argv[0] = prog;
+-        else {
+             intermediatefd = fd;
+             fd = -1;
+             if (virExec(conn, intermediate_argv, NULL, NULL,
+-- 
+1.6.2.5
+

libvirt-fix-qemu-restore-from-raw2.patch

@@ -0,0 +1,120 @@
+From 57d7cc602d14c6b50e2826e427a5de124e479f95 Mon Sep 17 00:00:00 2001
+From: Daniel P. Berrange <berrange@redhat.com>
+Date: Mon, 12 Oct 2009 20:32:33 +0100
+Subject: [PATCH] Fix virFileReadLimFD/virFileReadAll to handle EINTR
+
+The fread_file_lim() function uses fread() but never handles
+EINTR results, causing unexpected failures when reading QEMU
+help arg info. It was unneccessarily using FILE * instead
+of plain UNIX file handles, which prevented use of saferead()
+
+* src/util/util.c: Switch fread_file_lim over to use saferead
+  instead of fread, remove FILE * use, and rename
+
+(cherry picked from commit 11a36d956cb8a5e439e535bff3e0cfce50a64bca)
+
+Fedora-patch: libvirt-fix-qemu-restore-from-raw2.patch
+---
+ src/util.c |   45 ++++++++++++---------------------------------
+ 1 files changed, 12 insertions(+), 33 deletions(-)
+
+diff --git a/src/util.c b/src/util.c
+index 1878e33..7bc3a66 100644
+--- a/src/util.c
++++ b/src/util.c
+@@ -887,7 +887,7 @@ virExec(virConnectPtr conn,
+    number of bytes.  If the length of the input is <= max_len, and
+    upon error while reading that data, it works just like fread_file.  */
+ static char *
+-fread_file_lim (FILE *stream, size_t max_len, size_t *length)
++saferead_lim (int fd, size_t max_len, size_t *length)
+ {
+     char *buf = NULL;
+     size_t alloc = 0;
+@@ -895,8 +895,8 @@ fread_file_lim (FILE *stream, size_t max_len, size_t *length)
+     int save_errno;
+ 
+     for (;;) {
+-        size_t count;
+-        size_t requested;
++        int count;
++        int requested;
+ 
+         if (size + BUFSIZ + 1 > alloc) {
+             alloc += alloc / 2;
+@@ -912,12 +912,12 @@ fread_file_lim (FILE *stream, size_t max_len, size_t *length)
+         /* Ensure that (size + requested <= max_len); */
+         requested = MIN (size < max_len ? max_len - size : 0,
+                          alloc - size - 1);
+-        count = fread (buf + size, 1, requested, stream);
++        count = saferead (fd, buf + size, requested);
+         size += count;
+ 
+         if (count != requested || requested == 0) {
+             save_errno = errno;
+-            if (ferror (stream))
++            if (count < 0)
+                 break;
+             buf[size] = '\0';
+             *length = size;
+@@ -930,12 +930,12 @@ fread_file_lim (FILE *stream, size_t max_len, size_t *length)
+     return NULL;
+ }
+ 
+-/* A wrapper around fread_file_lim that maps a failure due to
++/* A wrapper around saferead_lim that maps a failure due to
+    exceeding the maximum size limitation to EOVERFLOW.  */
+-static int virFileReadLimFP(FILE *fp, int maxlen, char **buf)
++int virFileReadLimFD(int fd, int maxlen, char **buf)
+ {
+     size_t len;
+-    char *s = fread_file_lim (fp, maxlen+1, &len);
++    char *s = saferead_lim (fd, maxlen+1, &len);
+     if (s == NULL)
+         return -1;
+     if (len > maxlen || (int)len != len) {
+@@ -949,37 +949,16 @@ static int virFileReadLimFP(FILE *fp, int maxlen, char **buf)
+     return len;
+ }
+ 
+-/* Like virFileReadLimFP, but use a file descriptor rather than a FILE*.  */
+-int virFileReadLimFD(int fd_arg, int maxlen, char **buf)
+-{
+-    int fd = dup (fd_arg);
+-    if (fd >= 0) {
+-        FILE *fp = fdopen (fd, "r");
+-        if (fp) {
+-            int len = virFileReadLimFP (fp, maxlen, buf);
+-            int saved_errno = errno;
+-            fclose (fp);
+-            errno = saved_errno;
+-            return len;
+-        } else {
+-            int saved_errno = errno;
+-            close (fd);
+-            errno = saved_errno;
+-        }
+-    }
+-    return -1;
+-}
+-
+ int virFileReadAll(const char *path, int maxlen, char **buf)
+ {
+-    FILE *fh = fopen(path, "r");
+-    if (fh == NULL) {
++    int fd = open(path, O_RDONLY);
++    if (fd < 0) {
+         virReportSystemError(NULL, errno, _("Failed to open file '%s'"), path);
+         return -1;
+     }
+ 
+-    int len = virFileReadLimFP (fh, maxlen, buf);
+-    fclose(fh);
++    int len = virFileReadLimFD(fd, maxlen, buf);
++    close(fd);
+     if (len < 0) {
+         virReportSystemError(NULL, errno, _("Failed to read file '%s'"), path);
+         return -1;
+-- 
+1.6.2.5
+

libvirt-fix-usb-device-passthrough.patch

@@ -0,0 +1,41 @@
+From 6b12148864cf6a1d22a2cf4e0e9c48e9946331cb Mon Sep 17 00:00:00 2001
+From: Mark McLoughlin <markmc@redhat.com>
+Date: Wed, 30 Sep 2009 18:37:03 +0100
+Subject: [PATCH] Fix USB device re-labelling
+
+A simple misplaced break out of a switch results in:
+
+  libvir: error : Failed to open file '/sys/bus/pci/devices/0000:00:54c./vendor': No such file or directory
+  libvir: error : Failed to open file '/sys/bus/pci/devices/0000:00:54c./device': No such file or directory
+  libvir: error : this function is not supported by the hypervisor: Failed to read product/vendor ID for 0000:00:54c.
+
+when trying to passthrough a USB host device to qemu.
+
+* src/security_selinux.c: fix a switch/break thinko
+
+Fedora-patch: libvirt-fix-usb-device-passthrough.patch
+---
+ src/security_selinux.c |    3 +--
+ 1 files changed, 1 insertions(+), 2 deletions(-)
+
+diff --git a/src/security_selinux.c b/src/security_selinux.c
+index bc295b1..b4dc153 100644
+--- a/src/security_selinux.c
++++ b/src/security_selinux.c
+@@ -464,12 +464,11 @@ SELinuxSetSecurityHostdevLabel(virConnectPtr conn,
+ 
+             ret = usbDeviceFileIterate(conn, usb, SELinuxSetSecurityUSBLabel, vm);
+             usbFreeDevice(conn, usb);
+-
+-            break;
+         } else {
+             /* XXX deal with product/vendor better */
+             ret = 0;
+         }
++        break;
+     }
+ 
+     case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI: {
+-- 
+1.6.2.5
+

libvirt-logrotate-create-lxc-uml-dirs.patch

@@ -0,0 +1,54 @@
+From b7e3ac4f23befe67518b57e34691c301820a436c Mon Sep 17 00:00:00 2001
+From: Mark McLoughlin <markmc@redhat.com>
+Date: Tue, 6 Oct 2009 12:33:17 +0100
+Subject: [PATCH] Create /var/log/libvirt/{lxc,uml} dirs
+
+Otherwise logrotate barfs:
+
+  error: error accessing /var/log/libvirt/uml: No such file or directory
+  error: libvirtd:1 glob failed for /var/log/libvirt/uml/*.log
+  error: found error in /var/log/libvirt/qemu/*.log /var/log/libvirt/uml/*.log /var/log/libvirt/lxc/*.log , skipping
+
+* qemud/Makefile.am: always create /var/log/libvirt/{lxc,uml} when
+  installing the logrotate conf; not ideal, but easier than making
+  the logrotate conf depend on which drivers are enabled
+
+Fedora-patch: libvirt-logrotate-create-lxc-uml-dirs.patch
+---
+ qemud/Makefile.am |    6 ++++--
+ 1 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/qemud/Makefile.am b/qemud/Makefile.am
+index 3d143da..a7f4bdf 100644
+--- a/qemud/Makefile.am
++++ b/qemud/Makefile.am
+@@ -176,7 +176,7 @@ install-data-local: install-init install-data-sasl install-data-polkit \
+ 	test -e $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/autostart/default.xml || \
+            ln -s ../default.xml \
+ 	    $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/autostart/default.xml
+-	mkdir -p $(DESTDIR)$(localstatedir)/log/libvirt/qemu
++	mkdir -p $(DESTDIR)$(localstatedir)/log/libvirt
+ 	mkdir -p $(DESTDIR)$(localstatedir)/run/libvirt
+ 	mkdir -p $(DESTDIR)$(localstatedir)/lib/libvirt
+ 
+@@ -184,7 +184,7 @@ uninstall-local:: uninstall-init uninstall-data-sasl install-data-polkit
+ 	rm -f $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/autostart/default.xml
+ 	rm -f $(DESTDIR)$(sysconfdir)/$(default_xml_dest)
+ 	rmdir $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/autostart || :
+-	rmdir $(DESTDIR)$(localstatedir)/log/libvirt/qemu || :
++	rmdir $(DESTDIR)$(localstatedir)/log/libvirt || :
+ 	rmdir $(DESTDIR)$(localstatedir)/run/libvirt || :
+ 	rmdir $(DESTDIR)$(localstatedir)/lib/libvirt || :
+ 
+@@ -240,6 +240,8 @@ libvirtd.logrotate: libvirtd.logrotate.in
+ 
+ install-logrotate: libvirtd.logrotate
+ 	mkdir -p $(DESTDIR)$(localstatedir)/log/libvirt/qemu/
++	mkdir -p $(DESTDIR)$(localstatedir)/log/libvirt/lxc/
++	mkdir -p $(DESTDIR)$(localstatedir)/log/libvirt/uml/
+ 	mkdir -p $(DESTDIR)$(sysconfdir)/logrotate.d/
+ 	$(INSTALL_DATA) $< $(DESTDIR)$(sysconfdir)/logrotate.d/libvirtd
+ 
+-- 
+1.6.2.5
+

sources

@@ -1 +1 @@
-b3ffa5e11880acca7fa19a3cca2d6280  libvirt-1.2.9.3.tar.gz
+f1cd360a5da38b847e166c6482141940  libvirt-0.7.1.tar.gz