NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

qemuBuildBootCommandLine: remove unused boot_order_str

Browse Source 
After commit caccbba this variable is always NULL.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Andrea Bolognani <abologna@redhat.com>
This commit is contained in:
Ján Tomko 2018-08-09 16:35:20 +02:00
parent 68dc579f43
commit a8c1396a74
1 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/qemu/qemu_command.c
View File

@ -6457,7 +6457,7 @@ qemuBuildBootCommandLine(virCommandPtr cmd,
virQEMUCapsPtr qemuCaps) virQEMUCapsPtr qemuCaps)
{ {
virBuffer boot_buf = VIR_BUFFER_INITIALIZER; virBuffer boot_buf = VIR_BUFFER_INITIALIZER;
char *boot_order_str = NULL, *boot_opts_str = NULL; char *boot_opts_str = NULL;
if (def->os.bootmenu) { if (def->os.bootmenu) {
if (def->os.bootmenu == VIR_TRISTATE_BOOL_YES) if (def->os.bootmenu == VIR_TRISTATE_BOOL_YES)
@ -6499,20 +6499,11 @@ qemuBuildBootCommandLine(virCommandPtr cmd,
goto error; goto error;
boot_opts_str = virBufferContentAndReset(&boot_buf); boot_opts_str = virBufferContentAndReset(&boot_buf);
if (boot_order_str || boot_opts_str) { if (boot_opts_str) {
virCommandAddArg(cmd, "-boot"); virCommandAddArg(cmd, "-boot");
virCommandAddArg(cmd, boot_opts_str);
if (boot_order_str && boot_opts_str) {
virCommandAddArgFormat(cmd, "order=%s,%s",
boot_order_str, boot_opts_str);
} else if (boot_order_str) {
virCommandAddArg(cmd, boot_order_str);
} else if (boot_opts_str) {
virCommandAddArg(cmd, boot_opts_str);
}
} }
VIR_FREE(boot_opts_str); VIR_FREE(boot_opts_str);
VIR_FREE(boot_order_str);
if (def->os.kernel) if (def->os.kernel)
virCommandAddArgList(cmd, "-kernel", def->os.kernel, NULL); virCommandAddArgList(cmd, "-kernel", def->os.kernel, NULL);
@ -6533,7 +6524,6 @@ qemuBuildBootCommandLine(virCommandPtr cmd,
return 0; return 0;
error: error:
VIR_FREE(boot_order_str);
VIR_FREE(boot_opts_str); VIR_FREE(boot_opts_str);
virBufferFreeAndReset(&boot_buf); virBufferFreeAndReset(&boot_buf);
return -1; return -1;