[libvirt] [PATCHv2 2/2] Use virBufferTrim when generating boot options
Instead of tracking the number of added parameters,
add a comma at the end of each one unconditionally
and trim the trailing one at the end.
---
src/qemu/qemu_command.c | 27 ++++++++-------------------
1 file changed, 8 insertions(+), 19 deletions(-)
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index b504461..9da3c06 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -8214,7 +8214,6 @@ qemuBuildCommandLine(virConnectPtr conn,
virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver);
virBuffer boot_buf = VIR_BUFFER_INITIALIZER;
char *boot_order_str = NULL, *boot_opts_str = NULL;
- int boot_nparams = 0;
VIR_DEBUG("conn=%p driver=%p def=%p mon=%p json=%d "
"qemuCaps=%p migrateFrom=%s migrateFD=%d "
@@ -8786,13 +8785,10 @@ qemuBuildCommandLine(virConnectPtr conn,
if (def->os.bootmenu) {
if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_BOOT_MENU)) {
- if (boot_nparams++)
- virBufferAddChar(&boot_buf, ',');
-
if (def->os.bootmenu == VIR_TRISTATE_BOOL_YES)
- virBufferAddLit(&boot_buf, "menu=on");
+ virBufferAddLit(&boot_buf, "menu=on,");
else
- virBufferAddLit(&boot_buf, "menu=off");
+ virBufferAddLit(&boot_buf, "menu=off,");
} else {
/* We cannot emit an error when bootmenu is enabled but
* unsupported because of backward compatibility */
@@ -8809,11 +8805,8 @@ qemuBuildCommandLine(virConnectPtr conn,
goto error;
}
- if (boot_nparams++)
- virBufferAddChar(&boot_buf, ',');
-
virBufferAsprintf(&boot_buf,
- "reboot-timeout=%d",
+ "reboot-timeout=%d,",
def->os.bios.rt_delay);
}
@@ -8825,17 +8818,13 @@ qemuBuildCommandLine(virConnectPtr conn,
goto error;
}
- if (boot_nparams++)
- virBufferAddChar(&boot_buf, ',');
-
- virBufferAsprintf(&boot_buf, "splash-time=%u",
def->os.bm_timeout);
+ virBufferAsprintf(&boot_buf, "splash-time=%u,",
def->os.bm_timeout);
}
- if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_BOOT_STRICT)) {
- if (boot_nparams++)
- virBufferAddChar(&boot_buf, ',');
- virBufferAddLit(&boot_buf, "strict=on");
- }
+ if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_BOOT_STRICT))
+ virBufferAddLit(&boot_buf, "strict=on,");
+
+ virBufferTrim(&boot_buf, ",", -1);
if (virBufferCheckError(&boot_buf) < 0)
goto error;
--
2.0.5