From: Michal Privoznik <mprivozn@redhat.com>
Date: Mon, 26 Aug 2013 14:59:03 +0000 (+0200)
Subject: qemuDomainAttachHostPciDevice: Fall back to mem balloon if there's no hard_limit
X-Git-Tag: v1.1.2-rc1~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a45ec678e9bbe8a6157cb440f334b5d21e40f0b4;p=thirdparty%2Flibvirt.git

qemuDomainAttachHostPciDevice: Fall back to mem balloon if there's no hard_limit

If there's no hard_limit set and domain uses VFIO we still must lock
the guest memory (prerequisite from qemu). Hence, we should compute
the amount to be locked from max_balloon.
---

diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index 2ac1fe5deb..5943816c05 100644
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -1143,6 +1143,8 @@ int qemuDomainAttachHostPciDevice(virQEMUDriverPtr driver,
 
     if (hostdev->source.subsys.u.pci.backend
         == VIR_DOMAIN_HOSTDEV_PCI_BACKEND_VFIO) {
+        unsigned long long memKB;
+
         if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_DEVICE_VFIO_PCI)) {
             virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
                            _("VFIO PCI device assignment is not "
@@ -1155,8 +1157,9 @@ int qemuDomainAttachHostPciDevice(virQEMUDriverPtr driver,
          * doesn't hurt to "change" the limit to the same value.
          */
         vm->def->hostdevs[vm->def->nhostdevs++] = hostdev;
-        virProcessSetMaxMemLock(vm->pid,
-                                vm->def->mem.hard_limit * 1024);
+        memKB = vm->def->mem.hard_limit ?
+            vm->def->mem.hard_limit : vm->def->mem.max_balloon + 1024 * 1024;
+        virProcessSetMaxMemLock(vm->pid, memKB);
         vm->def->hostdevs[vm->def->nhostdevs--] = NULL;
     }