From nobody Mon Feb 9 03:29:19 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=1607543579; cv=none; d=zohomail.com; s=zohoarc; b=iEMka+khrvXEZKL0ULzCDRVssWgtSRvSGJxM7m+XPXmI2br1BaRubEhnuW26zqtGqskb6M9/ar3WnkkbYqvn3xK5hka9u48AABvSKWz6pZrQ9QLMAMUA3xMsrn3BSTg8Qh/DXGvx+yNgnMxYP+Vw7BmhFDfojg0CLKzqGzinrs4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607543579; 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=l0qss9gU1YSRIieMwhZYjklQs2fppW1raaUm6UbwM0U=; b=VYL1+IPH0UP0V/OI4GjIofWAqVh1xCNXJlOLE5eUUiQ62onOJ8lLsJo6zUkz6K1PkXK+WHjDUCDDTBDqZB7cPkpKIlPcWmjLEssSTEWwZ0NqHMM1x4CG2ySEG7wyrcKLfi15br7fqtLkEkn/6dFxYV9BUQoXM6IAD0QFJMFq9hw= 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 1607543579707714.9695796710209; Wed, 9 Dec 2020 11:52:59 -0800 (PST) Received: from localhost ([::1]:43912 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kn4H8-0007m8-AO for importer@patchew.org; Wed, 09 Dec 2020 13:33:18 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:52208) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kn3tP-0002Ol-Cy for qemu-devel@nongnu.org; Wed, 09 Dec 2020 13:08:47 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:53955) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kn3tM-0008A0-Cc for qemu-devel@nongnu.org; Wed, 09 Dec 2020 13:08:46 -0500 Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-42-mfE3FdVVMNCVLu0FRfmAkg-1; Wed, 09 Dec 2020 13:08:41 -0500 Received: by mail-wr1-f72.google.com with SMTP id p18so946402wro.9 for ; Wed, 09 Dec 2020 10:08:41 -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 i11sm4766045wrm.1.2020.12.09.10.08.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Dec 2020 10:08:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1607537323; 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=l0qss9gU1YSRIieMwhZYjklQs2fppW1raaUm6UbwM0U=; b=Byahc4xnhe6CaOT//9Y/1kgrr+rrLkOgMQednxQgaVHLAaoNqbuR5hl6N3NDvPT6aDgXh1 RNWJRihUk8HUa99+o7/EfmcdZ1blgvJm4Pl9Yy11/UKmwqdKHLnvK4m8bb+X6SvXrT6AZH yttDJBVqp3JKB3c7sw664NBezlxUv/I= X-MC-Unique: mfE3FdVVMNCVLu0FRfmAkg-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=l0qss9gU1YSRIieMwhZYjklQs2fppW1raaUm6UbwM0U=; b=PkNscYqqYjvbI2R/dj0DajrOq+XL4KAiTvht+tMi6blFda6aOztWFTUHErq65EMvm4 5B6q9UcHKJHN77MTSf/hdZV7fABe4vjdxqDWNwCG4+lCc8ezUydT9GEJA6YkZVsfo0+D O0WVcL+cE3X6llRjuVH4V/sQ3E7klDcSH9kNrfAPdaAeNUWkOm/brNuOopk4SfIjbEbj cm0rOGFaWhSad0IXYpGEbDKRNr7De+fiWEL9VykOKhwGa/DcBuv0X/qTOtUCTXF50MJF xNcwDK8bHyy7BzyPAcWo/UMUSSPvliQVTrowXWgcnvuMVIvwcfXevgmhakEVf8tQKr1I VHRw== X-Gm-Message-State: AOAM530GgfO0iIUQt4hdVOOjQgZR46W8mrdmmzFumXHWeoeLZWzzGWXh DXGgvv0vCOEhT4RQ+oVtsAL/XeGjytYSpeWqlHUTndzlelgpphoFGY7q1ZkMklffWhZ/xF/aMtQ 9xanpCc/ncSc6IcmsPcZg6+QxXmWVI2XVOrCROpHY5msvvIABmZfKeOEgJjC0 X-Received: by 2002:a1c:e342:: with SMTP id a63mr4163337wmh.64.1607537320104; Wed, 09 Dec 2020 10:08:40 -0800 (PST) X-Google-Smtp-Source: ABdhPJx/fXNpX6B+TKlOh4OBJe2YH6MysLql/V+v1dPGrxTBvyPGXYviB2tZyVZ5//jHh60IOVagVg== X-Received: by 2002:a1c:e342:: with SMTP id a63mr4163319wmh.64.1607537319880; Wed, 09 Dec 2020 10:08:39 -0800 (PST) Date: Wed, 9 Dec 2020 13:08:37 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Subject: [PULL v2 26/65] failover: remove standby_id variable Message-ID: <20201209180546.721296-27-mst@redhat.com> References: <20201209180546.721296-1-mst@redhat.com> MIME-Version: 1.0 In-Reply-To: <20201209180546.721296-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=63.128.21.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_H4=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 We can calculate it, and we only use it once anyways. Signed-off-by: Juan Quintela Message-Id: <20201118083748.1328-12-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 | 11 +++-------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/include/hw/virtio/virtio-net.h b/include/hw/virtio/virtio-net.h index 7159e6c0a0..a055f39dd6 100644 --- a/include/hw/virtio/virtio-net.h +++ b/include/hw/virtio/virtio-net.h @@ -205,7 +205,6 @@ struct VirtIONet { QDict *primary_device_dict; DeviceState *primary_dev; char *primary_device_id; - char *standby_id; /* 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 2a99b0e0f6..953d5c2bc8 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -3181,23 +3181,19 @@ static int virtio_net_primary_should_be_hidden(Devi= ceListener *listener, VirtIONet *n =3D container_of(listener, VirtIONet, primary_listener); bool match_found =3D false; bool hide =3D false; + const char *standby_id; =20 if (!device_opts) { return -1; } n->primary_device_dict =3D qemu_opts_to_qdict(device_opts, n->primary_device_dict); - if (n->primary_device_dict) { - g_free(n->standby_id); - n->standby_id =3D g_strdup(qdict_get_try_str(n->primary_device_dic= t, - "failover_pair_id")); - } - if (g_strcmp0(n->standby_id, n->netclient_name) =3D=3D 0) { + standby_id =3D qemu_opt_get(device_opts, "failover_pair_id"); + if (g_strcmp0(standby_id, n->netclient_name) =3D=3D 0) { match_found =3D true; } else { match_found =3D false; hide =3D false; - g_free(n->standby_id); n->primary_device_dict =3D NULL; goto out; } @@ -3400,7 +3396,6 @@ static void virtio_net_device_unrealize(DeviceState *= dev) if (n->failover) { device_listener_unregister(&n->primary_listener); g_free(n->primary_device_id); - g_free(n->standby_id); qobject_unref(n->primary_device_dict); n->primary_device_dict =3D NULL; } --=20 MST