diff mbox

[v3,3/6] qemu: command: escape commas in secret master path

Message ID 9596e306a87cb7bed3b4c3e5f82eb89d2c1f3c9f.1462732781.git.crobinso@redhat.com
State Accepted
Commit 3153ac08c9e2a566bec6ee258e484a7a72c07b9a
Headers show

Commit Message

Cole Robinson May 8, 2016, 6:43 p.m. UTC 
Need to convert the local function to virBuffer usage, so we
can use qemuBufferEscapeComma
---
 src/qemu/qemu_command.c                              | 7 +++++--
 tests/qemuxml2argvdata/qemuxml2argv-name-escape.args | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

-- 
2.7.4

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
diff mbox

Patch

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 6ed7ae5..067a8c3 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -196,6 +196,7 @@  qemuBuildMasterKeyCommandLine(virCommandPtr cmd,
     int ret = -1;
     char *alias = NULL;
     char *path = NULL;
+    virBuffer buf = VIR_BUFFER_INITIALIZER;
 
     /* If the -object secret does not exist, then just return. This just
      * means the domain won't be able to use a secret master key and is
@@ -218,12 +219,14 @@  qemuBuildMasterKeyCommandLine(virCommandPtr cmd,
         goto cleanup;
 
     virCommandAddArg(cmd, "-object");
-    virCommandAddArgFormat(cmd, "secret,id=%s,format=raw,file=%s",
-                           alias, path);
+    virBufferAsprintf(&buf, "secret,id=%s,format=raw,file=", alias);
+    qemuBufferEscapeComma(&buf, path);
+    virCommandAddArgBuffer(cmd, &buf);
 
     ret = 0;
 
  cleanup:
+    virBufferFreeAndReset(&buf);
     VIR_FREE(alias);
     VIR_FREE(path);
     return ret;
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-name-escape.args b/tests/qemuxml2argvdata/qemuxml2argv-name-escape.args
index 94a3133..a5e35b8 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-name-escape.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-name-escape.args
@@ -7,7 +7,7 @@  QEMU_AUDIO_DRV=none \
 /usr/bin/qemu \
 -name foo,,bar,debug-threads=on \
 -S \
--object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-foo,\
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-foo,,\
 bar/master-key.aes \
 -M pc \
 -m 214 \