diff options
| author | Cédric Le Goater <clg@redhat.com> | 2025-02-06 14:14:35 +0100 |
|---|---|---|
| committer | Cédric Le Goater <clg@redhat.com> | 2025-02-11 14:15:19 +0100 |
| commit | be7d8579eb5758c0edf81eb068017a56471a77e0 (patch) | |
| tree | 88cab7869b06f012d4fd0dac431f73cb5af95124 /hw/vfio | |
| parent | 889695f8f3c10647cc27a3788b4a3f1d0192926c (diff) | |
| download | qemu-be7d8579eb5758c0edf81eb068017a56471a77e0.zip qemu-be7d8579eb5758c0edf81eb068017a56471a77e0.tar.gz qemu-be7d8579eb5758c0edf81eb068017a56471a77e0.tar.bz2 | |
vfio: Remove superfluous error report in vfio_listener_region_add()
For pseries machines, commit 567b5b309abe ("vfio/pci: Relax DMA map
errors for MMIO regions") introduced 2 error reports to notify the
user of MMIO mapping errors. Consolidate both code paths under one.
Cc: Harsh Prateek Bora <harshpb@linux.ibm.com>
Cc: Shivaprasad G Bhat <sbhat@linux.ibm.com>
Reviewed-by: Harsh Prateek Bora <harshpb@linux.ibm.com>
Reviewed-by: Alex Williamson <alex.williamson@redhat.com>
Link: https://lore.kernel.org/qemu-devel/20250206131438.1505542-8-clg@redhat.com
Signed-off-by: Cédric Le Goater <clg@redhat.com>
Diffstat (limited to 'hw/vfio')
| -rw-r--r-- | hw/vfio/common.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/hw/vfio/common.c b/hw/vfio/common.c index 4fca4c6..abbdc56 100644 --- a/hw/vfio/common.c +++ b/hw/vfio/common.c @@ -594,8 +594,9 @@ static void vfio_listener_region_add(MemoryListener *listener, return; } + /* PPC64/pseries machine only */ if (!vfio_container_add_section_window(bcontainer, section, &err)) { - goto fail; + goto mmio_dma_error; } memory_region_ref(section->mr); @@ -680,6 +681,7 @@ static void vfio_listener_region_add(MemoryListener *listener, "0x%"HWADDR_PRIx", %p) = %d (%s)", bcontainer, iova, int128_get64(llsize), vaddr, ret, strerror(-ret)); + mmio_dma_error: if (memory_region_is_ram_device(section->mr)) { /* Allow unexpected mappings not to be fatal for RAM devices */ VFIODevice *vbasedev = @@ -694,11 +696,6 @@ static void vfio_listener_region_add(MemoryListener *listener, return; fail: - if (memory_region_is_ram_device(section->mr)) { - error_reportf_err(err, "PCI p2p may not work: "); - return; - } - if (!bcontainer->initialized) { /* * At machine init time or when the device is attached to the @@ -806,6 +803,7 @@ static void vfio_listener_region_del(MemoryListener *listener, memory_region_unref(section->mr); + /* PPC64/pseries machine only */ vfio_container_del_section_window(bcontainer, section); } |