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

convert net_init_tap() to NetClientOptions

Browse Source 
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
This commit is contained in:
Laszlo Ersek 2012-07-17 16:17:19 +02:00 committed by Stefan Hajnoczi
parent 4a917c39ae
commit 08c573a8d1
8 changed files with 71 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net/tap-aix.c
View File

@ -31,7 +31,7 @@ int tap_open(char *ifname, int ifname_size, int *vnet_hdr, int vnet_hdr_required
return -1; return -1;
} }
int tap_set_sndbuf(int fd, QemuOpts *opts) int tap_set_sndbuf(int fd, const NetdevTapOptions *tap)
{ {
return 0; return 0;
} }

2
net/tap-bsd.c
View File

@ -117,7 +117,7 @@ int tap_open(char *ifname, int ifname_size, int *vnet_hdr, int vnet_hdr_required
return fd; return fd;
} }
int tap_set_sndbuf(int fd, QemuOpts *opts) int tap_set_sndbuf(int fd, const NetdevTapOptions *tap)
{ {
return 0; return 0;
} }

2
net/tap-haiku.c
View File

@ -31,7 +31,7 @@ int tap_open(char *ifname, int ifname_size, int *vnet_hdr, int vnet_hdr_required
return -1; return -1;
} }
int tap_set_sndbuf(int fd, QemuOpts *opts) int tap_set_sndbuf(int fd, const NetdevTapOptions *tap)
{ {
return 0; return 0;
} }

9
net/tap-linux.c
View File

