[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL v2 23/65] failover: Rename bool to failover_primary_hidden
From: |
Michael S. Tsirkin |
Subject: |
[PULL v2 23/65] failover: Rename bool to failover_primary_hidden |
Date: |
Wed, 9 Dec 2020 13:08:20 -0500 |
From: Juan Quintela <quintela@redhat.com>
You should not use passive naming variables.
And once there, be able to search for them.
Signed-off-by: Juan Quintela <quintela@redhat.com>
Message-Id: <20201118083748.1328-9-quintela@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
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)
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 = virtio_connect_failover_devices(n, &err);
@@ -3127,7 +3127,7 @@ static bool failover_replug_primary(VirtIONet *n, Error
**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 = 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(VirtIONet
*n,
bool should_be_hidden;
Error *err = NULL;
- should_be_hidden = qatomic_read(&n->primary_should_be_hidden);
+ should_be_hidden = qatomic_read(&n->failover_primary_hidden);
if (!n->primary_dev) {
n->primary_dev = virtio_connect_failover_devices(n, &err);
@@ -3163,7 +3163,7 @@ static void virtio_net_handle_migration_primary(VirtIONet
*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(DeviceListener *listener,
n->primary_device_opts = device_opts;
- /* primary_should_be_hidden is set during feature negotiation */
- hide = qatomic_read(&n->primary_should_be_hidden);
+ /* failover_primary_hidden is set during feature negotiation */
+ hide = qatomic_read(&n->failover_primary_hidden);
if (n->primary_device_dict) {
g_free(n->primary_device_id);
@@ -3271,7 +3271,7 @@ static void virtio_net_device_realize(DeviceState *dev,
Error **errp)
if (n->failover) {
n->primary_listener.should_be_hidden =
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 = virtio_net_migration_state_notifier;
add_migration_state_change_notifier(&n->migration_state);
--
MST
- [PULL v2 13/65] acpi: Align the size to 128k, (continued)
- [PULL v2 13/65] acpi: Align the size to 128k, Michael S. Tsirkin, 2020/12/09
- [PULL v2 14/65] unit-test: The files changed., Michael S. Tsirkin, 2020/12/09
- [PULL v2 16/65] unit-test: Add the binary file and clear diff.h, Michael S. Tsirkin, 2020/12/09
- [PULL v2 17/65] failover: fix indentantion, Michael S. Tsirkin, 2020/12/09
- [PULL v2 18/65] failover: Use always atomics for primary_should_be_hidden, Michael S. Tsirkin, 2020/12/09
- [PULL v2 15/65] unit-test: Add testcase for pxb, Michael S. Tsirkin, 2020/12/09
- [PULL v2 20/65] failover: Remove unused parameter, Michael S. Tsirkin, 2020/12/09
- [PULL v2 19/65] failover: primary bus is only used once, and where it is set, Michael S. Tsirkin, 2020/12/09
- [PULL v2 22/65] failover: qdev_device_add() returns err or dev set, Michael S. Tsirkin, 2020/12/09
- [PULL v2 21/65] failover: Remove external partially_hotplugged property, Michael S. Tsirkin, 2020/12/09
- [PULL v2 23/65] failover: Rename bool to failover_primary_hidden,
Michael S. Tsirkin <=
- [PULL v2 24/65] failover: g_strcmp0() knows how to handle NULL, Michael S. Tsirkin, 2020/12/09
- [PULL v2 25/65] failover: Remove primary_device_opts, Michael S. Tsirkin, 2020/12/09
- [PULL v2 26/65] failover: remove standby_id variable, Michael S. Tsirkin, 2020/12/09
- [PULL v2 27/65] failover: Remove primary_device_dict, Michael S. Tsirkin, 2020/12/09
- [PULL v2 28/65] failover: Remove memory leak, Michael S. Tsirkin, 2020/12/09
- [PULL v2 29/65] failover: simplify virtio_net_find_primary(), Michael S. Tsirkin, 2020/12/09
- [PULL v2 30/65] failover: should_be_hidden() should take a bool, Michael S. Tsirkin, 2020/12/09
- [PULL v2 31/65] failover: Rename function to hide_device(), Michael S. Tsirkin, 2020/12/09
- [PULL v2 32/65] failover: virtio_net_connect_failover_devices() does nothing, Michael S. Tsirkin, 2020/12/09
- [PULL v2 33/65] failover: Rename to failover_find_primary_device(), Michael S. Tsirkin, 2020/12/09