starred/qemu
1
0
Fork 0
mirror of https://github.com/qemu/qemu.git synced 2026-07-08 17:46:10 +00:00
Code Issues 380 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'remotes/armbru/tags/pull-error-2020-10-09' into staging

Browse Source 
Error reporting patches for 2020-10-09

# gpg: Signature made Fri 09 Oct 2020 07:45:17 BST
# gpg:                using RSA key 354BC8B3D7EB2A6B68674E5F3870B400EB918653
# gpg:                issuer "armbru@redhat.com"
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>" [full]
# gpg:                 aka "Markus Armbruster <armbru@pond.sub.org>" [full]
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867  4E5F 3870 B400 EB91 8653

* remotes/armbru/tags/pull-error-2020-10-09:
  error: Use error_fatal to simplify obvious fatal errors (again)
  error: Remove NULL checks on error_propagate() calls (again)

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell
2020-10-09 14:47:44 +01:00
parent b7092cda1b 805d44961b
commit e1c30c43cd
6 changed files with 12 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
exec.c
View File

@@ -623,8 +623,7 @@ static void tcg_register_iommu_notifier(CPUState *cpu,
*/
MemoryRegion *mr = MEMORY_REGION(iommu_mr);
TCGIOMMUNotifier *notifier;
Error *err = NULL;
int i, ret;
int i;
for (i = 0; i < cpu->iommu_notifiers->len; i++) {
notifier = g_array_index(cpu->iommu_notifiers, TCGIOMMUNotifier *, i);
@@ -653,12 +652,8 @@ static void tcg_register_iommu_notifier(CPUState *cpu,
0,
HWADDR_MAX,
iommu_idx);
ret = memory_region_register_iommu_notifier(notifier->mr, &notifier->n,
&err);
if (ret) {
error_report_err(err);
exit(1);
}
memory_region_register_iommu_notifier(notifier->mr, &notifier->n,
&error_fatal);
}
if (!notifier->active) {

8
hw/net/virtio-net.c
View File

@@ -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;

7
hw/s390x/s390-virtio-ccw.c
View File

@@ -161,7 +161,6 @@ static void virtio_ccw_register_hcalls(void)
static void s390_memory_init(MemoryRegion *ram)
{
MemoryRegion *sysmem = get_system_memory();
Error *local_err = NULL;
/* allocate RAM for core */
memory_region_add_subregion(sysmem, 0, ram);
@@ -170,11 +169,7 @@ static void s390_memory_init(MemoryRegion *ram)
* Configure the maximum page size. As no memory devices were created
* yet, this is the page size of initial memory only.
*/
s390_set_max_pagesize(qemu_maxrampagesize(), &local_err);
if (local_err) {
error_report_err(local_err);
exit(EXIT_FAILURE);
}
s390_set_max_pagesize(qemu_maxrampagesize(), &error_fatal);
/* Initialize storage key device */
s390_skeys_init();
/* Initialize storage attributes device */

10
hw/virtio/vhost.c
View File

@@ -712,9 +712,8 @@ static void vhost_iommu_region_add(MemoryListener *listener,
iommu_listener);
struct vhost_iommu *iommu;
Int128 end;
int iommu_idx, ret;
int iommu_idx;
IOMMUMemoryRegion *iommu_mr;
Error *err = NULL;
if (!memory_region_is_iommu(section->mr)) {
return;
@@ -737,11 +736,8 @@ static void vhost_iommu_region_add(MemoryListener *listener,
iommu->iommu_offset = section->offset_within_address_space -
section->offset_within_region;
iommu->hdev = dev;
ret = memory_region_register_iommu_notifier(section->mr, &iommu->n, &err);
if (ret) {
error_report_err(err);
exit(1);
}
memory_region_register_iommu_notifier(section->mr, &iommu->n,
&error_fatal);
QLIST_INSERT_HEAD(&dev->iommu_list, iommu, iommu_next);
/* TODO: can replay help performance here? */
}

4
migration/colo.c
View File

@@ -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,

8
migration/migration.c
View File

@@ -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;
}