[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 01/15] pc: Rearrange pc_system_firmware_init()'s lega
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PULL 01/15] pc: Rearrange pc_system_firmware_init()'s legacy -drive loop |
Date: |
Tue, 7 May 2019 12:59:57 +0100 |
From: Markus Armbruster <address@hidden>
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 <address@hidden>
Reviewed-by: Laszlo Ersek <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Message-id: address@hidden
Signed-off-by: Peter Maydell <address@hidden>
---
hw/i386/pc_sysfw.c | 24 +++++++++++-------------
1 file changed, 11 insertions(+), 13 deletions(-)
diff --git a/hw/i386/pc_sysfw.c b/hw/i386/pc_sysfw.c
index c6285407748..75925f5d3f7 100644
--- a/hw/i386/pc_sysfw.c
+++ b/hw/i386/pc_sysfw.c
@@ -280,21 +280,19 @@ void pc_system_firmware_init(PCMachineState *pcms,
/* Map legacy -drive if=pflash to machine properties */
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);
- if (!pflash_drv) {
- continue;
+ if (pflash_drv) {
+ loc_push_none(&loc);
+ qemu_opts_loc_restore(pflash_drv->opts);
+ if (pflash_cfi01_get_blk(pcms->flash[i])) {
+ error_report("clashes with -machine");
+ exit(1);
+ }
+ qdev_prop_set_drive(DEVICE(pcms->flash[i]), "drive",
+ blk_by_legacy_dinfo(pflash_drv), &error_fatal);
+ loc_pop(&loc);
}
- loc_push_none(&loc);
- qemu_opts_loc_restore(pflash_drv->opts);
- if (pflash_blk[i]) {
- error_report("clashes with -machine");
- exit(1);
- }
- pflash_blk[i] = blk_by_legacy_dinfo(pflash_drv);
- qdev_prop_set_drive(DEVICE(pcms->flash[i]),
- "drive", pflash_blk[i], &error_fatal);
- loc_pop(&loc);
+ pflash_blk[i] = pflash_cfi01_get_blk(pcms->flash[i]);
}
/* Reject gaps */
--
2.20.1
- [Qemu-devel] [PULL 00/15] target-arm queue, Peter Maydell, 2019/05/07
- [Qemu-devel] [PULL 02/15] pflash_cfi01: New pflash_cfi01_legacy_drive(), Peter Maydell, 2019/05/07
- [Qemu-devel] [PULL 01/15] pc: Rearrange pc_system_firmware_init()'s legacy -drive loop,
Peter Maydell <=
- [Qemu-devel] [PULL 05/15] arm: Allow system registers for KVM guests to be changed by QEMU code, Peter Maydell, 2019/05/07
- [Qemu-devel] [PULL 09/15] util/cacheinfo: Use uint64_t on LLP64 model to satisfy Windows ARM64, Peter Maydell, 2019/05/07
- [Qemu-devel] [PULL 04/15] hw/arm/raspi: Diagnose requests for too much RAM, Peter Maydell, 2019/05/07
- [Qemu-devel] [PULL 07/15] QEMU_PACKED: Remove gcc_struct attribute in Windows non x86 targets, Peter Maydell, 2019/05/07
- [Qemu-devel] [PULL 10/15] osdep: Fix mingw compilation regarding stdio formats, Peter Maydell, 2019/05/07
- [Qemu-devel] [PULL 08/15] qga: Fix mingw compilation warnings on enum conversion, Peter Maydell, 2019/05/07
- [Qemu-devel] [PULL 06/15] arm: aspeed: Set SDRAM size, Peter Maydell, 2019/05/07
- [Qemu-devel] [PULL 11/15] hw/arm/armv7m_nvic: Check subpriority in nvic_recompute_state_secure(), Peter Maydell, 2019/05/07
- [Qemu-devel] [PULL 03/15] hw/arm/virt: Support firmware configuration with -blockdev, Peter Maydell, 2019/05/07
- [Qemu-devel] [PULL 13/15] hw/intc/armv7m_nvic: Don't enable ARMV7M_EXCP_DEBUG from reset, Peter Maydell, 2019/05/07