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