From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4B4EDC433FE for ; Wed, 9 Dec 2020 18:25:45 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 07E4923C8F for ; Wed, 9 Dec 2020 18:25:45 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 07E4923C8F Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:55118 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kn49o-0000Pe-5p for qemu-devel@archiver.kernel.org; Wed, 09 Dec 2020 13:25:44 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:52092) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kn3t6-0002By-SX for qemu-devel@nongnu.org; Wed, 09 Dec 2020 13:08:28 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:30388) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kn3sx-00084d-Ey for qemu-devel@nongnu.org; Wed, 09 Dec 2020 13:08:28 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1607537297; 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=bvk6Ny86rso8mg1Vb1kLOvKe4SXQYHEXQ5syAnjwF2M=; b=H9FNjvc/UlRDQh5/NMlnxgSj4Kb2Wk6Dh+BknWqAZIqUp91FrLcFXU+hhoZ1p0Z7n3q33N VG3ONFd4coUEouIHLhpKplRVGISQg4fEuXZcHjFQib65VECeCoqF7YMza8KKLkYWukbqcn AolnfBvQqgc9k8kbPbMDwlAXTZPifTM= Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-534--SB5PoG0PMmhCKD0i9iVdA-1; Wed, 09 Dec 2020 13:08:14 -0500 X-MC-Unique: -SB5PoG0PMmhCKD0i9iVdA-1 Received: by mail-wm1-f71.google.com with SMTP id k128so866602wme.7 for ; Wed, 09 Dec 2020 10:08:13 -0800 (PST) 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=bvk6Ny86rso8mg1Vb1kLOvKe4SXQYHEXQ5syAnjwF2M=; b=TQuPCz1UnshcXrbkvjBbeIYZDmLVZZilMzV/3hayjKOiEkl32uhZR2+Gpl2mYssihk jkYm7rUC9WMlMVjyilZ08a0EB8MF52gm9WwTYx/2v3MmMDHJNFs2gZE+DQxDiwE4SoJk +Udhlg1sFIAYzFPYsPgdukIfwSPKQhxpbYKQELdnZDHbNagRmB6iNHaT32a10lBTkhGz YjMyrXOVkRDj8nTVNPNd7QTiy9N7UVoITTTU8poTXVVzmd4iz34j/rFtBnk8GQf7R8g0 gh3c0+ZIFjqwpaxFZNjJECYJebLC556IXED8eIJn3RmClXKjrIg69EsI5n6fhFTUPfcH b8VQ== X-Gm-Message-State: AOAM531PJ0+zLB5o79tLUfg3iGle5pC3sJUSDjav6SZbEugwCT7lcUlO 10AOMpHj6sgvaNVnHo7mqCMQ6aSLtagHFeg5Zy67AH6YybWYnhGHBaozp8p0cgCSS5QfHTv9lgL pqomjgthLZxVTh42oarBWxsoOT2pZf465c53Sj4H1cy//mo/hK0c71hDaWkxZ X-Received: by 2002:adf:e48d:: with SMTP id i13mr4080140wrm.48.1607537292251; Wed, 09 Dec 2020 10:08:12 -0800 (PST) X-Google-Smtp-Source: ABdhPJx6fwFfZnaDiGw+iZqpKoxWF30+fePH2QuFOFw4E146SXN1TFy9xSmDWwb/F5JSkYva8mxtaw== X-Received: by 2002:adf:e48d:: with SMTP id i13mr4080121wrm.48.1607537292066; Wed, 09 Dec 2020 10:08:12 -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 u66sm5197759wmg.30.2020.12.09.10.08.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Dec 2020 10:08:11 -0800 (PST) Date: Wed, 9 Dec 2020 13:08:09 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Subject: [PULL v2 19/65] failover: primary bus is only used once, and where it is set Message-ID: <20201209180546.721296-20-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-Type: text/plain; charset=us-ascii Content-Disposition: inline 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Juan Quintela Just remove the struct member. Signed-off-by: Juan Quintela Message-Id: <20201118083748.1328-5-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 | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/include/hw/virtio/virtio-net.h b/include/hw/virtio/virtio-net.h index f4852ac27b..c8da637d40 100644 --- a/include/hw/virtio/virtio-net.h +++ b/include/hw/virtio/virtio-net.h @@ -205,7 +205,6 @@ struct VirtIONet { QemuOpts *primary_device_opts; QDict *primary_device_dict; DeviceState *primary_dev; - BusState *primary_bus; char *primary_device_id; char *standby_id; bool primary_should_be_hidden; diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index a0fa63e7cb..786d313330 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -804,7 +804,6 @@ static void failover_add_primary(VirtIONet *n, Error **errp) qemu_opts_del(n->primary_device_opts); } if (n->primary_dev) { - n->primary_bus = n->primary_dev->parent_bus; if (err) { qdev_unplug(n->primary_dev, &err); qdev_set_id(n->primary_dev, ""); @@ -3118,6 +3117,7 @@ static bool failover_replug_primary(VirtIONet *n, Error **errp) Error *err = NULL; HotplugHandler *hotplug_ctrl; PCIDevice *pdev = PCI_DEVICE(n->primary_dev); + BusState *primary_bus; if (!pdev->partially_hotplugged) { return true; @@ -3130,12 +3130,12 @@ static bool failover_replug_primary(VirtIONet *n, Error **errp) return false; } } - n->primary_bus = n->primary_dev->parent_bus; - if (!n->primary_bus) { + primary_bus = n->primary_dev->parent_bus; + if (!primary_bus) { error_setg(errp, "virtio_net: couldn't find primary bus"); return false; } - qdev_set_parent_bus(n->primary_dev, n->primary_bus, &error_abort); + qdev_set_parent_bus(n->primary_dev, primary_bus, &error_abort); qatomic_set(&n->primary_should_be_hidden, false); if (!qemu_opt_set_bool(n->primary_device_opts, "partially_hotplugged", true, errp)) { -- MST