@ -98,16 +98,19 @@ int tap_open(char *ifname, int ifname_size, int *vnet_hdr, int vnet_hdr_required
*/ */
#define TAP_DEFAULT_SNDBUF 0 #define TAP_DEFAULT_SNDBUF 0
int tap_set_sndbuf(int fd, QemuOpts *opts) int tap_set_sndbuf(int fd, const NetdevTapOptions *tap)
{ {
int sndbuf; int sndbuf;
sndbuf = qemu_opt_get_size(opts, "sndbuf", TAP_DEFAULT_SNDBUF); sndbuf = !tap->has_sndbuf ? TAP_DEFAULT_SNDBUF :
tap->sndbuf > INT_MAX ? INT_MAX :
tap->sndbuf;
if (!sndbuf) { if (!sndbuf) {
sndbuf = INT_MAX; sndbuf = INT_MAX;
} }
if (ioctl(fd, TUNSETSNDBUF, &sndbuf) == -1 && qemu_opt_get(opts, "sndbuf")) { if (ioctl(fd, TUNSETSNDBUF, &sndbuf) == -1 && tap->has_sndbuf) {
error_report("TUNSETSNDBUF ioctl failed: %s", strerror(errno)); error_report("TUNSETSNDBUF ioctl failed: %s", strerror(errno));
return -1; return -1;
} }

2
net/tap-solaris.c
View File

@ -197,7 +197,7 @@ int tap_open(char *ifname, int ifname_size, int *vnet_hdr, int vnet_hdr_required
return fd; return fd;
} }
int tap_set_sndbuf(int fd, QemuOpts *opts) int tap_set_sndbuf(int fd, const NetdevTapOptions *tap)
{ {
return 0; return 0;
} }

11
net/tap-win32.c
View File

@ -699,19 +699,20 @@ static int tap_win32_init(VLANState *vlan, const char *model,
return 0; return 0;
} }
int net_init_tap(QemuOpts *opts, const NetClientOptions *new_opts, int net_init_tap(QemuOpts *old_opts, const NetClientOptions *opts,
const char *name, VLANState *vlan) const char *name, VLANState *vlan)
{ {
const char *ifname; const NetdevTapOptions *tap;
ifname = qemu_opt_get(opts, "ifname"); assert(opts->kind == NET_CLIENT_OPTIONS_KIND_TAP);
tap = opts->tap;
if (!ifname) { if (!tap->has_ifname) {
error_report("tap: no interface name"); error_report("tap: no interface name");
return -1; return -1;
} }
if (tap_win32_init(vlan, "tap", name, ifname) == -1) { if (tap_win32_init(vlan, "tap", name, tap->ifname) == -1) {
return -1; return -1;
} }

111
net/tap.c
View File

@ -548,29 +548,32 @@ int net_init_bridge(QemuOpts *opts, const NetClientOptions *new_opts,
return 0; return 0;
} }
static int net_tap_init(QemuOpts *opts, int *vnet_hdr) static int net_tap_init(const NetdevTapOptions *tap, int *vnet_hdr,
const char *setup_script, char *ifname,
size_t ifname_sz)
{ {
int fd, vnet_hdr_required; int fd, vnet_hdr_required;
char ifname[128] = {0,};
const char *setup_script;
if (qemu_opt_get(opts, "ifname")) { if (tap->has_ifname) {
pstrcpy(ifname, sizeof(ifname), qemu_opt_get(opts, "ifname")); pstrcpy(ifname, ifname_sz, tap->ifname);
} else {
assert(ifname_sz > 0);
ifname[0] = '\0';
} }
*vnet_hdr = qemu_opt_get_bool(opts, "vnet_hdr", 1); if (tap->has_vnet_hdr) {
if (qemu_opt_get(opts, "vnet_hdr")) { *vnet_hdr = tap->vnet_hdr;
vnet_hdr_required = *vnet_hdr; vnet_hdr_required = *vnet_hdr;
} else { } else {
*vnet_hdr = 1;
vnet_hdr_required = 0; vnet_hdr_required = 0;
} }
TFR(fd = tap_open(ifname, sizeof(ifname), vnet_hdr, vnet_hdr_required)); TFR(fd = tap_open(ifname, ifname_sz, vnet_hdr, vnet_hdr_required));
if (fd < 0) { if (fd < 0) {
return -1; return -1;
} }
setup_script = qemu_opt_get(opts, "script");
if (setup_script && if (setup_script &&
setup_script[0] != '\0' && setup_script[0] != '\0' &&
strcmp(setup_script, "no") != 0 && strcmp(setup_script, "no") != 0 &&
@ -579,30 +582,34 @@ static int net_tap_init(QemuOpts *opts, int *vnet_hdr)
return -1; return -1;
} }
qemu_opt_set(opts, "ifname", ifname);
return fd; return fd;
} }
int net_init_tap(QemuOpts *opts, const NetClientOptions *new_opts, int net_init_tap(QemuOpts *old_opts, const NetClientOptions *opts,
const char *name, VLANState *vlan) const char *name, VLANState *vlan)
{ {
TAPState *s; const NetdevTapOptions *tap;
int fd, vnet_hdr = 0; int fd, vnet_hdr = 0;
const char *model; const char *model;
TAPState *s;
if (qemu_opt_get(opts, "fd")) { /* for the no-fd, no-helper case */
if (qemu_opt_get(opts, "ifname") || const char *script = NULL; /* suppress wrong "uninit'd use" gcc warning */
qemu_opt_get(opts, "script") || char ifname[128];
qemu_opt_get(opts, "downscript") ||
qemu_opt_get(opts, "vnet_hdr") || assert(opts->kind == NET_CLIENT_OPTIONS_KIND_TAP);
qemu_opt_get(opts, "helper")) { tap = opts->tap;
if (tap->has_fd) {
if (tap->has_ifname || tap->has_script || tap->has_downscript ||
tap->has_vnet_hdr || tap->has_helper) {
error_report("ifname=, script=, downscript=, vnet_hdr=, " error_report("ifname=, script=, downscript=, vnet_hdr=, "
"and helper= are invalid with fd="); "and helper= are invalid with fd=");
return -1; return -1;
} }
fd = net_handle_fd_param(cur_mon, qemu_opt_get(opts, "fd")); fd = net_handle_fd_param(cur_mon, tap->fd);
if (fd == -1) { if (fd == -1) {
return -1; return -1;
} }
@ -613,18 +620,15 @@ int net_init_tap(QemuOpts *opts, const NetClientOptions *new_opts,
model = "tap"; model = "tap";
} else if (qemu_opt_get(opts, "helper")) { } else if (tap->has_helper) {
if (qemu_opt_get(opts, "ifname") || if (tap->has_ifname || tap->has_script || tap->has_downscript ||
qemu_opt_get(opts, "script") || tap->has_vnet_hdr) {
qemu_opt_get(opts, "downscript") ||
qemu_opt_get(opts, "vnet_hdr")) {
error_report("ifname=, script=, downscript=, and vnet_hdr= " error_report("ifname=, script=, downscript=, and vnet_hdr= "
"are invalid with helper="); "are invalid with helper=");
return -1; return -1;
} }
fd = net_bridge_run_helper(qemu_opt_get(opts, "helper"), fd = net_bridge_run_helper(tap->helper, DEFAULT_BRIDGE_INTERFACE);
DEFAULT_BRIDGE_INTERFACE);
if (fd == -1) { if (fd == -1) {
return -1; return -1;
} }
@ -636,15 +640,8 @@ int net_init_tap(QemuOpts *opts, const NetClientOptions *new_opts,
model = "bridge"; model = "bridge";
} else { } else {
if (!qemu_opt_get(opts, "script")) { script = tap->has_script ? tap->script : DEFAULT_NETWORK_SCRIPT;
qemu_opt_set(opts, "script", DEFAULT_NETWORK_SCRIPT); fd = net_tap_init(tap, &vnet_hdr, script, ifname, sizeof ifname);
}
if (!qemu_opt_get(opts, "downscript")) {
qemu_opt_set(opts, "downscript", DEFAULT_NETWORK_DOWN_SCRIPT);
}
fd = net_tap_init(opts, &vnet_hdr);
if (fd == -1) { if (fd == -1) {
return -1; return -1;
} }
@ -658,25 +655,24 @@ int net_init_tap(QemuOpts *opts, const NetClientOptions *new_opts,
return -1; return -1;
} }
if (tap_set_sndbuf(s->fd, opts) < 0) { if (tap_set_sndbuf(s->fd, tap) < 0) {
return -1; return -1;
} }
if (qemu_opt_get(opts, "fd")) { if (tap->has_fd) {
snprintf(s->nc.info_str, sizeof(s->nc.info_str), "fd=%d", fd); snprintf(s->nc.info_str, sizeof(s->nc.info_str), "fd=%d", fd);
} else if (qemu_opt_get(opts, "helper")) { } else if (tap->has_helper) {
snprintf(s->nc.info_str, sizeof(s->nc.info_str), snprintf(s->nc.info_str, sizeof(s->nc.info_str), "helper=%s",
"helper=%s", qemu_opt_get(opts, "helper")); tap->helper);
} else { } else {
const char *ifname, *script, *downscript; const char *downscript;
ifname = qemu_opt_get(opts, "ifname"); downscript = tap->has_downscript ? tap->downscript :
script = qemu_opt_get(opts, "script"); DEFAULT_NETWORK_DOWN_SCRIPT;
downscript = qemu_opt_get(opts, "downscript");
snprintf(s->nc.info_str, sizeof(s->nc.info_str), snprintf(s->nc.info_str, sizeof(s->nc.info_str),
"ifname=%s,script=%s,downscript=%s", "ifname=%s,script=%s,downscript=%s", ifname, script,
ifname, script, downscript); downscript);
if (strcmp(downscript, "no") != 0) { if (strcmp(downscript, "no") != 0) {
snprintf(s->down_script, sizeof(s->down_script), "%s", downscript); snprintf(s->down_script, sizeof(s->down_script), "%s", downscript);
@ -684,25 +680,26 @@ int net_init_tap(QemuOpts *opts, const NetClientOptions *new_opts,
} }
} }
if (qemu_opt_get_bool(opts, "vhost", !!qemu_opt_get(opts, "vhostfd") || if (tap->has_vhost ? tap->vhost :
qemu_opt_get_bool(opts, "vhostforce", false))) { tap->has_vhostfd || (tap->has_vhostforce && tap->vhostforce)) {
int vhostfd, r; int vhostfd;
bool force = qemu_opt_get_bool(opts, "vhostforce", false);
if (qemu_opt_get(opts, "vhostfd")) { if (tap->has_vhostfd) {
r = net_handle_fd_param(cur_mon, qemu_opt_get(opts, "vhostfd")); vhostfd = net_handle_fd_param(cur_mon, tap->vhostfd);
if (r == -1) { if (vhostfd == -1) {
return -1; return -1;
} }
vhostfd = r;
} else { } else {
vhostfd = -1; vhostfd = -1;
} }
s->vhost_net = vhost_net_init(&s->nc, vhostfd, force);
s->vhost_net = vhost_net_init(&s->nc, vhostfd,
tap->has_vhostforce && tap->vhostforce);
if (!s->vhost_net) { if (!s->vhost_net) {
error_report("vhost-net requested but could not be initialized"); error_report("vhost-net requested but could not be initialized");
return -1; return -1;
} }
} else if (qemu_opt_get(opts, "vhostfd")) { } else if (tap->has_vhostfd) {
error_report("vhostfd= is not valid without vhost"); error_report("vhostfd= is not valid without vhost");
return -1; return -1;
} }

2
net/tap.h
View File

@ -47,7 +47,7 @@ void tap_using_vnet_hdr(VLANClientState *vc, int using_vnet_hdr);
void tap_set_offload(VLANClientState *vc, int csum, int tso4, int tso6, int ecn, int ufo); void tap_set_offload(VLANClientState *vc, int csum, int tso4, int tso6, int ecn, int ufo);
void tap_set_vnet_hdr_len(VLANClientState *vc, int len); void tap_set_vnet_hdr_len(VLANClientState *vc, int len);
int tap_set_sndbuf(int fd, QemuOpts *opts); int tap_set_sndbuf(int fd, const NetdevTapOptions *tap);
int tap_probe_vnet_hdr(int fd); int tap_probe_vnet_hdr(int fd);
int tap_probe_vnet_hdr_len(int fd, int len); int tap_probe_vnet_hdr_len(int fd, int len);
int tap_probe_has_ufo(int fd); int tap_probe_has_ufo(int fd);