[libvirt] [PATCH 2/2] Revert "util: virqemu: introduce virQEMUBuildBufferEscape"

Pavel Hrdina phrdina at redhat.com
Mon Jun 12 09:51:51 UTC 2017


This reverts commit 22b02f44920388534d3da65cc6f0a70714dcf075.
---
 src/libvirt_private.syms |  1 -
 src/util/virqemu.c       | 17 -----------------
 src/util/virqemu.h       |  1 -
 3 files changed, 19 deletions(-)

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index b6c828fc22..044510f091 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -2422,7 +2422,6 @@ virProcessWait;
 
 
 # util/virqemu.h
-virQEMUBuildBufferEscape;
 virQEMUBuildBufferEscapeComma;
 virQEMUBuildCommandLineJSON;
 virQEMUBuildCommandLineJSONArrayBitmap;
diff --git a/src/util/virqemu.c b/src/util/virqemu.c
index f10b356781..2e9e65f9ef 100644
--- a/src/util/virqemu.c
+++ b/src/util/virqemu.c
@@ -300,23 +300,6 @@ virQEMUBuildBufferEscapeComma(virBufferPtr buf, const char *str)
 
 
 /**
- * virQEMUBuildBufferEscape:
- * @buf: buffer to append the escaped string
- * @str: the string to escape
- *
- * Some characters passed as values on the QEMU command line must be escaped.
- *
- *  - ',' must by escaped by ','
- *  - '=' must by escaped by '\'
- */
-void
-virQEMUBuildBufferEscape(virBufferPtr buf, const char *str)
-{
-    virBufferEscapeN(buf, "%s", str, ',', ",", '\\', "=", NULL);
-}
-
-
-/**
  * virQEMUBuildLuksOpts:
  * @buf: buffer to build the string into
  * @enc: pointer to encryption info
diff --git a/src/util/virqemu.h b/src/util/virqemu.h
index 10aeb67f4e..539d62ab14 100644
--- a/src/util/virqemu.h
+++ b/src/util/virqemu.h
@@ -50,7 +50,6 @@ char *virQEMUBuildObjectCommandlineFromJSON(const char *type,
 char *virQEMUBuildDriveCommandlineFromJSON(virJSONValuePtr src);
 
 void virQEMUBuildBufferEscapeComma(virBufferPtr buf, const char *str);
-void virQEMUBuildBufferEscape(virBufferPtr buf, const char *str);
 void virQEMUBuildLuksOpts(virBufferPtr buf,
                           virStorageEncryptionInfoDefPtr enc,
                           const char *alias)
-- 
2.13.0




More information about the libvir-list mailing list