Commit e64befe9 authored by Markus Armbruster's avatar Markus Armbruster
Browse files

ivshmem: Clean up after commit 9940c323 



IVShmemState member eventfd_chr is useless since commit 9940c323.  Drop
it.

Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Reviewed-by: default avatarMarc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <1458066895-20632-14-git-send-email-armbru@redhat.com>
parent a4fa93bf

hw/misc/ivshmem.c

+0 −12
Original line number Diff line number Diff line
@@ -79,7 +79,6 @@ typedef struct IVShmemState { 
    uint32_t intrmask;

    uint32_t intrstatus;



    CharDriverState **eventfd_chr;

    CharDriverState *server_chr;

    Fifo8 incoming_fifo;

    MemoryRegion ivshmem_mmio;
@@ -942,8 +941,6 @@ static void pci_ivshmem_realize(PCIDevice *dev, Error **errp) 


        pci_register_bar(dev, 2, attr, &s->bar);



        s->eventfd_chr = g_malloc0(s->vectors * sizeof(CharDriverState *));



        qemu_chr_add_handlers(s->server_chr, ivshmem_can_receive,

                              ivshmem_check_version, ivshmem_event, s);

    } else {
@@ -1007,15 +1004,6 @@ static void pci_ivshmem_exit(PCIDevice *dev) 
        memory_region_del_subregion(&s->bar, &s->ivshmem);

    }



    if (s->eventfd_chr) {

        for (i = 0; i < s->vectors; i++) {

            if (s->eventfd_chr[i]) {

                qemu_chr_free(s->eventfd_chr[i]);

            }

        }

        g_free(s->eventfd_chr);

    }



    if (s->peers) {

        for (i = 0; i < s->nb_peers; i++) {

            close_peer_eventfds(s, i);