[Qemu-devel] [PATCH for-next? 0/2] qemu-img: Minor fixes to an amend error path

[Qemu-devel] [PATCH for-next? 0/2] qemu-img: Minor fixes to an amend error path

[Max Reitz]

One of the amend error paths has two issues that are fixed by this
series.  Since they are relatively minor and have been present in 3.0
already, I think there is no need to get them into 3.1.  OTOH they are
bug fixes, so they could go into 3.1 if you, dear reader, insist.


Max Reitz (2):
  qemu-img: Fix typo
  qemu-img: Fix leak

 qemu-img.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

-- 
2.17.2

[Qemu-devel] [PATCH for-next? 1/2] qemu-img: Fix typo

[Max Reitz]

Fixes: d402b6a21a825a5c07aac9251990860723d49f5d
Reported-by: Kevin Wolf <kwolf@redhat.com>
Cc: qemu-stable@nongnu.org
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 qemu-img.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qemu-img.c b/qemu-img.c
index 13a6ca31b4..a9a2470e1a 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -261,7 +261,7 @@ static int print_block_option_help(const char *filename, const char *fmt)
             return 1;
         }
         if (!proto_drv->create_opts) {
-            error_report("Protocal driver '%s' does not support image creation",
+            error_report("Protocol driver '%s' does not support image creation",
                          proto_drv->format_name);
             return 1;
         }
-- 
2.17.2

[Qemu-devel] [PATCH for-next? 2/2] qemu-img: Fix leak

[Max Reitz]

create_opts was leaked here.  This is not too bad since the process is
about to exit anyway, but relying on that does not make the code nicer
to read.

Fixes: d402b6a21a825a5c07aac9251990860723d49f5d
Reported-by: Kevin Wolf <kwolf@redhat.com>
Cc: qemu-stable@nongnu.org
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 qemu-img.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/qemu-img.c b/qemu-img.c
index a9a2470e1a..ad04f59565 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -263,6 +263,7 @@ static int print_block_option_help(const char *filename, const char *fmt)
         if (!proto_drv->create_opts) {
             error_report("Protocol driver '%s' does not support image creation",
                          proto_drv->format_name);
+            qemu_opts_free(create_opts);
             return 1;
         }
         create_opts = qemu_opts_append(create_opts, proto_drv->create_opts);
-- 
2.17.2

Re: [Qemu-devel] [Qemu-block] [PATCH for-next? 0/2] qemu-img: Minor fixes to an amend error path

[John Snow]

On 11/19/18 5:19 AM, Max Reitz wrote:
> One of the amend error paths has two issues that are fixed by this
> series.  Since they are relatively minor and have been present in 3.0
> already, I think there is no need to get them into 3.1.  OTOH they are
> bug fixes, so they could go into 3.1 if you, dear reader, insist.

I enjoy your use of "dear reader" in cover letters.

Not related to the above:

Reviewed-by: John Snow <jsnow@redhat.com>

> 
> 
> Max Reitz (2):
>   qemu-img: Fix typo
>   qemu-img: Fix leak
> 
>  qemu-img.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 

Re: [Qemu-devel] [PATCH for-next? 0/2] qemu-img: Minor fixes to an amend error path

[Kevin Wolf]

Am 19.11.2018 um 11:19 hat Max Reitz geschrieben:
> One of the amend error paths has two issues that are fixed by this
> series.  Since they are relatively minor and have been present in 3.0
> already, I think there is no need to get them into 3.1.  OTOH they are
> bug fixes, so they could go into 3.1 if you, dear reader, insist.

Thanks, applied to the block branch (looks like the dear reader
insists).

Kevin