|
 |
7a3408 |
From 5693792f3f900eacdfee55902726e1052d714a91 Mon Sep 17 00:00:00 2001
|
|
|
7a3408 |
Message-Id: <5693792f3f900eacdfee55902726e1052d714a91@dist-git>
|
|
|
7a3408 |
From: Martin Kletzander <mkletzan@redhat.com>
|
|
|
7a3408 |
Date: Tue, 6 Oct 2015 15:20:32 +0200
|
|
|
7a3408 |
Subject: [PATCH] qemu: Move simplification variable to begining of the
|
|
|
7a3408 |
function
|
|
|
7a3408 |
|
|
|
7a3408 |
https://bugzilla.redhat.com/show_bug.cgi?id=1266856
|
|
|
7a3408 |
|
|
|
7a3408 |
Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
|
|
|
7a3408 |
(cherry picked from commit 04b57b4ae19cf299ac13efdd7d84de47b8d26e0e)
|
|
|
7a3408 |
Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
|
|
|
7a3408 |
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
|
|
7a3408 |
---
|
|
|
7a3408 |
src/qemu/qemu_command.c | 2 +-
|
|
|
7a3408 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
7a3408 |
|
|
|
7a3408 |
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
|
|
|
7a3408 |
index 6314976..53c9d01 100644
|
|
|
7a3408 |
--- a/src/qemu/qemu_command.c
|
|
|
7a3408 |
+++ b/src/qemu/qemu_command.c
|
|
|
7a3408 |
@@ -4767,6 +4767,7 @@ qemuBuildMemoryBackendStr(unsigned long long size,
|
|
|
7a3408 |
virBitmapPtr nodemask = NULL;
|
|
|
7a3408 |
int ret = -1;
|
|
|
7a3408 |
virJSONValuePtr props = NULL;
|
|
|
7a3408 |
+ bool nodeSpecified = virDomainNumatuneNodeSpecified(def->numa, guestNode);
|
|
|
7a3408 |
|
|
|
7a3408 |
*backendProps = NULL;
|
|
|
7a3408 |
*backendType = NULL;
|
|
|
7a3408 |
@@ -4919,7 +4920,6 @@ qemuBuildMemoryBackendStr(unsigned long long size,
|
|
|
7a3408 |
}
|
|
|
7a3408 |
|
|
|
7a3408 |
if (!hugepage && !pagesize) {
|
|
|
7a3408 |
- bool nodeSpecified = virDomainNumatuneNodeSpecified(def->numa, guestNode);
|
|
|
7a3408 |
|
|
|
7a3408 |
if ((userNodeset || nodeSpecified || force) &&
|
|
|
7a3408 |
!virQEMUCapsGet(qemuCaps, QEMU_CAPS_OBJECT_MEMORY_RAM)) {
|
|
|
7a3408 |
--
|
|
|
7a3408 |
2.6.1
|
|
|
7a3408 |
|