From nobody Mon Feb 9 07:43:06 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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 170.10.133.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=1637083622; cv=none; d=zohomail.com; s=zohoarc; b=M/8juuBkJQSZVIQ4eclxLdUHmQmEVtEYhvHEKOfAdJUeM7VY+NQACWHyn3RaE6zhstt9aRTQZ2XnaFZXyXHWHUH3vVGTHR0dl6U0n4Itjq2J8av9QhaoG651krQBAWf7lCBgGUgWt6BxjXNib/7kf7eUimrzkgS+8pQP7UxkYSE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1637083622; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:MIME-Version:Message-ID:Subject:To; bh=HqZnPDrp1xIa4GdFRINL3GzOA88hthFW+13YOjEUpHI=; b=dZdPqFUvikQODdNHOf2hd5fJEIPXTxSUhhAHSgxHmOvh1YKIo9ymwUy2IugbSlBLqehhmalU7QFyPiGgc2Qivo8pRsxyrNyaS2eg+vDNotmpwTJEOxlg8BpU1LWJEoQmaRYUMxW1v5W0I1MbLsNWejjBYb6ssCoBevv1YmdGRos= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1637083622013281.7760950406674; Tue, 16 Nov 2021 09:27:02 -0800 (PST) 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-420-OhyKuV-PPdG5PaPZ_1vJZw-1; Tue, 16 Nov 2021 12:26:59 -0500 Received: by mail-wm1-f72.google.com with SMTP id n16-20020a05600c3b9000b003331973fdbbso35887wms.0 for ; Tue, 16 Nov 2021 09:26:59 -0800 (PST) Return-Path: Return-Path: Received: from x1w.. (62.red-83-57-168.dynamicip.rima-tde.net. [83.57.168.62]) by smtp.gmail.com with ESMTPSA id q8sm17707960wrx.71.2021.11.16.09.26.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Nov 2021 09:26:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1637083621; 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; bh=HqZnPDrp1xIa4GdFRINL3GzOA88hthFW+13YOjEUpHI=; b=YwYz6D+v34XyfB9cIMCiEIHc0127vObR1P2YTvC+bTRAA/yPl7LZayXiSFaZ+Qm923rCNA 29qKsNBlV93Qcds4L3TbQK20kjN0dd78NUcXBbuw3hfT4hrez0V30CCnr6eVLB6SvVuWRr CieUohdA8d+1ebvJplKMEefGMaZEkps= X-MC-Unique: OhyKuV-PPdG5PaPZ_1vJZw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=HqZnPDrp1xIa4GdFRINL3GzOA88hthFW+13YOjEUpHI=; b=QsQab89Ledp4OgRviDczVmf8p9hx9MwTXisOvQr8BrYzRIC02JsrRvjXv8WiIOOxQ3 +GgWBSucrMJrk/mL+wna5AQ5uLVMTz29ZOKbUmeIBvdj0XHsn3F7KA/OWqEcYkJJVkKS rerQYS4G98SJGgOj1k3T8Fts+rVsY2nQiiEmFLAOi+3P+L0LcwP1DCQaoBhrY3hbqkbm Ea5/BnuoV4KW4Q6Ua04njB0u1/Te8B1o2jjM9wRTkP0B6w/bj3FImjnD7rDRoaOHKZ1n 4asK/SM5DtKhYZNqp/+KdETgbYxJO0esHcHQH4zVE4A/G6jmgddgxqcpViQKP0tLD5DB OkqA== X-Gm-Message-State: AOAM5301rmVgkPrvy2ILo/c2US62iOKLouKPkLHdI70I6shbtQIek63E FIsENyxhYBxNt0jwgogspTXWeKC50QlLt+dUm2dvXcDZLrn3fqsdY71tpbZOoQ8EHpT+ogVtveC RJ86R5+Y2kFfnkQ== X-Received: by 2002:a05:600c:19cc:: with SMTP id u12mr72022541wmq.24.1637083618138; Tue, 16 Nov 2021 09:26:58 -0800 (PST) X-Google-Smtp-Source: ABdhPJzYED4VJKHOibXGZzcDumNop9s29r0K02kI47PZkUP6G5maLM7aaQdmBnRH/h/Oevtg7q/cqw== X-Received: by 2002:a05:600c:19cc:: with SMTP id u12mr72022518wmq.24.1637083617959; Tue, 16 Nov 2021 09:26:57 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Jagannathan Raman , Jason Wang , John G Johnson , Dmitry Fleytman , qemu-trivial@nongnu.org, Elena Ufimtseva , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH-for-7.0] hw/pci: Don't open-code pci_intx() Date: Tue, 16 Nov 2021 18:26:55 +0100 Message-Id: <20211116172655.2752742-1-philmd@redhat.com> X-Mailer: git-send-email 2.31.1 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) X-ZM-MESSAGEID: 1637083624051100001 Use the pci_intx() helper instead of open-coding it. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Acked-by: Jagannathan Raman --- Based-on: <20211116170133.724751-3-fbarrat@linux.ibm.com> --- hw/net/vmxnet3.c | 2 +- hw/remote/iohub.c | 6 ++---- hw/remote/proxy.c | 3 +-- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/hw/net/vmxnet3.c b/hw/net/vmxnet3.c index 41f796a247d..c7fc5f44d8f 100644 --- a/hw/net/vmxnet3.c +++ b/hw/net/vmxnet3.c @@ -1350,7 +1350,7 @@ static void vmxnet3_update_features(VMXNET3State *s) static bool vmxnet3_verify_intx(VMXNET3State *s, int intx) { return s->msix_used || msi_enabled(PCI_DEVICE(s)) - || intx =3D=3D pci_get_byte(s->parent_obj.config + PCI_INTERRUPT_P= IN) - 1; + || intx =3D=3D pci_intx(PCI_DEVICE(s)); } =20 static void vmxnet3_validate_interrupt_idx(bool is_msix, int idx) diff --git a/hw/remote/iohub.c b/hw/remote/iohub.c index 547d597f0fe..0e0bb651d1a 100644 --- a/hw/remote/iohub.c +++ b/hw/remote/iohub.c @@ -93,11 +93,9 @@ void process_set_irqfd_msg(PCIDevice *pci_dev, MPQemuMsg= *msg) { RemoteMachineState *machine =3D REMOTE_MACHINE(current_machine); RemoteIOHubState *iohub =3D &machine->iohub; - int pirq, intx; + int pirq; =20 - intx =3D pci_get_byte(pci_dev->config + PCI_INTERRUPT_PIN) - 1; - - pirq =3D remote_iohub_map_irq(pci_dev, intx); + pirq =3D remote_iohub_map_irq(pci_dev, pci_intx(pci_dev)); =20 if (event_notifier_get_fd(&iohub->irqfds[pirq]) !=3D -1) { qemu_set_fd_handler(event_notifier_get_fd(&iohub->resamplefds[pirq= ]), diff --git a/hw/remote/proxy.c b/hw/remote/proxy.c index bad164299dd..22f32a5930b 100644 --- a/hw/remote/proxy.c +++ b/hw/remote/proxy.c @@ -32,14 +32,13 @@ static void proxy_intx_update(PCIDevice *pci_dev) { PCIProxyDev *dev =3D PCI_PROXY_DEV(pci_dev); PCIINTxRoute route; - int pin =3D pci_get_byte(pci_dev->config + PCI_INTERRUPT_PIN) - 1; =20 if (dev->virq !=3D -1) { kvm_irqchip_remove_irqfd_notifier_gsi(kvm_state, &dev->intr, dev->= virq); dev->virq =3D -1; } =20 - route =3D pci_device_route_intx_to_irq(pci_dev, pin); + route =3D pci_device_route_intx_to_irq(pci_dev, pci_intx(pci_dev)); =20 dev->virq =3D route.irq; =20 --=20 2.31.1