]> www.infradead.org Git - users/dwmw2/qemu.git/commitdiff
hw/sparc64/niagara: Use blk_name() instead of open-coding it
authorMarkus Armbruster <armbru@redhat.com>
Wed, 21 Dec 2022 13:35:50 +0000 (14:35 +0100)
committerMarkus Armbruster <armbru@redhat.com>
Fri, 20 Jan 2023 06:25:01 +0000 (07:25 +0100)
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-Id: <20221221133551.3967339-3-armbru@redhat.com>

hw/sparc64/niagara.c

index ab3c4ec346305d770803eb04af5f3ae0be6f701b..6725cc61fd587308489f5f1580b7d5966a53b5a3 100644 (file)
@@ -23,7 +23,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "block/block_int-common.h"
 #include "qemu/units.h"
 #include "cpu.h"
 #include "hw/boards.h"
@@ -144,10 +143,9 @@ 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_bs(blk)->filename, NIAGARA_VDISK_BASE, -1);
+            rom_add_file_fixed(blk_name(blk), NIAGARA_VDISK_BASE, -1);
         } else {
-            error_report("could not load ram disk '%s'",
-                         blk_bs(blk)->filename);
+            error_report("could not load ram disk '%s'", blk_name(blk));
             exit(1);
         }
     }