qemu with hax to log dma reads & writes jcs.org/2018/11/12/vfio

qapi: Use returned bool to check for failure, Coccinelle part

The previous commit enables conversion of

visit_foo(..., &err);
if (err) {
...
}

to

if (!visit_foo(..., errp)) {
...
}

for visitor functions that now return true / false on success / error.
Coccinelle script:

@@
identifier fun =~ "check_list|input_type_enum|lv_start_struct|lv_type_bool|lv_type_int64|lv_type_str|lv_type_uint64|output_type_enum|parse_type_bool|parse_type_int64|parse_type_null|parse_type_number|parse_type_size|parse_type_str|parse_type_uint64|print_type_bool|print_type_int64|print_type_null|print_type_number|print_type_size|print_type_str|print_type_uint64|qapi_clone_start_alternate|qapi_clone_start_list|qapi_clone_start_struct|qapi_clone_type_bool|qapi_clone_type_int64|qapi_clone_type_null|qapi_clone_type_number|qapi_clone_type_str|qapi_clone_type_uint64|qapi_dealloc_start_list|qapi_dealloc_start_struct|qapi_dealloc_type_anything|qapi_dealloc_type_bool|qapi_dealloc_type_int64|qapi_dealloc_type_null|qapi_dealloc_type_number|qapi_dealloc_type_str|qapi_dealloc_type_uint64|qobject_input_check_list|qobject_input_check_struct|qobject_input_start_alternate|qobject_input_start_list|qobject_input_start_struct|qobject_input_type_any|qobject_input_type_bool|qobject_input_type_bool_keyval|qobject_input_type_int64|qobject_input_type_int64_keyval|qobject_input_type_null|qobject_input_type_number|qobject_input_type_number_keyval|qobject_input_type_size_keyval|qobject_input_type_str|qobject_input_type_str_keyval|qobject_input_type_uint64|qobject_input_type_uint64_keyval|qobject_output_start_list|qobject_output_start_struct|qobject_output_type_any|qobject_output_type_bool|qobject_output_type_int64|qobject_output_type_null|qobject_output_type_number|qobject_output_type_str|qobject_output_type_uint64|start_list|visit_check_list|visit_check_struct|visit_start_alternate|visit_start_list|visit_start_struct|visit_type_.*";
expression list args;
typedef Error;
Error *err;
@@
- fun(args, &err);
- if (err)
+ if (!fun(args, &err))
{
...
}

A few line breaks tidied up manually.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-Id: <20200707160613.848843-19-armbru@redhat.com>

