Commit 82793715 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/aperard/tags/pull-xen-20200710' into staging 



xen patches

Fixes following harden checks in qdev.

# gpg: Signature made Fri 10 Jul 2020 14:05:46 BST
# gpg:                using RSA key F80C006308E22CFD8A92E7980CF5572FD7FB55AF
# gpg:                issuer "anthony.perard@citrix.com"
# gpg: Good signature from "Anthony PERARD <anthony.perard@gmail.com>" [marginal]
# gpg:                 aka "Anthony PERARD <anthony.perard@citrix.com>" [marginal]
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 5379 2F71 024C 600F 778A  7161 D8D5 7199 DF83 42C8
#      Subkey fingerprint: F80C 0063 08E2 2CFD 8A92  E798 0CF5 572F D7FB 55AF

* remotes/aperard/tags/pull-xen-20200710:
  xen: cleanup unrealized flash devices
  xen: Fix xen-legacy-backend qdev types

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 0fb7ea45 dd29b5c3

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;

hw/xen/xen-legacy-backend.c

+2 −2
Original line number Diff line number Diff line
@@ -789,11 +789,12 @@ static void xendev_class_init(ObjectClass *klass, void *data) 
    set_bit(DEVICE_CATEGORY_MISC, dc->categories);

    /* xen-backend devices can be plugged/unplugged dynamically */

    dc->user_creatable = true;

    dc->bus_type = TYPE_XENSYSBUS;

}



static const TypeInfo xendev_type_info = {

    .name          = TYPE_XENBACKEND,

    .parent        = TYPE_XENSYSDEV,

    .parent        = TYPE_DEVICE,

    .class_init    = xendev_class_init,

    .instance_size = sizeof(struct XenLegacyDevice),

};
@@ -824,7 +825,6 @@ static void xen_sysdev_class_init(ObjectClass *klass, void *data) 
    DeviceClass *dc = DEVICE_CLASS(klass);



    device_class_set_props(dc, xen_sysdev_properties);

    dc->bus_type = TYPE_XENSYSBUS;

}



static const TypeInfo xensysdev_info = {

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 */