clearlinux/kvmtool
2
0
Fork 0
mirror of https://github.com/clearlinux/kvmtool.git synced 2026-06-15 18:05:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

kvmtool: Introduce downscript option for virtio-net

Browse Source 
To detach tap device automatically from bridge when exiting,
just like what the reverse of "script" does.

Signed-off-by: Fan Du <fan.du@intel.com>
This commit is contained in:
Fan Du
2015-07-23 09:09:19 -04:00
committed by Dimitri John Ledkov
parent ad5ecfa6f5
commit a6740cbebb
2 changed files with 39 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/kvm/virtio-net.h
+1
View File
@@ -9,6 +9,7 @@ struct virtio_net_params {
const char *guest_ip;
const char *host_ip;
const char *script;
const char *downscript;
const char *trans;
const char *tapif;
char guest_mac[6];
virtio/net.c
+38 -12
View File
@@ -294,10 +294,29 @@ static int virtio_net_request_tap(struct net_dev *ndev, struct ifreq *ifr,
return ret;
}
static int virtio_net_exec_script(const char* script, char *tap_name)
{
int pid;
int status;
pid = fork();
if (pid == 0) {
execl(script, script, tap_name, NULL);
_exit(1);
} else {
waitpid(pid, &status, 0);
if (WIFEXITED(status) && WEXITSTATUS(status) != 0) {
pr_warning("Fail to setup tap by %s", script);
return -1;
}
}
return 0;
}
static bool virtio_net__tap_init(struct net_dev *ndev)
{
int sock = socket(AF_INET, SOCK_STREAM, 0);
int pid, status, offload, hdr_len;
int offload, hdr_len;
struct sockaddr_in sin = {0};
struct ifreq ifr;
const struct virtio_net_params *params = ndev->params;
@@ -339,17 +358,8 @@ static bool virtio_net__tap_init(struct net_dev *ndev)
}
if (strcmp(params->script, "none")) {
pid = fork();
if (pid == 0) {
execl(params->script, params->script, ndev->tap_name, NULL);
_exit(1);
} else {
waitpid(pid, &status, 0);
if (WIFEXITED(status) && WEXITSTATUS(status) != 0) {
pr_warning("Fail to setup tap by %s", params->script);
goto fail;
}
}
if(virtio_net_exec_script(params->script, ndev->tap_name) < 0)
goto fail;
} else if (!skipconf) {
memset(&ifr, 0, sizeof(ifr));
strncpy(ifr.ifr_name, ndev->tap_name, sizeof(ndev->tap_name));
@@ -702,6 +712,8 @@ static int set_net_param(struct kvm *kvm, struct virtio_net_params *p,
die("Unknown network mode %s, please use user, tap or none", kvm->cfg.network);
} else if (strcmp(param, "script") == 0) {
p->script = strdup(val);
} else if (strcmp(param, "downscript") == 0) {
p->downscript = strdup(val);
} else if (strcmp(param, "guest_ip") == 0) {
p->guest_ip = strdup(val);
} else if (strcmp(param, "host_ip") == 0) {
@@ -740,6 +752,7 @@ int netdev_parser(const struct option *opt, const char *arg, int unset)
.guest_ip = DEFAULT_GUEST_ADDR,
.host_ip = DEFAULT_HOST_ADDR,
.script = DEFAULT_SCRIPT,
.downscript = DEFAULT_SCRIPT,
.mode = NET_MODE_TAP,
};
@@ -877,6 +890,19 @@ virtio_dev_init(virtio_net__init);
int virtio_net__exit(struct kvm *kvm)
{
struct virtio_net_params *params;
struct net_dev *ndev;
struct list_head *ptr;
list_for_each(ptr, &ndevs) {
ndev = list_entry(ptr, struct net_dev, list);
params = ndev->params;
/* Cleanup any tap device which attached to bridge */
if (ndev->mode == NET_MODE_TAP &&
strcmp(params->downscript, "none")) {
virtio_net_exec_script(params->downscript, ndev->tap_name);
}
}
return 0;
}
virtio_dev_exit(virtio_net__exit);