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 <pkrempa@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 0c52efa81643efe54df3d619be46cd2fdf9bb249..8172c8882aca9c3a79c1e1672ea438b6e6e9a38e 100644 (file)
--- 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 d01be6f7bab336236ac0d92e16f673d698333a13..a4599499d04f2821cc20433594c2e6f4e0f67176 100644 (file)
--- 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 31a1ac0949c314724d6b343f008c4602d29940e9..19c1502ee02da1a2d8375d4e4cd355332058edbe 100644 (file)
--- 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 a972662c3fda69c1274ef2f35559566a18a376bb..1ee0e7ebc0abe012e78257288cf1b42dca888344 100644 (file)
--- 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 2aa4574d94c4a94fe4c2b8a0c1445a76bff4db9f..9dc6b71ae5d10aa1a5e0958552a89543f1d17902 100644 (file)
--- 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 eed99af1278b590bf7ace2a9db2d5287e37964c1..0bacd0bc4bbb4f4703d5b9a5d7c03637c85e9af2 100644 (file)
--- 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 94d588615fed00748ab30147f53cd4837b970741..73ae28f718816922b5c897c49ac3f492cb3ecec6 100644 (file)
--- 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 1870f3f875b18d759ab1967186fd980fd2dc8f92..407270271f713ecb90bd67b35617931a62e6aa54 100644 (file)
--- 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 a3facd8ac20cf960ecfce69fd56ffe4ffd4181ad..01d5d01d025b5bf7e5f7e58ee8be9ce950cdb2db 100644 (file)
--- 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 15ea77b36a4b0c16a0dbf13410719fe8e01f718a..57c7db67d85cff3c9c31a12c5ee26f71299a8486 100644 (file)
--- 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 0d753cd0ee6eb90a274b861561be0517dcea0c63..e7930d3453783c8e8b98dfa30de0b0ca3c09e3fa 100644 (file)
--- 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 7d7109cfdf92cc5fffe8fb4abb70e04257954303..fd32944c2492201179f388610abbf7923c970b88 100644 (file)
--- 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 3a050ab9ab3f5e124f5ccdfb794f325bd994f21c..dd17743b9d6e85cb97c87c8b858be76cca6a1306 100644 (file)
--- 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;