From b8b58e22b9042025b5871d26a84377aebbadd284 Mon Sep 17 00:00:00 2001 From: Laine Stump Date: Thu, 2 Jul 2020 18:26:41 -0400 Subject: [PATCH] qemu: use g_auto() for all virBuffers MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Laine Stump Reviewed-by: Ján Tomko --- src/qemu/qemu_agent.c | 2 +- src/qemu/qemu_block.c | 2 +- src/qemu/qemu_capabilities.c | 2 +- src/qemu/qemu_command.c | 4 ++-- src/qemu/qemu_dbus.c | 2 +- src/qemu/qemu_domain.c | 4 ++-- src/qemu/qemu_driver.c | 5 ++--- src/qemu/qemu_migration.c | 2 +- src/qemu/qemu_migration_cookie.c | 6 ++---- src/qemu/qemu_monitor.c | 2 +- 10 files changed, 14 insertions(+), 17 deletions(-) diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c index 6fa48c06e3..37b5451e33 100644 --- a/src/qemu/qemu_agent.c +++ b/src/qemu/qemu_agent.c @@ -155,7 +155,7 @@ static char * qemuAgentEscapeNonPrintable(const char *text) { size_t i; - virBuffer buf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; for (i = 0; text[i] != '\0'; i++) { if (text[i] == '\\') virBufferAddLit(&buf, "\\\\"); diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c index 36fc6784de..a2eabbcd64 100644 --- a/src/qemu/qemu_block.c +++ b/src/qemu/qemu_block.c @@ -3283,7 +3283,7 @@ qemuBlockStorageSourceNeedsStorageSliceLayer(const virStorageSource *src) char * qemuBlockStorageSourceGetCookieString(virStorageSourcePtr src) { - virBuffer buf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; size_t i; for (i = 0; i < src->ncookies; i++) { diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 8d5b76d9ec..5f21aafa68 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -4604,7 +4604,7 @@ virQEMUCapsFormatSEVInfo(virQEMUCapsPtr qemuCaps, virBufferPtr buf) char * virQEMUCapsFormatCache(virQEMUCapsPtr qemuCaps) { - virBuffer buf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; size_t i; virBufferAddLit(&buf, "\n"); diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index f06a2f2754..f86f32639d 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -5478,7 +5478,7 @@ qemuBuildRNGCommandLine(virLogManagerPtr logManager, for (i = 0; i < def->nrngs; i++) { g_autoptr(virJSONValue) props = NULL; - virBuffer buf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; virDomainRNGDefPtr rng = def->rngs[i]; g_autofree char *chardev = NULL; g_autofree char *devstr = NULL; @@ -6156,7 +6156,7 @@ qemuBuildBootCommandLine(virCommandPtr cmd, if (def->os.dtb) virCommandAddArgList(cmd, "-dtb", def->os.dtb, NULL); if (def->os.slic_table) { - virBuffer buf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; virCommandAddArg(cmd, "-acpitable"); virBufferAddLit(&buf, "sig=SLIC,file="); virQEMUBuildBufferEscapeComma(&buf, def->os.slic_table); diff --git a/src/qemu/qemu_dbus.c b/src/qemu/qemu_dbus.c index 53f6c45986..51f6c94e3e 100644 --- a/src/qemu/qemu_dbus.c +++ b/src/qemu/qemu_dbus.c @@ -100,7 +100,7 @@ qemuDBusGetAddress(virQEMUDriverPtr driver, static int qemuDBusWriteConfig(const char *filename, const char *path) { - virBuffer buf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; g_autofree char *config = NULL; virBufferAddLit(&buf, "deviceType != VIR_DOMAIN_CHR_DEVICE_TYPE_CHANNEL || @@ -6019,7 +6019,7 @@ qemuDomainDefFormatXMLInternal(virQEMUDriverPtr driver, virCPUDefPtr origCPU, unsigned int flags) { - virBuffer buf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; if (qemuDomainDefFormatBufInternal(driver, qemuCaps, def, origCPU, flags, &buf) < 0) return NULL; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index f361795709..75667049f9 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1272,7 +1272,7 @@ static char * qemuConnectGetSysinfo(virConnectPtr conn, unsigned int flags) { virQEMUDriverPtr driver = conn->privateData; - virBuffer buf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; virCheckFlags(0, NULL); @@ -14392,7 +14392,7 @@ qemuDomainSnapshotCreateInactiveExternal(virQEMUDriverPtr driver, virBitmapPtr created = NULL; g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver); int ret = -1; - virBuffer buf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; virDomainSnapshotDefPtr snapdef = virDomainSnapshotObjGetDef(snap); if (!(qemuImgPath = qemuFindQemuImgBinary(driver))) @@ -14479,7 +14479,6 @@ qemuDomainSnapshotCreateInactiveExternal(virQEMUDriverPtr driver, ret = 0; cleanup: - virBufferFreeAndReset(&buf); virCommandFree(cmd); /* unlink images if creation has failed */ diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 13427c1203..b7dbadb728 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -178,7 +178,7 @@ qemuMigrationDstPrecreateDisk(virConnectPtr conn, virStorageVolPtr vol = NULL; char *volName = NULL, *basePath = NULL; char *volStr = NULL; - virBuffer buf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; const char *format = NULL; unsigned int flags = 0; diff --git a/src/qemu/qemu_migration_cookie.c b/src/qemu/qemu_migration_cookie.c index fb8b5bcd92..2e48d1b524 100644 --- a/src/qemu/qemu_migration_cookie.c +++ b/src/qemu/qemu_migration_cookie.c @@ -869,12 +869,10 @@ qemuMigrationCookieXMLFormatStr(virQEMUDriverPtr driver, virQEMUCapsPtr qemuCaps, qemuMigrationCookiePtr mig) { - virBuffer buf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; - if (qemuMigrationCookieXMLFormat(driver, qemuCaps, &buf, mig) < 0) { - virBufferFreeAndReset(&buf); + if (qemuMigrationCookieXMLFormat(driver, qemuCaps, &buf, mig) < 0) return NULL; - } return virBufferContentAndReset(&buf); } diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 5033cbeabf..157ebb43e8 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -203,7 +203,7 @@ static char * qemuMonitorEscapeNonPrintable(const char *text) { size_t i; - virBuffer buf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; for (i = 0; text[i] != '\0'; i++) { if (g_ascii_isprint(text[i]) || text[i] == '\n' ||