From cee22001d3982ee0cceec69899e3377e453211da Mon Sep 17 00:00:00 2001
From: Martin Kletzander <mkletzan@redhat.com>
Date: Wed, 7 May 2014 15:10:47 +0200
Subject: [PATCH] qemu: purely a code movement
to ease the review of commits to follow.
Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
---
src/qemu/qemu_command.c | 26 +++++++++++++++-----------
1 file changed, 15 insertions(+), 11 deletions(-)
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index c0a5a13a5e..2d783853be 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -6384,12 +6384,24 @@ qemuBuildNumaArgStr(const virDomainDef *def, virCommandPtr cmd)
int ret = -1;
for (i = 0; i < def->cpu->ncells; i++) {
+ int cellmem = VIR_DIV_UP(def->cpu->cells[i].mem, 1024);
+ def->cpu->cells[i].mem = cellmem * 1024;
+
VIR_FREE(cpumask);
+
+ if (!(cpumask = virBitmapFormat(def->cpu->cells[i].cpumask)))
+ goto cleanup;
+
+ if (strchr(cpumask, ',')) {
+ virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
+ _("disjoint NUMA cpu ranges are not supported "
+ "with this QEMU"));
+ goto cleanup;
+ }
+
virCommandAddArg(cmd, "-numa");
virBufferAsprintf(&buf, "node,nodeid=%d", def->cpu->cells[i].cellid);
virBufferAddLit(&buf, ",cpus=");
- if (!(cpumask = virBitmapFormat(def->cpu->cells[i].cpumask)))
- goto cleanup;
/* Up through qemu 1.4, -numa does not accept a cpus
* argument any more complex than start-stop.
@@ -6397,16 +6409,8 @@ qemuBuildNumaArgStr(const virDomainDef *def, virCommandPtr cmd)
* XXX For qemu 1.5, the syntax has not yet been decided;
* but when it is, we need a capability bit and
* translation of our cpumask into the qemu syntax. */
- if (strchr(cpumask, ',')) {
- virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
- _("disjoint NUMA cpu ranges are not supported "
- "with this QEMU"));
- goto cleanup;
- }
virBufferAdd(&buf, cpumask, -1);
- def->cpu->cells[i].mem = VIR_DIV_UP(def->cpu->cells[i].mem,
- 1024) * 1024;
- virBufferAsprintf(&buf, ",mem=%d", def->cpu->cells[i].mem / 1024);
+ virBufferAsprintf(&buf, ",mem=%d", cellmem);
if (virBufferCheckError(&buf) < 0)
goto cleanup;