Message ID | 20220121202733.404989-30-eperezma@redhat.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | vDPA shadow virtqueue | expand |
在 2022/1/22 上午4:27, Eugenio Pérez 写道: > Simplifying memory management. > > Signed-off-by: Eugenio Pérez <eperezma@redhat.com> To reduce the size of this series. This can be sent as an separate patch if I was not wrong. Thanks > --- > 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 4125d13118..4befba5cc7 100644 > --- a/net/vhost-vdpa.c > +++ b/net/vhost-vdpa.c > @@ -264,7 +264,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); > @@ -302,7 +303,6 @@ int net_init_vhost_vdpa(const Netdev *netdev, const char *name, > goto err; > } > > - g_free(ncs); > return 0; > > err: > @@ -310,7 +310,6 @@ err: > qemu_del_net_client(ncs[0]); > } > qemu_close(vdpa_device_fd); > - g_free(ncs); > > return -1; > }
On Sun, Jan 30, 2022 at 7:52 AM Jason Wang <jasowang@redhat.com> wrote: > > > 在 2022/1/22 上午4:27, Eugenio Pérez 写道: > > Simplifying memory management. > > > > Signed-off-by: Eugenio Pérez <eperezma@redhat.com> > > > To reduce the size of this series. This can be sent as an separate patch > if I was not wrong. > Sure, I'll send separately to trivial maillist. Thanks! > Thanks > > > > --- > > 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 4125d13118..4befba5cc7 100644 > > --- a/net/vhost-vdpa.c > > +++ b/net/vhost-vdpa.c > > @@ -264,7 +264,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); > > @@ -302,7 +303,6 @@ int net_init_vhost_vdpa(const Netdev *netdev, const char *name, > > goto err; > > } > > > > - g_free(ncs); > > return 0; > > > > err: > > @@ -310,7 +310,6 @@ err: > > qemu_del_net_client(ncs[0]); > > } > > qemu_close(vdpa_device_fd); > > - g_free(ncs); > > > > return -1; > > } >
diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c index 4125d13118..4befba5cc7 100644 --- a/net/vhost-vdpa.c +++ b/net/vhost-vdpa.c @@ -264,7 +264,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); @@ -302,7 +303,6 @@ int net_init_vhost_vdpa(const Netdev *netdev, const char *name, goto err; } - g_free(ncs); return 0; err: @@ -310,7 +310,6 @@ err: qemu_del_net_client(ncs[0]); } qemu_close(vdpa_device_fd); - g_free(ncs); return -1; }
Simplifying memory management. Signed-off-by: Eugenio Pérez <eperezma@redhat.com> --- net/vhost-vdpa.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)