From patchwork Thu Oct 25 14:06:31 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sameeh Jubran X-Patchwork-Id: 10655873 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 1D10613A4 for ; Thu, 25 Oct 2018 14:08:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 076942BA54 for ; Thu, 25 Oct 2018 14:08:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EAC072BA34; Thu, 25 Oct 2018 14:08:14 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 74FDF2BA34 for ; Thu, 25 Oct 2018 14:08:14 +0000 (UTC) Received: from localhost ([::1]:54713 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gFgJ3-0007rz-5F for patchwork-qemu-devel@patchwork.kernel.org; Thu, 25 Oct 2018 10:08:13 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43603) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gFgHd-0007pq-Md for qemu-devel@nongnu.org; Thu, 25 Oct 2018 10:06:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gFgHb-0007dv-S8 for qemu-devel@nongnu.org; Thu, 25 Oct 2018 10:06:45 -0400 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]:35093) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gFgHb-0007dj-KN for qemu-devel@nongnu.org; Thu, 25 Oct 2018 10:06:43 -0400 Received: by mail-wr1-x42e.google.com with SMTP id w5-v6so9485517wrt.2 for ; Thu, 25 Oct 2018 07:06:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daynix-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=D+dl7//netDr19dT4IhCLcNc8iz3ooHFs7meEX+stv4=; b=iW68Cej5LkyHzuyk5unAR5QwsYg1bOzoZLoiRkhyhSI60aDsgn3QOic2E9vyRsU5Bn XgTQX+A7/lt/h6C/iG5nlrxm92LpvBRo+SRx84pgAz4Aw9ZqsLLoqSkuAysbBe7DeUmj lqGacTII97Jurz5WoNNk7BMDRxioa+XxSfQRKxFcZgpbpviH0fVWJN4Fy34CqMl5BFf3 aryvNNytGkB8lMVwY0pWO1blUSliZLBpouP/NidNgXiMOwLpk+feu2Y5eln+JdhAbjxE JWPF+T+EdbPzmwGlRdgbFN25FDrcqVlYOfAdAS/S2DwB0PhdBRTIZo9FzktO7nvEo4rW GsOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=D+dl7//netDr19dT4IhCLcNc8iz3ooHFs7meEX+stv4=; b=eElI85ohrdLY8p34f5ezy5RPzbnN4cp/hJUTH5AKkh4t57E/O5M0DFCBWbpaymMdHA RmJTYJ+fmGEn3w3+/BWWmZ4nP2kskI7T7TLbmRBIAvCRcxFose7X9LU7RFKVkk2oiTgJ lmrzTDk36rBFSDeE5teI5rKBGdwQzcUAvQO+O//jFFJShv6gpCQXNnPN/9GlzW20uJ5X M/0VN0bq+9g4TIwdzJGhJb78hXpoGSzOXYQPMo0JfFDPF2iSCONmtG1eFQ39EADcxmyk 4r1+T+/QrwCtf4RWmHMmjcFAoNy9+T9cPIN/jskQP8aACQT6SBXULZHJOW2wKYR59kY0 S9TA== X-Gm-Message-State: AGRZ1gLMNx3zvRL8d1Pe6WNL4PVnq2+2dlrl2/f/UFuoz19EEQLhvarf +VFFDXkba6IuaXOsRb8R9Wb/qYzw5tTKtg== X-Google-Smtp-Source: AJdET5eUbQs05yVgnUvA9xsQR3gXsc/Cbv4jc+IWED9vRFAfd6oYEtFXHaAL/kE65qXdFRdOhiNCJw== X-Received: by 2002:adf:fe4d:: with SMTP id m13-v6mr1991658wrs.71.1540476402264; Thu, 25 Oct 2018 07:06:42 -0700 (PDT) Received: from bark.daynix ([141.226.163.173]) by smtp.gmail.com with ESMTPSA id t194-v6sm2061842wmd.48.2018.10.25.07.06.40 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 25 Oct 2018 07:06:41 -0700 (PDT) From: Sameeh Jubran To: qemu-devel@nongnu.org, Jason Wang Date: Thu, 25 Oct 2018 17:06:31 +0300 Message-Id: <20181025140631.634922-3-sameeh@daynix.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20181025140631.634922-1-sameeh@daynix.com> References: <20181025140631.634922-1-sameeh@daynix.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42e Subject: [Qemu-devel] [RFC 2/2] virtio-net: Implement VIRTIO_NET_F_STANDBY feature X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Yan Vugenfirer , Eduardo Habkost , "Michael S . Tsirkin" Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Sameeh Jubran Signed-off-by: Sameeh Jubran --- hw/net/virtio-net.c | 25 +++++++++++++++++++++++++ include/hw/virtio/virtio-net.h | 5 +++++ 2 files changed, 30 insertions(+) diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index f154756e85..f478445cbd 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -686,6 +686,7 @@ static void virtio_net_set_features(VirtIODevice *vdev, uint64_t features) { VirtIONet *n = VIRTIO_NET(vdev); int i; + Error *err; if (n->mtu_bypass_backend && !virtio_has_feature(vdev->backend_features, VIRTIO_NET_F_MTU)) { @@ -721,6 +722,10 @@ static void virtio_net_set_features(VirtIODevice *vdev, uint64_t features) } else { memset(n->vlans, 0xff, MAX_VLAN >> 3); } + + if (virtio_has_feature(features, VIRTIO_NET_F_STANDBY)) { + qdev_unhide(n->net_conf.primary_id_str, n->primary_parent_bus, &err); + } } static int virtio_net_handle_rx_mode(VirtIONet *n, uint8_t cmd, @@ -1946,6 +1951,20 @@ void virtio_net_set_netclient_name(VirtIONet *n, const char *name, n->netclient_type = g_strdup(type); } +static void virtio_net_primary_should_be_hidden(DeviceListener *listener,const char *dev_id, BusState *bus, bool *res) +{ + VirtIONet *n = container_of(listener, VirtIONet, primary_listener); + if (!strcmp(n->net_conf.primary_id_str ,dev_id) && bus) + { + printf("net_confnet_confnet_confnet_confnet_conf\n"); + n->host_features |= (1ULL << VIRTIO_NET_F_STANDBY); + n->primary_parent_bus = bus; + *res = true; + return; + } + *res = false; +} + static void virtio_net_device_realize(DeviceState *dev, Error **errp) { VirtIODevice *vdev = VIRTIO_DEVICE(dev); @@ -1976,6 +1995,11 @@ static void virtio_net_device_realize(DeviceState *dev, Error **errp) n->host_features |= (1ULL << VIRTIO_NET_F_SPEED_DUPLEX); } + if (n->net_conf.primary_id_str) { + n->primary_listener.should_be_hidden = virtio_net_primary_should_be_hidden; + device_listener_register(&n->primary_listener); + } + virtio_net_set_config_size(n, n->host_features); virtio_init(vdev, "virtio-net", VIRTIO_ID_NET, n->config_size); @@ -2198,6 +2222,7 @@ static Property virtio_net_properties[] = { true), DEFINE_PROP_INT32("speed", VirtIONet, net_conf.speed, SPEED_UNKNOWN), DEFINE_PROP_STRING("duplex", VirtIONet, net_conf.duplex_str), + DEFINE_PROP_STRING("primary", VirtIONet, net_conf.primary_id_str), DEFINE_PROP_END_OF_LIST(), }; diff --git a/include/hw/virtio/virtio-net.h b/include/hw/virtio/virtio-net.h index 4d7f3c82ca..6aca93e461 100644 --- a/include/hw/virtio/virtio-net.h +++ b/include/hw/virtio/virtio-net.h @@ -42,6 +42,7 @@ typedef struct virtio_net_conf int32_t speed; char *duplex_str; uint8_t duplex; + char *primary_id_str; } virtio_net_conf; /* Maximum packet size we can receive from tap device: header + 64k */ @@ -103,9 +104,13 @@ typedef struct VirtIONet { int announce_counter; bool needs_vnet_hdr_swap; bool mtu_bypass_backend; + BusState *primary_parent_bus; + DeviceListener primary_listener; } VirtIONet; void virtio_net_set_netclient_name(VirtIONet *n, const char *name, const char *type); +void virtio_net_register_primary_device(DeviceState *vdev, DeviceState *pdev); + #endif