From patchwork Wed Oct 24 12:49:21 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 193763 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id DEDDF2C0123 for ; Wed, 24 Oct 2012 23:49:46 +1100 (EST) Received: from localhost ([::1]:48197 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TR0P1-0006Nx-IR for incoming@patchwork.ozlabs.org; Wed, 24 Oct 2012 08:49:43 -0400 Received: from eggs.gnu.org ([208.118.235.92]:53681) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TR0Or-0006Nf-En for qemu-devel@nongnu.org; Wed, 24 Oct 2012 08:49:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TR0Om-0007Np-FY for qemu-devel@nongnu.org; Wed, 24 Oct 2012 08:49:33 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48889) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TR0Om-0007Na-6n for qemu-devel@nongnu.org; Wed, 24 Oct 2012 08:49:28 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q9OCnRu1026977 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 24 Oct 2012 08:49:27 -0400 Received: from localhost (dhcp-64-10.muc.redhat.com [10.32.64.10]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q9OCnQAp010797; Wed, 24 Oct 2012 08:49:26 -0400 From: Stefan Hajnoczi To: Date: Wed, 24 Oct 2012 14:49:21 +0200 Message-Id: <1351082961-13628-1-git-send-email-stefanha@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: Stefan Hajnoczi , Laine Stump Subject: [Qemu-devel] [RFC] net: Peer with existing NIC in netdev_add X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Allow netdev_del followed by netdev_add to re-peer a NIC and its netdev: (qemu) info network virtio-net-pci.0: type=nic,model=virtio-net-pci,macaddr=52:54:00:12:34:56 \ netdev0: type=user,net=10.0.2.0,restrict=off (qemu) netdev_del netdev0 (qemu) netdev_add socket,id=netdev0,listen=:1234 (qemu) info network virtio-net-pci.0: type=nic,model=virtio-net-pci,macaddr=52:54:00:12:34:56 \ netdev0: type=socket, This makes it possible to switch netdev while the guest is running. It is not necessary to reset the NIC. Note that the NIC's link goes down in netdev_del and back up again in netdev_add. Therefore the guest becomes aware that the network has changed, although this depends on the emulated NIC model providing link status change interrupts. Signed-off-by: Stefan Hajnoczi --- This patch addresses the netdev hotplug issue that has been discussed previously on the mailing list: https://www.redhat.com/archives/libvir-list/2012-October/msg00629.html Initially I thought we need to add a new monitor command. After looking at the code it seems that simply allowing netdev_del followed by netdev_add (as suggested by Laine) is the simplest way to solve the problem. No new monitor commands are necessary. The current code is not safe with virtio-net + tap, where the virtio-net device reports offload features from the tap device to the guest. If you try to switch to a -netdev user or -netdev socket device, those offload capabilities are not present and network communication will fail. Laine: Please try this out and see if it works for your use case. net.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/net.c b/net.c index ae4bc0d..d7c60b0 100644 --- a/net.c +++ b/net.c @@ -619,6 +619,19 @@ static int (* const net_client_init_fun[NET_CLIENT_OPTIONS_KIND_MAX])( [NET_CLIENT_OPTIONS_KIND_HUBPORT] = net_init_hubport, }; +static NICState *net_find_nic_for_peername(const char *name) +{ + NetClientState *nc; + QTAILQ_FOREACH(nc, &net_clients, next) { + if (nc->info->type != NET_CLIENT_OPTIONS_KIND_NIC) { + continue; + } + if (nc->peer && strcmp(nc->peer->name, name) == 0) { + return (NICState *)nc; + } + } + return NULL; +} static int net_client_init1(const void *object, int is_netdev, Error **errp) { @@ -678,6 +691,25 @@ static int net_client_init1(const void *object, int is_netdev, Error **errp) NetClientOptionsKind_lookup[opts->kind]); return -1; } + + /* Peer with existing nic if netdev name matches */ + if (is_netdev && opts->kind != NET_CLIENT_OPTIONS_KIND_NIC) { + NICState *nic = net_find_nic_for_peername(name); + if (nic && nic->peer_deleted) { + NetClientState *netdev = qemu_find_netdev(name); + + /* TODO vnet_hdr compatibility check */ + + qemu_free_net_client(nic->nc.peer); + nic->nc.peer = netdev; + netdev->peer = &nic->nc; + nic->peer_deleted = false; + nic->nc.link_down = false; + if (nic->nc.info->link_status_changed) { + nic->nc.info->link_status_changed(&nic->nc); + } + } + } } return 0; }