+97 -188
+1 -2
accel/kvm/kvm-all.c
··· 3116 3116 Error *error = NULL; 3117 3117 int64_t value; 3118 3118 3119 - visit_type_int(v, name, &value, &error); 3120 - if (error) { 3119 + if (!visit_type_int(v, name, &value, &error)) { 3121 3120 error_propagate(errp, error); 3122 3121 return; 3123 3122 }
+1 -2
accel/tcg/tcg-all.c
··· 185 185 Error *error = NULL; 186 186 uint32_t value; 187 187 188 - visit_type_uint32(v, name, &value, &error); 189 - if (error) { 188 + if (!visit_type_uint32(v, name, &value, &error)) { 190 189 error_propagate(errp, error); 191 190 return; 192 191 }
+1 -2
backends/cryptodev.c
··· 157 157 Error *local_err = NULL; 158 158 uint32_t value; 159 159 160 - visit_type_uint32(v, name, &value, &local_err); 161 - if (local_err) { 160 + if (!visit_type_uint32(v, name, &value, &local_err)) { 162 161 goto out; 163 162 } 164 163 if (!value) {
+1 -2
backends/hostmem-file.c
··· 119 119 goto out; 120 120 } 121 121 122 - visit_type_size(v, name, &val, &local_err); 123 - if (local_err) { 122 + if (!visit_type_size(v, name, &val, &local_err)) { 124 123 goto out; 125 124 } 126 125 fb->align = val;
+1 -2
backends/hostmem-memfd.c
··· 85 85 goto out; 86 86 } 87 87 88 - visit_type_size(v, name, &value, &local_err); 89 - if (local_err) { 88 + if (!visit_type_size(v, name, &value, &local_err)) { 90 89 goto out; 91 90 } 92 91 if (!value) {
+2 -4
backends/hostmem.c
··· 63 63 goto out; 64 64 } 65 65 66 - visit_type_size(v, name, &value, &local_err); 67 - if (local_err) { 66 + if (!visit_type_size(v, name, &value, &local_err)) { 68 67 goto out; 69 68 } 70 69 if (!value) { ··· 257 256 Error *local_err = NULL; 258 257 uint32_t value; 259 258 260 - visit_type_uint32(v, name, &value, &local_err); 261 - if (local_err) { 259 + if (!visit_type_uint32(v, name, &value, &local_err)) { 262 260 goto out; 263 261 } 264 262 if (value <= 0) {
+1 -2
backends/tpm/tpm_util.c
··· 58 58 return; 59 59 } 60 60 61 - visit_type_str(v, name, &str, &local_err); 62 - if (local_err) { 61 + if (!visit_type_str(v, name, &str, &local_err)) { 63 62 error_propagate(errp, local_err); 64 63 return; 65 64 }
+1 -2
block/blkdebug.c
··· 375 375 } 376 376 377 377 v = qobject_input_visitor_new(crumpled_subqdict); 378 - visit_type_BlockPermissionList(v, NULL, &perm_list, &local_err); 379 - if (local_err) { 378 + if (!visit_type_BlockPermissionList(v, NULL, &perm_list, &local_err)) { 380 379 error_propagate(errp, local_err); 381 380 ret = -EINVAL; 382 381 goto out;
+1 -2
block/nbd.c
··· 1739 1739 goto done; 1740 1740 } 1741 1741 1742 - visit_type_SocketAddress(iv, NULL, &saddr, &local_err); 1743 - if (local_err) { 1742 + if (!visit_type_SocketAddress(iv, NULL, &saddr, &local_err)) { 1744 1743 error_propagate(errp, local_err); 1745 1744 goto done; 1746 1745 }
+1 -2
block/sheepdog.c
··· 541 541 goto done; 542 542 } 543 543 544 - visit_type_SocketAddress(iv, NULL, &saddr, &local_err); 545 - if (local_err) { 544 + if (!visit_type_SocketAddress(iv, NULL, &saddr, &local_err)) { 546 545 error_propagate(errp, local_err); 547 546 goto done; 548 547 }
+2 -4
block/throttle-groups.c
··· 823 823 goto ret; 824 824 } 825 825 826 - visit_type_int64(v, name, &value, &local_err); 827 - if (local_err) { 826 + if (!visit_type_int64(v, name, &value, &local_err)) { 828 827 goto ret; 829 828 } 830 829 if (value < 0) { ··· 896 895 ThrottleLimits *argp; 897 896 Error *local_err = NULL; 898 897 899 - visit_type_ThrottleLimits(v, name, &argp, &local_err); 900 - if (local_err) { 898 + if (!visit_type_ThrottleLimits(v, name, &argp, &local_err)) { 901 899 goto ret; 902 900 } 903 901 qemu_mutex_lock(&tg->lock);
+1 -2
bootdevice.c
··· 297 297 int32_t boot_index; 298 298 Error *local_err = NULL; 299 299 300 - visit_type_int32(v, name, &boot_index, &local_err); 301 - if (local_err) { 300 + if (!visit_type_int32(v, name, &boot_index, &local_err)) { 302 301 goto out; 303 302 } 304 303 /* check whether bootindex is present in fw_boot_order list */
+1 -2
hw/block/xen-block.c
··· 412 412 return; 413 413 } 414 414 415 - visit_type_str(v, name, &str, &local_err); 416 - if (local_err) { 415 + if (!visit_type_str(v, name, &str, &local_err)) { 417 416 error_propagate(errp, local_err); 418 417 return; 419 418 }
+1 -2
hw/core/machine.c
··· 293 293 Error *error = NULL; 294 294 int64_t value; 295 295 296 - visit_type_int(v, name, &value, &error); 297 - if (error) { 296 + if (!visit_type_int(v, name, &value, &error)) { 298 297 error_propagate(errp, error); 299 298 return; 300 299 }
+4 -8
hw/core/qdev-properties-system.c
··· 92 92 return; 93 93 } 94 94 95 - visit_type_str(v, name, &str, &local_err); 96 - if (local_err) { 95 + if (!visit_type_str(v, name, &str, &local_err)) { 97 96 error_propagate(errp, local_err); 98 97 return; 99 98 } ··· 238 237 return; 239 238 } 240 239 241 - visit_type_str(v, name, &str, &local_err); 242 - if (local_err) { 240 + if (!visit_type_str(v, name, &str, &local_err)) { 243 241 error_propagate(errp, local_err); 244 242 return; 245 243 } ··· 316 314 return; 317 315 } 318 316 319 - visit_type_str(v, name, &str, &local_err); 320 - if (local_err) { 317 + if (!visit_type_str(v, name, &str, &local_err)) { 321 318 error_propagate(errp, local_err); 322 319 return; 323 320 } ··· 398 395 return; 399 396 } 400 397 401 - visit_type_str(v, name, &str, &local_err); 402 - if (local_err) { 398 + if (!visit_type_str(v, name, &str, &local_err)) { 403 399 error_propagate(errp, local_err); 404 400 return; 405 401 }
+14 -24
hw/core/qdev-properties.c
··· 125 125 return; 126 126 } 127 127 128 - visit_type_bool(v, name, &value, &local_err); 129 - if (local_err) { 128 + if (!visit_type_bool(v, name, &value, &local_err)) { 130 129 error_propagate(errp, local_err); 131 130 return; 132 131 } ··· 189 188 return; 190 189 } 191 190 192 - visit_type_bool(v, name, &value, &local_err); 193 - if (local_err) { 191 + if (!visit_type_bool(v, name, &value, &local_err)) { 194 192 error_propagate(errp, local_err); 195 193 return; 196 194 } ··· 486 484 return; 487 485 } 488 486 489 - visit_type_str(v, name, &str, &local_err); 490 - if (local_err) { 487 + if (!visit_type_str(v, name, &str, &local_err)) { 491 488 error_propagate(errp, local_err); 492 489 return; 493 490 } ··· 540 537 return; 541 538 } 542 539 543 - visit_type_str(v, name, &str, &local_err); 544 - if (local_err) { 540 + if (!visit_type_str(v, name, &str, &local_err)) { 545 541 error_propagate(errp, local_err); 546 542 return; 547 543 } ··· 762 758 return; 763 759 } 764 760 765 - visit_type_str(v, name, &str, &local_err); 766 - if (local_err) { 761 + if (!visit_type_str(v, name, &str, &local_err)) { 767 762 error_free(local_err); 768 763 local_err = NULL; 769 764 visit_type_int32(v, name, &value, &local_err); ··· 844 839 return; 845 840 } 846 841 847 - visit_type_size(v, name, &value, &local_err); 848 - if (local_err) { 842 + if (!visit_type_size(v, name, &value, &local_err)) { 849 843 error_propagate(errp, local_err); 850 844 return; 851 845 } ··· 894 888 return; 895 889 } 896 890 897 - visit_type_size(v, name, &value, &local_err); 898 - if (local_err) { 891 + if (!visit_type_size(v, name, &value, &local_err)) { 899 892 error_propagate(errp, local_err); 900 893 return; 901 894 } ··· 976 969 return; 977 970 } 978 971 979 - visit_type_str(v, name, &str, &local_err); 980 - if (local_err) { 972 + if (!visit_type_str(v, name, &str, &local_err)) { 981 973 error_propagate(errp, local_err); 982 974 return; 983 975 } ··· 1076 1068 return; 1077 1069 } 1078 1070 1079 - visit_type_str(v, name, &str, &local_err); 1080 - if (local_err) { 1071 + if (!visit_type_str(v, name, &str, &local_err)) { 1081 1072 error_propagate(errp, local_err); 1082 1073 return; 1083 1074 } ··· 1158 1149 name); 1159 1150 return; 1160 1151 } 1161 - visit_type_uint32(v, name, alenptr, &local_err); 1162 - if (local_err) { 1152 + if (!visit_type_uint32(v, name, alenptr, &local_err)) { 1163 1153 error_propagate(errp, local_err); 1164 1154 return; 1165 1155 } ··· 1490 1480 return; 1491 1481 } 1492 1482 1493 - visit_type_enum(v, prop->name, &speed, prop->info->enum_table, &local_err); 1494 - if (local_err) { 1483 + if (!visit_type_enum(v, prop->name, &speed, prop->info->enum_table, 1484 + &local_err)) { 1495 1485 error_propagate(errp, local_err); 1496 1486 return; 1497 1487 } ··· 1578 1568 return; 1579 1569 } 1580 1570 1581 - visit_type_enum(v, prop->name, &width, prop->info->enum_table, &local_err); 1582 - if (local_err) { 1571 + if (!visit_type_enum(v, prop->name, &width, prop->info->enum_table, 1572 + &local_err)) { 1583 1573 error_propagate(errp, local_err); 1584 1574 return; 1585 1575 }
+2 -4
hw/cpu/core.c
··· 31 31 Error *local_err = NULL; 32 32 int64_t value; 33 33 34 - visit_type_int(v, name, &value, &local_err); 35 - if (local_err) { 34 + if (!visit_type_int(v, name, &value, &local_err)) { 36 35 error_propagate(errp, local_err); 37 36 return; 38 37 } ··· 61 60 Error *local_err = NULL; 62 61 int64_t value; 63 62 64 - visit_type_int(v, name, &value, &local_err); 65 - if (local_err) { 63 + if (!visit_type_int(v, name, &value, &local_err)) { 66 64 error_propagate(errp, local_err); 67 65 return; 68 66 }
+1 -2
hw/gpio/aspeed_gpio.c
··· 762 762 AspeedGPIOState *s = ASPEED_GPIO(obj); 763 763 int set_idx, group_idx = 0; 764 764 765 - visit_type_bool(v, name, &level, &local_err); 766 - if (local_err) { 765 + if (!visit_type_bool(v, name, &level, &local_err)) { 767 766 error_propagate(errp, local_err); 768 767 return; 769 768 }
+1 -2
hw/i386/pc.c
··· 1862 1862 Error *error = NULL; 1863 1863 uint64_t value; 1864 1864 1865 - visit_type_size(v, name, &value, &error); 1866 - if (error) { 1865 + if (!visit_type_size(v, name, &value, &error)) { 1867 1866 error_propagate(errp, error); 1868 1867 return; 1869 1868 }
+1 -2
hw/ide/qdev.c
··· 245 245 int32_t boot_index; 246 246 Error *local_err = NULL; 247 247 248 - visit_type_int32(v, name, &boot_index, &local_err); 249 - if (local_err) { 248 + if (!visit_type_int32(v, name, &boot_index, &local_err)) { 250 249 goto out; 251 250 } 252 251 /* check whether bootindex is present in fw_boot_order list */
+1 -2
hw/intc/apic_common.c
··· 428 428 return; 429 429 } 430 430 431 - visit_type_uint32(v, name, &value, &local_err); 432 - if (local_err) { 431 + if (!visit_type_uint32(v, name, &value, &local_err)) { 433 432 error_propagate(errp, local_err); 434 433 return; 435 434 }
+2 -4
hw/mem/nvdimm.c
··· 53 53 goto out; 54 54 } 55 55 56 - visit_type_size(v, name, &value, &local_err); 57 - if (local_err) { 56 + if (!visit_type_size(v, name, &value, &local_err)) { 58 57 goto out; 59 58 } 60 59 if (value < MIN_NAMESPACE_LABEL_SIZE) { ··· 89 88 Error *local_err = NULL; 90 89 char *value; 91 90 92 - visit_type_str(v, name, &value, &local_err); 93 - if (local_err) { 91 + if (!visit_type_str(v, name, &value, &local_err)) { 94 92 goto out; 95 93 } 96 94
+1 -2
hw/misc/aspeed_sdmc.c
··· 227 227 AspeedSDMCState *s = ASPEED_SDMC(obj); 228 228 AspeedSDMCClass *asc = ASPEED_SDMC_GET_CLASS(s); 229 229 230 - visit_type_int(v, name, &value, &local_err); 231 - if (local_err) { 230 + if (!visit_type_int(v, name, &value, &local_err)) { 232 231 error_propagate(errp, local_err); 233 232 return; 234 233 }
+1 -2
hw/misc/pca9552.c
··· 296 296 uint8_t state; 297 297 char *state_str; 298 298 299 - visit_type_str(v, name, &state_str, &local_err); 300 - if (local_err) { 299 + if (!visit_type_str(v, name, &state_str, &local_err)) { 301 300 error_propagate(errp, local_err); 302 301 return; 303 302 }
+1 -2
hw/misc/tmp105.c
··· 75 75 Error *local_err = NULL; 76 76 int64_t temp; 77 77 78 - visit_type_int(v, name, &temp, &local_err); 79 - if (local_err) { 78 + if (!visit_type_int(v, name, &temp, &local_err)) { 80 79 error_propagate(errp, local_err); 81 80 return; 82 81 }
+1 -2
hw/misc/tmp421.c
··· 147 147 int offset = ext_range * 64 * 256; 148 148 int tempid; 149 149 150 - visit_type_int(v, name, &temp, &local_err); 151 - if (local_err) { 150 + if (!visit_type_int(v, name, &temp, &local_err)) { 152 151 error_propagate(errp, local_err); 153 152 return; 154 153 }
+1 -2
hw/net/ne2000-isa.c
··· 113 113 int32_t boot_index; 114 114 Error *local_err = NULL; 115 115 116 - visit_type_int32(v, name, &boot_index, &local_err); 117 - if (local_err) { 116 + if (!visit_type_int32(v, name, &boot_index, &local_err)) { 118 117 goto out; 119 118 } 120 119 /* check whether bootindex is present in fw_boot_order list */
+3 -6
hw/ppc/spapr_caps.c
··· 88 88 bool value; 89 89 Error *local_err = NULL; 90 90 91 - visit_type_bool(v, name, &value, &local_err); 92 - if (local_err) { 91 + if (!visit_type_bool(v, name, &value, &local_err)) { 93 92 error_propagate(errp, local_err); 94 93 return; 95 94 } ··· 127 126 uint8_t i; 128 127 char *val; 129 128 130 - visit_type_str(v, name, &val, &local_err); 131 - if (local_err) { 129 + if (!visit_type_str(v, name, &val, &local_err)) { 132 130 error_propagate(errp, local_err); 133 131 return; 134 132 } ··· 171 169 uint8_t val; 172 170 Error *local_err = NULL; 173 171 174 - visit_type_size(v, name, &pagesize, &local_err); 175 - if (local_err) { 172 + if (!visit_type_size(v, name, &pagesize, &local_err)) { 176 173 error_propagate(errp, local_err); 177 174 return; 178 175 }
+4 -6
hw/ppc/spapr_drc.c
··· 327 327 case FDT_BEGIN_NODE: 328 328 fdt_depth++; 329 329 name = fdt_get_name(fdt, fdt_offset, &name_len); 330 - visit_start_struct(v, name, NULL, 0, &err); 331 - if (err) { 330 + if (!visit_start_struct(v, name, NULL, 0, &err)) { 332 331 error_propagate(errp, err); 333 332 return; 334 333 } ··· 348 347 int i; 349 348 prop = fdt_get_property_by_offset(fdt, fdt_offset, &prop_len); 350 349 name = fdt_string(fdt, fdt32_to_cpu(prop->nameoff)); 351 - visit_start_list(v, name, NULL, 0, &err); 352 - if (err) { 350 + if (!visit_start_list(v, name, NULL, 0, &err)) { 353 351 error_propagate(errp, err); 354 352 return; 355 353 } 356 354 for (i = 0; i < prop_len; i++) { 357 - visit_type_uint8(v, NULL, (uint8_t *)&prop->data[i], &err); 358 - if (err) { 355 + if (!visit_type_uint8(v, NULL, (uint8_t *)&prop->data[i], 356 + &err)) { 359 357 error_propagate(errp, err); 360 358 return; 361 359 }
+1 -2
hw/s390x/css.c
··· 2387 2387 return; 2388 2388 } 2389 2389 2390 - visit_type_str(v, name, &str, &local_err); 2391 - if (local_err) { 2390 + if (!visit_type_str(v, name, &str, &local_err)) { 2392 2391 error_propagate(errp, local_err); 2393 2392 return; 2394 2393 }
+1 -2
hw/usb/dev-storage.c
··· 736 736 int32_t boot_index; 737 737 Error *local_err = NULL; 738 738 739 - visit_type_int32(v, name, &boot_index, &local_err); 740 - if (local_err) { 739 + if (!visit_type_int32(v, name, &boot_index, &local_err)) { 741 740 goto out; 742 741 } 743 742 /* check whether bootindex is present in fw_boot_order list */
+1 -2
hw/vfio/pci-quirks.c
··· 1509 1509 return; 1510 1510 } 1511 1511 1512 - visit_type_uint8(v, name, &value, &local_err); 1513 - if (local_err) { 1512 + if (!visit_type_uint8(v, name, &value, &local_err)) { 1514 1513 error_propagate(errp, local_err); 1515 1514 return; 1516 1515 }
+5 -10
hw/virtio/virtio-balloon.c
··· 239 239 VirtIOBalloon *s = opaque; 240 240 int i; 241 241 242 - visit_start_struct(v, name, NULL, 0, &err); 243 - if (err) { 242 + if (!visit_start_struct(v, name, NULL, 0, &err)) { 244 243 goto out; 245 244 } 246 - visit_type_int(v, "last-update", &s->stats_last_update, &err); 247 - if (err) { 245 + if (!visit_type_int(v, "last-update", &s->stats_last_update, &err)) { 248 246 goto out_end; 249 247 } 250 248 251 - visit_start_struct(v, "stats", NULL, 0, &err); 252 - if (err) { 249 + if (!visit_start_struct(v, "stats", NULL, 0, &err)) { 253 250 goto out_end; 254 251 } 255 252 for (i = 0; i < VIRTIO_BALLOON_S_NR; i++) { 256 - visit_type_uint64(v, balloon_stat_names[i], &s->stats[i], &err); 257 - if (err) { 253 + if (!visit_type_uint64(v, balloon_stat_names[i], &s->stats[i], &err)) { 258 254 goto out_nested; 259 255 } 260 256 } ··· 287 283 Error *local_err = NULL; 288 284 int64_t value; 289 285 290 - visit_type_int(v, name, &value, &local_err); 291 - if (local_err) { 286 + if (!visit_type_int(v, name, &value, &local_err)) { 292 287 error_propagate(errp, local_err); 293 288 return; 294 289 }
+1 -2
iothread.c
··· 243 243 Error *local_err = NULL; 244 244 int64_t value; 245 245 246 - visit_type_int64(v, name, &value, &local_err); 247 - if (local_err) { 246 + if (!visit_type_int64(v, name, &value, &local_err)) { 248 247 goto out; 249 248 } 250 249
+1 -2
monitor/hmp-cmds.c
··· 1355 1355 break; 1356 1356 case MIGRATION_PARAMETER_XBZRLE_CACHE_SIZE: 1357 1357 p->has_xbzrle_cache_size = true; 1358 - visit_type_size(v, param, &cache_size, &err); 1359 - if (err) { 1358 + if (!visit_type_size(v, param, &cache_size, &err)) { 1360 1359 break; 1361 1360 } 1362 1361 if (cache_size > INT64_MAX || (size_t)cache_size != cache_size) {
+2 -4
net/colo-compare.c
··· 1096 1096 Error *local_err = NULL; 1097 1097 uint32_t value; 1098 1098 1099 - visit_type_uint32(v, name, &value, &local_err); 1100 - if (local_err) { 1099 + if (!visit_type_uint32(v, name, &value, &local_err)) { 1101 1100 goto out; 1102 1101 } 1103 1102 if (!value) { ··· 1129 1128 Error *local_err = NULL; 1130 1129 uint32_t value; 1131 1130 1132 - visit_type_uint32(v, name, &value, &local_err); 1133 - if (local_err) { 1131 + if (!visit_type_uint32(v, name, &value, &local_err)) { 1134 1132 goto out; 1135 1133 } 1136 1134 if (!value) {
+1 -2
net/dump.c
··· 195 195 Error *local_err = NULL; 196 196 uint32_t value; 197 197 198 - visit_type_uint32(v, name, &value, &local_err); 199 - if (local_err) { 198 + if (!visit_type_uint32(v, name, &value, &local_err)) { 200 199 goto out; 201 200 } 202 201 if (value == 0) {
+1 -2
net/filter-buffer.c
··· 173 173 Error *local_err = NULL; 174 174 uint32_t value; 175 175 176 - visit_type_uint32(v, name, &value, &local_err); 177 - if (local_err) { 176 + if (!visit_type_uint32(v, name, &value, &local_err)) { 178 177 goto out; 179 178 } 180 179 if (!value) {
+14 -28
qom/object.c
··· 2094 2094 char *value; 2095 2095 Error *local_err = NULL; 2096 2096 2097 - visit_type_str(v, name, &value, &local_err); 2098 - if (local_err) { 2097 + if (!visit_type_str(v, name, &value, &local_err)) { 2099 2098 error_propagate(errp, local_err); 2100 2099 return; 2101 2100 } ··· 2175 2174 bool value; 2176 2175 Error *local_err = NULL; 2177 2176 2178 - visit_type_bool(v, name, &value, &local_err); 2179 - if (local_err) { 2177 + if (!visit_type_bool(v, name, &value, &local_err)) { 2180 2178 error_propagate(errp, local_err); 2181 2179 return; 2182 2180 } ··· 2248 2246 int value; 2249 2247 Error *err = NULL; 2250 2248 2251 - visit_type_enum(v, name, &value, prop->lookup, &err); 2252 - if (err) { 2249 + if (!visit_type_enum(v, name, &value, prop->lookup, &err)) { 2253 2250 error_propagate(errp, err); 2254 2251 return; 2255 2252 } ··· 2319 2316 goto out; 2320 2317 } 2321 2318 2322 - visit_start_struct(v, name, NULL, 0, &err); 2323 - if (err) { 2319 + if (!visit_start_struct(v, name, NULL, 0, &err)) { 2324 2320 goto out; 2325 2321 } 2326 - visit_type_int32(v, "tm_year", &value.tm_year, &err); 2327 - if (err) { 2322 + if (!visit_type_int32(v, "tm_year", &value.tm_year, &err)) { 2328 2323 goto out_end; 2329 2324 } 2330 - visit_type_int32(v, "tm_mon", &value.tm_mon, &err); 2331 - if (err) { 2325 + if (!visit_type_int32(v, "tm_mon", &value.tm_mon, &err)) { 2332 2326 goto out_end; 2333 2327 } 2334 - visit_type_int32(v, "tm_mday", &value.tm_mday, &err); 2335 - if (err) { 2328 + if (!visit_type_int32(v, "tm_mday", &value.tm_mday, &err)) { 2336 2329 goto out_end; 2337 2330 } 2338 - visit_type_int32(v, "tm_hour", &value.tm_hour, &err); 2339 - if (err) { 2331 + if (!visit_type_int32(v, "tm_hour", &value.tm_hour, &err)) { 2340 2332 goto out_end; 2341 2333 } 2342 - visit_type_int32(v, "tm_min", &value.tm_min, &err); 2343 - if (err) { 2334 + if (!visit_type_int32(v, "tm_min", &value.tm_min, &err)) { 2344 2335 goto out_end; 2345 2336 } 2346 - visit_type_int32(v, "tm_sec", &value.tm_sec, &err); 2347 - if (err) { 2337 + if (!visit_type_int32(v, "tm_sec", &value.tm_sec, &err)) { 2348 2338 goto out_end; 2349 2339 } 2350 2340 visit_check_struct(v, &err); ··· 2408 2398 uint8_t value; 2409 2399 Error *local_err = NULL; 2410 2400 2411 - visit_type_uint8(v, name, &value, &local_err); 2412 - if (local_err) { 2401 + if (!visit_type_uint8(v, name, &value, &local_err)) { 2413 2402 error_propagate(errp, local_err); 2414 2403 return; 2415 2404 } ··· 2431 2420 uint16_t value; 2432 2421 Error *local_err = NULL; 2433 2422 2434 - visit_type_uint16(v, name, &value, &local_err); 2435 - if (local_err) { 2423 + if (!visit_type_uint16(v, name, &value, &local_err)) { 2436 2424 error_propagate(errp, local_err); 2437 2425 return; 2438 2426 } ··· 2454 2442 uint32_t value; 2455 2443 Error *local_err = NULL; 2456 2444 2457 - visit_type_uint32(v, name, &value, &local_err); 2458 - if (local_err) { 2445 + if (!visit_type_uint32(v, name, &value, &local_err)) { 2459 2446 error_propagate(errp, local_err); 2460 2447 return; 2461 2448 } ··· 2477 2464 uint64_t value; 2478 2465 Error *local_err = NULL; 2479 2466 2480 - visit_type_uint64(v, name, &value, &local_err); 2481 - if (local_err) { 2467 + if (!visit_type_uint64(v, name, &value, &local_err)) { 2482 2468 error_propagate(errp, local_err); 2483 2469 return; 2484 2470 }
+1 -2
qom/object_interfaces.c
··· 63 63 64 64 assert(qdict); 65 65 obj = object_new(type); 66 - visit_start_struct(v, NULL, NULL, 0, &local_err); 67 - if (local_err) { 66 + if (!visit_start_struct(v, NULL, NULL, 0, &local_err)) { 68 67 goto out; 69 68 } 70 69 for (e = qdict_first(qdict); e; e = qdict_next(qdict, e)) {
+3 -6
target/arm/cpu64.c
··· 467 467 Error *err = NULL; 468 468 uint32_t max_vq; 469 469 470 - visit_type_uint32(v, name, &max_vq, &err); 471 - if (err) { 470 + if (!visit_type_uint32(v, name, &max_vq, &err)) { 472 471 error_propagate(errp, err); 473 472 return; 474 473 } ··· 513 512 Error *err = NULL; 514 513 bool value; 515 514 516 - visit_type_bool(v, name, &value, &err); 517 - if (err) { 515 + if (!visit_type_bool(v, name, &value, &err)) { 518 516 error_propagate(errp, err); 519 517 return; 520 518 } ··· 550 548 bool value; 551 549 uint64_t t; 552 550 553 - visit_type_bool(v, name, &value, &err); 554 - if (err) { 551 + if (!visit_type_bool(v, name, &value, &err)) { 555 552 error_propagate(errp, err); 556 553 return; 557 554 }
+1 -2
target/arm/monitor.c
··· 174 174 Error *err = NULL; 175 175 176 176 visitor = qobject_input_visitor_new(model->props); 177 - visit_start_struct(visitor, NULL, NULL, 0, &err); 178 - if (err) { 177 + if (!visit_start_struct(visitor, NULL, NULL, 0, &err)) { 179 178 visit_free(visitor); 180 179 object_unref(obj); 181 180 error_propagate(errp, err);
+5 -10
target/i386/cpu.c
··· 4420 4420 Error *local_err = NULL; 4421 4421 int64_t value; 4422 4422 4423 - visit_type_int(v, name, &value, &local_err); 4424 - if (local_err) { 4423 + if (!visit_type_int(v, name, &value, &local_err)) { 4425 4424 error_propagate(errp, local_err); 4426 4425 return; 4427 4426 } ··· 4463 4462 Error *local_err = NULL; 4464 4463 int64_t value; 4465 4464 4466 - visit_type_int(v, name, &value, &local_err); 4467 - if (local_err) { 4465 + if (!visit_type_int(v, name, &value, &local_err)) { 4468 4466 error_propagate(errp, local_err); 4469 4467 return; 4470 4468 } ··· 4501 4499 Error *local_err = NULL; 4502 4500 int64_t value; 4503 4501 4504 - visit_type_int(v, name, &value, &local_err); 4505 - if (local_err) { 4502 + if (!visit_type_int(v, name, &value, &local_err)) { 4506 4503 error_propagate(errp, local_err); 4507 4504 return; 4508 4505 } ··· 4606 4603 Error *local_err = NULL; 4607 4604 int64_t value; 4608 4605 4609 - visit_type_int(v, name, &value, &local_err); 4610 - if (local_err) { 4606 + if (!visit_type_int(v, name, &value, &local_err)) { 4611 4607 error_propagate(errp, local_err); 4612 4608 return; 4613 4609 } ··· 6816 6812 return; 6817 6813 } 6818 6814 6819 - visit_type_bool(v, name, &value, &local_err); 6820 - if (local_err) { 6815 + if (!visit_type_bool(v, name, &value, &local_err)) { 6821 6816 error_propagate(errp, local_err); 6822 6817 return; 6823 6818 }
+1 -2
target/ppc/compat.c
··· 264 264 char *value; 265 265 uint32_t compat_pvr; 266 266 267 - visit_type_str(v, name, &value, &local_err); 268 - if (local_err) { 267 + if (!visit_type_str(v, name, &value, &local_err)) { 269 268 error_propagate(errp, local_err); 270 269 return; 271 270 }
+3 -6
target/s390x/cpu_models.c
··· 510 510 511 511 if (qdict) { 512 512 visitor = qobject_input_visitor_new(info->props); 513 - visit_start_struct(visitor, NULL, NULL, 0, &err); 514 - if (err) { 513 + if (!visit_start_struct(visitor, NULL, NULL, 0, &err)) { 515 514 error_propagate(errp, err); 516 515 visit_free(visitor); 517 516 object_unref(obj); ··· 1017 1016 return; 1018 1017 } 1019 1018 1020 - visit_type_bool(v, name, &value, &err); 1021 - if (err) { 1019 + if (!visit_type_bool(v, name, &value, &err)) { 1022 1020 error_propagate(errp, err); 1023 1021 return; 1024 1022 } ··· 1076 1074 return; 1077 1075 } 1078 1076 1079 - visit_type_bool(v, name, &value, &err); 1080 - if (err) { 1077 + if (!visit_type_bool(v, name, &value, &err)) { 1081 1078 error_propagate(errp, err); 1082 1079 return; 1083 1080 }
+1 -2
target/sparc/cpu.c
··· 804 804 Error *err = NULL; 805 805 int64_t value; 806 806 807 - visit_type_int(v, name, &value, &err); 808 - if (err) { 807 + if (!visit_type_int(v, name, &value, &err)) { 809 808 error_propagate(errp, err); 810 809 return; 811 810 }