diff options
| author | Peter Maydell | 2020-01-23 14:41:47 +0100 |
|---|---|---|
| committer | Peter Maydell | 2020-01-23 14:41:47 +0100 |
| commit | 7cea426c1d2e12777a2e61d7970044981ff82aa8 (patch) | |
| tree | 21d2f89af23045b0b3a51ea888f057b97395d945 /hw/i386/acpi-build.c | |
| parent | Merge remote-tracking branch 'remotes/rth/tags/pull-tcg-20200121' into staging (diff) | |
| parent | vhost: coding style fix (diff) | |
| download | qemu-7cea426c1d2e12777a2e61d7970044981ff82aa8.tar.gz qemu-7cea426c1d2e12777a2e61d7970044981ff82aa8.tar.xz qemu-7cea426c1d2e12777a2e61d7970044981ff82aa8.zip | |
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 'hw/i386/acpi-build.c')
| -rw-r--r-- | hw/i386/acpi-build.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index e25df838f0..9c4e46fa74 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -1816,7 +1816,6 @@ static void build_smb0(Aml *table, I2CBus *smbus, int devnr, int func) Aml *scope = aml_scope("_SB.PCI0"); Aml *dev = aml_device("SMB0"); - aml_append(dev, aml_name_decl("_HID", aml_eisaid("APP0005"))); aml_append(dev, aml_name_decl("_ADR", aml_int(devnr << 16 | func))); build_acpi_ipmi_devices(dev, BUS(smbus), "\\_SB.PCI0.SMB0"); aml_append(scope, dev); |