{"id":2225842,"url":"http://patchwork.ozlabs.org/api/patches/2225842/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260421163438.3447280-6-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-6-clg@redhat.com>","list_archive_url":null,"date":"2026-04-21T16:34:29","name":"[PULL,05/14] hw/vfio/pci.c: eradicate CONFIG_KVM","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"57877898358d63d5a14760e45caea8937e99d3c7","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-6-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/2225842/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2225842/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=c6bV1Daa;\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 4g0SfB641Dz1yGs\n\tfor ; Wed, 22 Apr 2026 02:36:02 +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 1wFE4e-0004nu-TK; Tue, 21 Apr 2026 12:35:46 -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-0004aI-OS\n for qemu-devel@nongnu.org; Tue, 21 Apr 2026 12:35:12 -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 1wFE3t-0007NJ-LI\n for qemu-devel@nongnu.org; Tue, 21 Apr 2026 12:35:02 -0400","from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com\n (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by\n relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3,\n cipher=TLS_AES_256_GCM_SHA384) id us-mta-22-aUIqYgI-N2ervx99N1yH0g-1; Tue,\n 21 Apr 2026 12:34:54 -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-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS\n id 773E81955F29; Tue, 21 Apr 2026 16:34:53 +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 C125D1956056; Tue, 21 Apr 2026 16:34:51 +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=DIr7OAH7jPAt9Ijrp8ig0Z4yyQ3WYxYoNGA5UcPZCys=;\n b=c6bV1Daa7qVe58VW2QYE6r6lK//xNxe7C3uWbdTdEfMY3ZSEgmzMHlUi7wYfni9umO6EzN\n 3QITOyJTC9siFbiez1AmZRIJ5iTLHH/M/TuGY4r8V5s301nspf7KGpZqVL1hKf3K1fSxvQ\n /mFku3Vg0Qx0/EcPFej3EIQUCScm90k=","X-MC-Unique":"aUIqYgI-N2ervx99N1yH0g-1","X-Mimecast-MFC-AGG-ID":"aUIqYgI-N2ervx99N1yH0g_1776789293","From":"=?utf-8?q?C=C3=A9dric_Le_Goater?= ","To":"qemu-devel@nongnu.org","Cc":"Alex Williamson ,\n Pierrick Bouvier , =?utf-8?q?Philippe_Mathieu-?=\n\t=?utf-8?q?Daud=C3=A9?= ,\n =?utf-8?q?C=C3=A9dric_Le_Goater?= ","Subject":"[PULL 05/14] hw/vfio/pci.c: eradicate CONFIG_KVM","Date":"Tue, 21 Apr 2026 18:34:29 +0200","Message-ID":"<20260421163438.3447280-6-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\nWe just need to add kvm_enabled() guard when calling concerned\nfunctions, but no need to extract those kvm functions since they are not\nusing any kvm specific types that would not be visible at compilation\ntime.\n\nReviewed-by: Philippe Mathieu-Daudé \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-6-pierrick.bouvier@linaro.org\nSigned-off-by: Cédric Le Goater \n---\n hw/vfio/pci.c | 28 ++++++++++------------------\n 1 file changed, 10 insertions(+), 18 deletions(-)","diff":"diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c\nindex 1f1f3aaad9a901a087ecad1b5c46e8756b3a6339..b2a07f6bb4217bcacead194ce75b359b1896ef3a 100644\n--- a/hw/vfio/pci.c\n+++ b/hw/vfio/pci.c\n@@ -152,7 +152,6 @@ void vfio_pci_intx_eoi(VFIODevice *vbasedev)\n \n static bool vfio_intx_enable_kvm(VFIOPCIDevice *vdev, Error **errp)\n {\n-#ifdef CONFIG_KVM\n PCIDevice *pdev = PCI_DEVICE(vdev);\n int irq_fd = event_notifier_get_fd(&vdev->intx.interrupt);\n \n@@ -206,14 +205,10 @@ fail:\n qemu_set_fd_handler(irq_fd, vfio_intx_interrupt, NULL, vdev);\n vfio_device_irq_unmask(&vdev->vbasedev, VFIO_PCI_INTX_IRQ_INDEX);\n return false;\n-#else\n- return true;\n-#endif\n }\n \n static bool vfio_cpr_intx_enable_kvm(VFIOPCIDevice *vdev, Error **errp)\n {\n-#ifdef CONFIG_KVM\n if (vdev->no_kvm_intx || !kvm_irqfds_enabled() ||\n vdev->intx.route.mode != PCI_INTX_ENABLED ||\n !kvm_resamplefds_enabled()) {\n@@ -236,14 +231,10 @@ static bool vfio_cpr_intx_enable_kvm(VFIOPCIDevice *vdev, Error **errp)\n vdev->intx.kvm_accel = true;\n trace_vfio_intx_enable_kvm(vdev->vbasedev.name);\n return true;\n-#else\n- return true;\n-#endif\n }\n \n static void vfio_intx_disable_kvm(VFIOPCIDevice *vdev)\n {\n-#ifdef CONFIG_KVM\n PCIDevice *pdev = PCI_DEVICE(vdev);\n \n if (!vdev->intx.kvm_accel) {\n@@ -277,7 +268,6 @@ static void vfio_intx_disable_kvm(VFIOPCIDevice *vdev)\n vfio_device_irq_unmask(&vdev->vbasedev, VFIO_PCI_INTX_IRQ_INDEX);\n \n trace_vfio_intx_disable_kvm(vdev->vbasedev.name);\n-#endif\n }\n \n static void vfio_intx_update(VFIOPCIDevice *vdev, PCIINTxRoute *route)\n@@ -287,7 +277,9 @@ static void vfio_intx_update(VFIOPCIDevice *vdev, PCIINTxRoute *route)\n trace_vfio_intx_update(vdev->vbasedev.name,\n vdev->intx.route.irq, route->irq);\n \n- vfio_intx_disable_kvm(vdev);\n+ if (kvm_enabled()) {\n+ vfio_intx_disable_kvm(vdev);\n+ }\n \n vdev->intx.route = *route;\n \n@@ -295,7 +287,7 @@ static void vfio_intx_update(VFIOPCIDevice *vdev, PCIINTxRoute *route)\n return;\n }\n \n- if (!vfio_intx_enable_kvm(vdev, &err)) {\n+ if (kvm_enabled() && !vfio_intx_enable_kvm(vdev, &err)) {\n warn_reportf_err(err, VFIO_MSG_PREFIX, vdev->vbasedev.name);\n }\n \n@@ -350,16 +342,14 @@ static bool vfio_intx_enable(VFIOPCIDevice *vdev, Error **errp)\n vdev->intx.pin = pin - 1; /* Pin A (1) -> irq[0] */\n pci_config_set_interrupt_pin(pdev->config, pin);\n \n-#ifdef CONFIG_KVM\n /*\n * Only conditional to avoid generating error messages on platforms\n * where we won't actually use the result anyway.\n */\n- if (kvm_irqfds_enabled() && kvm_resamplefds_enabled()) {\n+ if (kvm_enabled() && kvm_irqfds_enabled() && kvm_resamplefds_enabled()) {\n vdev->intx.route = pci_device_route_intx_to_irq(pdev,\n vdev->intx.pin);\n }\n-#endif\n \n if (!vfio_notifier_init(vdev, &vdev->intx.interrupt, \"intx-interrupt\", 0,\n errp)) {\n@@ -370,7 +360,7 @@ static bool vfio_intx_enable(VFIOPCIDevice *vdev, Error **errp)\n \n \n if (cpr_is_incoming()) {\n- if (!vfio_cpr_intx_enable_kvm(vdev, &err)) {\n+ if (kvm_enabled() && !vfio_cpr_intx_enable_kvm(vdev, &err)) {\n warn_reportf_err(err, VFIO_MSG_PREFIX, vdev->vbasedev.name);\n }\n goto skip_signaling;\n@@ -383,7 +373,7 @@ static bool vfio_intx_enable(VFIOPCIDevice *vdev, Error **errp)\n return false;\n }\n \n- if (!vfio_intx_enable_kvm(vdev, &err)) {\n+ if (kvm_enabled() && !vfio_intx_enable_kvm(vdev, &err)) {\n warn_reportf_err(err, VFIO_MSG_PREFIX, vdev->vbasedev.name);\n }\n \n@@ -400,7 +390,9 @@ static void vfio_intx_disable(VFIOPCIDevice *vdev)\n int fd;\n \n timer_del(vdev->intx.mmap_timer);\n- vfio_intx_disable_kvm(vdev);\n+ if (kvm_enabled()) {\n+ vfio_intx_disable_kvm(vdev);\n+ }\n vfio_device_irq_disable(&vdev->vbasedev, VFIO_PCI_INTX_IRQ_INDEX);\n vdev->intx.pending = false;\n pci_irq_deassert(pdev);\n","prefixes":["PULL","05/14"]}