From: Markus Armbruster <armbru@redhat.com>
Date: Wed, 21 Dec 2022 13:35:50 +0000 (+0100)
Subject: hw/sparc64/niagara: Use blk_name() instead of open-coding it
X-Git-Tag: v8.0.0-rc0~87^2~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1881f336a33a8a99cb17ab1c57ed953682e8e107;p=thirdparty%2Fqemu.git

hw/sparc64/niagara: Use blk_name() instead of open-coding it

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-Id: <20221221133551.3967339-3-armbru@redhat.com>
---

diff --git a/hw/sparc64/niagara.c b/hw/sparc64/niagara.c
index ab3c4ec3463..6725cc61fd5 100644
--- a/hw/sparc64/niagara.c
+++ b/hw/sparc64/niagara.c
@@ -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);
         }
     }