From nobody Tue Feb 10 01:15:52 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=1603709802; cv=none; d=zohomail.com; s=zohoarc; b=AlbT/5nx4f0nuMv/Kvr6IZkDKQxs/Wuzb6A1bI74ouaVK6Y44EdvYDzf8P7470UgZzHj2+sJKXHGpxiZ7UOsw8/0agNxEgXaCsOJ6ByhUf8fqyYPRImbBi8FQeo7g4FC0TIiTNWyqb2GK8CmvdiIAMjUD3UiOM98qX0jb6dh0CA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603709802; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=tjiqDTNg6IlVQRDX7FtGh0Vb3qFf/kKU7hA/I3jkchg=; b=MQfzIVYGcqRatqPHIxIKN1yphT748qhj7lnNLxC/TysxL3uMtXQZwVJ3LMJRAIRPl3FVnhPSWVCAUZgmn7+DILapyCz/+ZPd89yjf3L8vEj19NJjHJxfA1m64tahGY4kVeJcqW5pLIg5X84MpMTSmwRnkKAza0zm78ybG5NxlZ0= 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 1603709802633966.9462098249297; Mon, 26 Oct 2020 03:56:42 -0700 (PDT) Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-45-AFxgSn_NNqWq1piPBy5fWw-1; Mon, 26 Oct 2020 06:56:40 -0400 Received: by mail-wr1-f72.google.com with SMTP id k14so8193101wrd.6 for ; Mon, 26 Oct 2020 03:56:39 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (237.red-88-18-140.staticip.rima-tde.net. [88.18.140.237]) by smtp.gmail.com with ESMTPSA id x22sm23311138wmj.25.2020.10.26.03.56.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Oct 2020 03:56:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1603709801; 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=tjiqDTNg6IlVQRDX7FtGh0Vb3qFf/kKU7hA/I3jkchg=; b=StnC6G3k3oKDoyEiERmBwd1a2fWIs19sJaZHolWAvkoR2veVgQDflhPkn6kTAV7VFG+CoB KvZngkgt9KkvctXjz0srT/tU4cBfqn/TPI3mf1Equc+Qv9WOmQ6Duq0jKKUtADY8GJcUOl HVibXKy0Wn5JCJxUpNdxUFIqB4P63Rg= X-MC-Unique: AFxgSn_NNqWq1piPBy5fWw-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=tjiqDTNg6IlVQRDX7FtGh0Vb3qFf/kKU7hA/I3jkchg=; b=ekUONjUQC/I1WCYWN8K65m4uSRbxUG4xQeTnLcuJhew3AN+z0IX9tChJff3bd55MsK uF8lWAX30VoBB8IRmPFdjhwSa0RCtMq6IlzF3prm0/8QH/fsPlyb2aDCZC3GZJ9BN24A 92qn9PANHk6xFTKh1RxXSnzcf8sDppU262zOBq/wnWSbHrI5q5atuhEDGpqIJU4guUJJ 67rb2Evu0vA8lqT9fvR3BnrQSVv4WG1G64qW7YB47yWzFjBOuBQuJHFkBkm5ctuDs5yi 5GdOka5+njuXxh2XU9XEJyhKHlNHZF9/ab8QAR183jYKt1jRNjoX8Wk+SoQofwBCmYDM p5uA== X-Gm-Message-State: AOAM531+iWA3e/uE3B/DAyLvakowju9RJo1lIIk7LaQjTqdDC0o/Kllo LG+3Yq3sMOAd6R5hWbsRCTCN3nk+D3PJpvntk8UmDXghLqvZQ8wh3Clanw0LtIzdLbVPs5J7HBB Ka03zQIxbF6I2bA== X-Received: by 2002:adf:df91:: with SMTP id z17mr16494479wrl.379.1603709798839; Mon, 26 Oct 2020 03:56:38 -0700 (PDT) X-Google-Smtp-Source: ABdhPJytN3mEF4Hc6GaEYj3Y6qef4YQsPeZ8djC15U7IdK3PastNYOq167V0jsz8okdHtd5QnArKWg== X-Received: by 2002:adf:df91:: with SMTP id z17mr16494463wrl.379.1603709798676; Mon, 26 Oct 2020 03:56:38 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Eric Auger , Alex Williamson , qemu-block@nongnu.org, Fam Zheng , Max Reitz , Stefan Hajnoczi , Kevin Wolf , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 19/19] util/vfio-helpers: Remove now unused qemu_vfio_pci_init_irq() Date: Mon, 26 Oct 2020 11:55:04 +0100 Message-Id: <20201026105504.4023620-20-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201026105504.4023620-1-philmd@redhat.com> References: <20201026105504.4023620-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. Reviewed-by: Stefan Hajnoczi Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- 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