[3/3,v2] kvm tools: Setup bridged network by a script

Message ID	20110415101933.11014.83707.stgit@localhost6.localdomain6 (mailing list archive)
State	New, archived
Headers	show Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p3FAJhGp017815 for <patchwork-kvm@patchwork.kernel.org>; Fri, 15 Apr 2011 10:19:43 GMT Subject: [PATCH 3/3 v2] kvm tools: Setup bridged network by a script To: kvm@vger.kernel.org From: Amos Kong <kongjianjun@gmail.com> Cc: penberg@kernel.org, asias.hejun@gmail.com, sirouni@gmail.com Date: Fri, 15 Apr 2011 18:19:34 +0800 Message-ID: <20110415101933.11014.83707.stgit@localhost6.localdomain6> In-Reply-To: <20110414043803.9279.11700.stgit@localhost6.localdomain6> References: <20110414043803.9279.11700.stgit@localhost6.localdomain6> User-Agent: StGit/0.15 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Sender: kvm-owner@vger.kernel.org Precedence: bulk

diff --git a/tools/kvm/include/kvm/virtio-net.h b/tools/kvm/include/kvm/virtio-net.h index c889854..959ccb5 100644 --- a/tools/kvm/include/kvm/virtio-net.h +++ b/tools/kvm/include/kvm/virtio-net.h @@ -7,6 +7,7 @@ struct virtio_net_parameters { struct kvm *self; const char *host_ip; char guest_mac[6]; + const char *script; }; void virtio_net__init(const struct virtio_net_parameters *params); diff --git a/tools/kvm/kvm-run.c b/tools/kvm/kvm-run.c index 4007402..80e1a6c 100644 --- a/tools/kvm/kvm-run.c +++ b/tools/kvm/kvm-run.c @@ -33,6 +33,7 @@ #define DEFAULT_NETWORK "virtio" #define DEFAULT_HOST_ADDR "192.168.33.2" #define DEFAULT_GUEST_MAC "00:11:22:33:44:55" +#define DEFAULT_SCRIPT "none" #define MB_SHIFT (20) #define MIN_RAM_SIZE_MB (64ULL) @@ -65,6 +66,7 @@ static const char *kvm_dev; static const char *network; static const char *host_ip_addr; static const char *guest_mac; +static const char *script; static bool single_step; static bool readonly_image; extern bool ioport_debug; @@ -102,6 +104,8 @@ static const struct option options[] = { "Assign this address to the host side networking"), OPT_STRING('\0', "guest-mac", &guest_mac, "aa:bb:cc:dd:ee:ff", "Assign this address to the guest side NIC"), + OPT_STRING('\0', "tapscript", &script, "Script path", + "Assign a script to process created tap device"), OPT_GROUP("Debug options:"), OPT_STRING('d', "kvm-dev", &kvm_dev, "kvm-dev", "KVM device file"), OPT_BOOLEAN('s', "single-step", &single_step, @@ -277,6 +281,9 @@ int kvm_cmd_run(int argc, const char **argv, const char *prefix) if (!guest_mac) guest_mac = DEFAULT_GUEST_MAC; + if (!script) + script = DEFAULT_SCRIPT; + term_init(); kvm = kvm__init(kvm_dev, ram_size); @@ -320,7 +327,8 @@ int kvm_cmd_run(int argc, const char **argv, const char *prefix) if (!strncmp(network, "virtio", 6)) { net_params = (struct virtio_net_parameters) { .host_ip = host_ip_addr, - .self = kvm + .self = kvm, + .script = script }; sscanf(guest_mac, "%hhx:%hhx:%hhx:%hhx:%hhx:%hhx", net_params.guest_mac, diff --git a/tools/kvm/virtio-net.c b/tools/kvm/virtio-net.c index 8d08272..f8d7276 100644 --- a/tools/kvm/virtio-net.c +++ b/tools/kvm/virtio-net.c @@ -17,6 +17,8 @@ #include <arpa/inet.h> #include <sys/types.h> #include <sys/socket.h> +#include <unistd.h> +#include <sys/wait.h> #define VIRTIO_NET_IRQ 14 #define VIRTIO_NET_QUEUE_SIZE 128 @@ -280,7 +282,7 @@ static bool virtio_net__tap_init(const struct virtio_net_parameters *params) { struct ifreq ifr; int sock = socket(AF_INET, SOCK_STREAM, 0); - int i; + int i, pid, status; struct sockaddr_in sin = {0}; for (i = 0 ; i < 6 ; i++) @@ -304,18 +306,31 @@ static bool virtio_net__tap_init(const struct virtio_net_parameters *params) ioctl(net_device.tap_fd, TUNSETNOCSUM, 1); + if (strcmp(params->script, "none")) { + pid = fork(); + if (pid == 0) { + execl(params->script, params->script, net_device.tap_name, NULL); + _exit(1); + } else { + waitpid(pid, &status, 0); + if (WIFEXITED(status) && WEXITSTATUS(status) != 0) { + warning("Fail to setup tap by %s", params->script); + goto fail; + } + } + } else { + memset(&ifr, 0, sizeof(ifr)); - memset(&ifr, 0, sizeof(ifr)); - - strncpy(ifr.ifr_name, net_device.tap_name, sizeof(net_device.tap_name)); + strncpy(ifr.ifr_name, net_device.tap_name, sizeof(net_device.tap_name)); - sin.sin_addr.s_addr = inet_addr(params->host_ip); - memcpy(&(ifr.ifr_addr), &sin, sizeof(ifr.ifr_addr)); - ifr.ifr_addr.sa_family = AF_INET; + sin.sin_addr.s_addr = inet_addr(params->host_ip); + memcpy(&(ifr.ifr_addr), &sin, sizeof(ifr.ifr_addr)); + ifr.ifr_addr.sa_family = AF_INET; - if (ioctl(sock, SIOCSIFADDR, &ifr) < 0) { - warning("Can not set ip address on tap device"); - goto fail; + if (ioctl(sock, SIOCSIFADDR, &ifr) < 0) { + warning("Can not set ip address on tap device"); + goto fail; + } } memset(&ifr, 0, sizeof(ifr));

[3/3,v2] kvm tools: Setup bridged network by a script

Commit Message

Patch