[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 4/5] disallow kqemu if we fail to load it.
From: |
Glauber Costa |
Subject: |
[Qemu-devel] [PATCH v2 4/5] disallow kqemu if we fail to load it. |
Date: |
Fri, 17 Apr 2009 17:00:07 -0400 |
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 <address@hidden>
---
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