From: Zhenzhong Duan <zhenzhong.duan@intel.com>
To: qemu-devel@nongnu.org
Cc: alex.williamson@redhat.com, clg@redhat.com, jgg@nvidia.com,
nicolinc@nvidia.com, joao.m.martins@oracle.com,
eric.auger@redhat.com, peterx@redhat.com, jasowang@redhat.com,
kevin.tian@intel.com, yi.l.liu@intel.com, yi.y.sun@intel.com,
chao.p.peng@intel.com, Zhenzhong Duan <zhenzhong.duan@intel.com>
Subject: [PATCH v4 41/41] vfio: Compile out iommufd for PPC target
Date: Thu, 2 Nov 2023 15:13:02 +0800 [thread overview]
Message-ID: <20231102071302.1818071-42-zhenzhong.duan@intel.com> (raw)
In-Reply-To: <20231102071302.1818071-1-zhenzhong.duan@intel.com>
Since PPC doesn't support IOMMUFD, make iommufd related code
compiled out.
Suggested-by: Cédric Le Goater <clg@redhat.com>
Signed-off-by: Zhenzhong Duan <zhenzhong.duan@intel.com>
---
hw/vfio/common.c | 2 +-
hw/vfio/pci.c | 2 +-
hw/vfio/platform.c | 2 +-
backends/meson.build | 4 ++--
hw/vfio/meson.build | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/hw/vfio/common.c b/hw/vfio/common.c
index 1c9203183d..000717cef3 100644
--- a/hw/vfio/common.c
+++ b/hw/vfio/common.c
@@ -1504,7 +1504,7 @@ int vfio_attach_device(char *name, VFIODevice *vbasedev,
{
const VFIOIOMMUOps *ops;
-#ifdef CONFIG_IOMMUFD
+#if defined(CONFIG_IOMMUFD) && !defined(TARGET_PPC)
if (vbasedev->iommufd) {
ops = &vfio_iommufd_ops;
} else
diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c
index d8f658ea47..2287e45119 100644
--- a/hw/vfio/pci.c
+++ b/hw/vfio/pci.c
@@ -3550,7 +3550,7 @@ static Property vfio_pci_dev_properties[] = {
qdev_prop_nv_gpudirect_clique, uint8_t),
DEFINE_PROP_OFF_AUTO_PCIBAR("x-msix-relocation", VFIOPCIDevice, msix_relo,
OFF_AUTOPCIBAR_OFF),
-#ifdef CONFIG_IOMMUFD
+#if defined(CONFIG_IOMMUFD) && !defined(TARGET_PPC)
DEFINE_PROP_LINK("iommufd", VFIOPCIDevice, vbasedev.iommufd,
TYPE_IOMMUFD_BACKEND, IOMMUFDBackend *),
#endif
diff --git a/hw/vfio/platform.c b/hw/vfio/platform.c
index aa0b2b9583..c8f4ae5a06 100644
--- a/hw/vfio/platform.c
+++ b/hw/vfio/platform.c
@@ -648,7 +648,7 @@ static Property vfio_platform_dev_properties[] = {
DEFINE_PROP_UINT32("mmap-timeout-ms", VFIOPlatformDevice,
mmap_timeout, 1100),
DEFINE_PROP_BOOL("x-irqfd", VFIOPlatformDevice, irqfd_allowed, true),
-#ifdef CONFIG_IOMMUFD
+#if defined(CONFIG_IOMMUFD) && !defined(TARGET_PPC)
DEFINE_PROP_LINK("iommufd", VFIOPlatformDevice, vbasedev.iommufd,
TYPE_IOMMUFD_BACKEND, IOMMUFDBackend *),
#endif
diff --git a/backends/meson.build b/backends/meson.build
index 05ac57ff15..9dbdfa87f7 100644
--- a/backends/meson.build
+++ b/backends/meson.build
@@ -21,9 +21,9 @@ if have_vhost_user
endif
system_ss.add(when: 'CONFIG_VIRTIO_CRYPTO', if_true: files('cryptodev-vhost.c'))
if have_iommufd
- system_ss.add(files('iommufd.c'))
+ system_ss.add(when: 'TARGET_PPC', if_false: files('iommufd.c'))
else
- system_ss.add(files('iommufd-stub.c'))
+ system_ss.add(when: 'TARGET_PPC', if_false: files('iommufd-stub.c'))
endif
if have_vhost_user_crypto
system_ss.add(when: 'CONFIG_VIRTIO_CRYPTO', if_true: files('cryptodev-vhost-user.c'))
diff --git a/hw/vfio/meson.build b/hw/vfio/meson.build
index 9cae2c9e21..4423bb3cd4 100644
--- a/hw/vfio/meson.build
+++ b/hw/vfio/meson.build
@@ -8,7 +8,7 @@ vfio_ss.add(files(
'migration.c',
))
if have_iommufd
- vfio_ss.add(files('iommufd.c'))
+ vfio_ss.add(when: 'TARGET_PPC', if_false: files('iommufd.c'))
endif
vfio_ss.add(when: 'CONFIG_VFIO_PCI', if_true: files(
'display.c',
--
2.34.1
next prev parent reply other threads:[~2023-11-02 7:32 UTC|newest]
Thread overview: 114+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-02 7:12 [PATCH v4 00/41] vfio: Adopt iommufd Zhenzhong Duan
2023-11-02 7:12 ` [PATCH v4 01/41] vfio/container: Move IBM EEH related functions into spapr_pci_vfio.c Zhenzhong Duan
2023-11-02 7:12 ` [PATCH v4 02/41] vfio/container: Move vfio_container_add/del_section_window into spapr.c Zhenzhong Duan
2023-11-02 7:12 ` [PATCH v4 03/41] vfio/container: Move spapr specific init/deinit " Zhenzhong Duan
2023-11-02 7:12 ` [PATCH v4 04/41] vfio/spapr: Make vfio_spapr_create/remove_window static Zhenzhong Duan
2023-11-02 7:12 ` [PATCH v4 05/41] vfio/common: Move vfio_host_win_add/del into spapr.c Zhenzhong Duan
2023-11-06 9:33 ` Cédric Le Goater
2023-11-02 7:12 ` [PATCH v4 06/41] vfio: Introduce base object for VFIOContainer and targeted interface Zhenzhong Duan
2023-11-06 16:36 ` Cédric Le Goater
2023-11-02 7:12 ` [PATCH v4 07/41] vfio/container: Introduce a empty VFIOIOMMUOps Zhenzhong Duan
2023-11-06 16:36 ` Cédric Le Goater
2023-11-02 7:12 ` [PATCH v4 08/41] vfio/container: Switch to dma_map|unmap API Zhenzhong Duan
2023-11-06 16:37 ` Cédric Le Goater
2023-11-02 7:12 ` [PATCH v4 09/41] vfio/common: Introduce vfio_container_init/destroy helper Zhenzhong Duan
2023-11-06 16:37 ` Cédric Le Goater
2023-11-02 7:12 ` [PATCH v4 10/41] vfio/common: Move giommu_list in base container Zhenzhong Duan
2023-11-06 16:50 ` Cédric Le Goater
2023-11-02 7:12 ` [PATCH v4 11/41] vfio/container: Move space field to " Zhenzhong Duan
2023-11-06 16:50 ` Cédric Le Goater
2023-11-02 7:12 ` [PATCH v4 12/41] vfio/container: Switch to IOMMU BE set_dirty_page_tracking/query_dirty_bitmap API Zhenzhong Duan
2023-11-06 16:50 ` Cédric Le Goater
2023-11-02 7:12 ` [PATCH v4 13/41] vfio/container: Move per container device list in base container Zhenzhong Duan
2023-11-02 7:12 ` [PATCH v4 14/41] vfio/container: Convert functions to " Zhenzhong Duan
2023-11-02 7:12 ` [PATCH v4 15/41] vfio/container: Move pgsizes and dma_max_mappings " Zhenzhong Duan
2023-11-06 16:53 ` Cédric Le Goater
2023-11-02 7:12 ` [PATCH v4 16/41] vfio/container: Move vrdl_list " Zhenzhong Duan
2023-11-06 16:53 ` Cédric Le Goater
2023-11-02 7:12 ` [PATCH v4 17/41] vfio/container: Move listener " Zhenzhong Duan
2023-11-06 16:57 ` Cédric Le Goater
2023-11-02 7:12 ` [PATCH v4 18/41] vfio/container: Move dirty_pgsizes and max_dirty_bitmap_size " Zhenzhong Duan
2023-11-02 7:12 ` [PATCH v4 19/41] vfio/container: Move iova_ranges " Zhenzhong Duan
2023-11-06 16:58 ` Cédric Le Goater
2023-11-02 7:12 ` [PATCH v4 20/41] vfio/container: Implement attach/detach_device Zhenzhong Duan
2023-11-06 16:59 ` Cédric Le Goater
2023-11-02 7:12 ` [PATCH v4 21/41] vfio/spapr: Introduce spapr backend and target interface Zhenzhong Duan
2023-11-06 17:30 ` Cédric Le Goater
2023-11-02 7:12 ` [PATCH v4 22/41] vfio/spapr: switch to spapr IOMMU BE add/del_section_window Zhenzhong Duan
2023-11-06 17:33 ` Cédric Le Goater
2023-11-07 3:06 ` Duan, Zhenzhong
2023-11-07 13:07 ` Cédric Le Goater
2023-11-07 17:34 ` Cédric Le Goater
2023-11-02 7:12 ` [PATCH v4 23/41] vfio/spapr: Move prereg_listener into spapr container Zhenzhong Duan
2023-11-06 17:34 ` Cédric Le Goater
2023-11-02 7:12 ` [PATCH v4 24/41] vfio/spapr: Move hostwin_list " Zhenzhong Duan
2023-11-06 17:35 ` Cédric Le Goater
2023-11-02 7:12 ` [PATCH v4 25/41] Add iommufd configure option Zhenzhong Duan
2023-11-07 13:14 ` Cédric Le Goater
2023-11-07 14:37 ` Cédric Le Goater
2023-11-08 6:08 ` Duan, Zhenzhong
2023-11-02 7:12 ` [PATCH v4 26/41] backends/iommufd: Introduce the iommufd object Zhenzhong Duan
2023-11-07 13:33 ` Cédric Le Goater
2023-11-08 3:35 ` Duan, Zhenzhong
2023-11-08 9:40 ` Cédric Le Goater
2023-11-08 9:43 ` Duan, Zhenzhong
2023-11-08 5:50 ` Markus Armbruster
2023-11-08 10:03 ` Cédric Le Goater
2023-11-08 10:30 ` Markus Armbruster
2023-11-08 13:48 ` Cédric Le Goater
2023-11-09 9:05 ` Markus Armbruster
2023-11-10 2:03 ` Duan, Zhenzhong
2023-11-14 9:40 ` Cédric Le Goater
2023-11-14 10:18 ` Duan, Zhenzhong
2023-11-02 7:12 ` [PATCH v4 27/41] util/char_dev: Add open_cdev() Zhenzhong Duan
2023-11-07 13:37 ` Cédric Le Goater
2023-11-08 4:29 ` Duan, Zhenzhong
2023-11-02 7:12 ` [PATCH v4 28/41] vfio/iommufd: Implement the iommufd backend Zhenzhong Duan
2023-11-07 13:41 ` Cédric Le Goater
2023-11-08 5:45 ` Duan, Zhenzhong
2023-11-08 2:59 ` Matthew Rosato
2023-11-08 7:16 ` Duan, Zhenzhong
2023-11-08 12:48 ` Jason Gunthorpe
2023-11-08 13:25 ` Duan, Zhenzhong
2023-11-08 14:19 ` Jason Gunthorpe
2023-11-09 2:45 ` Duan, Zhenzhong
2023-11-09 12:17 ` Joao Martins
2023-11-09 12:57 ` Jason Gunthorpe
2023-11-09 12:59 ` Joao Martins
2023-11-09 13:03 ` Joao Martins
2023-11-09 13:09 ` Jason Gunthorpe
2023-11-09 13:21 ` Joao Martins
2023-11-09 14:34 ` Jason Gunthorpe
2023-11-10 3:15 ` Duan, Zhenzhong
2023-11-10 13:09 ` Joao Martins
2023-11-13 3:17 ` Duan, Zhenzhong
2023-11-02 7:12 ` [PATCH v4 29/41] vfio/iommufd: Relax assert check for " Zhenzhong Duan
2023-11-02 7:12 ` [PATCH v4 30/41] vfio/iommufd: Add support for iova_ranges Zhenzhong Duan
2023-11-06 17:19 ` Cédric Le Goater
2023-11-07 3:07 ` Duan, Zhenzhong
2023-11-02 7:12 ` [PATCH v4 31/41] vfio/pci: Extract out a helper vfio_pci_get_pci_hot_reset_info Zhenzhong Duan
2023-11-07 13:48 ` Cédric Le Goater
2023-11-02 7:12 ` [PATCH v4 32/41] vfio/pci: Introduce a vfio pci hot reset interface Zhenzhong Duan
2023-11-07 13:52 ` Cédric Le Goater
2023-11-08 5:46 ` Duan, Zhenzhong
2023-11-02 7:12 ` [PATCH v4 33/41] vfio/iommufd: Enable pci hot reset through iommufd cdev interface Zhenzhong Duan
2023-11-02 7:12 ` [PATCH v4 34/41] vfio/pci: Allow the selection of a given iommu backend Zhenzhong Duan
2023-11-02 7:12 ` [PATCH v4 35/41] vfio/pci: Make vfio cdev pre-openable by passing a file handle Zhenzhong Duan
2023-11-02 7:12 ` [PATCH v4 36/41] vfio: Allow the selection of a given iommu backend for platform ap and ccw Zhenzhong Duan
2023-11-07 18:18 ` Cédric Le Goater
2023-11-02 7:12 ` [PATCH v4 37/41] vfio/platform: Make vfio cdev pre-openable by passing a file handle Zhenzhong Duan
2023-11-02 7:12 ` [PATCH v4 38/41] vfio/ap: " Zhenzhong Duan
2023-11-07 18:19 ` Cédric Le Goater
2023-11-02 7:13 ` [PATCH v4 39/41] vfio/ccw: " Zhenzhong Duan
2023-11-07 18:20 ` Cédric Le Goater
2023-11-02 7:13 ` [PATCH v4 40/41] vfio: Make VFIOContainerBase poiner parameter const in VFIOIOMMUOps callbacks Zhenzhong Duan
2023-11-02 7:13 ` Zhenzhong Duan [this message]
2023-11-07 13:44 ` [PATCH v4 41/41] vfio: Compile out iommufd for PPC target Cédric Le Goater
2023-11-08 4:31 ` Duan, Zhenzhong
2023-11-06 14:23 ` [PATCH v4 00/41] vfio: Adopt iommufd Cédric Le Goater
2023-11-07 18:28 ` Cédric Le Goater
2023-11-08 3:26 ` Matthew Rosato
2023-11-08 8:37 ` Duan, Zhenzhong
2023-11-08 9:07 ` Duan, Zhenzhong
2023-11-08 9:23 ` Cédric Le Goater
2023-11-08 9:21 ` Cédric Le Goater
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231102071302.1818071-42-zhenzhong.duan@intel.com \
--to=zhenzhong.duan@intel.com \
--cc=alex.williamson@redhat.com \
--cc=chao.p.peng@intel.com \
--cc=clg@redhat.com \
--cc=eric.auger@redhat.com \
--cc=jasowang@redhat.com \
--cc=jgg@nvidia.com \
--cc=joao.m.martins@oracle.com \
--cc=kevin.tian@intel.com \
--cc=nicolinc@nvidia.com \
--cc=peterx@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=yi.l.liu@intel.com \
--cc=yi.y.sun@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).