From bbd55e92848d18282aad4387b9c0e429a3785ed2 Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Wed, 19 May 2021 16:45:11 +0200 Subject: [PATCH] Drop magic comments for coverity They were added mostly randomly and we don't really want to keep working around of false positives. Signed-off-by: Peter Krempa Reviewed-by: Pavel Hrdina Reviewed-by: Michal Privoznik --- src/conf/domain_conf.c | 13 ------------- src/cpu/cpu_x86.c | 1 - src/qemu/qemu_command.c | 2 -- src/qemu/qemu_driver.c | 2 -- src/qemu/qemu_process.c | 1 - src/remote/remote_driver.c | 1 - src/storage/parthelper.c | 2 -- src/util/virnetdev.c | 1 - src/util/virprocess.c | 1 - tests/commandtest.c | 1 - tests/virdrivermoduletest.c | 1 - tools/virsh.c | 1 - tools/virt-admin.c | 1 - 13 files changed, 28 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 0c52efa816..8172c8882a 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -17421,7 +17421,6 @@ virDomainFeaturesDefParse(virDomainDef *def, break; } - /* coverity[dead_error_begin] */ case VIR_DOMAIN_FEATURE_LAST: break; } @@ -17509,7 +17508,6 @@ virDomainFeaturesDefParse(virDomainDef *def, } break; - /* coverity[dead_error_begin] */ case VIR_DOMAIN_HYPERV_LAST: break; } @@ -17564,7 +17562,6 @@ virDomainFeaturesDefParse(virDomainDef *def, def->kvm_features[feature] = value; break; - /* coverity[dead_error_begin] */ case VIR_DOMAIN_KVM_LAST: break; } @@ -17609,7 +17606,6 @@ virDomainFeaturesDefParse(virDomainDef *def, return -1; break; - /* coverity[dead_error_begin] */ case VIR_DOMAIN_XEN_LAST: break; } @@ -21541,7 +21537,6 @@ virDomainDefFeaturesCheckABIStability(virDomainDef *src, } break; - /* coverity[dead_error_begin] */ case VIR_DOMAIN_HYPERV_LAST: break; } @@ -21586,7 +21581,6 @@ virDomainDefFeaturesCheckABIStability(virDomainDef *src, } break; - /* coverity[dead_error_begin] */ case VIR_DOMAIN_XEN_LAST: break; } @@ -21612,7 +21606,6 @@ virDomainDefFeaturesCheckABIStability(virDomainDef *src, break; - /* coverity[dead_error_begin] */ case VIR_DOMAIN_KVM_LAST: break; } @@ -27575,7 +27568,6 @@ virDomainDefFormatFeatures(virBuffer *buf, def->hyperv_vendor_id); break; - /* coverity[dead_error_begin] */ case VIR_DOMAIN_HYPERV_LAST: break; } @@ -27602,7 +27594,6 @@ virDomainDefFormatFeatures(virBuffer *buf, def->kvm_features[j])); break; - /* coverity[dead_error_begin] */ case VIR_DOMAIN_KVM_LAST: break; } @@ -27644,7 +27635,6 @@ virDomainDefFormatFeatures(virBuffer *buf, } break; - /* coverity[dead_error_begin] */ case VIR_DOMAIN_XEN_LAST: break; } @@ -27738,7 +27728,6 @@ virDomainDefFormatFeatures(virBuffer *buf, virDomainIBSTypeToString(def->features[i])); break; - /* coverity[dead_error_begin] */ case VIR_DOMAIN_FEATURE_LAST: break; } @@ -29592,7 +29581,6 @@ virDomainObjGetMetadata(virDomainObj *vm, return NULL; break; - /* coverity[dead_error_begin] */ case VIR_DOMAIN_METADATA_LAST: break; } @@ -29674,7 +29662,6 @@ virDomainDefSetMetadata(virDomainDef *def, } break; - /* coverity[dead_error_begin] */ case VIR_DOMAIN_METADATA_LAST: break; } diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c index d01be6f7ba..a4599499d0 100644 --- a/src/cpu/cpu_x86.c +++ b/src/cpu/cpu_x86.c @@ -1376,7 +1376,6 @@ x86ModelFromCPU(const virCPUDef *cpu, x86DataSubtract(&model->data, &feature->data); break; - /* coverity[dead_error_condition] */ case VIR_CPU_FEATURE_OPTIONAL: case VIR_CPU_FEATURE_LAST: break; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 31a1ac0949..19c1502ee0 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -6606,7 +6606,6 @@ qemuBuildCpuCommandLine(virCommand *cmd, def->hyperv_vendor_id); break; - /* coverity[dead_error_begin] */ case VIR_DOMAIN_HYPERV_LAST: break; } @@ -6638,7 +6637,6 @@ qemuBuildCpuCommandLine(virCommand *cmd, virBufferAddLit(&buf, ",kvm-poll-control=on"); break; - /* coverity[dead_error_begin] */ case VIR_DOMAIN_KVM_LAST: break; } diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index a972662c3f..1ee0e7ebc0 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -8989,7 +8989,6 @@ qemuDomainGetNumaParameters(virDomainPtr dom, nodeset = NULL; break; - /* coverity[dead_error_begin] */ default: break; /* should not hit here */ @@ -10556,7 +10555,6 @@ qemuDomainGetInterfaceParameters(virDomainPtr dom, if (net->bandwidth && net->bandwidth->out) params[i].value.ui = net->bandwidth->out->burst; break; - /* coverity[dead_error_begin] */ default: break; /* should not hit here */ diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 2aa4574d94..9dc6b71ae5 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -4244,7 +4244,6 @@ qemuProcessVerifyHypervFeatures(virDomainDef *def, virDomainHypervTypeToString(i)); return -1; - /* coverity[dead_error_begin] */ case VIR_DOMAIN_HYPERV_SPINLOCKS: case VIR_DOMAIN_HYPERV_VENDOR_ID: case VIR_DOMAIN_HYPERV_LAST: diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index eed99af127..0bacd0bc4b 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -5643,7 +5643,6 @@ remoteStreamEventAddCallback(virStreamPtr st, cleanup: remoteDriverUnlock(priv); - /* coverity[leaked_storage] - cbdata is not leaked */ return ret; } diff --git a/src/storage/parthelper.c b/src/storage/parthelper.c index 94d588615f..73ae28f718 100644 --- a/src/storage/parthelper.c +++ b/src/storage/parthelper.c @@ -131,7 +131,6 @@ int main(int argc, char **argv) content = "free"; else if (part->type & PED_PARTITION_METADATA) content = "metadata"; - /* coverity[dead_error_condition] - not true if defined */ else if (part->type & PED_PARTITION_PROTECTED) content = "protected"; else @@ -145,7 +144,6 @@ int main(int argc, char **argv) content = "free"; else if (part->type & PED_PARTITION_METADATA) content = "metadata"; - /* coverity[dead_error_condition] - not true if defined */ else if (part->type & PED_PARTITION_PROTECTED) content = "protected"; else diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index 1870f3f875..407270271f 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -2750,7 +2750,6 @@ static int virNetDevParseMcast(char *buf, virNetDevMcastEntry *mcast) } break; - /* coverity[dead_error_begin] */ case VIR_MCAST_TYPE_LAST: break; } diff --git a/src/util/virprocess.c b/src/util/virprocess.c index a3facd8ac2..01d5d01d02 100644 --- a/src/util/virprocess.c +++ b/src/util/virprocess.c @@ -521,7 +521,6 @@ virProcessGetAffinity(pid_t pid) ret = virBitmapNew(ncpus); for (i = 0; i < ncpus; i++) { - /* coverity[overrun-local] */ if (CPU_ISSET_S(i, masklen, mask)) ignore_value(virBitmapSetBit(ret, i)); } diff --git a/tests/commandtest.c b/tests/commandtest.c index 15ea77b36a..57c7db67d8 100644 --- a/tests/commandtest.c +++ b/tests/commandtest.c @@ -1206,7 +1206,6 @@ mymain(void) virinitret = virInitialize(); /* Phase two of killing interfering fds; see above. */ - /* coverity[overwrite_var] - silence the obvious */ fd = 3; VIR_FORCE_CLOSE(fd); fd = 4; diff --git a/tests/virdrivermoduletest.c b/tests/virdrivermoduletest.c index 0d753cd0ee..e7930d3453 100644 --- a/tests/virdrivermoduletest.c +++ b/tests/virdrivermoduletest.c @@ -38,7 +38,6 @@ static int testDriverModule(const void *args) { const struct testDriverModuleData *data = args; - /* coverity[leaked_storage] */ if (virDriverLoadModule(data->module, data->regfunc, true) != 0) return -1; diff --git a/tools/virsh.c b/tools/virsh.c index 7d7109cfdf..fd32944c24 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -96,7 +96,6 @@ virshCatchDisconnect(virConnectPtr conn, case VIR_CONNECT_CLOSE_REASON_KEEPALIVE: str = N_("Disconnected from %s due to keepalive timeout"); break; - /* coverity[dead_error_condition] */ case VIR_CONNECT_CLOSE_REASON_CLIENT: case VIR_CONNECT_CLOSE_REASON_LAST: break; diff --git a/tools/virt-admin.c b/tools/virt-admin.c index 3a050ab9ab..dd17743b9d 100644 --- a/tools/virt-admin.c +++ b/tools/virt-admin.c @@ -92,7 +92,6 @@ vshAdmCatchDisconnect(virAdmConnectPtr conn G_GNUC_UNUSED, case VIR_CONNECT_CLOSE_REASON_KEEPALIVE: str = N_("Disconnected from %s due to keepalive timeout"); break; - /* coverity[dead_error_condition] */ case VIR_CONNECT_CLOSE_REASON_CLIENT: case VIR_CONNECT_CLOSE_REASON_LAST: break;