From: "Michael S. Tsirkin" <mst@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Peter Maydell" <peter.maydell@linaro.org>,
"Mark Cave-Ayland" <mark.cave-ayland@ilande.co.uk>,
"Philippe Mathieu-Daudé" <f4bug@amsat.org>
Subject: [PULL 06/15] hw/pci: Extract pci_bus_change_irq_level() from pci_change_irq_level()
Date: Fri, 30 Oct 2020 10:12:01 -0400 [thread overview]
Message-ID: <20201030141136.1013521-7-mst@redhat.com> (raw)
In-Reply-To: <20201030141136.1013521-1-mst@redhat.com>
From: Philippe Mathieu-Daudé <f4bug@amsat.org>
Extract pci_bus_change_irq_level() from pci_change_irq_level() to
make it clearer it operates on the bus.
Reported-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20201024203900.3619498-2-f4bug@amsat.org>
Reviewed-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
hw/pci/pci.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/hw/pci/pci.c b/hw/pci/pci.c
index 100c9381c2..081ddcadd1 100644
--- a/hw/pci/pci.c
+++ b/hw/pci/pci.c
@@ -248,6 +248,12 @@ static inline void pci_set_irq_state(PCIDevice *d, int irq_num, int level)
d->irq_state |= level << irq_num;
}
+static void pci_bus_change_irq_level(PCIBus *bus, int irq_num, int change)
+{
+ bus->irq_count[irq_num] += change;
+ bus->set_irq(bus->irq_opaque, irq_num, bus->irq_count[irq_num] != 0);
+}
+
static void pci_change_irq_level(PCIDevice *pci_dev, int irq_num, int change)
{
PCIBus *bus;
@@ -258,8 +264,7 @@ static void pci_change_irq_level(PCIDevice *pci_dev, int irq_num, int change)
break;
pci_dev = bus->parent_dev;
}
- bus->irq_count[irq_num] += change;
- bus->set_irq(bus->irq_opaque, irq_num, bus->irq_count[irq_num] != 0);
+ pci_bus_change_irq_level(bus, irq_num, change);
}
int pci_bus_get_irq_level(PCIBus *bus, int irq_num)
--
MST
next prev parent reply other threads:[~2020-10-30 14:14 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-30 14:11 [PULL 00/15] pc,pci,vhost,virtio: misc fixes Michael S. Tsirkin
2020-10-30 14:11 ` [PULL 01/15] vhost-vdpa: negotiate VIRTIO_NET_F_STATUS with driver Michael S. Tsirkin
2020-10-30 14:11 ` [PULL 02/15] vhost-vsock: set vhostfd to non-blocking mode Michael S. Tsirkin
2020-10-30 14:11 ` [PULL 03/15] acpi/crs: Prevent bad ranges for host bridges Michael S. Tsirkin
2020-10-30 14:11 ` [PULL 04/15] acpi/crs: Support ranges > 32b for hosts Michael S. Tsirkin
2020-10-30 14:11 ` [PULL 05/15] hw/virtio/vhost-vdpa: Fix Coverity CID 1432864 Michael S. Tsirkin
2020-10-30 14:12 ` Michael S. Tsirkin [this message]
2020-10-30 14:12 ` [PULL 07/15] pci: Assert irqnum is between 0 and bus->nirqs in pci_bus_change_irq_level Michael S. Tsirkin
2020-10-30 14:12 ` [PULL 08/15] vhost: Don't special case vq->used_phys in vhost_get_log_size() Michael S. Tsirkin
2020-10-30 14:12 ` [PULL 09/15] pc: Implement -no-hpet as sugar for -machine hpet=on Michael S. Tsirkin
2020-10-30 14:12 ` [PULL 10/15] pci: advertise a page aligned ATS Michael S. Tsirkin
2020-10-30 14:12 ` [PULL 11/15] pci: Change error_report to assert(3) Michael S. Tsirkin
2020-10-30 14:12 ` [PULL 12/15] pci: Disallow improper BAR registration for type 1 Michael S. Tsirkin
2020-10-30 14:12 ` [PULL 13/15] vhost-blk: set features before setting inflight feature Michael S. Tsirkin
2020-10-30 14:12 ` [PULL 14/15] virtio: skip guest index check on device load Michael S. Tsirkin
2020-10-30 14:12 ` [PULL 15/15] intel_iommu: Fix two misuse of "0x%u" prints Michael S. Tsirkin
2020-10-30 14:33 ` [PULL 00/15] pc,pci,vhost,virtio: misc fixes no-reply
2020-11-01 14:03 ` Peter Maydell
2020-11-02 10:08 ` Michael S. Tsirkin
2020-11-01 19:05 ` Peter Maydell
-- strict thread matches above, loose matches on Subject: below --
2020-10-30 12:45 Michael S. Tsirkin
2020-10-30 12:45 ` [PULL 06/15] hw/pci: Extract pci_bus_change_irq_level() from pci_change_irq_level() Michael S. Tsirkin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201030141136.1013521-7-mst@redhat.com \
--to=mst@redhat.com \
--cc=f4bug@amsat.org \
--cc=mark.cave-ayland@ilande.co.uk \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).