motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-09-09 00:07:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

failover: Rename bool to failover_primary_hidden

Browse source 
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>
This commit is contained in:
Juan Quintela 2020-11-18 09:37:29 +01:00 • committed by Michael S. Tsirkin
parent 3d1c7a9782
commit e2bde83e23
2 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

14
hw/net/virtio-net.c
View file

@ -916,7 +916,7 @@ static void virtio_net_set_features(VirtIODevice *vdev, uint64_t features)
if (virtio_has_feature(features, VIRTIO_NET_F_STANDBY)) { if (virtio_has_feature(features, VIRTIO_NET_F_STANDBY)) {
qapi_event_send_failover_negotiated(n->netclient_name); 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); failover_add_primary(n, &err);
if (err) { if (err) {
n->primary_dev = virtio_connect_failover_devices(n, &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; return false;
} }
qdev_set_parent_bus(n->primary_dev, primary_bus, &error_abort); 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); hotplug_ctrl = qdev_get_hotplug_handler(n->primary_dev);
if (hotplug_ctrl) { if (hotplug_ctrl) {
hotplug_handler_pre_plug(hotplug_ctrl, n->primary_dev, &err); 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; bool should_be_hidden;
Error *err = NULL; 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) { if (!n->primary_dev) {
n->primary_dev = virtio_connect_failover_devices(n, &err); 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), qdev_get_vmsd(n->primary_dev),
n->primary_dev); n->primary_dev);
qapi_event_send_unplug_primary(n->primary_device_id); 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 { } else {
warn_report("couldn't unplug primary device"); 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; n->primary_device_opts = device_opts;
/* primary_should_be_hidden is set during feature negotiation */ /* failover_primary_hidden is set during feature negotiation */
hide = qatomic_read(&n->primary_should_be_hidden); hide = qatomic_read(&n->failover_primary_hidden);
if (n->primary_device_dict) { if (n->primary_device_dict) {
g_free(n->primary_device_id); g_free(n->primary_device_id);
@ -3271,7 +3271,7 @@ static void virtio_net_device_realize(DeviceState *dev, Error **errp)
if (n->failover) { if (n->failover) {
n->primary_listener.should_be_hidden = n->primary_listener.should_be_hidden =
virtio_net_primary_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); device_listener_register(&n->primary_listener);
n->migration_state.notify = virtio_net_migration_state_notifier; n->migration_state.notify = virtio_net_migration_state_notifier;
add_migration_state_change_notifier(&n->migration_state); add_migration_state_change_notifier(&n->migration_state);

3
include/hw/virtio/virtio-net.h
View file

@ -207,7 +207,8 @@ struct VirtIONet {
DeviceState *primary_dev; DeviceState *primary_dev;
char *primary_device_id; char *primary_device_id;
char *standby_id; char *standby_id;
bool primary_should_be_hidden; /* primary failover device is hidden*/
bool failover_primary_hidden;
bool failover; bool failover;
DeviceListener primary_listener; DeviceListener primary_listener;
Notifier migration_state; Notifier migration_state;