diff options
| -rw-r--r-- | hw/net/virtio-net.c | 8 | ||||
| -rw-r--r-- | migration/colo.c | 4 | ||||
| -rw-r--r-- | migration/migration.c | 8 |
3 files changed, 5 insertions, 15 deletions
diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index 7bf27b9..a160a9d 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -817,9 +817,7 @@ static void failover_add_primary(VirtIONet *n, Error **errp) "sure primary device has parameter" " failover_pair_id=<virtio-net-id>\n"); } - if (err) { - error_propagate(errp, err); - } + error_propagate(errp, err); } static int is_my_primary(void *opaque, QemuOpts *opts, Error **errp) @@ -873,9 +871,7 @@ static DeviceState *virtio_connect_failover_devices(VirtIONet *n, n->primary_device_id = g_strdup(prim_dev->id); n->primary_device_opts = prim_dev->opts; } else { - if (err) { - error_propagate(errp, err); - } + error_propagate(errp, err); } return prim_dev; diff --git a/migration/colo.c b/migration/colo.c index 80788d4..3f1d3df 100644 --- a/migration/colo.c +++ b/migration/colo.c @@ -798,9 +798,7 @@ static void colo_incoming_process_checkpoint(MigrationIncomingState *mis, colo_send_message(mis->to_src_file, COLO_MESSAGE_VMSTATE_LOADED, &local_err); - if (local_err) { - error_propagate(errp, local_err); - } + error_propagate(errp, local_err); } static void colo_wait_handle_message(MigrationIncomingState *mis, diff --git a/migration/migration.c b/migration/migration.c index aca7fdc..0575ecb 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -623,9 +623,7 @@ void migration_fd_process_incoming(QEMUFile *f, Error **errp) } if (migration_incoming_setup(f, &local_err)) { - if (local_err) { - error_propagate(errp, local_err); - } + error_propagate(errp, local_err); return; } migration_incoming_process(); @@ -647,9 +645,7 @@ void migration_ioc_process_incoming(QIOChannel *ioc, Error **errp) } if (migration_incoming_setup(f, &local_err)) { - if (local_err) { - error_propagate(errp, local_err); - } + error_propagate(errp, local_err); return; } |