From 217e21be6e0f2c1caa0b644f56aa60dba7ea7893 Mon Sep 17 00:00:00 2001 From: liguang Date: Thu, 24 Jan 2013 13:03:26 +0800 Subject: [PATCH] vl: correct error message when fail to init kvm command: qemu-system-x86_64 -hda disk.img -smp 32 --enable-kvm error: Number of SMP cpus requested (32) exceeds max cpus supported by KVM (16) failed to initialize KVM: Invalid argument No accelerator found! well, it did find kvm, but failed to init, so message "No accelerator found!" is confusing, this commit remove the confusing error message. Signed-off-by: liguang Signed-off-by: Anthony Liguori --- vl.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/vl.c b/vl.c index 140ce84cc0..fe2898594d 100644 --- a/vl.c +++ b/vl.c @@ -2557,8 +2557,8 @@ static int configure_accelerator(void) const char *p = NULL; char buf[10]; int i, ret; - bool accel_initialised = 0; - bool init_failed = 0; + bool accel_initialised = false; + bool init_failed = false; QemuOptsList *list = qemu_find_opts("machine"); if (!QTAILQ_EMPTY(&list->head)) { @@ -2585,13 +2585,13 @@ static int configure_accelerator(void) *(accel_list[i].allowed) = 1; ret = accel_list[i].init(); if (ret < 0) { - init_failed = 1; + init_failed = true; fprintf(stderr, "failed to initialize %s: %s\n", accel_list[i].name, strerror(-ret)); *(accel_list[i].allowed) = 0; } else { - accel_initialised = 1; + accel_initialised = true; } break; } @@ -2602,7 +2602,9 @@ static int configure_accelerator(void) } if (!accel_initialised) { - fprintf(stderr, "No accelerator found!\n"); + if (!init_failed) { + fprintf(stderr, "No accelerator found!\n"); + } exit(1); } -- 2.11.4.GIT