[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 02/27] failover: fix indentantion
From: |
Juan Quintela |
Subject: |
[PATCH v2 02/27] failover: fix indentantion |
Date: |
Wed, 18 Nov 2020 09:37:23 +0100 |
Once there, remove not needed cast.
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
hw/net/virtio-net.c | 33 +++++++++++++++------------------
softmmu/qdev-monitor.c | 4 ++--
2 files changed, 17 insertions(+), 20 deletions(-)
diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c
index 9179013ac4..1011a524bf 100644
--- a/hw/net/virtio-net.c
+++ b/hw/net/virtio-net.c
@@ -797,7 +797,7 @@ static void failover_add_primary(VirtIONet *n, Error **errp)
}
n->primary_device_opts = qemu_opts_find(qemu_find_opts("device"),
- n->primary_device_id);
+ n->primary_device_id);
if (n->primary_device_opts) {
n->primary_dev = qdev_device_add(n->primary_device_opts, &err);
if (err) {
@@ -814,9 +814,9 @@ static void failover_add_primary(VirtIONet *n, Error **errp)
} else {
error_setg(errp, "Primary device not found");
error_append_hint(errp, "Virtio-net failover will not work. Make "
- "sure primary device has parameter"
- " failover_pair_id=<virtio-net-id>\n");
-}
+ "sure primary device has parameter"
+ " failover_pair_id=<virtio-net-id>\n");
+ }
error_propagate(errp, err);
}
@@ -824,7 +824,6 @@ static int is_my_primary(void *opaque, QemuOpts *opts,
Error **errp)
{
VirtIONet *n = opaque;
int ret = 0;
-
const char *standby_id = qemu_opt_get(opts, "failover_pair_id");
if (standby_id != NULL && (g_strcmp0(standby_id, n->netclient_name) == 0))
{
@@ -841,14 +840,14 @@ static DeviceState *virtio_net_find_primary(VirtIONet *n,
Error **errp)
Error *err = NULL;
if (qemu_opts_foreach(qemu_find_opts("device"),
- is_my_primary, n, &err)) {
+ is_my_primary, n, &err)) {
if (err) {
error_propagate(errp, err);
return NULL;
}
if (n->primary_device_id) {
dev = qdev_find_recursive(sysbus_get_default(),
- n->primary_device_id);
+ n->primary_device_id);
} else {
error_setg(errp, "Primary device id not found");
return NULL;
@@ -857,8 +856,6 @@ static DeviceState *virtio_net_find_primary(VirtIONet *n,
Error **errp)
return dev;
}
-
-
static DeviceState *virtio_connect_failover_devices(VirtIONet *n,
DeviceState *dev,
Error **errp)
@@ -3126,9 +3123,9 @@ static bool failover_replug_primary(VirtIONet *n, Error
**errp)
return true;
}
if (!n->primary_device_opts) {
- n->primary_device_opts = qemu_opts_from_qdict(
- qemu_find_opts("device"),
- n->primary_device_dict, errp);
+ n->primary_device_opts = qemu_opts_from_qdict(qemu_find_opts("device"),
+ n->primary_device_dict,
+ errp);
if (!n->primary_device_opts) {
return false;
}
@@ -3176,8 +3173,8 @@ static void virtio_net_handle_migration_primary(VirtIONet
*n,
if (migration_in_setup(s) && !should_be_hidden) {
if (failover_unplug_primary(n)) {
vmstate_unregister(VMSTATE_IF(n->primary_dev),
- qdev_get_vmsd(n->primary_dev),
- n->primary_dev);
+ 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);
} else {
@@ -3201,7 +3198,7 @@ static void virtio_net_migration_state_notifier(Notifier
*notifier, void *data)
}
static int virtio_net_primary_should_be_hidden(DeviceListener *listener,
- QemuOpts *device_opts)
+ QemuOpts *device_opts)
{
VirtIONet *n = container_of(listener, VirtIONet, primary_listener);
bool match_found = false;
@@ -3211,11 +3208,11 @@ static int
virtio_net_primary_should_be_hidden(DeviceListener *listener,
return -1;
}
n->primary_device_dict = qemu_opts_to_qdict(device_opts,
- n->primary_device_dict);
+ n->primary_device_dict);
if (n->primary_device_dict) {
g_free(n->standby_id);
n->standby_id = g_strdup(qdict_get_try_str(n->primary_device_dict,
- "failover_pair_id"));
+ "failover_pair_id"));
}
if (g_strcmp0(n->standby_id, n->netclient_name) == 0) {
match_found = true;
@@ -3235,7 +3232,7 @@ static int
virtio_net_primary_should_be_hidden(DeviceListener *listener,
if (n->primary_device_dict) {
g_free(n->primary_device_id);
n->primary_device_id = g_strdup(qdict_get_try_str(
- n->primary_device_dict, "id"));
+ n->primary_device_dict, "id"));
if (!n->primary_device_id) {
warn_report("primary_device_id not set");
}
diff --git a/softmmu/qdev-monitor.c b/softmmu/qdev-monitor.c
index bf79d0bbcd..a25f5d612c 100644
--- a/softmmu/qdev-monitor.c
+++ b/softmmu/qdev-monitor.c
@@ -573,10 +573,10 @@ void qdev_set_id(DeviceState *dev, const char *id)
}
static int is_failover_device(void *opaque, const char *name, const char
*value,
- Error **errp)
+ Error **errp)
{
if (strcmp(name, "failover_pair_id") == 0) {
- QemuOpts *opts = (QemuOpts *)opaque;
+ QemuOpts *opts = opaque;
if (qdev_should_hide_device(opts)) {
return 1;
--
2.26.2
- [PATCH v2 00/27] Virtio net failover fixes, Juan Quintela, 2020/11/18
- [PATCH v2 01/27] migration: Network Failover can't work with a paused guest, Juan Quintela, 2020/11/18
- [PATCH v2 02/27] failover: fix indentantion,
Juan Quintela <=
- [PATCH v2 04/27] failover: primary bus is only used once, and where it is set, Juan Quintela, 2020/11/18
- [PATCH v2 03/27] failover: Use always atomics for primary_should_be_hidden, Juan Quintela, 2020/11/18
- [PATCH v2 05/27] failover: Remove unused parameter, Juan Quintela, 2020/11/18
- [PATCH v2 06/27] failover: Remove external partially_hotplugged property, Juan Quintela, 2020/11/18
- [PATCH v2 08/27] failover: Rename bool to failover_primary_hidden, Juan Quintela, 2020/11/18
- [PATCH v2 09/27] failover: g_strcmp0() knows how to handle NULL, Juan Quintela, 2020/11/18
- [PATCH v2 07/27] failover: qdev_device_add() returns err or dev set, Juan Quintela, 2020/11/18
- [PATCH v2 10/27] failover: Remove primary_device_opts, Juan Quintela, 2020/11/18
- [PATCH v2 11/27] failover: remove standby_id variable, Juan Quintela, 2020/11/18
- [PATCH v2 13/27] failover: Remove memory leak, Juan Quintela, 2020/11/18