[qemu-xen staging] xen: cleanup unrealized flash devices

[patchbot@xxxxxxx]

commit dd29b5c30cd2a13f8c12376a8de84cb090c338bf
Author:     Paul Durrant <pdurrant@xxxxxxxxxx>
AuthorDate: Wed Jun 24 13:18:41 2020 +0100
Commit:     Anthony PERARD <anthony.perard@xxxxxxxxxx>
CommitDate: Fri Jul 10 13:49:16 2020 +0100

    xen: cleanup unrealized flash devices
    
    The generic pc_machine_initfn() calls pc_system_flash_create() which creates
    'system.flash0' and 'system.flash1' devices. These devices are then realized
    by pc_system_flash_map() which is called from pc_system_firmware_init() 
which
    itself is called via pc_memory_init(). The latter however is not called when
    xen_enable() is true and hence the following assertion fails:
    
    qemu-system-i386: hw/core/qdev.c:439: qdev_assert_realized_properly:
    Assertion `dev->realized' failed
    
    These flash devices are unneeded when using Xen so this patch avoids the
    assertion by simply removing them using pc_system_flash_cleanup_unused().
    
    Reported-by: Jason Andryuk <jandryuk@xxxxxxxxx>
    Fixes: ebc29e1beab0 ("pc: Support firmware configuration with -blockdev")
    Signed-off-by: Paul Durrant <pdurrant@xxxxxxxxxx>
    Tested-by: Jason Andryuk <jandryuk@xxxxxxxxx>
    Reviewed-by: Anthony PERARD <anthony.perard@xxxxxxxxxx>
    Reviewed-by: Philippe Mathieu-Daudé <philmd@xxxxxxxxxx>
    Message-Id: <20200624121841.17971-3-paul@xxxxxxx>
    Fixes: dfe8c79c4468 ("qdev: Assert onboard devices all get realized 
properly")
    Signed-off-by: Anthony PERARD <anthony.perard@xxxxxxxxxx>
---
 hw/i386/pc_piix.c    | 9 ++++++---
 hw/i386/pc_sysfw.c   | 2 +-
 include/hw/i386/pc.h | 1 +
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index 2bb42a8141..3469b1fd10 100644
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -186,9 +186,12 @@ static void pc_init1(MachineState *machine,
     if (!xen_enabled()) {
         pc_memory_init(pcms, system_memory,
                        rom_memory, &ram_memory);
-    } else if (machine->kernel_filename != NULL) {
-        /* For xen HVM direct kernel boot, load linux here */
-        xen_load_linux(pcms);
+    } else {
+        pc_system_flash_cleanup_unused(pcms);
+        if (machine->kernel_filename != NULL) {
+            /* For xen HVM direct kernel boot, load linux here */
+            xen_load_linux(pcms);
+        }
     }
 
     gsi_state = pc_gsi_create(&x86ms->gsi, pcmc->pci_enabled);
diff --git a/hw/i386/pc_sysfw.c b/hw/i386/pc_sysfw.c
index ec2a3b3e7e..0ff47a4b59 100644
--- a/hw/i386/pc_sysfw.c
+++ b/hw/i386/pc_sysfw.c
@@ -108,7 +108,7 @@ void pc_system_flash_create(PCMachineState *pcms)
     }
 }
 
-static void pc_system_flash_cleanup_unused(PCMachineState *pcms)
+void pc_system_flash_cleanup_unused(PCMachineState *pcms)
 {
     char *prop_name;
     int i;
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
index a802e69974..3d7ed3a55e 100644
--- a/include/hw/i386/pc.h
+++ b/include/hw/i386/pc.h
@@ -186,6 +186,7 @@ ISADevice *pc_find_fdc0(void);
 
 /* pc_sysfw.c */
 void pc_system_flash_create(PCMachineState *pcms);
+void pc_system_flash_cleanup_unused(PCMachineState *pcms);
 void pc_system_firmware_init(PCMachineState *pcms, MemoryRegion *rom_memory);
 
 /* acpi-build.c */
--
generated by git-patchbot for /home/xen/git/qemu-xen.git#staging