From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LupsH-0002f9-52 for qemu-devel@nongnu.org; Fri, 17 Apr 2009 11:21:05 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LupsB-0002ZZ-3t for qemu-devel@nongnu.org; Fri, 17 Apr 2009 11:21:03 -0400 Received: from [199.232.76.173] (port=45864 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LupsA-0002Z8-By for qemu-devel@nongnu.org; Fri, 17 Apr 2009 11:20:58 -0400 Received: from mx2.redhat.com ([66.187.237.31]:41043) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Lups9-0005jf-Hk for qemu-devel@nongnu.org; Fri, 17 Apr 2009 11:20:57 -0400 From: Glauber Costa Date: Fri, 17 Apr 2009 11:20:47 -0400 Message-Id: <1239981649-6366-5-git-send-email-glommer@redhat.com> In-Reply-To: <1239981649-6366-4-git-send-email-glommer@redhat.com> References: <1239981649-6366-1-git-send-email-glommer@redhat.com> <1239981649-6366-2-git-send-email-glommer@redhat.com> <1239981649-6366-3-git-send-email-glommer@redhat.com> <1239981649-6366-4-git-send-email-glommer@redhat.com> Subject: [Qemu-devel] [PATCH 4/6] disallow kqemu if we fail to load it. Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: jan.kiszka@siemens.com, aliguori@us.ibm.com Since we're not retrying it anyway, set kqemu_allowed = 0 if we fail to load it. It will allow us to test for kqemu runtime presence where we don't have an env pointer, possibly because we don't have a cpu yet. The monitor code is such an example. Signed-off-by: Glauber Costa --- kqemu.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/kqemu.c b/kqemu.c index 040e817..e0e0499 100644 --- a/kqemu.c +++ b/kqemu.c @@ -179,14 +179,14 @@ int kqemu_init(CPUState *env) if (kqemu_fd == KQEMU_INVALID_FD) { fprintf(stderr, "Could not open '%s' - QEMU acceleration layer not activated: %lu\n", KQEMU_DEVICE, GetLastError()); - return -1; + goto out; } #else kqemu_fd = open(KQEMU_DEVICE, O_RDWR); if (kqemu_fd == KQEMU_INVALID_FD) { fprintf(stderr, "Could not open '%s' - QEMU acceleration layer not activated: %s\n", KQEMU_DEVICE, strerror(errno)); - return -1; + goto out; } #endif version = 0; @@ -239,6 +239,8 @@ int kqemu_init(CPUState *env) fail: kqemu_closefd(kqemu_fd); kqemu_fd = KQEMU_INVALID_FD; + out: + kqemu_allowed = 0; return -1; } kqemu_update_cpuid(env); -- 1.5.6.6