[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 01/10] Revert "hw/sparc64/niagara: Use blk_name() instead of open-
From: |
Mark Cave-Ayland |
Subject: |
[PULL 01/10] Revert "hw/sparc64/niagara: Use blk_name() instead of open-coding it" |
Date: |
Wed, 28 Jun 2023 12:44:55 +0100 |
From: Markus Armbruster <armbru@redhat.com>
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>
---
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);
}
}
--
2.30.2
- [PULL 00/10] qemu-sparc queue 20230628, Mark Cave-Ayland, 2023/06/28
- [PULL 01/10] Revert "hw/sparc64/niagara: Use blk_name() instead of open-coding it",
Mark Cave-Ayland <=
- [PULL 02/10] target/sparc: Use tcg_gen_lookup_and_goto_ptr in gen_goto_tb, Mark Cave-Ayland, 2023/06/28
- [PULL 03/10] target/sparc: Fix npc comparison in sparc_tr_insn_start, Mark Cave-Ayland, 2023/06/28
- [PULL 04/10] target/sparc: Drop inline markers from translate.c, Mark Cave-Ayland, 2023/06/28
- [PULL 06/10] target/sparc: Use DYNAMIC_PC_LOOKUP for conditional branches, Mark Cave-Ayland, 2023/06/28
- [PULL 07/10] target/sparc: Use DYNAMIC_PC_LOOKUP for JMPL, Mark Cave-Ayland, 2023/06/28
- [PULL 10/10] escc: emulate dip switch language layout settings on SUN keyboard, Mark Cave-Ayland, 2023/06/28
- [PULL 08/10] target/sparc: Use DYNAMIC_PC_LOOKUP for v9 RETURN, Mark Cave-Ayland, 2023/06/28
- [PULL 09/10] target/sparc: Use tcg_gen_lookup_and_goto_ptr for v9 WRASI, Mark Cave-Ayland, 2023/06/28