{"id":2225852,"url":"http://patchwork.ozlabs.org/api/patches/2225852/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260421163438.3447280-5-clg@redhat.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20260421163438.3447280-5-clg@redhat.com>","list_archive_url":null,"date":"2026-04-21T16:34:28","name":"[PULL,04/14] hw/vfio: eradicate CONFIG_IOMMU from sources","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"ca7b7835b4b12572c15e5c583e7bb39a79f227b2","submitter":{"id":85406,"url":"http://patchwork.ozlabs.org/api/people/85406/?format=json","name":"Cédric Le Goater","email":"clg@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260421163438.3447280-5-clg@redhat.com/mbox/","series":[{"id":500853,"url":"http://patchwork.ozlabs.org/api/series/500853/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=500853","date":"2026-04-21T16:34:24","name":"[PULL,01/14] hw/vfio/listener.c: remove CONFIG_KVM","version":1,"mbox":"http://patchwork.ozlabs.org/series/500853/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2225852/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2225852/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@legolas.ozlabs.org","Authentication-Results":["legolas.ozlabs.org;\n\tdkim=pass (1024-bit key;\n unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256\n header.s=mimecast20190719 header.b=AG5Tuopo;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org\n (client-ip=209.51.188.17; helo=lists1p.gnu.org;\n envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n receiver=patchwork.ozlabs.org)"],"Received":["from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17])\n\t(using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4g0ShZ73j9z1yGs\n\tfor ; Wed, 22 Apr 2026 02:38:06 +1000 (AEST)","from localhost ([::1] helo=lists1p.gnu.org)\n\tby lists1p.gnu.org with esmtp (Exim 4.90_1)\n\t(envelope-from )\n\tid 1wFE55-0004wf-DP; Tue, 21 Apr 2026 12:36:11 -0400","from eggs.gnu.org ([2001:470:142:3::10])\n by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from ) id 1wFE40-0004aH-OY\n for qemu-devel@nongnu.org; Tue, 21 Apr 2026 12:35:10 -0400","from us-smtp-delivery-124.mimecast.com ([170.10.133.124])\n by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from ) id 1wFE3s-0007Mq-M0\n for qemu-devel@nongnu.org; Tue, 21 Apr 2026 12:34:58 -0400","from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com\n (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by\n relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3,\n cipher=TLS_AES_256_GCM_SHA384) id us-mta-572-GbRd4z22OHe5gd_rHo0WdA-1; Tue,\n 21 Apr 2026 12:34:52 -0400","from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com\n (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17])\n (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest\n SHA256)\n (No client certificate requested)\n by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS\n id 524DB1800345; Tue, 21 Apr 2026 16:34:51 +0000 (UTC)","from corto.redhat.com (unknown [10.44.32.70])\n by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP\n id 71F9A1956095; Tue, 21 Apr 2026 16:34:49 +0000 (UTC)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n s=mimecast20190719; t=1776789296;\n h=from:from:reply-to:subject:subject:date:date:message-id:message-id:\n to:to:cc:cc:mime-version:mime-version:content-type:content-type:\n content-transfer-encoding:content-transfer-encoding:\n in-reply-to:in-reply-to:references:references;\n bh=2aZygv18QyrraI5duFZEhvUtiCLkK2qjW57P+380aKo=;\n b=AG5TuopoTuE4HxjjbmpCQwLgjEJVpuZqGtTOj7fs1ciu+1H0yTykPV4xI45SXpiMiFpJrD\n yFhq+0DPmYvygnVpubl41A6NhemivZOx+0Zr+spZeiwt4XLmj0Kq+KUIJFSlADEkL6hFpe\n M249d8zTLQJK2chP8jSgloniI/spZpQ=","X-MC-Unique":"GbRd4z22OHe5gd_rHo0WdA-1","X-Mimecast-MFC-AGG-ID":"GbRd4z22OHe5gd_rHo0WdA_1776789291","From":"=?utf-8?q?C=C3=A9dric_Le_Goater?= ","To":"qemu-devel@nongnu.org","Cc":"Alex Williamson ,\n Pierrick Bouvier , =?utf-8?q?C=C3=A9dric_Le_Go?=\n\t=?utf-8?q?ater?= ,\n =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= ","Subject":"[PULL 04/14] hw/vfio: eradicate CONFIG_IOMMU from sources","Date":"Tue, 21 Apr 2026 18:34:28 +0200","Message-ID":"<20260421163438.3447280-5-clg@redhat.com>","In-Reply-To":"<20260421163438.3447280-1-clg@redhat.com>","References":"<20260421163438.3447280-1-clg@redhat.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","Content-Transfer-Encoding":"8bit","X-Scanned-By":"MIMEDefang 3.0 on 10.30.177.17","Received-SPF":"pass client-ip=170.10.133.124; envelope-from=clg@redhat.com;\n helo=us-smtp-delivery-124.mimecast.com","X-Spam_score_int":"-20","X-Spam_score":"-2.1","X-Spam_bar":"--","X-Spam_report":"(-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001,\n DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,\n RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_PASS=-0.001,\n SPF_PASS=-0.001 autolearn=ham autolearn_force=no","X-Spam_action":"no action","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"qemu development ","List-Unsubscribe":",\n ","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org"},"content":"From: Pierrick Bouvier \n\nThis commit removes usage of CONFIG_IOMMU in hw/vfio sources, exposing\ninconditionally iommufd related properties, which are declared\nstatically (in const arrays). The alternative to expose them dynamically\nis more complex and requires boilerplate to set properties at runtime,\nwith set_* callbacks and added logic to check if iommufd backend is\navailable, with no obvious benefit.\n\nOne possible difference is that user may see a different error message\nwhen trying to attach a vfio device with a QEMU not supporting iommufd,\nwithout declaring iommufd object associated.\n\nInstead of:\n```\n$ qemu-system-* -device vfio-pci,host=0000:01:00.0,iommufd=iommufd0\nqemu-system-*: -device vfio-pci,host=0000:01:00.0,iommufd=iommufd0: Property 'vfio-pci.iommufd' not found\n```\nUser will now see:\n```\nqemu-system-aarch64: -device vfio-pci,host=0000:01:00.0,iommufd=iommufd0: Device 'iommufd0' not found\n```\n\nHowever, since declaring the iommufd object is needed, error reported\nbefore and after is still the same:\n```\n$ qemu-system-* -object iommufd,id=iommufd0 -device vfio-pci,host=0000:01:00.0,iommufd=iommufd0\nqemu-system-*: invalid object type: iommufd\n```\n\nSigned-off-by: Pierrick Bouvier \nReviewed-by: Cédric Le Goater \nTested-by: Cédric Le Goater \nTested-by: Philippe Mathieu-Daudé \nLink: https://lore.kernel.org/qemu-devel/20260318174733.1717643-5-pierrick.bouvier@linaro.org\nSigned-off-by: Cédric Le Goater \n---\n hw/vfio/ap.c | 9 ---------\n hw/vfio/ccw.c | 9 ---------\n hw/vfio/pci.c | 11 -----------\n 3 files changed, 29 deletions(-)","diff":"diff --git a/hw/vfio/ap.c b/hw/vfio/ap.c\nindex 5c8f3056530c7027670f042ac920bd9e4a3da6e9..be20d7e7dc67f21363863f8c6d8b2a7cdedb8762 100644\n--- a/hw/vfio/ap.c\n+++ b/hw/vfio/ap.c\n@@ -11,7 +11,6 @@\n */\n \n #include \"qemu/osdep.h\"\n-#include CONFIG_DEVICES /* CONFIG_IOMMUFD */\n #include \n #include \n #include \"qapi/error.h\"\n@@ -279,10 +278,8 @@ static void vfio_ap_unrealize(DeviceState *dev)\n \n static const Property vfio_ap_properties[] = {\n DEFINE_PROP_STRING(\"sysfsdev\", VFIOAPDevice, vdev.sysfsdev),\n-#ifdef CONFIG_IOMMUFD\n DEFINE_PROP_LINK(\"iommufd\", VFIOAPDevice, vdev.iommufd,\n TYPE_IOMMUFD_BACKEND, IOMMUFDBackend *),\n-#endif\n };\n \n static void vfio_ap_reset(DeviceState *dev)\n@@ -320,21 +317,17 @@ static void vfio_ap_instance_init(Object *obj)\n vbasedev->mdev = true;\n }\n \n-#ifdef CONFIG_IOMMUFD\n static void vfio_ap_set_fd(Object *obj, const char *str, Error **errp)\n {\n vfio_device_set_fd(&VFIO_AP_DEVICE(obj)->vdev, str, errp);\n }\n-#endif\n \n static void vfio_ap_class_init(ObjectClass *klass, const void *data)\n {\n DeviceClass *dc = DEVICE_CLASS(klass);\n \n device_class_set_props(dc, vfio_ap_properties);\n-#ifdef CONFIG_IOMMUFD\n object_class_property_add_str(klass, \"fd\", NULL, vfio_ap_set_fd);\n-#endif\n dc->vmsd = &vfio_ap_vmstate;\n dc->desc = \"VFIO-based AP device assignment\";\n set_bit(DEVICE_CATEGORY_MISC, dc->categories);\n@@ -347,11 +340,9 @@ static void vfio_ap_class_init(ObjectClass *klass, const void *data)\n object_class_property_set_description(klass, /* 3.1 */\n \"sysfsdev\",\n \"Host sysfs path of assigned device\");\n-#ifdef CONFIG_IOMMUFD\n object_class_property_set_description(klass, /* 9.0 */\n \"iommufd\",\n \"Set host IOMMUFD backend device\");\n-#endif\n }\n \n static const TypeInfo vfio_ap_info = {\ndiff --git a/hw/vfio/ccw.c b/hw/vfio/ccw.c\nindex ce9c014e6a7f23b2eceecc05bc60509ece270e4b..ff6ab9a7408f01b9e64ba06f2c8da4a69fa1f9ff 100644\n--- a/hw/vfio/ccw.c\n+++ b/hw/vfio/ccw.c\n@@ -15,7 +15,6 @@\n */\n \n #include \"qemu/osdep.h\"\n-#include CONFIG_DEVICES /* CONFIG_IOMMUFD */\n #include \n #include \n #include \n@@ -647,10 +646,8 @@ static void vfio_ccw_unrealize(DeviceState *dev)\n static const Property vfio_ccw_properties[] = {\n DEFINE_PROP_STRING(\"sysfsdev\", VFIOCCWDevice, vdev.sysfsdev),\n DEFINE_PROP_BOOL(\"force-orb-pfch\", VFIOCCWDevice, force_orb_pfch, false),\n-#ifdef CONFIG_IOMMUFD\n DEFINE_PROP_LINK(\"iommufd\", VFIOCCWDevice, vdev.iommufd,\n TYPE_IOMMUFD_BACKEND, IOMMUFDBackend *),\n-#endif\n DEFINE_PROP_CCW_LOADPARM(\"loadparm\", CcwDevice, loadparm),\n };\n \n@@ -679,12 +676,10 @@ static void vfio_ccw_instance_init(Object *obj)\n DEVICE(vcdev), true);\n }\n \n-#ifdef CONFIG_IOMMUFD\n static void vfio_ccw_set_fd(Object *obj, const char *str, Error **errp)\n {\n vfio_device_set_fd(&VFIO_CCW(obj)->vdev, str, errp);\n }\n-#endif\n \n static void vfio_ccw_class_init(ObjectClass *klass, const void *data)\n {\n@@ -692,9 +687,7 @@ static void vfio_ccw_class_init(ObjectClass *klass, const void *data)\n S390CCWDeviceClass *cdc = S390_CCW_DEVICE_CLASS(klass);\n \n device_class_set_props(dc, vfio_ccw_properties);\n-#ifdef CONFIG_IOMMUFD\n object_class_property_add_str(klass, \"fd\", NULL, vfio_ccw_set_fd);\n-#endif\n dc->vmsd = &vfio_ccw_vmstate;\n dc->desc = \"VFIO-based subchannel assignment\";\n set_bit(DEVICE_CATEGORY_MISC, dc->categories);\n@@ -713,11 +706,9 @@ static void vfio_ccw_class_init(ObjectClass *klass, const void *data)\n object_class_property_set_description(klass, /* 3.0 */\n \"force-orb-pfch\",\n \"Force unlimited prefetch\");\n-#ifdef CONFIG_IOMMUFD\n object_class_property_set_description(klass, /* 9.0 */\n \"iommufd\",\n \"Set host IOMMUFD backend device\");\n-#endif\n object_class_property_set_description(klass, /* 9.2 */\n \"loadparm\",\n \"Define which devices that can be used for booting\");\ndiff --git a/hw/vfio/pci.c b/hw/vfio/pci.c\nindex 1945751ffd44dd129768ac7788f0375b216f1747..1f1f3aaad9a901a087ecad1b5c46e8756b3a6339 100644\n--- a/hw/vfio/pci.c\n+++ b/hw/vfio/pci.c\n@@ -19,7 +19,6 @@\n */\n \n #include \"qemu/osdep.h\"\n-#include CONFIG_DEVICES /* CONFIG_IOMMUFD */\n #include \n #include \n \n@@ -3471,9 +3470,7 @@ static void vfio_pci_realize(PCIDevice *pdev, Error **errp)\n ~vdev->host.slot || ~vdev->host.function)) {\n error_setg(errp, \"No provided host device\");\n error_append_hint(errp, \"Use -device vfio-pci,host=DDDD:BB:DD.F \"\n-#ifdef CONFIG_IOMMUFD\n \"or -device vfio-pci,fd=DEVICE_FD \"\n-#endif\n \"or -device vfio-pci,sysfsdev=PATH_TO_DEVICE\\n\");\n return;\n }\n@@ -3816,22 +3813,18 @@ static const Property vfio_pci_properties[] = {\n qdev_prop_nv_gpudirect_clique, uint8_t),\n DEFINE_PROP_OFF_AUTO_PCIBAR(\"x-msix-relocation\", VFIOPCIDevice, msix_relo,\n OFF_AUTO_PCIBAR_OFF),\n-#ifdef CONFIG_IOMMUFD\n DEFINE_PROP_LINK(\"iommufd\", VFIOPCIDevice, vbasedev.iommufd,\n TYPE_IOMMUFD_BACKEND, IOMMUFDBackend *),\n-#endif\n DEFINE_PROP_BOOL(\"skip-vsc-check\", VFIOPCIDevice, skip_vsc_check, true),\n DEFINE_PROP_UINT16(\"x-vpasid-cap-offset\", VFIOPCIDevice,\n vpasid_cap_offset, 0),\n };\n \n-#ifdef CONFIG_IOMMUFD\n static void vfio_pci_set_fd(Object *obj, const char *str, Error **errp)\n {\n VFIOPCIDevice *vdev = VFIO_PCI_DEVICE(obj);\n vfio_device_set_fd(&vdev->vbasedev, str, errp);\n }\n-#endif\n \n static void vfio_pci_class_init(ObjectClass *klass, const void *data)\n {\n@@ -3840,9 +3833,7 @@ static void vfio_pci_class_init(ObjectClass *klass, const void *data)\n \n device_class_set_legacy_reset(dc, vfio_pci_reset);\n device_class_set_props(dc, vfio_pci_properties);\n-#ifdef CONFIG_IOMMUFD\n object_class_property_add_str(klass, \"fd\", NULL, vfio_pci_set_fd);\n-#endif\n dc->vmsd = &vfio_cpr_pci_vmstate;\n dc->desc = \"VFIO-based PCI device assignment\";\n pdc->realize = vfio_pci_realize;\n@@ -3944,11 +3935,9 @@ static void vfio_pci_class_init(ObjectClass *klass, const void *data)\n \"vf-token\",\n \"Specify UUID VF token. Required for VF when PF is owned \"\n \"by another VFIO driver\");\n-#ifdef CONFIG_IOMMUFD\n object_class_property_set_description(klass, /* 9.0 */\n \"iommufd\",\n \"Set host IOMMUFD backend device\");\n-#endif\n object_class_property_set_description(klass, /* 9.1 */\n \"x-device-dirty-page-tracking\",\n \"Disable device dirty page tracking and use \"\n","prefixes":["PULL","04/14"]}