Due to the way the hardware works, KVM on ppc64 always requires memory locking; however, that is not the case for non-KVM ppc64 guests, eg. ppc64 guests that are running on x86_64 with TCG. Only require memory locking for ppc64 guests if they are using KVM or, as it's the case for all architectures, they have host devices assigned using VFIO. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1350772 --- src/qemu/qemu_domain.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 304e617..42b5511 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -5355,10 +5355,6 @@ qemuDomainRequiresMemLock(virDomainDefPtr def) if (def->mem.locked) return true; - /* ppc64 domains need to lock some memory even when VFIO is not used */ - if (ARCH_IS_PPC64(def->os.arch)) - return true; - for (i = 0; i < def->nhostdevs; i++) { virDomainHostdevDefPtr dev = def->hostdevs[i]; @@ -5368,6 +5364,10 @@ qemuDomainRequiresMemLock(virDomainDefPtr def) return true; } + /* ppc64 KVM domains need to lock some memory even when VFIO is not used */ + if (ARCH_IS_PPC64(def->os.arch) && def->virtType == VIR_DOMAIN_VIRT_KVM) + return true; + return false; } -- 2.7.4