|
 |
1bdc94 |
From 1f1faf92011618b0d32dc6a4a7e5b5119c38c2ac Mon Sep 17 00:00:00 2001
|
|
|
1bdc94 |
From: Max Reitz <mreitz@redhat.com>
|
|
|
1bdc94 |
Date: Mon, 18 Jun 2018 14:59:39 +0200
|
|
|
1bdc94 |
Subject: [PATCH 05/89] qemu-option: Pull out "Supported options" print
|
|
|
1bdc94 |
|
|
|
1bdc94 |
RH-Author: Max Reitz <mreitz@redhat.com>
|
|
|
1bdc94 |
Message-id: <20180618145943.4489-4-mreitz@redhat.com>
|
|
|
1bdc94 |
Patchwork-id: 80756
|
|
|
1bdc94 |
O-Subject: [RHV-7.6 qemu-kvm-rhev PATCH 3/7] qemu-option: Pull out "Supported options" print
|
|
|
1bdc94 |
Bugzilla: 1537956
|
|
|
1bdc94 |
RH-Acked-by: John Snow <jsnow@redhat.com>
|
|
|
1bdc94 |
RH-Acked-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
1bdc94 |
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
1bdc94 |
|
|
|
1bdc94 |
It really is up to the caller to decide what this list of options means.
|
|
|
1bdc94 |
|
|
|
1bdc94 |
Signed-off-by: Max Reitz <mreitz@redhat.com>
|
|
|
1bdc94 |
Reviewed-by: John Snow <jsnow@redhat.com>
|
|
|
1bdc94 |
Reviewed-by: Eric Blake <eblake@redhat.com>
|
|
|
1bdc94 |
Message-id: 20180509210023.20283-4-mreitz@redhat.com
|
|
|
1bdc94 |
Signed-off-by: Max Reitz <mreitz@redhat.com>
|
|
|
1bdc94 |
(cherry picked from commit 7f3fb00136aaec74df8132492d1f48b8e9840258)
|
|
|
1bdc94 |
Signed-off-by: Max Reitz <mreitz@redhat.com>
|
|
|
1bdc94 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
1bdc94 |
---
|
|
|
1bdc94 |
qemu-img.c | 1 +
|
|
|
1bdc94 |
util/qemu-option.c | 1 -
|
|
|
1bdc94 |
2 files changed, 1 insertion(+), 1 deletion(-)
|
|
|
1bdc94 |
|
|
|
1bdc94 |
diff --git a/qemu-img.c b/qemu-img.c
|
|
|
1bdc94 |
index e40d6ff..cdeb01b 100644
|
|
|
1bdc94 |
--- a/qemu-img.c
|
|
|
1bdc94 |
+++ b/qemu-img.c
|
|
|
1bdc94 |
@@ -261,6 +261,7 @@ static int print_block_option_help(const char *filename, const char *fmt)
|
|
|
1bdc94 |
create_opts = qemu_opts_append(create_opts, proto_drv->create_opts);
|
|
|
1bdc94 |
}
|
|
|
1bdc94 |
|
|
|
1bdc94 |
+ printf("Supported options:\n");
|
|
|
1bdc94 |
qemu_opts_print_help(create_opts);
|
|
|
1bdc94 |
qemu_opts_free(create_opts);
|
|
|
1bdc94 |
return 0;
|
|
|
1bdc94 |
diff --git a/util/qemu-option.c b/util/qemu-option.c
|
|
|
1bdc94 |
index d0756fd..95e6cf4 100644
|
|
|
1bdc94 |
--- a/util/qemu-option.c
|
|
|
1bdc94 |
+++ b/util/qemu-option.c
|
|
|
1bdc94 |
@@ -218,7 +218,6 @@ void qemu_opts_print_help(QemuOptsList *list)
|
|
|
1bdc94 |
|
|
|
1bdc94 |
assert(list);
|
|
|
1bdc94 |
desc = list->desc;
|
|
|
1bdc94 |
- printf("Supported options:\n");
|
|
|
1bdc94 |
while (desc && desc->name) {
|
|
|
1bdc94 |
printf("%-16s %s\n", desc->name,
|
|
|
1bdc94 |
desc->help ? desc->help : "No description available");
|
|
|
1bdc94 |
--
|
|
|
1bdc94 |
1.8.3.1
|
|
|
1bdc94 |
|