From: Laurent Vivier <laurent@vivier.eu>
To: qemu-devel@nongnu.org
Cc: qemu-trivial@nongnu.org, "Jason Wang" <jasowang@redhat.com>,
"Laurent Vivier" <laurent@vivier.eu>,
"Philippe Mathieu-Daudé" <f4bug@amsat.org>,
"Eugenio Pérez" <eperezma@redhat.com>,
"Stefano Garzarella" <sgarzare@redhat.com>
Subject: [PULL 6/7] vdpa: Make ncs autofree
Date: Tue, 22 Feb 2022 17:16:23 +0100 [thread overview]
Message-ID: <20220222161624.382218-7-laurent@vivier.eu> (raw)
In-Reply-To: <20220222161624.382218-1-laurent@vivier.eu>
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
next prev parent reply other threads:[~2022-02-22 16:42 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-22 16:16 [PULL 0/7] Trivial branch for 7.0 patches Laurent Vivier
2022-02-22 16:16 ` [PULL 1/7] configure: Disable capstone and slirp in the --without-default-features mode Laurent Vivier
2022-02-22 16:16 ` [PULL 2/7] target/avr: Correct AVRCPUClass docstring Laurent Vivier
2022-02-22 16:16 ` [PULL 3/7] target/rx: Remove unused ENV_OFFSET definition Laurent Vivier
2022-02-22 16:16 ` [PULL 4/7] hw/nvram: use at24 macro Laurent Vivier
2022-02-22 16:16 ` [PULL 5/7] qemu-options: fix incorrect description for '-drive index=' Laurent Vivier
2022-02-22 16:16 ` Laurent Vivier [this message]
2022-02-22 16:16 ` [PULL 7/7] hid: Implement support for side and extra buttons Laurent Vivier
2022-02-23 9:24 ` [PULL 0/7] Trivial branch for 7.0 patches Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220222161624.382218-7-laurent@vivier.eu \
--to=laurent@vivier.eu \
--cc=eperezma@redhat.com \
--cc=f4bug@amsat.org \
--cc=jasowang@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-trivial@nongnu.org \
--cc=sgarzare@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).