starred/qemu-qemu-1
1
0
Fork 0
mirror of https://github.com/qemu/qemu.git synced 2026-02-04 02:24:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

net/tap: tap_set_sndbuf(): add return value

Browse Source 
Follow common recommendations in include/qapi/error.h of having
a return value together with errp. This allows to avoid error propagation.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
Reviewed-by: Maksim Davydov <davydov-max@yandex-team.ru>
Signed-off-by: Jason Wang <jasowang@redhat.com>
This commit is contained in:
Vladimir Sementsov-Ogievskiy
2025-10-30 19:40:22 +03:00
committed by Jason Wang
parent 0b72ea1ff5
commit 638a302b1b
6 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
net/tap-bsd.c
View File

@@ -206,8 +206,9 @@ error:
}
#endif /* __FreeBSD__ */
void tap_set_sndbuf(int fd, const NetdevTapOptions *tap, Error **errp)
bool tap_set_sndbuf(int fd, const NetdevTapOptions *tap, Error **errp)
{
return true;
}
int tap_probe_vnet_hdr(int fd, Error **errp)

5
net/tap-linux.c
View File

@@ -145,7 +145,7 @@ int tap_open(char *ifname, int ifname_size, int *vnet_hdr,
*/
#define TAP_DEFAULT_SNDBUF 0
void tap_set_sndbuf(int fd, const NetdevTapOptions *tap, Error **errp)
bool tap_set_sndbuf(int fd, const NetdevTapOptions *tap, Error **errp)
{
int sndbuf;
@@ -159,7 +159,10 @@ void tap_set_sndbuf(int fd, const NetdevTapOptions *tap, Error **errp)
if (ioctl(fd, TUNSETSNDBUF, &sndbuf) == -1 && tap->has_sndbuf) {
error_setg_errno(errp, errno, "TUNSETSNDBUF ioctl failed");
return false;
}
return true;
}
int tap_probe_vnet_hdr(int fd, Error **errp)

3
net/tap-solaris.c
View File

@@ -208,8 +208,9 @@ int tap_open(char *ifname, int ifname_size, int *vnet_hdr,
return fd;
}
void tap_set_sndbuf(int fd, const NetdevTapOptions *tap, Error **errp)
bool tap_set_sndbuf(int fd, const NetdevTapOptions *tap, Error **errp)
{
return true;
}
int tap_probe_vnet_hdr(int fd, Error **errp)

3
net/tap-stub.c
View File

@@ -33,8 +33,9 @@ int tap_open(char *ifname, int ifname_size, int *vnet_hdr,
return -1;
}
void tap_set_sndbuf(int fd, const NetdevTapOptions *tap, Error **errp)
bool tap_set_sndbuf(int fd, const NetdevTapOptions *tap, Error **errp)
{
return true;
}
int tap_probe_vnet_hdr(int fd, Error **errp)

5
net/tap.c
View File

@@ -709,13 +709,10 @@ static void net_init_tap_one(const NetdevTapOptions *tap, NetClientState *peer,
const char *downscript, const char *vhostfdname,
int vnet_hdr, int fd, Error **errp)
{
Error *err = NULL;
TAPState *s = net_tap_fd_init(peer, model, name, fd, vnet_hdr);
int vhostfd;
tap_set_sndbuf(s->fd, tap, &err);
if (err) {
error_propagate(errp, err);
if (!tap_set_sndbuf(s->fd, tap, errp)) {
goto failed;
}

2
net/tap_int.h
View File

@@ -34,7 +34,7 @@ int tap_open(char *ifname, int ifname_size, int *vnet_hdr,
ssize_t tap_read_packet(int tapfd, uint8_t *buf, int maxlen);
void tap_set_sndbuf(int fd, const NetdevTapOptions *tap, Error **errp);
bool tap_set_sndbuf(int fd, const NetdevTapOptions *tap, Error **errp);
int tap_probe_vnet_hdr(int fd, Error **errp);
int tap_probe_has_ufo(int fd);
int tap_probe_has_uso(int fd);