[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 6/7] vdpa: Make ncs autofree
From: |
Laurent Vivier |
Subject: |
[PULL 6/7] vdpa: Make ncs autofree |
Date: |
Tue, 22 Feb 2022 17:16:23 +0100 |
From: Eugenio Pérez <eperezma@redhat.com>
Simplifying memory management.
Signed-off-by: Eugenio Pérez <eperezma@redhat.com>
Acked-by: Jason Wang <jasowang@redhat.com>
Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20220214193415.1606752-2-eperezma@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
net/vhost-vdpa.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c
index 25dd6dd97547..1e9fe47c033d 100644
--- a/net/vhost-vdpa.c
+++ b/net/vhost-vdpa.c
@@ -263,7 +263,8 @@ int net_init_vhost_vdpa(const Netdev *netdev, const char
*name,
{
const NetdevVhostVDPAOptions *opts;
int vdpa_device_fd;
- NetClientState **ncs, *nc;
+ g_autofree NetClientState **ncs = NULL;
+ NetClientState *nc;
int queue_pairs, i, has_cvq = 0;
assert(netdev->type == NET_CLIENT_DRIVER_VHOST_VDPA);
@@ -301,7 +302,6 @@ int net_init_vhost_vdpa(const Netdev *netdev, const char
*name,
goto err;
}
- g_free(ncs);
return 0;
err:
@@ -309,7 +309,6 @@ err:
qemu_del_net_client(ncs[0]);
}
qemu_close(vdpa_device_fd);
- g_free(ncs);
return -1;
}
--
2.35.1
- [PULL 0/7] Trivial branch for 7.0 patches, Laurent Vivier, 2022/02/22
- [PULL 2/7] target/avr: Correct AVRCPUClass docstring, Laurent Vivier, 2022/02/22
- [PULL 1/7] configure: Disable capstone and slirp in the --without-default-features mode, Laurent Vivier, 2022/02/22
- [PULL 5/7] qemu-options: fix incorrect description for '-drive index=', Laurent Vivier, 2022/02/22
- [PULL 7/7] hid: Implement support for side and extra buttons, Laurent Vivier, 2022/02/22
- [PULL 4/7] hw/nvram: use at24 macro, Laurent Vivier, 2022/02/22
- [PULL 6/7] vdpa: Make ncs autofree,
Laurent Vivier <=
- [PULL 3/7] target/rx: Remove unused ENV_OFFSET definition, Laurent Vivier, 2022/02/22
- Re: [PULL 0/7] Trivial branch for 7.0 patches, Peter Maydell, 2022/02/23