Patchwork hmp: Print \n after [not inserted]

login
register
mail settings
Submitter Lucas Meneghel Rodrigues
Date Oct. 3, 2013, 1:08 a.m.
Message ID <1380762514-15096-1-git-send-email-lmr@redhat.com>
Download mbox | patch
Permalink /patch/280198/
State New
Headers show

Comments

Lucas Meneghel Rodrigues - Oct. 3, 2013, 1:08 a.m.
I've noticed this when virt-test QEMU monitor protocol
code was getting all confused with output like:

'Removable device: not locked, tray closed\n [not inserted](qemu) '

Since it was breaking some assumptions on that code. I've
fixed the prompt matching code to be more lenient, but here
the human monitor is supposed to print the newline anyway.

CC: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Lucas Meneghel Rodrigues <lmr@redhat.com>
---
 hmp.c        | 2 +-
 roms/seabios | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
Lucas Meneghel Rodrigues - Oct. 3, 2013, 1:30 a.m.
On 10/02/2013 10:08 PM, Lucas Meneghel Rodrigues wrote:
> I've noticed this when virt-test QEMU monitor protocol
> code was getting all confused with output like:
>
> 'Removable device: not locked, tray closed\n [not inserted](qemu)'
>
> Since it was breaking some assumptions on that code. I've
> fixed the prompt matching code to be more lenient, but here
> the human monitor is supposed to print the newline anyway.

Oh well, it seems that we're not supposed to have the newline there by 
the look of the resulting output. Please ignore this patch.

> CC: Stefan Hajnoczi <stefanha@redhat.com>
> Signed-off-by: Lucas Meneghel Rodrigues <lmr@redhat.com>
> ---
>   hmp.c        | 2 +-
>   roms/seabios | 2 +-
>   2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/hmp.c b/hmp.c
> index 5891507..2d2e5f8 100644
> --- a/hmp.c
> +++ b/hmp.c
> @@ -367,7 +367,7 @@ void hmp_info_block(Monitor *mon, const QDict *qdict)
>                               info->value->inserted->iops_wr_max,
>                               info->value->inserted->iops_size);
>           } else {
> -            monitor_printf(mon, " [not inserted]");
> +            monitor_printf(mon, " [not inserted]\n");
>           }
>
>           if (verbose) {
> diff --git a/roms/seabios b/roms/seabios
> index ece025f..7093aa5 160000
> --- a/roms/seabios
> +++ b/roms/seabios
> @@ -1 +1 @@
> -Subproject commit ece025f5980bae88fa677bc9c0d24d2e580e205d
> +Subproject commit 7093aa58046f8685025b0198708e7768733a017d
>

Patch

diff --git a/hmp.c b/hmp.c
index 5891507..2d2e5f8 100644
--- a/hmp.c
+++ b/hmp.c
@@ -367,7 +367,7 @@  void hmp_info_block(Monitor *mon, const QDict *qdict)
                             info->value->inserted->iops_wr_max,
                             info->value->inserted->iops_size);
         } else {
-            monitor_printf(mon, " [not inserted]");
+            monitor_printf(mon, " [not inserted]\n");
         }
 
         if (verbose) {
diff --git a/roms/seabios b/roms/seabios
index ece025f..7093aa5 160000
--- a/roms/seabios
+++ b/roms/seabios
@@ -1 +1 @@ 
-Subproject commit ece025f5980bae88fa677bc9c0d24d2e580e205d
+Subproject commit 7093aa58046f8685025b0198708e7768733a017d