From nobody Sat Feb 7 09:29:47 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1603214755; cv=none; d=zohomail.com; s=zohoarc; b=I4/qBTr/z+6RHINUMy5eebE+GCx6pC0w1PLYThu+TogMcQmpSV7W7xhwLrgoEH0aEzVyhC+uRw6xDy1gbdM87N7aMevkyMzART2hArZNDL6fFCBKu5y2HE7qWcE4akszWMb1F8yAqHgzLMUL3mB2jV5TDfUfrOpTmXu8iQeLYW8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603214755; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=8oqdstf17QDkdRiVc5f+XWE4kqpKFWIiKO1K+jCCJoE=; b=FfI21seHtEOFngWkJcQu67h7NrGKDNlsU83XkK7RU1SWsJiEHaMYobhKUjTCCziOhBn92us2VS4tObz7vBCdlGTkyvSGVSW2gQyfmCqupTeXWav7Cx4YwPSpsF6goqQJMP1EFXIfRuf3aJpt/C9n+Z90uyqtCMI1QsAi4NxfX8c= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1603214755612549.8870102730422; Tue, 20 Oct 2020 10:25:55 -0700 (PDT) Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-505-HDnsAFLLM-qQ1Wi5Idu6wQ-1; Tue, 20 Oct 2020 13:25:53 -0400 Received: by mail-wm1-f72.google.com with SMTP id z7so703288wmi.3 for ; Tue, 20 Oct 2020 10:25:53 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (237.red-88-18-140.staticip.rima-tde.net. [88.18.140.237]) by smtp.gmail.com with ESMTPSA id 130sm3827184wmd.18.2020.10.20.10.25.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Oct 2020 10:25:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1603214754; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=8oqdstf17QDkdRiVc5f+XWE4kqpKFWIiKO1K+jCCJoE=; b=KR2cjJuk279B2kEKGTOaljWETHwi43Z4ZGVy5O14fx78Tq65WpSv7KqqByEjldqnl4jjpY NWxHcDJaW20keo6+DInm890CE3go5I8ho0tBRm1rXkeV/JFdSmAzrFUjynpxGhsD3aNBeN Dbmw25sYwm9nVhCSV0OMtJCW/fDAjKg= X-MC-Unique: HDnsAFLLM-qQ1Wi5Idu6wQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=8oqdstf17QDkdRiVc5f+XWE4kqpKFWIiKO1K+jCCJoE=; b=cAbFAcEjbEhT0zrf8fzx33vKXsOLGPdZZJOdNM821mMIzfdXveRqlFUisAoiIU/QAB yR4TcLRs/NjHwiDfstdh8uwZAKHwl51CmWeQkktwA2K5r6CzeS2aa2Dt+ZL+u+5xy7SK T/k0UPyaAEd7W0qeni6JEdG3T88JwfaDieZh4foA878/o9BYJlpxslDHzaKxPf6SwkKb ascPng2fD95HRQrg9wkCHk1TaMTioed/eUhuFmJQfLmHu0rn5DwkCwuUAHWfF+C3K79L XfRZIopZ5bxt1ZWJo/ENWFFTT+PyHAfbfuRFSxNyP8hyMhi60ImlgL4ReYJxFIvth7Kb yCbQ== X-Gm-Message-State: AOAM5321FApVG5Kp9nFerY1Ip0CVH4k//Hbkh+eYrlv9m5JkH7EIXQCA OivQCW2wGNPN43DrLqHVfAyj2sfuhuug7LZn9taOkzBxRW1oG42Q2HhIHE1xZfEqHex2kwjBzRl JCx5jSjSopZi8iA== X-Received: by 2002:a1c:49c2:: with SMTP id w185mr3997332wma.70.1603214751974; Tue, 20 Oct 2020 10:25:51 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwdcxOTOZoM/gU99BUW1BC35eAswqh/g0UQilPWU36+0grXfNSITkALfOWA2eGpPksUWVEXTw== X-Received: by 2002:a1c:49c2:: with SMTP id w185mr3997314wma.70.1603214751797; Tue, 20 Oct 2020 10:25:51 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Kevin Wolf , Alex Williamson , Stefan Hajnoczi , Max Reitz , Fam Zheng , qemu-block@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 16/16] util/vfio-helpers: Remove now unused qemu_vfio_pci_init_irq() Date: Tue, 20 Oct 2020 19:24:28 +0200 Message-Id: <20201020172428.2220726-17-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201020172428.2220726-1-philmd@redhat.com> References: <20201020172428.2220726-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Our only user, the NVMe block driver, switched to the MSIX API. As this function is now unused, remove it. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Stefan Hajnoczi --- include/qemu/vfio-helpers.h | 2 -- util/vfio-helpers.c | 43 ------------------------------------- 2 files changed, 45 deletions(-) diff --git a/include/qemu/vfio-helpers.h b/include/qemu/vfio-helpers.h index 4c06694e03a..f42371d25d6 100644 --- a/include/qemu/vfio-helpers.h +++ b/include/qemu/vfio-helpers.h @@ -29,8 +29,6 @@ void *qemu_vfio_pci_map_bar(QEMUVFIOState *s, int index, Error **errp); void qemu_vfio_pci_unmap_bar(QEMUVFIOState *s, int index, void *bar, uint64_t offset, uint64_t size); -int qemu_vfio_pci_init_irq(QEMUVFIOState *s, EventNotifier *e, - int irq_type, Error **errp); int qemu_vfio_pci_msix_init_irqs(QEMUVFIOState *s, unsigned *irq_count, Error **errp); int qemu_vfio_pci_msix_set_irq(QEMUVFIOState *s, unsigned irq_index, diff --git a/util/vfio-helpers.c b/util/vfio-helpers.c index 18142e6be86..83d6eef13fb 100644 --- a/util/vfio-helpers.c +++ b/util/vfio-helpers.c @@ -189,49 +189,6 @@ void qemu_vfio_pci_unmap_bar(QEMUVFIOState *s, int ind= ex, void *bar, } } =20 -/** - * Initialize device IRQ with @irq_type and register an event notifier. - */ -int qemu_vfio_pci_init_irq(QEMUVFIOState *s, EventNotifier *e, - int irq_type, Error **errp) -{ - int r; - struct vfio_irq_set *irq_set; - size_t irq_set_size; - struct vfio_irq_info irq_info =3D { .argsz =3D sizeof(irq_info) }; - - irq_info.index =3D irq_type; - if (ioctl(s->device, VFIO_DEVICE_GET_IRQ_INFO, &irq_info)) { - error_setg_errno(errp, errno, "Failed to get device interrupt info= "); - return -errno; - } - if (!(irq_info.flags & VFIO_IRQ_INFO_EVENTFD)) { - error_setg(errp, "Device interrupt doesn't support eventfd"); - return -EINVAL; - } - - irq_set_size =3D sizeof(*irq_set) + sizeof(int); - irq_set =3D g_malloc0(irq_set_size); - - /* Get to a known IRQ state */ - *irq_set =3D (struct vfio_irq_set) { - .argsz =3D irq_set_size, - .flags =3D VFIO_IRQ_SET_DATA_EVENTFD | VFIO_IRQ_SET_ACTION_TRIGGER, - .index =3D irq_info.index, - .start =3D 0, - .count =3D 1, - }; - - *(int *)&irq_set->data =3D event_notifier_get_fd(e); - r =3D ioctl(s->device, VFIO_DEVICE_SET_IRQS, irq_set); - g_free(irq_set); - if (r) { - error_setg_errno(errp, errno, "Failed to setup device interrupt"); - return -errno; - } - return 0; -} - /** * Initialize a MSIX IRQ and register its event notifier. * @irq_index: MSIX IRQ index --=20 2.26.2