From patchwork Thu Oct 8 18:58:29 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark McLoughlin X-Patchwork-Id: 35515 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id BEE63B7B71 for ; Fri, 9 Oct 2009 06:26:34 +1100 (EST) Received: from localhost ([127.0.0.1]:47194 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MvydE-0006g3-18 for incoming@patchwork.ozlabs.org; Thu, 08 Oct 2009 15:26:32 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MvyET-0006Oq-Gm for qemu-devel@nongnu.org; Thu, 08 Oct 2009 15:00:57 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MvyEK-0006Is-N3 for qemu-devel@nongnu.org; Thu, 08 Oct 2009 15:00:52 -0400 Received: from [199.232.76.173] (port=52370 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MvyEK-0006IT-Af for qemu-devel@nongnu.org; Thu, 08 Oct 2009 15:00:48 -0400 Received: from mx1.redhat.com ([209.132.183.28]:15946) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MvyEG-00074V-Fq for qemu-devel@nongnu.org; Thu, 08 Oct 2009 15:00:45 -0400 Received: from int-mx03.intmail.prod.int.phx2.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n98J0Fso020484 for ; Thu, 8 Oct 2009 15:00:40 -0400 Received: from blaa.localdomain (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx03.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id n98J0Dv7013165; Thu, 8 Oct 2009 15:00:14 -0400 Received: by blaa.localdomain (Postfix, from userid 500) id 80468517A6; Thu, 8 Oct 2009 19:58:33 +0100 (IST) From: Mark McLoughlin To: qemu-devel@nongnu.org Date: Thu, 8 Oct 2009 19:58:29 +0100 Message-Id: <1255028312-28180-14-git-send-email-markmc@redhat.com> In-Reply-To: <1255028312-28180-1-git-send-email-markmc@redhat.com> References: <1255028312-28180-1-git-send-email-markmc@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.16 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: Mark McLoughlin Subject: [Qemu-devel] [PATCH 13/16] net: add -net nic,netdev= option X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Mark McLoughlin --- net.c | 41 ++++++++++++++++++++++++++++++++++++----- net.h | 1 + 2 files changed, 37 insertions(+), 5 deletions(-) diff --git a/net.c b/net.c index d6fe84b..3f997cc 100644 --- a/net.c +++ b/net.c @@ -2340,6 +2340,19 @@ VLANState *qemu_find_vlan(int id, int allocate) return vlan; } +static VLANClientState *qemu_find_netdev(const char *id) +{ + VLANClientState *vc; + + QTAILQ_FOREACH(vc, &non_vlan_clients, next) { + if (!strcmp(vc->name, id)) { + return vc; + } + } + + return NULL; +} + static int nic_get_free_idx(void) { int index; @@ -2417,6 +2430,7 @@ static int net_init_nic(QemuOpts *opts, { int idx; NICInfo *nd; + const char *netdev; idx = nic_get_free_idx(); if (idx == -1 || nb_nics >= MAX_NICS) { @@ -2428,9 +2442,16 @@ static int net_init_nic(QemuOpts *opts, memset(nd, 0, sizeof(*nd)); - assert(vlan); - nd->vlan = vlan; - + if ((netdev = qemu_opt_get(opts, "netdev"))) { + nd->netdev = qemu_find_netdev(netdev); + if (!nd->netdev) { + qemu_error("netdev '%s' not found\n", netdev); + return -1; + } + } else { + assert(vlan); + nd->vlan = vlan; + } if (name) { nd->name = qemu_strdup(name); } @@ -2462,7 +2483,9 @@ static int net_init_nic(QemuOpts *opts, } nd->used = 1; - nd->vlan->nb_guest_devs++; + if (vlan) { + nd->vlan->nb_guest_devs++; + } nb_nics++; return idx; @@ -2821,6 +2844,11 @@ static struct { .desc = { NET_COMMON_PARAMS_DESC, { + .name = "netdev", + .type = QEMU_OPT_STRING, + .help = "id of -netdev to connect to", + }, + { .name = "macaddr", .type = QEMU_OPT_STRING, .help = "MAC address", @@ -3069,7 +3097,10 @@ int net_client_init(Monitor *mon, QemuOpts *opts, int is_netdev) return -1; } - if (!is_netdev) { + /* Do not add to a vlan if it's a -netdev or a nic with a + * netdev= parameter. */ + if (!(is_netdev || + (strcmp(type, "nic") == 0 && qemu_opt_get(opts, "netdev")))) { vlan = qemu_find_vlan(qemu_opt_get_number(opts, "vlan", 0), 1); } diff --git a/net.h b/net.h index edaf942..e23047c 100644 --- a/net.h +++ b/net.h @@ -99,6 +99,7 @@ struct NICInfo { char *name; char *devaddr; VLANState *vlan; + VLANClientState *netdev; VLANClientState *vc; void *private; int used;