[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 14/47] acpi: fix DMAR device scope for IOAPIC
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 14/47] acpi: fix DMAR device scope for IOAPIC |
Date: |
Thu, 10 Nov 2016 18:13:05 +0200 |
From: Peter Xu <address@hidden>
We should not use cpu_to_le16() here, instead each of device/function
value is stored in a 8 byte field.
Signed-off-by: Peter Xu <address@hidden>
Reviewed-by: Igor Mammedov <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
include/hw/acpi/acpi-defs.h | 5 ++++-
hw/i386/acpi-build.c | 3 ++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/include/hw/acpi/acpi-defs.h b/include/hw/acpi/acpi-defs.h
index d1d1d61..154f3b8 100644
--- a/include/hw/acpi/acpi-defs.h
+++ b/include/hw/acpi/acpi-defs.h
@@ -619,7 +619,10 @@ struct AcpiDmarDeviceScope {
uint16_t reserved;
uint8_t enumeration_id;
uint8_t bus;
- uint16_t path[0]; /* list of dev:func pairs */
+ struct {
+ uint8_t device;
+ uint8_t function;
+ } path[0];
} QEMU_PACKED;
typedef struct AcpiDmarDeviceScope AcpiDmarDeviceScope;
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index c02f408..a155857 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -2605,7 +2605,8 @@ build_dmar_q35(GArray *table_data, BIOSLinker *linker)
scope->length = ioapic_scope_size;
scope->enumeration_id = ACPI_BUILD_IOAPIC_ID;
scope->bus = Q35_PSEUDO_BUS_PLATFORM;
- scope->path[0] = cpu_to_le16(Q35_PSEUDO_DEVFN_IOAPIC);
+ scope->path[0].device = PCI_SLOT(Q35_PSEUDO_DEVFN_IOAPIC);
+ scope->path[0].function = PCI_FUNC(Q35_PSEUDO_DEVFN_IOAPIC);
build_header(linker, table_data, (void *)(table_data->data + dmar_start),
"DMAR", table_data->len - dmar_start, 1, NULL, NULL);
--
MST
- [Qemu-devel] [PULL 04/47] tests/vhost-user-bridge: do not accept more than one connection, (continued)
- [Qemu-devel] [PULL 04/47] tests/vhost-user-bridge: do not accept more than one connection, Michael S. Tsirkin, 2016/11/10
- [Qemu-devel] [PULL 03/47] tests/vhost-user-bridge: indicate peer disconnected, Michael S. Tsirkin, 2016/11/10
- [Qemu-devel] [PULL 06/47] tests/vhost-user-bridge: use contrib/libvhost-user, Michael S. Tsirkin, 2016/11/10
- [Qemu-devel] [PULL 07/47] intel_iommu: fixing source id during IOTLB hash key calculation, Michael S. Tsirkin, 2016/11/10
- [Qemu-devel] [PULL 09/47] virtio: make virtqueue_alloc_element static, Michael S. Tsirkin, 2016/11/10
- [Qemu-devel] [PULL 08/47] virtio: rename virtqueue_discard to virtqueue_unpop, Michael S. Tsirkin, 2016/11/10
- [Qemu-devel] [PULL 10/47] pcie_aer: Convert pcie_aer_init to Error, Michael S. Tsirkin, 2016/11/10
- [Qemu-devel] [PULL 12/47] intel_iommu: fix several incorrect endianess and bit fields, Michael S. Tsirkin, 2016/11/10
- [Qemu-devel] [PULL 11/47] virtio-crypto: tag as not hotpluggable and migration, Michael S. Tsirkin, 2016/11/10
- [Qemu-devel] [PULL 13/47] intel_iommu: fix incorrect assert, Michael S. Tsirkin, 2016/11/10
- [Qemu-devel] [PULL 14/47] acpi: fix DMAR device scope for IOAPIC,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL 15/47] virtio: allow per-device-class legacy features, Michael S. Tsirkin, 2016/11/10
- [Qemu-devel] [PULL 16/47] virtio-net: mark VIRTIO_NET_F_GSO as legacy, Michael S. Tsirkin, 2016/11/10
- [Qemu-devel] [PULL 17/47] vhost: Update 'ioeventfd_started' with host notifiers, Michael S. Tsirkin, 2016/11/10
- [Qemu-devel] [PULL 18/47] vhost: Use vbus var instead of VIRTIO_BUS() macro, Michael S. Tsirkin, 2016/11/10
- [Qemu-devel] [PULL 19/47] vhost: migration blocker only if shared log is used, Michael S. Tsirkin, 2016/11/10
- [Qemu-devel] [PULL 20/47] qdev: hotplug: drop HotplugHandler.post_plug callback, Michael S. Tsirkin, 2016/11/10
- [Qemu-devel] [PULL 21/47] nvdimm acpi: drop the lock of fit buffer, Michael S. Tsirkin, 2016/11/10
- [Qemu-devel] [PULL 22/47] pc: memhp: move nvdimm hotplug out of memory hotplug, Michael S. Tsirkin, 2016/11/10
- [Qemu-devel] [PULL 24/47] nvdimm acpi: clean up nvdimm_build_acpi, Michael S. Tsirkin, 2016/11/10
- [Qemu-devel] [PULL 23/47] pc: memhp: stop handling nvdimm hotplug in pc_dimm_unplug, Michael S. Tsirkin, 2016/11/10