OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

kvm: Improve upgrade notes when facing unsupported kernels 

Users complained that it is not obvious what to do when kvm refuses to
build or run due to an unsupported host kernel, so let's improve the
hints.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
This commit is contained in:
Jan Kiszka 2009-06-07 11:30:25 +02:00 committed by Blue Swirl
parent 4ca1a9c62a
commit 168ccc11c3
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configure vendored
View File

@ -1158,7 +1158,9 @@ EOF
| grep "error: " \ | grep "error: " \
| awk -F "error: " '{if (NR>1) printf(", "); printf("%s",$2);}'` | awk -F "error: " '{if (NR>1) printf(", "); printf("%s",$2);}'`
if test "$kvmerr" != "" ; then if test "$kvmerr" != "" ; then
kvm="no - (${kvmerr})" kvm="no - (${kvmerr})\n\
NOTE: To enable KVM support, update your kernel to 2.6.29+ or install \
recent kvm-kmod from http://sourceforge.net/projects/kvm."
fi fi
fi fi
fi fi
@ -1377,7 +1379,7 @@ echo "vde support $vde"
echo "AIO support $aio" echo "AIO support $aio"
echo "IO thread $io_thread" echo "IO thread $io_thread"
echo "Install blobs $blobs" echo "Install blobs $blobs"
echo "KVM support $kvm" echo -e "KVM support $kvm"
echo "fdt support $fdt" echo "fdt support $fdt"
echo "preadv support $preadv" echo "preadv support $preadv"

10
kvm-all.c
View File

@ -404,6 +404,9 @@ static void kvm_reset_vcpus(void *opaque)
int kvm_init(int smp_cpus) int kvm_init(int smp_cpus)
{ {
static const char upgrade_note[] =
"Please upgrade to at least kernel 2.6.29 or recent kvm-kmod\n"
"(see http://sourceforge.net/projects/kvm).\n";
KVMState *s; KVMState *s;
int ret; int ret;
int i; int i;
@ -454,7 +457,8 @@ int kvm_init(int smp_cpus)
*/ */
if (!kvm_check_extension(s, KVM_CAP_USER_MEMORY)) { if (!kvm_check_extension(s, KVM_CAP_USER_MEMORY)) {
ret = -EINVAL; ret = -EINVAL;
fprintf(stderr, "kvm does not support KVM_CAP_USER_MEMORY\n"); fprintf(stderr, "kvm does not support KVM_CAP_USER_MEMORY\n%s",
upgrade_note);
goto err; goto err;
} }
@ -465,8 +469,8 @@ int kvm_init(int smp_cpus)
ret = -EINVAL; ret = -EINVAL;
fprintf(stderr, fprintf(stderr,
"KVM kernel module broken (DESTROY_MEMORY_REGION)\n" "KVM kernel module broken (DESTROY_MEMORY_REGION).\n%s",
"Please upgrade to at least kvm-81.\n"); upgrade_note);
goto err; goto err;
} }