From 81fb7b9ed8decb67d83dd2e8a4e2eae579e96acd Mon Sep 17 00:00:00 2001 From: Marti Raudsepp Date: Fri, 1 Jun 2012 19:25:33 +0300 Subject: [PATCH] qemu: Move -name arg to be the 1st so it's visible in "ps x" output etc --- src/qemu/qemu_command.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 9f99dce..40a4209 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -4179,10 +4179,22 @@ qemuBuildCommandLine(virConnectPtr conn, break; } - cmd = virCommandNewArgList(emulator, "-S", NULL); + cmd = virCommandNewArgList(emulator, NULL); virCommandAddEnvPassCommon(cmd); + if (qemuCapsGet(qemuCaps, QEMU_CAPS_NAME)) { + virCommandAddArg(cmd, "-name"); + if (driver->setProcessName && + qemuCapsGet(qemuCaps, QEMU_CAPS_NAME_PROCESS)) { + virCommandAddArgFormat(cmd, "%s,process=qemu:%s", + def->name, def->name); + } else { + virCommandAddArg(cmd, def->name); + } + } + virCommandAddArg(cmd, "-S"); /* freeze CPU */ + /* This should *never* be NULL, since we always provide * a machine in the capabilities data for QEMU. So this * check is just here as a safety in case the unexpected @@ -4256,16 +4268,6 @@ qemuBuildCommandLine(virConnectPtr conn, if (qemuBuildNumaArgStr(def, cmd) < 0) goto error; - if (qemuCapsGet(qemuCaps, QEMU_CAPS_NAME)) { - virCommandAddArg(cmd, "-name"); - if (driver->setProcessName && - qemuCapsGet(qemuCaps, QEMU_CAPS_NAME_PROCESS)) { - virCommandAddArgFormat(cmd, "%s,process=qemu:%s", - def->name, def->name); - } else { - virCommandAddArg(cmd, def->name); - } - } if (qemuCapsGet(qemuCaps, QEMU_CAPS_UUID)) virCommandAddArgList(cmd, "-uuid", uuid, NULL); if (def->virtType == VIR_DOMAIN_VIRT_XEN || -- 1.7.10.3