[PATCH 0/2] Two simple virBuffer*() usage fixes
*** BLURB HERE *** Michal Prívozník (2): qemu_capabilities: Indent <cpudata/> properly domain_conf: Switch to virBufferAddLit for literal strings src/conf/domain_conf.c | 4 ++-- src/qemu/qemu_capabilities.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) -- 2.35.1
When formatting qemuCaps XML, the <cpudata/> element is misaligned. This is because it contains multiple lines and virBufferAsprintf() does not expect that. Switch to virBufferAddStr() which does. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/qemu/qemu_capabilities.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index cf8f33475c..30b396d32d 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -4756,7 +4756,7 @@ virQEMUCapsFormatCache(virQEMUCaps *qemuCaps) if (qemuCaps->cpuData) { g_autofree char * cpudata = virCPUDataFormat(qemuCaps->cpuData); - virBufferAsprintf(&buf, "%s", cpudata); + virBufferAddStr(&buf, cpudata); } virBufferAsprintf(&buf, "<arch>%s</arch>\n", -- 2.35.1
There's no need to use virBufferAddStr() for literal strings without any newline character as it's more expensive than virBufferAddLit(). Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/conf/domain_conf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 4c7a5a044c..44a01ab628 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -25376,7 +25376,7 @@ virDomainGraphicsDefFormat(virBuffer *buf, case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NONE: if (flags & VIR_DOMAIN_DEF_FORMAT_MIGRATABLE) - virBufferAddStr(buf, " autoport='no'"); + virBufferAddLit(buf, " autoport='no'"); break; case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_SOCKET: @@ -25388,7 +25388,7 @@ virDomainGraphicsDefFormat(virBuffer *buf, * parsed as listen type "none". */ if ((flags & VIR_DOMAIN_DEF_FORMAT_MIGRATABLE) && glisten->fromConfig) { - virBufferAddStr(buf, " autoport='yes'"); + virBufferAddLit(buf, " autoport='yes'"); } break; -- 2.35.1
On Tue, 2022-07-19 at 14:04 +0200, Michal Privoznik wrote:
*** BLURB HERE ***
Michal Prívozník (2): qemu_capabilities: Indent <cpudata/> properly domain_conf: Switch to virBufferAddLit for literal strings
src/conf/domain_conf.c | 4 ++-- src/qemu/qemu_capabilities.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
Reviewed-by: Tim Wiederhake <twiederh@redhat.com>
participants (2)
-
Michal Privoznik -
Tim Wiederhake