mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

virtio: del net client if net_init_tap_one failed

Browse Source 
If the net tap initializes successful, but failed during
network card hot-plugging, the net-tap will remains,
so cleanup.

Signed-off-by: lu zhipeng <luzhipeng@cestc.cn>
Signed-off-by: Jason Wang <jasowang@redhat.com>
This commit is contained in:
lu zhipeng 2022-09-23 23:50:46 +08:00 committed by Jason Wang
parent 72b99a87ce
commit bf769f742c
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
net/tap.c
View File

@ -686,7 +686,7 @@ static void net_init_tap_one(const NetdevTapOptions *tap, NetClientState *peer,
tap_set_sndbuf(s->fd, tap, &err); tap_set_sndbuf(s->fd, tap, &err);
if (err) { if (err) {
error_propagate(errp, err); error_propagate(errp, err);
return; goto failed;
} }
if (tap->has_fd || tap->has_fds) { if (tap->has_fd || tap->has_fds) {
@ -726,12 +726,12 @@ static void net_init_tap_one(const NetdevTapOptions *tap, NetClientState *peer,
} else { } else {
warn_report_err(err); warn_report_err(err);
} }
return; goto failed;
} }
if (!g_unix_set_fd_nonblocking(vhostfd, true, NULL)) { if (!g_unix_set_fd_nonblocking(vhostfd, true, NULL)) {
error_setg_errno(errp, errno, "%s: Can't use file descriptor %d", error_setg_errno(errp, errno, "%s: Can't use file descriptor %d",
name, fd); name, fd);
return; goto failed;
} }
} else { } else {
vhostfd = open("/dev/vhost-net", O_RDWR); vhostfd = open("/dev/vhost-net", O_RDWR);
@ -743,11 +743,11 @@ static void net_init_tap_one(const NetdevTapOptions *tap, NetClientState *peer,
warn_report("tap: open vhost char device failed: %s", warn_report("tap: open vhost char device failed: %s",
strerror(errno)); strerror(errno));
} }
return; goto failed;
} }
if (!g_unix_set_fd_nonblocking(vhostfd, true, NULL)) { if (!g_unix_set_fd_nonblocking(vhostfd, true, NULL)) {
error_setg_errno(errp, errno, "Failed to set FD nonblocking"); error_setg_errno(errp, errno, "Failed to set FD nonblocking");
return; goto failed;
} }
} }
options.opaque = (void *)(uintptr_t)vhostfd; options.opaque = (void *)(uintptr_t)vhostfd;
@ -760,11 +760,17 @@ static void net_init_tap_one(const NetdevTapOptions *tap, NetClientState *peer,
} else { } else {
warn_report(VHOST_NET_INIT_FAILED); warn_report(VHOST_NET_INIT_FAILED);
} }
return; goto failed;
} }
} else if (vhostfdname) { } else if (vhostfdname) {
error_setg(errp, "vhostfd(s)= is not valid without vhost"); error_setg(errp, "vhostfd(s)= is not valid without vhost");
goto failed;
} }
return;
failed:
qemu_del_net_client(&s->nc);
} }
static int get_fds(char *str, char *fds[], int max) static int get_fds(char *str, char *fds[], int max)