From nobody Mon Feb 9 23:01:25 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=1605690452; cv=none; d=zohomail.com; s=zohoarc; b=HakH26ZUamJCJ6iDGGwrLE5pmHS9/qtvdCu5bWjSJH+0LnyEMBnRp+cy2t4j6ktC9S1BQng0HVmR1QIB95BYVvogaE7qTrIc56/OY3R1HE9me2DFVc9hTscJT43RcdoY7M5bUXVh9qXiW3d+iwAWQ7lwfkv1ZdLWT3nd7Il05DE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605690452; h=Content-Type:Content-Transfer-Encoding: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=CYb6fiPj5EFAv8ZxJdzIa0JaYihePB45/157vgEZlH0=; b=jHH9RpGIMbHz2EKMwAc28zSUSXAZwOrIpCxByVXmuiTlyheMQL0P9rApmpakhTuJd64OoPqo1Zq3bB4SQh8QawHOl4AYQ2U8SqMA3kX3pBrnfpBUV9LgWJcqblCYIItkK1WIkdOcF/VaAcnYekpOyBxF7bDAOa4H0M4HD7ihByo= 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 1605690452029767.2936367034551; Wed, 18 Nov 2020 01:07:32 -0800 (PST) Received: from localhost ([::1]:42664 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kfJR4-00010v-Tl for importer@patchew.org; Wed, 18 Nov 2020 04:07:30 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:52498) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kfIz7-0003WZ-2H for qemu-devel@nongnu.org; Wed, 18 Nov 2020 03:38:37 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:43470) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kfIz5-0005hD-AR for qemu-devel@nongnu.org; Wed, 18 Nov 2020 03:38:36 -0500 Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-77-g2_iiMzqNnCXl1Q3i8I87A-1; Wed, 18 Nov 2020 03:38:32 -0500 Received: by mail-wr1-f69.google.com with SMTP id w5so610363wrm.22 for ; Wed, 18 Nov 2020 00:38:32 -0800 (PST) Received: from localhost (trasno.trasno.org. [83.165.45.250]) by smtp.gmail.com with ESMTPSA id o197sm2383541wme.17.2020.11.18.00.38.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Nov 2020 00:38:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605688714; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=CYb6fiPj5EFAv8ZxJdzIa0JaYihePB45/157vgEZlH0=; b=Pk/KWlEinncwrhri39jw+g9Es9+ci06sxJrXOyaGY4MehaKUwasrvFw7m7TwXdB2GO+NcM sl4WflEfKiyCIWQZTzEfPQQ7Yd442EIwYJ03WLetlVizqaxOt/MdTsMwmHINWtPAR+jc3b bN5DCRHsdx+2H8+sH1zAQIuBo94mzHM= X-MC-Unique: g2_iiMzqNnCXl1Q3i8I87A-1 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:mime-version:content-transfer-encoding; bh=CYb6fiPj5EFAv8ZxJdzIa0JaYihePB45/157vgEZlH0=; b=lPEIgN56Osc0ud0lzmWxffxSvaWC2gd+Sha6LQkHw+K1YGWcs1ButgSujZnBMwVdFV 3T8tp8kJ5Bivef8k0k8QMEDVyVFllKd1KUjLooc80dPsqcY8N5OXx2Eoni54+10ZKwWW z4Vt00xd5Yim5pY3Sub2RXaK7JPRQNmAQ1xojMMPHSaqjJC/SajQBbbwvjZrcmReyAcl GD1ziwCeK/Qr+ur0JsYhXhQEvBTffqteZauXl+ruG75RzoZYDFCuX7f1hCUJFCtovwVW TDBo0vfw/fZsCbvBIKVG5HUl1taV+GOmnahKtr+NHDAaaXEpMFM/SYPkbw2HRPER/hOB e25g== X-Gm-Message-State: AOAM531LZhd+OPR9VBJKuDsQStUPOXoRpW9A+XQd7Mp49CMKRd8cs/Az BLWlS7UBoDwNTGnqaCwKFev6cbZi9m1akpKm+D4gpenirERtIq0kRTwx25nX+/2oiYIMzfQxQnT 6Hx202StIa3677rm7Ln1wVdNc1/egBlNvxDYqedsfQfgaddq/L9tovCJYnYrZvMjjoHs= X-Received: by 2002:a1c:750b:: with SMTP id o11mr3323905wmc.32.1605688711552; Wed, 18 Nov 2020 00:38:31 -0800 (PST) X-Google-Smtp-Source: ABdhPJxugSUA4uBg3uk8SP/RtEBJBx23bbmPmDtHdAdQ6CV2TuIyrUfZRpS3kgP4dyQ80Kcinc6XcQ== X-Received: by 2002:a1c:750b:: with SMTP id o11mr3323879wmc.32.1605688711326; Wed, 18 Nov 2020 00:38:31 -0800 (PST) From: Juan Quintela To: qemu-devel@nongnu.org Subject: [PATCH v2 27/27] failover: Remove primary_dev member Date: Wed, 18 Nov 2020 09:37:48 +0100 Message-Id: <20201118083748.1328-28-quintela@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201118083748.1328-1-quintela@redhat.com> References: <20201118083748.1328-1-quintela@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=quintela@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable 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=quintela@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/18 00:38:29 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] 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: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Eduardo Habkost , "Michael S. Tsirkin" , Jason Wang , Juan Quintela , "Dr. David Alan Gilbert" , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Only three uses remained, and we can remove them on that case. Signed-off-by: Juan Quintela --- include/hw/virtio/virtio-net.h | 1 - hw/net/virtio-net.c | 55 +++++++++++++++------------------- 2 files changed, 24 insertions(+), 32 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,13 +832,31 @@ static char *failover_find_primary_device_id(VirtIONe= t *n) return fid.id; } =20 +/** + * Find the primary device for this failover virtio-net + * + * @n: VirtIONet device + * @errp: returns an error if this function fails + */ +static DeviceState *failover_find_primary_device(VirtIONet *n) +{ + char *id =3D failover_find_primary_device_id(n); + + if (!id) { + return NULL; + } + + return qdev_find_recursive(sysbus_get_default(), id); +} + 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); =20 - if (n->primary_dev) { + if (dev) { return; } =20 @@ -848,7 +866,7 @@ static void failover_add_primary(VirtIONet *n, Error **= errp) } opts =3D qemu_opts_find(qemu_find_opts("device"), id); if (opts) { - n->primary_dev =3D qdev_device_add(opts, &err); + dev =3D qdev_device_add(opts, &err); if (err) { qemu_opts_del(opts); } @@ -861,23 +879,6 @@ static void failover_add_primary(VirtIONet *n, Error *= *errp) error_propagate(errp, err); } =20 -/** - * Find the primary device for this failover virtio-net - * - * @n: VirtIONet device - * @errp: returns an error if this function fails - */ -static DeviceState *failover_find_primary_device(VirtIONet *n) -{ - char *id =3D failover_find_primary_device_id(n); - - if (!id) { - return NULL; - } - - return qdev_find_recursive(sysbus_get_default(), id); -} - 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 2.26.2