Re: [PATCH] Revert "hw/sparc64/niagara: Use blk_name() instead of open-coding it"

[Mark Cave-Ayland]

On 15/05/2023 16:11, Markus Armbruster wrote:

This reverts commit 1881f336a33a8a99cb17ab1c57ed953682e8e107.

This commit breaks "-drive if=pflash,readonly=on,file=image.iso".  It
claims to merely replace an open-coded version of blk_name() by a
call, but that's not the case.  Sorry for the inconvenience!

Reported-by: Jakub Jermář <ja...@jermar.eu>
Cc: qemu-sta...@nongnu.org
Signed-off-by: Markus Armbruster <arm...@redhat.com>
---
  hw/sparc64/niagara.c | 6 ++++--
  1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/hw/sparc64/niagara.c b/hw/sparc64/niagara.c
index 6725cc61fd..ab3c4ec346 100644
--- a/hw/sparc64/niagara.c
+++ b/hw/sparc64/niagara.c
@@ -23,6 +23,7 @@
   */

#include "qemu/osdep.h"

+#include "block/block_int-common.h"
  #include "qemu/units.h"
  #include "cpu.h"
  #include "hw/boards.h"
@@ -143,9 +144,10 @@ static void niagara_init(MachineState *machine)
              memory_region_add_subregion(get_system_memory(),
                                          NIAGARA_VDISK_BASE, &s->vdisk_ram);
              dinfo->is_default = 1;
-            rom_add_file_fixed(blk_name(blk), NIAGARA_VDISK_BASE, -1);
+            rom_add_file_fixed(blk_bs(blk)->filename, NIAGARA_VDISK_BASE, -1);
          } else {
-            error_report("could not load ram disk '%s'", blk_name(blk));
+            error_report("could not load ram disk '%s'",
+                         blk_bs(blk)->filename);
              exit(1);
          }
      }

Thanks - I've queued this to my qemu-sparc branch.


ATB,

Mark.