qemu: fix several codecheck in qemu_monitor.c

1.clear passwd in debug log
2.alignment
3.use the same variable name for function definition and declaration

Signed-off-by: Jiang Jiacheng <jiangjiacheng@huawei.com>
Reviewed-by: Martin Kletzander <mkletzan@redhat.com>

diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
index b2e4311ea9dd4dca437e6257e76a61247c1e999a..6303200d1e2a26e145379069f9abec0738d8d365 100644 (file)
--- a/src/qemu/qemu_monitor.c
+++ b/src/qemu/qemu_monitor.c
@@ -943,7 +943,7 @@ qemuMonitorInitBalloonObjectPath(qemuMonitor *mon,
             case VIR_DOMAIN_MEMBALLOON_MODEL_XEN:
             case VIR_DOMAIN_MEMBALLOON_MODEL_NONE:
                 virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-                        _("invalid model for virtio-balloon-pci"));
+                               _("invalid model for virtio-balloon-pci"));
                 return;
             case VIR_DOMAIN_MEMBALLOON_MODEL_LAST:
             default:
@@ -2053,8 +2053,8 @@ qemuMonitorSetPassword(qemuMonitor *mon,
     if (!protocol)
         return -1;
 
-    VIR_DEBUG("protocol=%s, password=%p, action_if_connected=%s",
-              protocol, password, action_if_connected);
+    VIR_DEBUG("protocol=%s, action_if_connected=%s",
+              protocol, action_if_connected);
 
     QEMU_CHECK_MONITOR(mon);
 
@@ -3488,7 +3488,7 @@ qemuMonitorBlockExportAdd(qemuMonitor *mon,
 
 int
 qemuMonitorGetTPMModels(qemuMonitor *mon,
-                            char ***tpmmodels)
+                        char ***tpmmodels)
 {
     VIR_DEBUG("tpmmodels=%p", tpmmodels);
 

diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
index 0d4a52bf4ae6f8a43161fabddaea3e691ee9a964..324eee5a89d97b92f28d6b6d1f640da0ad038873 100644 (file)
--- a/src/qemu/qemu_monitor.h
+++ b/src/qemu/qemu_monitor.h
@@ -627,8 +627,8 @@ struct _qemuMonitorCPUInfo {
 };
 typedef struct _qemuMonitorCPUInfo qemuMonitorCPUInfo;
 
-void qemuMonitorCPUInfoFree(qemuMonitorCPUInfo *list,
-                            size_t nitems);
+void qemuMonitorCPUInfoFree(qemuMonitorCPUInfo *cpus,
+                            size_t ncpus);
 int qemuMonitorGetCPUInfo(qemuMonitor *mon,
                           qemuMonitorCPUInfo **vcpus,
                           size_t maxvcpus,
@@ -1186,7 +1186,7 @@ int qemuMonitorNBDServerAdd(qemuMonitor *mon,
                             const char *export,
                             bool writable,
                             const char *bitmap);
-int qemuMonitorNBDServerStop(qemuMonitor *);
+int qemuMonitorNBDServerStop(qemuMonitor *mon);
 
 int qemuMonitorBlockExportAdd(qemuMonitor *mon,
                               virJSONValue **props);