Re: [libvirt] [PATCH] qemuBuildBootCommandLine: remove unused boot_order_str

[Andrea Bolognani]

On Thu, 2018-08-09 at 18:17 +0200, Ján Tomko wrote:
> After commit caccbba this variable is always NULL.
> 
> Signed-off-by: Ján Tomko 
> ---
>  src/qemu/qemu_command.c | 16 +++-
>  1 file changed, 3 insertions(+), 13 deletions(-)

Reviewed-by: Andrea Bolognani 

-- 
Andrea Bolognani / Red Hat / Virtualization

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

[libvirt] [PATCH] qemuBuildBootCommandLine: remove unused boot_order_str

[Ján Tomko]

After commit caccbba this variable is always NULL.

Signed-off-by: Ján Tomko 
---
 src/qemu/qemu_command.c | 16 +++-
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 65bd88a652..12ff09d46d 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -6457,7 +6457,7 @@ qemuBuildBootCommandLine(virCommandPtr cmd,
  virQEMUCapsPtr qemuCaps)
 {
 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 == VIR_TRISTATE_BOOL_YES)
@@ -6499,20 +6499,11 @@ qemuBuildBootCommandLine(virCommandPtr cmd,
 goto error;
 
 boot_opts_str = virBufferContentAndReset(_buf);
-if (boot_order_str || boot_opts_str) {
+if (boot_opts_str) {
 virCommandAddArg(cmd, "-boot");
-
-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);
-}
+virCommandAddArg(cmd, boot_opts_str);
 }
 VIR_FREE(boot_opts_str);
-VIR_FREE(boot_order_str);
 
 if (def->os.kernel)
 virCommandAddArgList(cmd, "-kernel", def->os.kernel, NULL);
@@ -6533,7 +6524,6 @@ qemuBuildBootCommandLine(virCommandPtr cmd,
 return 0;
 
  error:
-VIR_FREE(boot_order_str);
 VIR_FREE(boot_opts_str);
 virBufferFreeAndReset(_buf);
 return -1;
-- 
2.16.1

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list