Commit d160f3f7 authored by Marc-André Lureau's avatar Marc-André Lureau
Browse files

ivshmem: remove EventfdEntry.vector 



No need to store an extra int for the vector number when it can be
computed easily by looking at the position in the array.

Signed-off-by: default avatarMarc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: default avatarClaudio Fontana <claudio.fontana@huawei.com>
parent d9453c93

hw/misc/ivshmem.c

+4 −4
Original line number Diff line number Diff line
@@ -68,7 +68,6 @@ typedef struct Peer { 


typedef struct EventfdEntry {

    PCIDevice *pdev;

    int vector;

} EventfdEntry;



typedef struct IVShmemState {
@@ -287,9 +286,11 @@ static void fake_irqfd(void *opaque, const uint8_t *buf, int size) { 


    EventfdEntry *entry = opaque;

    PCIDevice *pdev = entry->pdev;

    IVShmemState *s = IVSHMEM(pdev);

    int vector = entry - s->eventfd_table;



    IVSHMEM_DPRINTF("interrupt on vector %p %d\n", pdev, entry->vector);

    msix_notify(pdev, entry->vector);

    IVSHMEM_DPRINTF("interrupt on vector %p %d\n", pdev, vector);

    msix_notify(pdev, vector);

}



static CharDriverState* create_eventfd_chr_device(void * opaque, EventNotifier *n,
@@ -311,7 +312,6 @@ static CharDriverState* create_eventfd_chr_device(void * opaque, EventNotifier * 
    /* if MSI is supported we need multiple interrupts */

    if (ivshmem_has_feature(s, IVSHMEM_MSI)) {

        s->eventfd_table[vector].pdev = PCI_DEVICE(s);

        s->eventfd_table[vector].vector = vector;



        qemu_chr_add_handlers(chr, ivshmem_can_receive, fake_irqfd,

                      ivshmem_event, &s->eventfd_table[vector]);