diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-01-23 13:41:47 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-01-23 13:41:47 +0000 |
| commit | 7cea426c1d2e12777a2e61d7970044981ff82aa8 (patch) | |
| tree | 21d2f89af23045b0b3a51ea888f057b97395d945 /include | |
| parent | be9612e8cbb4b5e5d4c5f66551db2b4d6e76495b (diff) | |
| parent | 8347505640238d3b80f9bb7510fdc1bb574bad19 (diff) | |
| download | qemu-7cea426c1d2e12777a2e61d7970044981ff82aa8.zip qemu-7cea426c1d2e12777a2e61d7970044981ff82aa8.tar.gz qemu-7cea426c1d2e12777a2e61d7970044981ff82aa8.tar.bz2 | |
Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging
virtio, pc: fixes, features
Bugfixes all over the place.
CPU hotplug with secureboot.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
# gpg: Signature made Thu 23 Jan 2020 07:08:32 GMT
# gpg: using RSA key 5D09FD0871C8F85B94CA8A0D281F0DB8D28D5469
# gpg: issuer "mst@redhat.com"
# gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>" [full]
# gpg: aka "Michael S. Tsirkin <mst@redhat.com>" [full]
# Primary key fingerprint: 0270 606B 6F3C DF3D 0B17 0970 C350 3912 AFBE 8E67
# Subkey fingerprint: 5D09 FD08 71C8 F85B 94CA 8A0D 281F 0DB8 D28D 5469
* remotes/mst/tags/for_upstream:
vhost: coding style fix
i386:acpi: Remove _HID from the SMBus ACPI entry
vhost: Only align sections for vhost-user
vhost: Add names to section rounded warning
vhost-vsock: delete vqs in vhost_vsock_unrealize to avoid memleaks
virtio-scsi: convert to new virtio_delete_queue
virtio-scsi: delete vqs in unrealize to avoid memleaks
virtio-9p-device: convert to new virtio_delete_queue
virtio-9p-device: fix memleak in virtio_9p_device_unrealize
bios-tables-test: document expected file update
acpi: cpuhp: add CPHP_GET_CPU_ID_CMD command
acpi: cpuhp: spec: add typical usecases
acpi: cpuhp: introduce 'Command data 2' field
acpi: cpuhp: spec: clarify store into 'Command data' when 'Command field' == 0
acpi: cpuhp: spec: fix 'Command data' description
acpi: cpuhp: spec: clarify 'CPU selector' register usage and endianness
tests: q35: MCH: add default SMBASE SMRAM lock test
q35: implement 128K SMRAM at default SMBASE address
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/hw/pci-host/q35.h | 10 | ||||
| -rw-r--r-- | include/hw/virtio/vhost-vsock.h | 2 |
2 files changed, 12 insertions, 0 deletions
diff --git a/include/hw/pci-host/q35.h b/include/hw/pci-host/q35.h index b3bcf2e..976fbae 100644 --- a/include/hw/pci-host/q35.h +++ b/include/hw/pci-host/q35.h @@ -32,6 +32,7 @@ #include "hw/acpi/ich9.h" #include "hw/pci-host/pam.h" #include "hw/i386/intel_iommu.h" +#include "qemu/units.h" #define TYPE_Q35_HOST_DEVICE "q35-pcihost" #define Q35_HOST_DEVICE(obj) \ @@ -54,6 +55,8 @@ typedef struct MCHPCIState { MemoryRegion smram_region, open_high_smram; MemoryRegion smram, low_smram, high_smram; MemoryRegion tseg_blackhole, tseg_window; + MemoryRegion smbase_blackhole, smbase_window; + bool has_smram_at_smbase; Range pci_hole; uint64_t below_4g_mem_size; uint64_t above_4g_mem_size; @@ -97,6 +100,13 @@ typedef struct Q35PCIHost { #define MCH_HOST_BRIDGE_EXT_TSEG_MBYTES_QUERY 0xffff #define MCH_HOST_BRIDGE_EXT_TSEG_MBYTES_MAX 0xfff +#define MCH_HOST_BRIDGE_SMBASE_SIZE (128 * KiB) +#define MCH_HOST_BRIDGE_SMBASE_ADDR 0x30000 +#define MCH_HOST_BRIDGE_F_SMBASE 0x9c +#define MCH_HOST_BRIDGE_F_SMBASE_QUERY 0xff +#define MCH_HOST_BRIDGE_F_SMBASE_IN_RAM 0x01 +#define MCH_HOST_BRIDGE_F_SMBASE_LCK 0x02 + #define MCH_HOST_BRIDGE_PCIEXBAR 0x60 /* 64bit register */ #define MCH_HOST_BRIDGE_PCIEXBAR_SIZE 8 /* 64bit register */ #define MCH_HOST_BRIDGE_PCIEXBAR_DEFAULT 0xb0000000 diff --git a/include/hw/virtio/vhost-vsock.h b/include/hw/virtio/vhost-vsock.h index d509d67..bc5a988 100644 --- a/include/hw/virtio/vhost-vsock.h +++ b/include/hw/virtio/vhost-vsock.h @@ -33,6 +33,8 @@ typedef struct { struct vhost_virtqueue vhost_vqs[2]; struct vhost_dev vhost_dev; VirtQueue *event_vq; + VirtQueue *recv_vq; + VirtQueue *trans_vq; QEMUTimer *post_load_timer; /*< public >*/ |