[PATCH] qemu: fix several codecheck in qemu_monitor.c

[Jiang Jiacheng]

Ping...

On 2022/12/8 20:49, Jiang Jiacheng wrote:
> 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 at huawei.com>
> ---
>  src/qemu/qemu_monitor.c | 8 ++++----
>  src/qemu/qemu_monitor.h | 6 +++---
>  2 files changed, 7 insertions(+), 7 deletions(-)
> 
> diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
> index 80f262cec7..de9a1b26f6 100644
> --- 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);
>  
> @@ -3485,7 +3485,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 c690fc3655..7278f2e706 100644
> --- 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,
> @@ -1184,7 +1184,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);