* [Qemu-devel] [PATCH] tap: delete tap(net client) if net_init_tap_one failed
@ 2018-03-06 5:11 linzhecheng
2018-03-06 8:15 ` Jason Wang
0 siblings, 1 reply; 2+ messages in thread
From: linzhecheng @ 2018-03-06 5:11 UTC (permalink / raw)
To: qemu-devel; +Cc: jasowang, wangxinxin.wang, jianjay.zhou, linzhecheng
If net_init_tap_one failed but net_tap_fd_init succeeded, we should
delete the TAPState *s without vhostforce and has_vhostforce flag.
Signed-off-by: linzhecheng <linzhecheng@huawei.com>
diff --git a/net/tap.c b/net/tap.c
index 2b3a36f9b5..1cb8eaf31f 100644
--- a/net/tap.c
+++ b/net/tap.c
@@ -651,7 +651,7 @@ static void net_init_tap_one(const NetdevTapOptions *tap, NetClientState *peer,
tap_set_sndbuf(s->fd, tap, &err);
if (err) {
error_propagate(errp, err);
- return;
+ goto fail;
}
if (tap->has_fd || tap->has_fds) {
@@ -688,6 +688,7 @@ static void net_init_tap_one(const NetdevTapOptions *tap, NetClientState *peer,
if (vhostfd == -1) {
if (tap->has_vhostforce && tap->vhostforce) {
error_propagate(errp, err);
+ goto fail;
} else {
warn_report_err(err);
}
@@ -699,6 +700,7 @@ static void net_init_tap_one(const NetdevTapOptions *tap, NetClientState *peer,
if (tap->has_vhostforce && tap->vhostforce) {
error_setg_errno(errp, errno,
"tap: open vhost char device failed");
+ goto fail;
} else {
warn_report("tap: open vhost char device failed: %s",
strerror(errno));
@@ -713,6 +715,7 @@ static void net_init_tap_one(const NetdevTapOptions *tap, NetClientState *peer,
if (!s->vhost_net) {
if (tap->has_vhostforce && tap->vhostforce) {
error_setg(errp, VHOST_NET_INIT_FAILED);
+ goto fail;
} else {
warn_report(VHOST_NET_INIT_FAILED);
}
@@ -720,7 +723,11 @@ static void net_init_tap_one(const NetdevTapOptions *tap, NetClientState *peer,
}
} else if (vhostfdname) {
error_setg(errp, "vhostfd(s)= is not valid without vhost");
+ goto fail;
}
+ return;
+fail:
+ qemu_del_net_client(&s->nc);
}
static int get_fds(char *str, char *fds[], int max)
--
2.12.2.windows.2
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [Qemu-devel] [PATCH] tap: delete tap(net client) if net_init_tap_one failed
2018-03-06 5:11 [Qemu-devel] [PATCH] tap: delete tap(net client) if net_init_tap_one failed linzhecheng
@ 2018-03-06 8:15 ` Jason Wang
0 siblings, 0 replies; 2+ messages in thread
From: Jason Wang @ 2018-03-06 8:15 UTC (permalink / raw)
To: linzhecheng, qemu-devel; +Cc: wangxinxin.wang, jianjay.zhou
On 2018年03月06日 13:11, linzhecheng wrote:
> If net_init_tap_one failed but net_tap_fd_init succeeded, we should
> delete the TAPState *s without vhostforce and has_vhostforce flag.
>
> Signed-off-by: linzhecheng <linzhecheng@huawei.com>
Applied and queued for stable.
Thanks
>
> diff --git a/net/tap.c b/net/tap.c
> index 2b3a36f9b5..1cb8eaf31f 100644
> --- a/net/tap.c
> +++ b/net/tap.c
> @@ -651,7 +651,7 @@ static void net_init_tap_one(const NetdevTapOptions *tap, NetClientState *peer,
> tap_set_sndbuf(s->fd, tap, &err);
> if (err) {
> error_propagate(errp, err);
> - return;
> + goto fail;
> }
>
> if (tap->has_fd || tap->has_fds) {
> @@ -688,6 +688,7 @@ static void net_init_tap_one(const NetdevTapOptions *tap, NetClientState *peer,
> if (vhostfd == -1) {
> if (tap->has_vhostforce && tap->vhostforce) {
> error_propagate(errp, err);
> + goto fail;
> } else {
> warn_report_err(err);
> }
> @@ -699,6 +700,7 @@ static void net_init_tap_one(const NetdevTapOptions *tap, NetClientState *peer,
> if (tap->has_vhostforce && tap->vhostforce) {
> error_setg_errno(errp, errno,
> "tap: open vhost char device failed");
> + goto fail;
> } else {
> warn_report("tap: open vhost char device failed: %s",
> strerror(errno));
> @@ -713,6 +715,7 @@ static void net_init_tap_one(const NetdevTapOptions *tap, NetClientState *peer,
> if (!s->vhost_net) {
> if (tap->has_vhostforce && tap->vhostforce) {
> error_setg(errp, VHOST_NET_INIT_FAILED);
> + goto fail;
> } else {
> warn_report(VHOST_NET_INIT_FAILED);
> }
> @@ -720,7 +723,11 @@ static void net_init_tap_one(const NetdevTapOptions *tap, NetClientState *peer,
> }
> } else if (vhostfdname) {
> error_setg(errp, "vhostfd(s)= is not valid without vhost");
> + goto fail;
> }
> + return;
> +fail:
> + qemu_del_net_client(&s->nc);
> }
>
> static int get_fds(char *str, char *fds[], int max)
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-03-06 8:16 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-03-06 5:11 [Qemu-devel] [PATCH] tap: delete tap(net client) if net_init_tap_one failed linzhecheng
2018-03-06 8:15 ` Jason Wang
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).