From nobody Mon Feb 9 08:10:38 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=1607542168; cv=none; d=zohomail.com; s=zohoarc; b=USVY7dJ7qlFeIzHcA0KJbI49+FgNspq/ExGGM/t6F+Gxz0NrEErSK+kdFpy2pmFxzhei420XJhHdn/c19Uhgy5MpJTUpwGGkq1NBPZU6UUCix0eIKy3WfbSHoGCiBLbDlXToz9FESL147YrqX1tjhn1gBK02+61RNrPrEVROXGE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607542168; 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=fWdn60YXLAPyXZe/D6icm9/1W6OTKOnwy4q/Y4bmQPM=; b=NJUlvhC+2rdSS8HDe1sIcwfgx1s9QmQ39xG87Ocu2xsXr11dhaXWtZAp02UYbuUVHVKIdOWL13HFStyRNYjPjaBGpL+TTrAFPtrEvXSrxxgsdEabK+sRRw155pK9HSI4U2DBN1LUZKfWpbY1f2iPi2/oncqWeRgYNdloCnSF6jw= 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 1607542168726198.57805869106141; Wed, 9 Dec 2020 11:29:28 -0800 (PST) Received: from localhost ([::1]:55786 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kn4Le-0004LQ-Rg for importer@patchew.org; Wed, 09 Dec 2020 13:37:58 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:52186) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kn3tM-0002MP-P9 for qemu-devel@nongnu.org; Wed, 09 Dec 2020 13:08:44 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:57901) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kn3tK-00089N-K3 for qemu-devel@nongnu.org; Wed, 09 Dec 2020 13:08:44 -0500 Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-470-iVmK0V2VObmpJ8csx_dHvA-1; Wed, 09 Dec 2020 13:08:38 -0500 Received: by mail-wm1-f70.google.com with SMTP id g198so638214wme.7 for ; Wed, 09 Dec 2020 10:08:38 -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 s133sm4807510wmf.38.2020.12.09.10.08.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Dec 2020 10:08:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1607537319; 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=fWdn60YXLAPyXZe/D6icm9/1W6OTKOnwy4q/Y4bmQPM=; b=h+tSq3nnHGBpEupKWCQbgaFmmUa3qvgbmkrJ6GfRjwM402JvykjEcuLbXh6kAgubcnx7Li bu1JMn+DVTP9ehfGQMLRwGWfLUMtIpA8vWiMAxluEEjZt3VemPRIR21kn3R76KNMkbtNPf bq4pritJA9yd3qCLFe1SMqw5pVbw/fI= X-MC-Unique: iVmK0V2VObmpJ8csx_dHvA-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=fWdn60YXLAPyXZe/D6icm9/1W6OTKOnwy4q/Y4bmQPM=; b=M2ll7oUEs8+8F5gTpruYYYlc5fG97lwL0/onvNsANR/wQQBc6Axd4cLkiLFf8MjOcg B5MrCjsxCWGS4KeIfQQQ9vx5lGRhUb5PwZnxxve1vLQifcOgQy+ySeleRBuOLZh8NnI1 Hb9jJ3yYhnJv8uOx8et1FG1kLzg56ttYZb8KJXZe5z8LHTGokANT/qL9Ezkgx5wlkNjk gEYIOA5Zg7KLZG/HKGscvhzJh42UmGn17hQIXXagNU1dIJDNL+p9NIhKCZAzHFy8WUVG hkv0ENWw/jqZWaUqdMyCm9KMizt/vRhnV7QVjhoHMi8BwMdcXh/BheOvEc7vrGx7qWL3 OK+g== X-Gm-Message-State: AOAM5339KfwapRVbHHsTMafpkiAjShlRsguwW8zwdKwrpCWHOQ/ykGf3 gK2PozGnxdpW5/S3pqeLMQzepAtAElgqSDVly7G+D1GjGHeWbPh6845zUeZhSg36LUme2AS1jmP hQ4b4mBEKVytdZxWO71GUGqlmiqYqd8AyAdhUNE79bEU0Jv15tCjM7Zhu6aHm X-Received: by 2002:a5d:634d:: with SMTP id b13mr4150342wrw.310.1607537316654; Wed, 09 Dec 2020 10:08:36 -0800 (PST) X-Google-Smtp-Source: ABdhPJzBuSMOLVYHhLEj82JyZzL0Zoy6miMd/Cm4ISiI0OUTtU8N42OatigwH19s8DF5S4gS6Ufa4A== X-Received: by 2002:a5d:634d:: with SMTP id b13mr4150311wrw.310.1607537316430; Wed, 09 Dec 2020 10:08:36 -0800 (PST) Date: Wed, 9 Dec 2020 13:08:32 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Subject: [PULL v2 25/65] failover: Remove primary_device_opts Message-ID: <20201209180546.721296-26-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 It was really only used once, in failover_add_primary(). Just search for it on global opts when it is needed. Signed-off-by: Juan Quintela Message-Id: <20201118083748.1328-11-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 | 21 +++++---------------- 2 files changed, 5 insertions(+), 17 deletions(-) diff --git a/include/hw/virtio/virtio-net.h b/include/hw/virtio/virtio-net.h index ca68be759f..7159e6c0a0 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; - QemuOpts *primary_device_opts; QDict *primary_device_dict; DeviceState *primary_dev; char *primary_device_id; diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index e334f05352..2a99b0e0f6 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -791,17 +791,17 @@ static inline uint64_t virtio_net_supported_guest_off= loads(VirtIONet *n) static void failover_add_primary(VirtIONet *n, Error **errp) { Error *err =3D NULL; + QemuOpts *opts; =20 if (n->primary_dev) { return; } =20 - n->primary_device_opts =3D qemu_opts_find(qemu_find_opts("device"), - n->primary_device_id); - if (n->primary_device_opts) { - n->primary_dev =3D qdev_device_add(n->primary_device_opts, &err); + opts =3D qemu_opts_find(qemu_find_opts("device"), n->primary_device_id= ); + if (opts) { + n->primary_dev =3D qdev_device_add(opts, &err); if (err) { - qemu_opts_del(n->primary_device_opts); + qemu_opts_del(opts); } } else { error_setg(errp, "Primary device not found"); @@ -856,7 +856,6 @@ static DeviceState *virtio_connect_failover_devices(Vir= tIONet *n, Error **errp) prim_dev =3D virtio_net_find_primary(n, &err); if (prim_dev) { n->primary_device_id =3D g_strdup(prim_dev->id); - n->primary_device_opts =3D prim_dev->opts; } else { error_propagate(errp, err); } @@ -3113,14 +3112,6 @@ static bool failover_replug_primary(VirtIONet *n, Er= ror **errp) if (!pdev->partially_hotplugged) { return true; } - if (!n->primary_device_opts) { - n->primary_device_opts =3D qemu_opts_from_qdict(qemu_find_opts("de= vice"), - n->primary_device_di= ct, - errp); - if (!n->primary_device_opts) { - return false; - } - } primary_bus =3D n->primary_dev->parent_bus; if (!primary_bus) { error_setg(errp, "virtio_net: couldn't find primary bus"); @@ -3211,8 +3202,6 @@ static int virtio_net_primary_should_be_hidden(Device= Listener *listener, goto out; } =20 - n->primary_device_opts =3D device_opts; - /* failover_primary_hidden is set during feature negotiation */ hide =3D qatomic_read(&n->failover_primary_hidden); =20 --=20 MST