|
 |
9ae3a8 |
From 27267616896168fe1177c42a73246a8a9c551be3 Mon Sep 17 00:00:00 2001
|
|
|
9ae3a8 |
From: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
9ae3a8 |
Date: Thu, 11 Apr 2013 11:07:31 +0200
|
|
|
9ae3a8 |
Subject: Change qemu to qemu-kvm
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
We use qemu-kvm as name for RHEL 7. This patch fixes various pathes and files that uses qemu so they use qemu-kvm instead.
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
diff --git a/os-posix.c b/os-posix.c
|
|
|
9ae3a8 |
index d39261d..3a4678a 100644
|
|
|
9ae3a8 |
--- a/os-posix.c
|
|
|
9ae3a8 |
+++ b/os-posix.c
|
|
|
9ae3a8 |
@@ -82,7 +82,7 @@ void os_setup_signal_handling(void)
|
|
|
9ae3a8 |
/* Find a likely location for support files using the location of the binary.
|
|
|
9ae3a8 |
For installed binaries this will be "$bindir/../share/qemu". When
|
|
|
9ae3a8 |
running from the build tree this will be "$bindir/../pc-bios". */
|
|
|
9ae3a8 |
-#define SHARE_SUFFIX "/share/qemu"
|
|
|
9ae3a8 |
+#define SHARE_SUFFIX "/share/qemu-kvm"
|
|
|
9ae3a8 |
#define BUILD_SUFFIX "/pc-bios"
|
|
|
9ae3a8 |
char *os_find_datadir(const char *argv0)
|
|
|
9ae3a8 |
{
|
|
|
9ae3a8 |
diff --git a/ui/vnc.c b/ui/vnc.c
|
|
|
9ae3a8 |
index dfc7459..3726352 100644
|
|
|
9ae3a8 |
--- a/ui/vnc.c
|
|
|
9ae3a8 |
+++ b/ui/vnc.c
|
|
|
9ae3a8 |
@@ -3260,7 +3260,7 @@ void vnc_display_open(DisplayState *ds, const char *display, Error **errp)
|
|
|
9ae3a8 |
}
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
#ifdef CONFIG_VNC_SASL
|
|
|
9ae3a8 |
- if ((saslErr = sasl_server_init(NULL, "qemu")) != SASL_OK) {
|
|
|
9ae3a8 |
+ if ((saslErr = sasl_server_init(NULL, "qemu-kvm")) != SASL_OK) {
|
|
|
9ae3a8 |
error_setg(errp, "Failed to initialize SASL auth: %s",
|
|
|
9ae3a8 |
sasl_errstring(saslErr, NULL, NULL));
|
|
|
9ae3a8 |
goto fail;
|