diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-09-21 17:41:32 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-09-21 17:41:32 +0100 |
| commit | 5df6c87e8080e0021e975c8387baa20cfe43c932 (patch) | |
| tree | 4da88ad9a618af2798f725152172d81e0911a7b7 /include | |
| parent | 14fe4edcfaf5c8843ddcdb9db14249fcc8d5b01d (diff) | |
| parent | 31ada106d891f56f54d4234ce58c552bc2e734af (diff) | |
| download | qemu-5df6c87e8080e0021e975c8387baa20cfe43c932.zip qemu-5df6c87e8080e0021e975c8387baa20cfe43c932.tar.gz qemu-5df6c87e8080e0021e975c8387baa20cfe43c932.tar.bz2 | |
Merge remote-tracking branch 'remotes/ehabkost/tags/x86-next-pull-request' into staging
x86 queue, 2020-09-18
Cleanups:
* Correct the meaning of '0xffffffff' value for hv-spinlocks (Vitaly Kuznetsov)
* vmport: Drop superfluous parenthesis (Philippe Mathieu-Daudé)
Fixes:
* Use generic APIC ID encoding code for EPYC (Babu Moger)
# gpg: Signature made Fri 18 Sep 2020 21:26:57 BST
# gpg: using RSA key 5A322FD5ABC4D3DBACCFD1AA2807936F984DC5A6
# gpg: issuer "ehabkost@redhat.com"
# gpg: Good signature from "Eduardo Habkost <ehabkost@redhat.com>" [full]
# Primary key fingerprint: 5A32 2FD5 ABC4 D3DB ACCF D1AA 2807 936F 984D C5A6
* remotes/ehabkost/tags/x86-next-pull-request:
i386: Simplify CPUID_8000_001E for AMD
i386: Simplify CPUID_8000_001d for AMD
hw/i386/vmport: Drop superfluous parenthesis around function typedef
i386/kvm: correct the meaning of '0xffffffff' value for hv-spinlocks
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/hw/i386/vmport.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/hw/i386/vmport.h b/include/hw/i386/vmport.h index c380b9c..8f5e27c 100644 --- a/include/hw/i386/vmport.h +++ b/include/hw/i386/vmport.h @@ -4,7 +4,7 @@ #include "hw/isa/isa.h" #define TYPE_VMPORT "vmport" -typedef uint32_t (VMPortReadFunc)(void *opaque, uint32_t address); +typedef uint32_t VMPortReadFunc(void *opaque, uint32_t address); typedef enum { VMPORT_CMD_GETVERSION = 10, |