motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-11 03:24:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

pc: Rearrange pc_system_firmware_init()'s legacy -drive loop

Browse source 
The loop does two things: map legacy -drive to properties, and collect
all the backends for use after the loop.  The next patch will factor
out the former for reuse in hw/arm/virt.c.  To make that easier,
rearrange the loop so it does the first thing first, and the second
thing second.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-id: 20190416091348.26075-2-armbru@redhat.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Markus Armbruster 2019-05-07 12:55:01 +01:00 • committed by Peter Maydell
parent 19eb2d4e73
commit c8d8ef00a1
1 changed files with 11 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

14
hw/i386/pc_sysfw.c
View file

@ -280,22 +280,20 @@ void pc_system_firmware_init(PCMachineState *pcms,
/* Map legacy -drive if=pflash to machine properties */ /* Map legacy -drive if=pflash to machine properties */
for (i = 0; i < ARRAY_SIZE(pcms->flash); i++) { for (i = 0; i < ARRAY_SIZE(pcms->flash); i++) {
pflash_blk[i] = pflash_cfi01_get_blk(pcms->flash[i]);
pflash_drv = drive_get(IF_PFLASH, 0, i); pflash_drv = drive_get(IF_PFLASH, 0, i);
if (!pflash_drv) { if (pflash_drv) {
continue;
}
loc_push_none(&loc); loc_push_none(&loc);
qemu_opts_loc_restore(pflash_drv->opts); qemu_opts_loc_restore(pflash_drv->opts);
if (pflash_blk[i]) { if (pflash_cfi01_get_blk(pcms->flash[i])) {
error_report("clashes with -machine"); error_report("clashes with -machine");
exit(1); exit(1);
} }
pflash_blk[i] = blk_by_legacy_dinfo(pflash_drv); qdev_prop_set_drive(DEVICE(pcms->flash[i]), "drive",
qdev_prop_set_drive(DEVICE(pcms->flash[i]), blk_by_legacy_dinfo(pflash_drv), &error_fatal);
"drive", pflash_blk[i], &error_fatal);
loc_pop(&loc); loc_pop(&loc);
} }
pflash_blk[i] = pflash_cfi01_get_blk(pcms->flash[i]);
}
/* Reject gaps */ /* Reject gaps */
for (i = 1; i < ARRAY_SIZE(pcms->flash); i++) { for (i = 1; i < ARRAY_SIZE(pcms->flash); i++) {