diff options
| author | Markus Armbruster <armbru@redhat.com> | 2023-05-15 17:11:04 +0200 |
|---|---|---|
| committer | Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> | 2023-06-28 10:50:41 +0100 |
| commit | ac5e8c1dec246950d73e22dceab5cb36e82aac0b (patch) | |
| tree | a201e831b9df239cab058361cbc296c3f0bb49a9 /hw | |
| parent | b111569da9f82fdf05df03184836a4564adef599 (diff) | |
| download | qemu-ac5e8c1dec246950d73e22dceab5cb36e82aac0b.zip qemu-ac5e8c1dec246950d73e22dceab5cb36e82aac0b.tar.gz qemu-ac5e8c1dec246950d73e22dceab5cb36e82aac0b.tar.bz2 | |
Revert "hw/sparc64/niagara: Use blk_name() instead of open-coding it"
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ář <jakub@jermar.eu>
Cc: qemu-stable@nongnu.org
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20230515151104.1350155-1-armbru@redhat.com>
Acked-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/sparc64/niagara.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/hw/sparc64/niagara.c b/hw/sparc64/niagara.c index 6725cc6..ab3c4ec 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); } } |