Skip to content

Commit 74b3445

Browse files
committed
Merge tag 'pull-vfio-20250311' of https://github.com/legoater/qemu into staging
vfio queue: * Fixed endianness of VFIO device state packets * Improved IGD passthrough support with legacy mode * Improved build * Added support for old AMD GPUs (x550) * Updated property documentation # -----BEGIN PGP SIGNATURE----- # # iQIzBAABCAAdFiEEoPZlSPBIlev+awtgUaNDx8/77KEFAmfQfQcACgkQUaNDx8/7 # 7KEUNw/+PjFpHrz5muQ8itkbyd36eJJdcxCl+9IPIWfnUfB582epkLcgvWyswGUo # krFTregoRG0PKtgZDtv95owGtVJOgK6XYFadGHiYkvvsb41twOYsP7/SuI+KMiEv # IDFLMvCTyorSIIoEF8i2EexfGPRV1VoWwvBoHgRRmYlzwzXnufjABpoZ0a25DTye # DQ4yhSfqoIh1gOcdL9tPictnZg9OxKr2ePXNdrtymtEIhg3ZobD3Jd8J4WCcsfKT # fxxBO5NsGgA8oM7i02fYN9kgMwqTnVhSAu1wq9PXsbrnNXam+trywAWSO6CjL+rV # ++STWNSrRoHzuotRBr7BzrTpTFyQyfwBWqUT5L4NlhgXB3Xybk+M6Zj08Yva8pjE # w78JQKvKp54gU34AWBW0/J6+u3v+iE8l1Eywx6xueF9Q+YSUDeW9B1LDdjFJryhF # d8j3J+vuglbdsp05D+tVErf5cqFvFDfrjTkXkZNtmx7wky45XS9ZvNazYW1KI3f9 # bg8Wjb7ZujuvxpSjycPRZzdKa8kqSgSZg7fg91Wimiy1Iqe3SZVVWNchLYiPp8Dm # nXMfOEpVHQZ1vzeo7dVWyxu9Y1ujgvUQy8kMa9q2W2S7HQ5Sna79n7eMVJxqZQ4G # m0ETFToOcPPOnZBWgqNOSUlSQncFuIVgNTDvycQ9dMhGorYcBDI= # =Vh0m # -----END PGP SIGNATURE----- # gpg: Signature made Wed 12 Mar 2025 02:12:23 HKT # gpg: using RSA key A0F66548F04895EBFE6B0B6051A343C7CFFBECA1 # gpg: Good signature from "Cédric Le Goater <[email protected]>" [full] # gpg: aka "Cédric Le Goater <[email protected]>" [full] # Primary key fingerprint: A0F6 6548 F048 95EB FE6B 0B60 51A3 43C7 CFFB ECA1 * tag 'pull-vfio-20250311' of https://github.com/legoater/qemu: (21 commits) vfio/pci: Drop debug commentary from x-device-dirty-page-tracking vfio/pci-quirks: Exclude non-ioport BAR from ATI quirk hw/vfio: Compile display.c once hw/vfio: Compile iommufd.c once hw/vfio: Compile more objects once hw/vfio: Compile some common objects once hw/vfio/common: Get target page size using runtime helpers hw/vfio/common: Include missing 'system/tcg.h' header hw/vfio/spapr: Do not include <linux/kvm.h> system: Declare qemu_[min/max]rampagesize() in 'system/hostmem.h' vfio/migration: Use BE byte order for device state wire packets vfio/igd: Fix broken KVMGT OpRegion support vfio/igd: Introduce x-igd-lpc option for LPC bridge ID quirk vfio/igd: Handle x-igd-opregion option in config quirk vfio/igd: Decouple common quirks from legacy mode vfio/igd: Refactor vfio_probe_igd_bar4_quirk into pci config quirk vfio/pci: Add placeholder for device-specific config space quirks vfio/igd: Move LPC bridge initialization to a separate function vfio/igd: Consolidate OpRegion initialization into a single function vfio/igd: Do not include GTT stolen size in etc/igd-bdsm-size ... Signed-off-by: Stefan Hajnoczi <[email protected]>
2 parents 71569cd + 4d96074 commit 74b3445

File tree

14 files changed

+288
-405
lines changed

14 files changed

+288
-405
lines changed

hw/ppc/spapr_caps.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
#include "kvm_ppc.h"
3535
#include "migration/vmstate.h"
3636
#include "system/tcg.h"
37+
#include "system/hostmem.h"
3738

3839
#include "hw/ppc/spapr.h"
3940

hw/s390x/s390-virtio-ccw.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
#include "hw/s390x/tod.h"
4242
#include "system/system.h"
4343
#include "system/cpus.h"
44+
#include "system/hostmem.h"
4445
#include "target/s390x/kvm/pv.h"
4546
#include "migration/blocker.h"
4647
#include "qapi/visitor.h"

hw/vfio/common.c

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
#include "exec/address-spaces.h"
3131
#include "exec/memory.h"
3232
#include "exec/ram_addr.h"
33+
#include "exec/target_page.h"
3334
#include "hw/hw.h"
3435
#include "qemu/error-report.h"
3536
#include "qemu/main-loop.h"
@@ -42,6 +43,7 @@
4243
#include "migration/misc.h"
4344
#include "migration/blocker.h"
4445
#include "migration/qemu-file.h"
46+
#include "system/tcg.h"
4547
#include "system/tpm.h"
4648

4749
VFIODeviceList vfio_device_list =
@@ -392,13 +394,14 @@ static void vfio_register_ram_discard_listener(VFIOContainerBase *bcontainer,
392394
MemoryRegionSection *section)
393395
{
394396
RamDiscardManager *rdm = memory_region_get_ram_discard_manager(section->mr);
397+
int target_page_size = qemu_target_page_size();
395398
VFIORamDiscardListener *vrdl;
396399

397400
/* Ignore some corner cases not relevant in practice. */
398-
g_assert(QEMU_IS_ALIGNED(section->offset_within_region, TARGET_PAGE_SIZE));
401+
g_assert(QEMU_IS_ALIGNED(section->offset_within_region, target_page_size));
399402
g_assert(QEMU_IS_ALIGNED(section->offset_within_address_space,
400-
TARGET_PAGE_SIZE));
401-
g_assert(QEMU_IS_ALIGNED(int128_get64(section->size), TARGET_PAGE_SIZE));
403+
target_page_size));
404+
g_assert(QEMU_IS_ALIGNED(int128_get64(section->size), target_page_size));
402405

403406
vrdl = g_new0(VFIORamDiscardListener, 1);
404407
vrdl->bcontainer = bcontainer;

0 commit comments

Comments
 (0)