Patchwork monitor: fix client_migrate_info error handling

login
register
mail settings
Submitter Yonit Halperin
Date March 18, 2012, 7:42 a.m.
Message ID <1332056559-8585-1-git-send-email-yhalperi@redhat.com>
Download mbox | patch
Permalink /patch/147353/
State New
Headers show

Comments

Yonit Halperin - March 18, 2012, 7:42 a.m.
Report QERR_INVALID_PARAMETER when port is missing. Otherwise
QERR_UNDEFINED_ERROR will occur.

rhbz #795652

Signed-off-by: Yonit Halperin <yhalperi@redhat.com>
---
 monitor.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)
Alon Levy - March 19, 2012, 8:49 a.m.
On Sun, Mar 18, 2012 at 09:42:39AM +0200, Yonit Halperin wrote:
> Report QERR_INVALID_PARAMETER when port is missing. Otherwise
> QERR_UNDEFINED_ERROR will occur.
> 
> rhbz #795652
> 

Reviewed-by: Alon Levy <alevy@redhat.com>

> Signed-off-by: Yonit Halperin <yhalperi@redhat.com>
> ---
>  monitor.c |    5 +++++
>  1 files changed, 5 insertions(+), 0 deletions(-)
> 
> diff --git a/monitor.c b/monitor.c
> index d57e7bf..8f46031 100644
> --- a/monitor.c
> +++ b/monitor.c
> @@ -880,6 +880,11 @@ static int client_migrate_info(Monitor *mon, const QDict *qdict,
>              return -1;
>          }
>  
> +        if (port == -1 && tls_port == -1) {
> +            qerror_report(QERR_MISSING_PARAMETER, "port/tls-port");
> +            return -1;
> +        }
> +
>          ret = qemu_spice_migrate_info(hostname, port, tls_port, subject,
>                                        cb, opaque);
>          if (ret != 0) {
> -- 
> 1.7.7.6
> 
>
Gerd Hoffmann - March 19, 2012, 11:57 a.m.
On 03/18/12 08:42, Yonit Halperin wrote:
> Report QERR_INVALID_PARAMETER when port is missing. Otherwise

> +            qerror_report(QERR_MISSING_PARAMETER, "port/tls-port");

Fixed commit message & added to spice patch queue.

thanks,
  Gerd

Patch

diff --git a/monitor.c b/monitor.c
index d57e7bf..8f46031 100644
--- a/monitor.c
+++ b/monitor.c
@@ -880,6 +880,11 @@  static int client_migrate_info(Monitor *mon, const QDict *qdict,
             return -1;
         }
 
+        if (port == -1 && tls_port == -1) {
+            qerror_report(QERR_MISSING_PARAMETER, "port/tls-port");
+            return -1;
+        }
+
         ret = qemu_spice_migrate_info(hostname, port, tls_port, subject,
                                       cb, opaque);
         if (ret != 0) {