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>
This commit is contained in:
parent
e2c1c34f13
commit
1881f336a3
@ -23,7 +23,6 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include "qemu/osdep.h"
|
#include "qemu/osdep.h"
|
||||||
#include "block/block_int-common.h"
|
|
||||||
#include "qemu/units.h"
|
#include "qemu/units.h"
|
||||||
#include "cpu.h"
|
#include "cpu.h"
|
||||||
#include "hw/boards.h"
|
#include "hw/boards.h"
|
||||||
@ -144,10 +143,9 @@ static void niagara_init(MachineState *machine)
|
|||||||
memory_region_add_subregion(get_system_memory(),
|
memory_region_add_subregion(get_system_memory(),
|
||||||
NIAGARA_VDISK_BASE, &s->vdisk_ram);
|
NIAGARA_VDISK_BASE, &s->vdisk_ram);
|
||||||
dinfo->is_default = 1;
|
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 {
|
} else {
|
||||||
error_report("could not load ram disk '%s'",
|
error_report("could not load ram disk '%s'", blk_name(blk));
|
||||||
blk_bs(blk)->filename);
|
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user