[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 21/40] ivshmem: Assert interrupts are set up once
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PULL v2 21/40] ivshmem: Assert interrupts are set up once |
Date: |
Mon, 21 Mar 2016 21:43:44 +0100 |
An interrupt is set up when the interrupt's file descriptor is
received. Each message applies to the next interrupt vector.
Therefore, each vector cannot be set up more than once.
ivshmem_add_kvm_msi_virq() half-heartedly tries not to rely on this by
doing nothing then, but that's not going to recover from this error
should it become possible in the future. watch_vector_notifier()
doesn't even try.
Simply assert what is the case, so we get alerted if we ever screw it
up.
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Marc-André Lureau <address@hidden>
Message-Id: <address@hidden>
---
hw/misc/ivshmem.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/hw/misc/ivshmem.c b/hw/misc/ivshmem.c
index 65e3a76..61e21cd 100644
--- a/hw/misc/ivshmem.c
+++ b/hw/misc/ivshmem.c
@@ -349,7 +349,7 @@ static void watch_vector_notifier(IVShmemState *s,
EventNotifier *n,
{
int eventfd = event_notifier_get_fd(n);
- /* if MSI is supported we need multiple interrupts */
+ assert(!s->msi_vectors[vector].pdev);
s->msi_vectors[vector].pdev = PCI_DEVICE(s);
qemu_set_fd_handler(eventfd, ivshmem_vector_notify,
@@ -535,10 +535,7 @@ static int ivshmem_add_kvm_msi_virq(IVShmemState *s, int
vector)
int ret;
IVSHMEM_DPRINTF("ivshmem_add_kvm_msi_virq vector:%d\n", vector);
-
- if (s->msi_vectors[vector].pdev != NULL) {
- return 0;
- }
+ assert(!s->msi_vectors[vector].pdev);
ret = kvm_irqchip_add_msi_route(kvm_state, msg, pdev);
if (ret < 0) {
--
2.4.3
- [Qemu-devel] [PULL v2 25/40] ivshmem: Receive shared memory synchronously in realize(), (continued)
- [Qemu-devel] [PULL v2 25/40] ivshmem: Receive shared memory synchronously in realize(), Markus Armbruster, 2016/03/21
- [Qemu-devel] [PULL v2 10/40] ivshmem: Rewrite specification document, Markus Armbruster, 2016/03/21
- [Qemu-devel] [PULL v2 39/40] ivshmem: Require master to have ID zero, Markus Armbruster, 2016/03/21
- [Qemu-devel] [PULL v2 03/40] ivshmem-server: Don't overload POSIX shmem and file name, Markus Armbruster, 2016/03/21
- [Qemu-devel] [PULL v2 19/40] ivshmem: Clean up MSI-X conditions, Markus Armbruster, 2016/03/21
- [Qemu-devel] [PULL v2 32/40] ivshmem: Simplify memory regions for BAR 2 (shared memory), Markus Armbruster, 2016/03/21
- [Qemu-devel] [PULL v2 37/40] ivshmem: Clean up after the previous commit, Markus Armbruster, 2016/03/21
- [Qemu-devel] [PULL v2 26/40] ivshmem: Propagate errors through ivshmem_recv_setup(), Markus Armbruster, 2016/03/21
- [Qemu-devel] [PULL v2 40/40] contrib/ivshmem-server: Print "not for production" warning, Markus Armbruster, 2016/03/21
- [Qemu-devel] [PULL v2 36/40] ivshmem: Split ivshmem-plain, ivshmem-doorbell off ivshmem, Markus Armbruster, 2016/03/21
- [Qemu-devel] [PULL v2 21/40] ivshmem: Assert interrupts are set up once,
Markus Armbruster <=
- [Qemu-devel] [PULL v2 33/40] ivshmem: Inline check_shm_size() into its only caller, Markus Armbruster, 2016/03/21
- [Qemu-devel] [PULL v2 28/40] ivshmem: Drop the hackish test for UNIX domain chardev, Markus Armbruster, 2016/03/21
- [Qemu-devel] [PULL v2 30/40] ivshmem: Tighten check of property "size", Markus Armbruster, 2016/03/21
- [Qemu-devel] [PULL v2 09/40] ivshmem-test: Improve test cases /ivshmem/server-*, Markus Armbruster, 2016/03/21
- [Qemu-devel] [PULL v2 23/40] ivshmem: Disentangle ivshmem_read(), Markus Armbruster, 2016/03/21
- Re: [Qemu-devel] [PULL v2 00/40] ivshmem: Fixes, cleanups, device model split, Peter Maydell, 2016/03/22