From nobody Mon Feb 9 07:22:30 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1607461090; cv=none; d=zohomail.com; s=zohoarc; b=ioDsl7hGl/3DzLxPaguJ0vWeTylVDtWcrUxjmkSEkLs0LmDr6zLgRQ3TMHVG01HpXxJL3DdP5WEejO3lF5MZZ/z+7r9jafuo1VgwaT2d2+9kT/gnT+uaFx666ed8ai+xdIllftiLv0gzSjxsG7VFFlpmAKpR9p8B4f8/Co1O9Og= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607461090; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=/6JOcPhUQFqc1kwmdgubQXhnbQ6P3mfE5pWlvANh7JM=; b=PevVkRg865tpSBbIkF6YAFCJR0wDOKLVH+Q91aEL6cpb4NdYX/Mhx0kT5c2poH7RzRi1vxres4Q3/ajyuZEdEl1/q94MeIFpQEhNgV2o+GGzIfpm3dw2RvCKmPK7mGsBda2PGq8Zx6XWhNEPsDeaL765ZaFUIMcUN9T4P7+r9fQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1607461090832457.70742327014375; Tue, 8 Dec 2020 12:58:10 -0800 (PST) Received: from localhost ([::1]:53390 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kmjGx-0005IJ-4t for importer@patchew.org; Tue, 08 Dec 2020 15:07:43 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:49722) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kmimX-000703-1G for qemu-devel@nongnu.org; Tue, 08 Dec 2020 14:36:17 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:38999) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kmimU-0005b7-47 for qemu-devel@nongnu.org; Tue, 08 Dec 2020 14:36:15 -0500 Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-509-zevb5agbOSW9Agvg8Fs4Hg-1; Tue, 08 Dec 2020 14:36:11 -0500 Received: by mail-wr1-f71.google.com with SMTP id q18so1161505wrc.20 for ; Tue, 08 Dec 2020 11:36:10 -0800 (PST) Received: from redhat.com (bzq-79-176-44-197.red.bezeqint.net. [79.176.44.197]) by smtp.gmail.com with ESMTPSA id l1sm15998448wrq.64.2020.12.08.11.36.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Dec 2020 11:36:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1607456173; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=/6JOcPhUQFqc1kwmdgubQXhnbQ6P3mfE5pWlvANh7JM=; b=V9IoESIBFOQnOGjQodRKZMy4w6fdF8V29S5Ez9SGXu6ABf3Bdg2jW+5XzdW6pPIx65uvs1 qPbgX017p2LuxbpJu0tfhJ1yg2A1UlNwm3yPJBLT+I4mk2hRuZ4jCUqzTWqb7KrnT6OKC3 m10eGliig1nRXglSYPT+D/wOKqxI9LE= X-MC-Unique: zevb5agbOSW9Agvg8Fs4Hg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=/6JOcPhUQFqc1kwmdgubQXhnbQ6P3mfE5pWlvANh7JM=; b=pxyJ3mvyuzDO9EyDCgiD2nvCut1cBYTnK0KkPmZDACoTzhhqce2QDHBADUe/jFLGbe wRLa4FBt8YIW1xBVCtNUqA5enOK5qM6wnaoZI8YnH3cZkKgtAh1lZAHVUorwTV1Tyf8V Gdr2i9q9fElBzxFNgj3OidLlBn5qRH0SkqJjWq9fTXtkILNitudFbFyGQeJ5Y5kXRpK1 WrnWsEE7Dmw60/mrPxZiaxhDgvisqpz+LaePD6oxLehAS59Nxhgd/BOMTaOtjom6xBcv P0+THZt+0WlzoGNlfFa6LOvW1KySWezEWscY1QzFt8z2Lp5wBZbhxWZW+WDV4AY8ebKF qjMg== X-Gm-Message-State: AOAM532dRaDIHCysok9VL4hqZs9vt36S/AhDbx0JfB6VKRrIhtKs52n2 8JPQr6MKfhUxFZWQwdflCxqmDNUgM9CFmk9eiEAPVdKqnkyPJ5dWdcPwhtbGDNvBvlCnCe9RsBu IbgpT6CBUFWeb73uDFdCiiJqGnRPkuXCzYi/Sz1VwuhA/FgVAPCPJDMJiqgnl X-Received: by 2002:adf:dc8d:: with SMTP id r13mr5905726wrj.325.1607456168727; Tue, 08 Dec 2020 11:36:08 -0800 (PST) X-Google-Smtp-Source: ABdhPJyTAg96c8huD9QsAgUJjDeKLczhkeXLlZaP0qI1VAiddWfnoHFfxULnFgdLDMlg8nBFq9CWFg== X-Received: by 2002:adf:dc8d:: with SMTP id r13mr5905707wrj.325.1607456168499; Tue, 08 Dec 2020 11:36:08 -0800 (PST) Date: Tue, 8 Dec 2020 14:36:04 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Subject: [PULL 42/66] failover: Remove primary_dev member Message-ID: <20201208193307.646726-43-mst@redhat.com> References: <20201208193307.646726-1-mst@redhat.com> MIME-Version: 1.0 In-Reply-To: <20201208193307.646726-1-mst@redhat.com> X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=mst@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Disposition: inline Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=216.205.24.124; envelope-from=mst@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Jason Wang , Juan Quintela Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Juan Quintela Only three uses remained, and we can remove them on that case. Signed-off-by: Juan Quintela Message-Id: <20201118083748.1328-28-quintela@redhat.com> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- include/hw/virtio/virtio-net.h | 1 - hw/net/virtio-net.c | 75 +++++++++++++++------------------- 2 files changed, 34 insertions(+), 42 deletions(-) diff --git a/include/hw/virtio/virtio-net.h b/include/hw/virtio/virtio-net.h index efef64e02f..7e96d193aa 100644 --- a/include/hw/virtio/virtio-net.h +++ b/include/hw/virtio/virtio-net.h @@ -202,7 +202,6 @@ struct VirtIONet { AnnounceTimer announce_timer; bool needs_vnet_hdr_swap; bool mtu_bypass_backend; - DeviceState *primary_dev; /* primary failover device is hidden*/ bool failover_primary_hidden; bool failover; diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index 9203d81780..044ac95f6f 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -832,35 +832,6 @@ static char *failover_find_primary_device_id(VirtIONet= *n) return fid.id; } =20 -static void failover_add_primary(VirtIONet *n, Error **errp) -{ - Error *err =3D NULL; - QemuOpts *opts; - char *id; - - if (n->primary_dev) { - return; - } - - id =3D failover_find_primary_device_id(n); - if (!id) { - return; - } - opts =3D qemu_opts_find(qemu_find_opts("device"), id); - if (opts) { - n->primary_dev =3D qdev_device_add(opts, &err); - if (err) { - qemu_opts_del(opts); - } - } else { - error_setg(errp, "Primary device not found"); - error_append_hint(errp, "Virtio-net failover will not work. Make " - "sure primary device has parameter" - " failover_pair_id=3D\n"); - } - error_propagate(errp, err); -} - /** * Find the primary device for this failover virtio-net * @@ -878,6 +849,36 @@ static DeviceState *failover_find_primary_device(VirtI= ONet *n) return qdev_find_recursive(sysbus_get_default(), id); } =20 +static void failover_add_primary(VirtIONet *n, Error **errp) +{ + Error *err =3D NULL; + QemuOpts *opts; + char *id; + DeviceState *dev =3D failover_find_primary_device(n); + + if (dev) { + return; + } + + id =3D failover_find_primary_device_id(n); + if (!id) { + return; + } + opts =3D qemu_opts_find(qemu_find_opts("device"), id); + if (opts) { + dev =3D qdev_device_add(opts, &err); + if (err) { + qemu_opts_del(opts); + } + } else { + error_setg(errp, "Primary device not found"); + error_append_hint(errp, "Virtio-net failover will not work. Make " + "sure primary device has parameter" + " failover_pair_id=3D\n"); + } + error_propagate(errp, err); +} + static void virtio_net_set_features(VirtIODevice *vdev, uint64_t features) { VirtIONet *n =3D VIRTIO_NET(vdev); @@ -933,19 +934,9 @@ static void virtio_net_set_features(VirtIODevice *vdev= , uint64_t features) qatomic_set(&n->failover_primary_hidden, false); failover_add_primary(n, &err); if (err) { - n->primary_dev =3D failover_find_primary_device(n); - failover_add_primary(n, &err); - if (err) { - goto out_err; - } + warn_report_err(err); } } - return; - -out_err: - if (err) { - warn_report_err(err); - } } =20 static int virtio_net_handle_rx_mode(VirtIONet *n, uint8_t cmd, @@ -3420,13 +3411,15 @@ static int virtio_net_pre_save(void *opaque) static bool primary_unplug_pending(void *opaque) { DeviceState *dev =3D opaque; + DeviceState *primary; VirtIODevice *vdev =3D VIRTIO_DEVICE(dev); VirtIONet *n =3D VIRTIO_NET(vdev); =20 if (!virtio_vdev_has_feature(vdev, VIRTIO_NET_F_STANDBY)) { return false; } - return n->primary_dev ? n->primary_dev->pending_deleted_event : false; + primary =3D failover_find_primary_device(n); + return primary ? primary->pending_deleted_event : false; } =20 static bool dev_unplug_pending(void *opaque) --=20 MST