Commit dd29b5c3 authored by Paul Durrant's avatar Paul Durrant Committed by Anthony PERARD
Browse files

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: default avatarJason Andryuk <jandryuk@gmail.com>
Fixes: ebc29e1b ("pc: Support firmware configuration with -blockdev")
Signed-off-by: default avatarPaul Durrant <pdurrant@amazon.com>
Tested-by: default avatarJason Andryuk <jandryuk@gmail.com>
Reviewed-by: default avatarAnthony PERARD <anthony.perard@citrix.com>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20200624121841.17971-3-paul@xen.org>
Fixes: dfe8c79c ("qdev: Assert onboard devices all get realized properly")
Signed-off-by: default avatarAnthony PERARD <anthony.perard@citrix.com>
parent 104a7f4e

hw/i386/pc_piix.c

+6 −3
Original line number Diff line number Diff line
@@ -186,10 +186,13 @@ 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) {

    } 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);

hw/i386/pc_sysfw.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

include/hw/i386/pc.h

+1 −0
Original line number Diff line number Diff line
@@ -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 */