39a0a891d8
- vdpa: move memory listener to the realize stage - vdpa: implement vdpa device migration - vhost: implement post resume bh - vhost: implement migration state notifier for vdpa device - vhost: implement savevm_hanlder for vdpa device - vhost: implement vhost_vdpa_device_suspend/resume - vhost: implement vhost-vdpa suspend/resume - vhost: add vhost_dev_suspend/resume_op - vhost: introduce bytemap for vhost backend logging - vhost-vdpa: add migration log ops for VhostOps - vhost-vdpa: add VHOST_BACKEND_F_BYTEMAPLOG - vhost: fix null pointer access - ui/gtk: prevent ui lock up when dpy_gl_update called again before current draw event occurs - hw/usb: dev-mtp: Use g_mkdir() - target/ppc/cpu-models: Remove the "default" CPU alias - hw/intc/arm_gicv3: ICC_PMR_EL1 high bits should be RAZ - Fixed a QEMU hang when guest poweroff in COLO mode - migration/colo: More accurate update checkpoint time - scripts/entitlement.sh: Use backward-compatible cp flags - block/nvme: fix infinite loop in nvme_free_req_queue_cb() - hw/net: npcm7xx_emc fix missing queue_flush - Add dummy Aspeed AST2600 Display Port MCU (DPMCU) - hw/arm: ast2600: Fix address mapping of second SPI controller - vhost-user-blk: reconnect on any error during realize - vhost-user-blk: propagate error return from generic vhost - hw/riscv: boot: Reduce FDT address alignment constraints - Revert "hw/virtio/virtio-iommu-pci: Enforce the device is plugged on the root bus" - Fix STM32F2XX USART data register readout - block: use 'unsigned' for in_flight field on driver state - sphinx: change default language to 'en' - tests/qtest: Fix two format strings - trivial typos: namesapce - hw/ide/atapi.c: Correct typos (CD-CDROM -> CD-ROM) - hw/virtio/virtio-iommu-pci: Enforce the device is plugged on the root bus - hw/display/next-fb: Fix comment typo - xen/pass-through: merge emulated bits correctly mainline inclusion commit be9c61da9fc57eb7d293f380d0805ca6f46c2657 category: bugfix - tests/qtest/migration-test.c: spelling fix: bandwith - target/i386/cpu: Improve error message for property "vendor" - balloon: Fix a misleading error message - target/arm: Don't set syndrome ISS for loads and stores with writeback mainline inclusion commit 53ae2fdef1f5661cbaa2ea571c517f98e6041cb8 category: bugfix - disas/hppa: Show hexcode of instruction along with disassembly - tcg/loongarch64: Fix tcg_out_mov() Aborted - ui/qmp-cmds: Improve two error messages - qga: Improve guest-exec-status error message - hmp: Improve sync-profile error message - spapr/pci: Correct "does not support hotplugging error messages - xen/pass-through: don't create needless register group mainline inclusion commit c0e86b7624cb9d6db03e0d48cf82659e5b89a6a6 category: bugfix Signed-off-by: Jiabo Feng <fengjiabo1@huawei.com>
70 lines
2.8 KiB
Diff
70 lines
2.8 KiB
Diff
From a2323aa79da71c92e818306f1e18184619309a35 Mon Sep 17 00:00:00 2001
|
|
From: Wanghe Xiao <xiaowanghe_yewu@cmss.chinamobile.com>
|
|
Date: Sat, 25 Nov 2023 02:03:07 -0800
|
|
Subject: [PATCH] hw/virtio/virtio-iommu-pci: Enforce the device is plugged on
|
|
the root bus
|
|
|
|
cherry picked from commit e72cfabf4ef2f0031e5d0b8129fb1533d383654d
|
|
|
|
In theory the virtio-iommu-pci could be plugged anywhere in the PCIe
|
|
topology and as long as the dt/acpi info are properly built this should
|
|
work. However at the moment we fail to do that because the
|
|
virtio-iommu-pci BDF is not computed at plug time and in that case
|
|
vms->virtio_iommu_bdf gets an incorrect value.
|
|
|
|
For instance if the virtio-iommu-pci is plugged onto a pcie root port
|
|
and the virtio-iommu protects a virtio-block-pci device the guest does
|
|
not boot.
|
|
|
|
So let's do not pretend we do support this case and fail the initialize()
|
|
if we detect the virtio-iommu-pci is plugged anywhere else than on the
|
|
root bus. Anyway this ability is not needed.
|
|
|
|
Signed-off-by: Eric Auger <eric.auger@redhat.com>
|
|
Message-Id: <20221012163448.121368-1-eric.auger@redhat.com>
|
|
Reviewed-by: Jean-Philippe Brucker <jean-philippe@linaro.org>
|
|
Tested-by: Jean-Philippe Brucker <jean-philippe@linaro.org>
|
|
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
|
|
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
|
|
Signed-off-by: Wanghe Xiao <xiaowanghe_yewu@cmss.chinamobile.com>
|
|
---
|
|
hw/virtio/virtio-iommu-pci.c | 13 ++++++++++---
|
|
1 file changed, 10 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/hw/virtio/virtio-iommu-pci.c b/hw/virtio/virtio-iommu-pci.c
|
|
index a160ae6b41..37eb2fb979 100644
|
|
--- a/hw/virtio/virtio-iommu-pci.c
|
|
+++ b/hw/virtio/virtio-iommu-pci.c
|
|
@@ -44,6 +44,7 @@ static Property virtio_iommu_pci_properties[] = {
|
|
static void virtio_iommu_pci_realize(VirtIOPCIProxy *vpci_dev, Error **errp)
|
|
{
|
|
VirtIOIOMMUPCI *dev = VIRTIO_IOMMU_PCI(vpci_dev);
|
|
+ PCIBus *pbus = pci_get_bus(&vpci_dev->pci_dev);
|
|
DeviceState *vdev = DEVICE(&dev->vdev);
|
|
VirtIOIOMMU *s = VIRTIO_IOMMU(vdev);
|
|
|
|
@@ -65,11 +66,17 @@ static void virtio_iommu_pci_realize(VirtIOPCIProxy *vpci_dev, Error **errp)
|
|
s->reserved_regions[i].type != VIRTIO_IOMMU_RESV_MEM_T_MSI) {
|
|
error_setg(errp, "reserved region %d has an invalid type", i);
|
|
error_append_hint(errp, "Valid values are 0 and 1\n");
|
|
- }
|
|
+ return;
|
|
+ }
|
|
}
|
|
+ if (!pci_bus_is_root(pbus)) {
|
|
+ error_setg(errp, "virtio-iommu-pci must be plugged on the root bus");
|
|
+ return;
|
|
+ }
|
|
+
|
|
object_property_set_link(OBJECT(dev), "primary-bus",
|
|
- OBJECT(pci_get_bus(&vpci_dev->pci_dev)),
|
|
- &error_abort);
|
|
+ OBJECT(pbus), &error_abort);
|
|
+
|
|
virtio_pci_force_virtio_1(vpci_dev);
|
|
qdev_realize(vdev, BUS(&vpci_dev->bus), errp);
|
|
}
|
|
--
|
|
2.27.0
|
|
|