diff options
author | Peter Maydell <peter.maydell@linaro.org> | 2020-07-11 13:56:03 +0100 |
---|---|---|
committer | Peter Maydell <peter.maydell@linaro.org> | 2020-07-11 13:56:03 +0100 |
commit | 827937158b72ce2265841ff528bba3c44a1bfbc8 (patch) | |
tree | e114926adc8e8d47e68d95132ae76293450bb97e /include | |
parent | 0fb7ea45157d63507675a4011bc4b24588217f6e (diff) | |
parent | dd29b5c30cd2a13f8c12376a8de84cb090c338bf (diff) |
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: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
-rw-r--r-- | include/hw/i386/pc.h | 1 |
1 files changed, 1 insertions, 0 deletions
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 */ |