From: liguang <lig.fnst@cn.fujitsu.com>
Date: Thu, 24 Jan 2013 05:03:25 +0000 (+0800)
Subject: vl: skip init accelerator if it's not available
X-Git-Tag: v1.4.0-rc0~17
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=e3c66d939480e0f372316c22184c07fb3de12873;p=qemu.git

vl: skip init accelerator if it's not available

Signed-off-by: liguang <lig.fnst@cn.fujitsu.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
---

diff --git a/vl.c b/vl.c
index 910abb652..140ce84cc 100644
--- a/vl.c
+++ b/vl.c
@@ -2577,18 +2577,18 @@ static int configure_accelerator(void)
         p = get_opt_name(buf, sizeof (buf), p, ':');
         for (i = 0; i < ARRAY_SIZE(accel_list); i++) {
             if (strcmp(accel_list[i].opt_name, buf) == 0) {
+                if (!accel_list[i].available()) {
+                    printf("%s not supported for this target\n",
+                           accel_list[i].name);
+                    continue;
+                }
                 *(accel_list[i].allowed) = 1;
                 ret = accel_list[i].init();
                 if (ret < 0) {
                     init_failed = 1;
-                    if (!accel_list[i].available()) {
-                        printf("%s not supported for this target\n",
-                               accel_list[i].name);
-                    } else {
-                        fprintf(stderr, "failed to initialize %s: %s\n",
-                                accel_list[i].name,
-                                strerror(-ret));
-                    }
+                    fprintf(stderr, "failed to initialize %s: %s\n",
+                            accel_list[i].name,
+                            strerror(-ret));
                     *(accel_list[i].allowed) = 0;
                 } else {
                     accel_initialised = 1;