Re: [Qemu-devel] [PATCH 11/38] ivshmem: Clean up after commit 9940c32

[Marc-André Lureau]

On Mon, Feb 29, 2016 at 7:40 PM, Markus Armbruster <address@hidden> wrote:
> IVShmemState member eventfd_chr is useless since commit 9940c32.  Drop
> it.
>
> Signed-off-by: Markus Armbruster <address@hidden>

oops indeed,
Reviewed-by: Marc-André Lureau <address@hidden>


> ---
>  hw/misc/ivshmem.c | 12 ------------
>  1 file changed, 12 deletions(-)
>
> diff --git a/hw/misc/ivshmem.c b/hw/misc/ivshmem.c
> index 395f357..b087dc3 100644
> --- a/hw/misc/ivshmem.c
> +++ b/hw/misc/ivshmem.c
> @@ -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;
> @@ -941,8 +940,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 {
> @@ -1004,15 +1001,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);
> --
> 2.4.3
>
>



-- 
Marc-André Lureau