|
 |
1bdc94 |
From e93d5457df2dde297089b44d185f5fe5b608d744 Mon Sep 17 00:00:00 2001
|
|
|
4a2fec |
From: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
4a2fec |
Date: Wed, 4 Dec 2013 18:53:17 +0100
|
|
|
4a2fec |
Subject: Add support statement to -help output
|
|
|
4a2fec |
|
|
|
4a2fec |
RH-Author: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
4a2fec |
Message-id: <1386183197-27761-1-git-send-email-ehabkost@redhat.com>
|
|
|
4a2fec |
Patchwork-id: 55994
|
|
|
4a2fec |
O-Subject: [qemu-kvm RHEL7 PATCH] Add support statement to -help output
|
|
|
4a2fec |
Bugzilla: 972773
|
|
|
4a2fec |
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
4a2fec |
RH-Acked-by: knoel@redhat.com
|
|
|
4a2fec |
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
4a2fec |
|
|
|
4a2fec |
Add support statement to -help output, reporting direct qemu-kvm usage
|
|
|
4a2fec |
as unsupported by Red Hat, and advising users to use libvirt instead.
|
|
|
4a2fec |
|
|
|
4a2fec |
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
4a2fec |
(cherry picked from commit 2a07700936e39856cc9f149c6a6517f0715536a6)
|
|
|
1bdc94 |
(cherry picked from commit 5dd2f4706e2fef945771949e59a8fcc1b5452de9)
|
|
|
1bdc94 |
(cherry picked from commit d660aafa98635de49f7f7a416a4e910d99b10bce)
|
|
|
1bdc94 |
(cherry picked from commit 6a5d4b1f602318a5b6f4e49bed90624c67848629)
|
|
|
1bdc94 |
(cherry picked from commit 506816e81f899d3daa6202e50ef12a21dcee7b96)
|
|
|
4a2fec |
---
|
|
|
4a2fec |
vl.c | 9 +++++++++
|
|
|
4a2fec |
1 file changed, 9 insertions(+)
|
|
|
4a2fec |
|
|
|
4a2fec |
diff --git a/vl.c b/vl.c
|
|
|
1bdc94 |
index 8dee9d0..7fce42d 100644
|
|
|
4a2fec |
--- a/vl.c
|
|
|
4a2fec |
+++ b/vl.c
|
|
|
1bdc94 |
@@ -1953,9 +1953,17 @@ static void version(void)
|
|
|
4a2fec |
QEMU_COPYRIGHT "\n");
|
|
|
4a2fec |
}
|
|
|
4a2fec |
|
|
|
4a2fec |
+static void print_rh_warning(void)
|
|
|
4a2fec |
+{
|
|
|
4a2fec |
+ printf("\nWARNING: Direct use of qemu-kvm from the command line is not supported by Red Hat.\n"
|
|
|
4a2fec |
+ "WARNING: Use libvirt as the stable management interface.\n"
|
|
|
4a2fec |
+ "WARNING: Some command line options listed here may not be available in future releases.\n\n");
|
|
|
4a2fec |
+}
|
|
|
4a2fec |
+
|
|
|
4a2fec |
static void help(int exitcode)
|
|
|
4a2fec |
{
|
|
|
4a2fec |
version();
|
|
|
4a2fec |
+ print_rh_warning();
|
|
|
4a2fec |
printf("usage: %s [options] [disk_image]\n\n"
|
|
|
4a2fec |
"'disk_image' is a raw hard disk image for IDE hard disk 0\n\n",
|
|
|
4a2fec |
error_get_progname());
|
|
|
1bdc94 |
@@ -1972,6 +1980,7 @@ static void help(int exitcode)
|
|
|
4a2fec |
"\n"
|
|
|
4a2fec |
QEMU_HELP_BOTTOM "\n");
|
|
|
4a2fec |
|
|
|
4a2fec |
+ print_rh_warning();
|
|
|
4a2fec |
exit(exitcode);
|
|
|
4a2fec |
}
|
|
|
4a2fec |
|
|
|
4a2fec |
--
|
|
|
4a2fec |
1.8.3.1
|
|
|
4a2fec |
|