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>
64 lines
2.7 KiB
Diff
64 lines
2.7 KiB
Diff
From 125b3c3ef9db4cda5e6f08d2f1f5b3d1fe853ef7 Mon Sep 17 00:00:00 2001
|
|
From: tangbinzy <tangbin_yewu@cmss.chinamobile.com>
|
|
Date: Fri, 24 Nov 2023 08:33:13 +0000
|
|
Subject: [PATCH] xen/pass-through: don't create needless register group
|
|
mainline inclusion commit c0e86b7624cb9d6db03e0d48cf82659e5b89a6a6 category:
|
|
bugfix
|
|
|
|
---------------------------------------------------------------
|
|
|
|
Currently we are creating a register group for the Intel IGD OpRegion
|
|
for every device we pass through, but the XEN_PCI_INTEL_OPREGION
|
|
register group is only valid for an Intel IGD. Add a check to make
|
|
sure the device is an Intel IGD and a check that the administrator has
|
|
enabled gfx_passthru in the xl domain configuration. Require both checks
|
|
to be true before creating the register group. Use the existing
|
|
is_igd_vga_passthrough() function to check for a graphics device from
|
|
any vendor and that the administrator enabled gfx_passthru in the xl
|
|
domain configuration, but further require that the vendor be Intel,
|
|
because only Intel IGD devices have an Intel OpRegion. These are the
|
|
same checks hvmloader and libxl do to determine if the Intel OpRegion
|
|
needs to be mapped into the guest's memory. Also, move the comment
|
|
about trapping 0xfc for the Intel OpRegion where it belongs after
|
|
applying this patch.
|
|
|
|
Signed-off-by: Chuck Zmudzinski <brchuckz@aol.com>
|
|
Reviewed-by: Anthony PERARD <anthony.perard@citrix.com>
|
|
Message-Id: <c76dff6369ccf2256bd9eed5141da1db767293d2.1656480662.git.brchuckz@aol.com>
|
|
Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
|
|
|
|
Signed-off-by: tangbinzy <tangbin_yewu@cmss.chinamobile.com>
|
|
---
|
|
hw/xen/xen_pt_config_init.c | 14 +++++++++-----
|
|
1 file changed, 9 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/hw/xen/xen_pt_config_init.c b/hw/xen/xen_pt_config_init.c
|
|
index e7bcbe4c4f..b9833d2fa7 100644
|
|
--- a/hw/xen/xen_pt_config_init.c
|
|
+++ b/hw/xen/xen_pt_config_init.c
|
|
@@ -2031,12 +2031,16 @@ void xen_pt_config_init(XenPCIPassthroughState *s, Error **errp)
|
|
}
|
|
}
|
|
|
|
- /*
|
|
- * By default we will trap up to 0x40 in the cfg space.
|
|
- * If an intel device is pass through we need to trap 0xfc,
|
|
- * therefore the size should be 0xff.
|
|
- */
|
|
if (xen_pt_emu_reg_grps[i].grp_id == XEN_PCI_INTEL_OPREGION) {
|
|
+ if (!is_igd_vga_passthrough(&s->real_device) ||
|
|
+ s->real_device.vendor_id != PCI_VENDOR_ID_INTEL) {
|
|
+ continue;
|
|
+ }
|
|
+ /*
|
|
+ * By default we will trap up to 0x40 in the cfg space.
|
|
+ * If an intel device is pass through we need to trap 0xfc,
|
|
+ * therefore the size should be 0xff.
|
|
+ */
|
|
reg_grp_offset = XEN_PCI_INTEL_OPREGION;
|
|
}
|
|
|
|
--
|
|
2.27.0
|
|
|