Once there, remove not needed cast.
Signed-off-by: Juan Quintela <quintela@redhat.com>
Message-Id: <
20201118083748.1328-3-quintela@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
}
n->primary_device_opts = qemu_opts_find(qemu_find_opts("device"),
}
n->primary_device_opts = qemu_opts_find(qemu_find_opts("device"),
if (n->primary_device_opts) {
n->primary_dev = qdev_device_add(n->primary_device_opts, &err);
if (err) {
if (n->primary_device_opts) {
n->primary_dev = qdev_device_add(n->primary_device_opts, &err);
if (err) {
} else {
error_setg(errp, "Primary device not found");
error_append_hint(errp, "Virtio-net failover will not work. Make "
} 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);
}
error_propagate(errp, err);
}
{
VirtIONet *n = opaque;
int ret = 0;
{
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)) {
const char *standby_id = qemu_opt_get(opts, "failover_pair_id");
if (standby_id != NULL && (g_strcmp0(standby_id, n->netclient_name) == 0)) {
Error *err = NULL;
if (qemu_opts_foreach(qemu_find_opts("device"),
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(),
if (err) {
error_propagate(errp, err);
return NULL;
}
if (n->primary_device_id) {
dev = qdev_find_recursive(sysbus_get_default(),
} else {
error_setg(errp, "Primary device id not found");
return NULL;
} else {
error_setg(errp, "Primary device id not found");
return NULL;
static DeviceState *virtio_connect_failover_devices(VirtIONet *n,
DeviceState *dev,
Error **errp)
static DeviceState *virtio_connect_failover_devices(VirtIONet *n,
DeviceState *dev,
Error **errp)
return true;
}
if (!n->primary_device_opts) {
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;
}
if (!n->primary_device_opts) {
return false;
}
if (migration_in_setup(s) && !should_be_hidden) {
if (failover_unplug_primary(n)) {
vmstate_unregister(VMSTATE_IF(n->primary_dev),
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 {
qapi_event_send_unplug_primary(n->primary_device_id);
qatomic_set(&n->primary_should_be_hidden, true);
} else {
}
static int virtio_net_primary_should_be_hidden(DeviceListener *listener,
}
static int virtio_net_primary_should_be_hidden(DeviceListener *listener,
{
VirtIONet *n = container_of(listener, VirtIONet, primary_listener);
bool match_found = false;
{
VirtIONet *n = container_of(listener, VirtIONet, primary_listener);
bool match_found = false;
return -1;
}
n->primary_device_dict = qemu_opts_to_qdict(device_opts,
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,
if (n->primary_device_dict) {
g_free(n->standby_id);
n->standby_id = g_strdup(qdict_get_try_str(n->primary_device_dict,
}
if (g_strcmp0(n->standby_id, n->netclient_name) == 0) {
match_found = true;
}
if (g_strcmp0(n->standby_id, n->netclient_name) == 0) {
match_found = true;
if (n->primary_device_dict) {
g_free(n->primary_device_id);
n->primary_device_id = g_strdup(qdict_get_try_str(
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");
}
if (!n->primary_device_id) {
warn_report("primary_device_id not set");
}
}
static int is_failover_device(void *opaque, const char *name, const char *value,
}
static int is_failover_device(void *opaque, const char *name, const char *value,
{
if (strcmp(name, "failover_pair_id") == 0) {
{
if (strcmp(name, "failover_pair_id") == 0) {
- QemuOpts *opts = (QemuOpts *)opaque;
+ QemuOpts *opts = opaque;
if (qdev_should_hide_device(opts)) {
return 1;
if (qdev_should_hide_device(opts)) {
return 1;