From 4fd196d6126cb9daeb771522ad23ecba0e9fd5c9 Mon Sep 17 00:00:00 2001 Message-Id: <4fd196d6126cb9daeb771522ad23ecba0e9fd5c9@dist-git> From: Michal Privoznik Date: Wed, 7 Oct 2020 18:45:35 +0200 Subject: [PATCH] qemu_command: Rename qemuBuildNumaArgStr() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The function doesn't just build the argument for -numa. Since the -numa can be repeated multiple times, it also puts -numa onto the cmd line. Also, the rest of the functions has 'Command' infix. Signed-off-by: Michal Privoznik Reviewed-by: Daniel Henrique Barboza (cherry picked from commit 8ba1792785e17736db866d62b68812a9c7e7ca40) Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1749518 Signed-off-by: Michal Privoznik Message-Id: Reviewed-by: Ján Tomko --- src/qemu/qemu_command.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index ed5f60e82e..8c4f7a015f 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -7363,10 +7363,10 @@ qemuBuildIOThreadCommandLine(virCommandPtr cmd, static int -qemuBuildNumaArgStr(virQEMUDriverConfigPtr cfg, - virDomainDefPtr def, - virCommandPtr cmd, - qemuDomainObjPrivatePtr priv) +qemuBuildNumaCommandLine(virQEMUDriverConfigPtr cfg, + virDomainDefPtr def, + virCommandPtr cmd, + qemuDomainObjPrivatePtr priv) { size_t i, j; virQEMUCapsPtr qemuCaps = priv->qemuCaps; @@ -9930,7 +9930,7 @@ qemuBuildCommandLine(virQEMUDriverPtr driver, return NULL; if (virDomainNumaGetNodeCount(def->numa) && - qemuBuildNumaArgStr(cfg, def, cmd, priv) < 0) + qemuBuildNumaCommandLine(cfg, def, cmd, priv) < 0) return NULL; if (qemuBuildMemoryDeviceCommandLine(cmd, cfg, def, priv) < 0) -- 2.29.2