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=1607545425; cv=none; d=zohomail.com; s=zohoarc; b=aAV4dDmWDIn6xqUpeZa2qqs/A109T9j+0XeO9kbIa/RuVkXEMPRdvppwGnU0zugUs/t0FybHZ0XeS4/RNVMo63ikPxlAo3EJ9I6R7nilSJz6GX2V2M8LpgDwdtursSSlrieStWrwi6IwmXrmBihuAVOH0PV6WGFrFJ++GL3SdBs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607545425; 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=MHcX9e7mD/h+Oeld8nnzKR5yrjwwB4Dy4Q0IjF0Tlvs=; b=INNa7X2baIl8i7XuIGUU9X/bVsTpOsfFcBjtxn4QW8/Pz7PjkKap31w8nwfedvPbCeAoivO/o4J9YujetkUe1r2G/PoddxV5sEOZjf/nT7Y/IvvL6HIwb2UYC6kyVci3ZWGw8q4N23I2OHOvDXXbIkfmVmKKWVTQYOQ/O3MyJXs= 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 1607545425306977.9281935537616; Wed, 9 Dec 2020 12:23:45 -0800 (PST) Received: from localhost ([::1]:51558 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kn4jn-0000wC-Cl for importer@patchew.org; Wed, 09 Dec 2020 14:02:55 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:52130) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kn3tD-0002IQ-3g for qemu-devel@nongnu.org; Wed, 09 Dec 2020 13:08:35 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:47367) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kn3tB-00087S-Fc for qemu-devel@nongnu.org; Wed, 09 Dec 2020 13:08:34 -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-209-Iwk424pVMzm0BigQt6NvpQ-1; Wed, 09 Dec 2020 13:08:30 -0500 Received: by mail-wr1-f72.google.com with SMTP id w8so943317wrv.18 for ; Wed, 09 Dec 2020 10:08:30 -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 p19sm5923770wrg.18.2020.12.09.10.08.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Dec 2020 10:08:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1607537312; 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=MHcX9e7mD/h+Oeld8nnzKR5yrjwwB4Dy4Q0IjF0Tlvs=; b=Ed1lftdjrBnxnUlyC6xoZLoiIMSRH3w2Ic2x6dZTTXc/3TCXdmEvF2LwNc0E3FhMc5GUY7 hljH3QEHQXgqGlqIe48kk2CVdUfqeZH/YJX9+nt8Hl5+GDiVZGIk01GAYOCyPDBbxZDEjH LKblTkhodE4tcvPlq2dsDNFIT5xoSIk= X-MC-Unique: Iwk424pVMzm0BigQt6NvpQ-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=MHcX9e7mD/h+Oeld8nnzKR5yrjwwB4Dy4Q0IjF0Tlvs=; b=J1d3vWHSxWQuuX2nDa8lHZ1R9zLFKHoUUjbBs3IAPyBBRwKM7zwPR4A1ehXCCxN1kK 6IIaUz1Jc4idF3HOAG9fQsi9i9em8tck6gA0h2ZqHp8oQDcYY8C+RJMh8Fl8zU95b9Ky TFNYziwxUfHU23z1W+vZF45FYn8XI4Oia2dc3CEXXhtQriRhuW+xij1n6OTMVCPUZXwB NXzDvsmjQ1JrtkbPxKJWyfIQQsAqLzzRChoN5Fo7XtRf+988ZNsmDhvnCCikIIMvkSWW zDaIy+l+L8j/5AKBPU3ZgNKEq5h3cE+dBk/qU+xNT26oP3Zro0JTFpXWyyJoHiZssMrM 8fgA== X-Gm-Message-State: AOAM530vx7wJPNVNCVZThB5egswxTiCL51zWJTyrmU8rj43ZSrddBbmE Ywxkr7xD8nMgkI95kghCTn314oa8EupNmw0MXgbU9+i74+cDEXdBsYinrz4G4TJplucmjDP40gx 95K98ZJTZggWuE5spjJWf6sILANwme6szwW5zkQwlpoh3WjYxYIYO76J6+aYO X-Received: by 2002:a1c:f002:: with SMTP id a2mr4020292wmb.101.1607537308662; Wed, 09 Dec 2020 10:08:28 -0800 (PST) X-Google-Smtp-Source: ABdhPJylIi1bEiX7yPWwAmgziMVLrM+IQKaOzgfVfNhG5z1JqBRDouz3EkF4oDiivlveSOkS6+/kPA== X-Received: by 2002:a1c:f002:: with SMTP id a2mr4020263wmb.101.1607537308402; Wed, 09 Dec 2020 10:08:28 -0800 (PST) Date: Wed, 9 Dec 2020 13:08:20 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Subject: [PULL v2 23/65] failover: Rename bool to failover_primary_hidden Message-ID: <20201209180546.721296-24-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=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 You should not use passive naming variables. And once there, be able to search for them. Signed-off-by: Juan Quintela Message-Id: <20201118083748.1328-9-quintela@redhat.com> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- include/hw/virtio/virtio-net.h | 3 ++- hw/net/virtio-net.c | 14 +++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/include/hw/virtio/virtio-net.h b/include/hw/virtio/virtio-net.h index c8da637d40..ca68be759f 100644 --- a/include/hw/virtio/virtio-net.h +++ b/include/hw/virtio/virtio-net.h @@ -207,7 +207,8 @@ struct VirtIONet { DeviceState *primary_dev; char *primary_device_id; char *standby_id; - bool primary_should_be_hidden; + /* primary failover device is hidden*/ + bool failover_primary_hidden; bool failover; DeviceListener primary_listener; Notifier migration_state; diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index 3e82108d42..c221671852 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -916,7 +916,7 @@ static void virtio_net_set_features(VirtIODevice *vdev,= uint64_t features) =20 if (virtio_has_feature(features, VIRTIO_NET_F_STANDBY)) { qapi_event_send_failover_negotiated(n->netclient_name); - qatomic_set(&n->primary_should_be_hidden, false); + qatomic_set(&n->failover_primary_hidden, false); failover_add_primary(n, &err); if (err) { n->primary_dev =3D virtio_connect_failover_devices(n, &err); @@ -3127,7 +3127,7 @@ static bool failover_replug_primary(VirtIONet *n, Err= or **errp) return false; } qdev_set_parent_bus(n->primary_dev, primary_bus, &error_abort); - qatomic_set(&n->primary_should_be_hidden, false); + qatomic_set(&n->failover_primary_hidden, false); hotplug_ctrl =3D qdev_get_hotplug_handler(n->primary_dev); if (hotplug_ctrl) { hotplug_handler_pre_plug(hotplug_ctrl, n->primary_dev, &err); @@ -3148,7 +3148,7 @@ static void virtio_net_handle_migration_primary(VirtI= ONet *n, bool should_be_hidden; Error *err =3D NULL; =20 - should_be_hidden =3D qatomic_read(&n->primary_should_be_hidden); + should_be_hidden =3D qatomic_read(&n->failover_primary_hidden); =20 if (!n->primary_dev) { n->primary_dev =3D virtio_connect_failover_devices(n, &err); @@ -3163,7 +3163,7 @@ static void virtio_net_handle_migration_primary(VirtI= ONet *n, qdev_get_vmsd(n->primary_dev), n->primary_dev); qapi_event_send_unplug_primary(n->primary_device_id); - qatomic_set(&n->primary_should_be_hidden, true); + qatomic_set(&n->failover_primary_hidden, true); } else { warn_report("couldn't unplug primary device"); } @@ -3213,8 +3213,8 @@ static int virtio_net_primary_should_be_hidden(Device= Listener *listener, =20 n->primary_device_opts =3D device_opts; =20 - /* primary_should_be_hidden is set during feature negotiation */ - hide =3D qatomic_read(&n->primary_should_be_hidden); + /* failover_primary_hidden is set during feature negotiation */ + hide =3D qatomic_read(&n->failover_primary_hidden); =20 if (n->primary_device_dict) { g_free(n->primary_device_id); @@ -3271,7 +3271,7 @@ static void virtio_net_device_realize(DeviceState *de= v, Error **errp) if (n->failover) { n->primary_listener.should_be_hidden =3D virtio_net_primary_should_be_hidden; - qatomic_set(&n->primary_should_be_hidden, true); + qatomic_set(&n->failover_primary_hidden, true); device_listener_register(&n->primary_listener); n->migration_state.notify =3D virtio_net_migration_state_notifier; add_migration_state_change_notifier(&n->migration_state); --=20 MST