|
 |
0a122b |
From a766091a8693181b77b0b1e3b5de9a05aab25c18 Mon Sep 17 00:00:00 2001
|
|
|
0a122b |
From: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
0a122b |
Date: Wed, 4 Dec 2013 18:53:17 +0100
|
|
|
0a122b |
Subject: [PATCH 01/16] Add support statement to -help output
|
|
|
0a122b |
|
|
|
0a122b |
RH-Author: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
0a122b |
Message-id: <1386183197-27761-1-git-send-email-ehabkost@redhat.com>
|
|
|
0a122b |
Patchwork-id: 55994
|
|
|
0a122b |
O-Subject: [qemu-kvm RHEL7 PATCH] Add support statement to -help output
|
|
|
0a122b |
Bugzilla: 972773
|
|
|
0a122b |
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
0a122b |
RH-Acked-by: knoel@redhat.com
|
|
|
0a122b |
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
0a122b |
|
|
|
0a122b |
Bugzilla: 972773
|
|
|
0a122b |
Brew scratch build: http://brewweb.devel.redhat.com/brew/taskinfo?taskID=6676272
|
|
|
0a122b |
|
|
|
0a122b |
Add support statement to -help output, reporting direct qemu-kvm usage
|
|
|
0a122b |
as unsupported by Red Hat, and advising users to use libvirt instead.
|
|
|
0a122b |
|
|
|
0a122b |
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
0a122b |
---
|
|
|
0a122b |
vl.c | 9 +++++++++
|
|
|
0a122b |
1 file changed, 9 insertions(+)
|
|
|
0a122b |
|
|
|
0a122b |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
0a122b |
---
|
|
|
0a122b |
vl.c | 9 +++++++++
|
|
|
0a122b |
1 files changed, 9 insertions(+), 0 deletions(-)
|
|
|
0a122b |
|
|
|
0a122b |
diff --git a/vl.c b/vl.c
|
|
|
0a122b |
index 4a79f62..b9074c5 100644
|
|
|
0a122b |
--- a/vl.c
|
|
|
0a122b |
+++ b/vl.c
|
|
|
0a122b |
@@ -1993,9 +1993,17 @@ static void version(void)
|
|
|
0a122b |
printf("QEMU emulator version " QEMU_VERSION QEMU_PKGVERSION ", Copyright (c) 2003-2008 Fabrice Bellard\n");
|
|
|
0a122b |
}
|
|
|
0a122b |
|
|
|
0a122b |
+static void print_rh_warning(void)
|
|
|
0a122b |
+{
|
|
|
0a122b |
+ printf("\nWARNING: Direct use of qemu-kvm from the command line is not supported by Red Hat.\n"
|
|
|
0a122b |
+ "WARNING: Use libvirt as the stable management interface.\n"
|
|
|
0a122b |
+ "WARNING: Some command line options listed here may not be available in future releases.\n\n");
|
|
|
0a122b |
+}
|
|
|
0a122b |
+
|
|
|
0a122b |
static void help(int exitcode)
|
|
|
0a122b |
{
|
|
|
0a122b |
version();
|
|
|
0a122b |
+ print_rh_warning();
|
|
|
0a122b |
printf("usage: %s [options] [disk_image]\n\n"
|
|
|
0a122b |
"'disk_image' is a raw hard disk image for IDE hard disk 0\n\n",
|
|
|
0a122b |
error_get_progname());
|
|
|
0a122b |
@@ -2010,6 +2018,7 @@ static void help(int exitcode)
|
|
|
0a122b |
"\n"
|
|
|
0a122b |
"When using -nographic, press 'ctrl-a h' to get some help.\n");
|
|
|
0a122b |
|
|
|
0a122b |
+ print_rh_warning();
|
|
|
0a122b |
exit(exitcode);
|
|
|
0a122b |
}
|
|
|
0a122b |
|
|
|
0a122b |
--
|
|
|
0a122b |
1.7.1
|
|
|
0a122b |
|