From ecda8242df18748b73a68d3f39a89a2ac483af4d Mon Sep 17 00:00:00 2001
From: Paolo Bonzini <pbonzini@redhat.com>
Date: Fri, 2 Apr 2010 18:07:55 +0000
Subject: [PATCH] provide a stub version of kvm-all.c if !CONFIG_KVM
This allows limited use of kvm functions (which will return ENOSYS)
even in once-compiled modules. The patch also improves a bit the error
messages for KVM initialization.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
---
Makefile.objs | 2 +-
Makefile.target | 4 +-
kvm-all.c | 9 +++-
kvm-stub.c | 135 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
kvm.h | 15 +-----
sysemu.h | 1 +
vl.c | 13 ++----
7 files changed, 154 insertions(+), 25 deletions(-)
create mode 100644 kvm-stub.c
@@ -128,7 +128,7 @@ user-obj-y += cutils.o cache-utils.o
# libhw
hw-obj-y =
-hw-obj-y += loader.o
+hw-obj-y += vl.o loader.o
hw-obj-y += virtio.o virtio-console.o
hw-obj-y += fw_cfg.o pci.o pci_host.o pcie_host.o
hw-obj-y += watchdog.o
@@ -1,6 +1,7 @@
# -*- Mode: makefile -*-
GENERATED_HEADERS = config-target.h
+CONFIG_NO_KVM = $(if $(subst n,,$(CONFIG_KVM)),n,y)
include ../config-host.mak
include config-devices.mak
@@ -161,7 +162,7 @@ endif #CONFIG_BSD_USER
# System emulator target
ifdef CONFIG_SOFTMMU
-obj-y = arch_init.o cpus.o monitor.o machine.o gdbstub.o vl.o
+obj-y = arch_init.o cpus.o monitor.o machine.o gdbstub.o
# virtio has to be here due to weird dependency between PCI and virtio-net.
# need to fix this properly
obj-y += virtio-blk.o virtio-balloon.o virtio-net.o virtio-pci.o virtio-serial-bus.o
@@ -170,6 +171,7 @@ obj-y += vhost_net.o
obj-$(CONFIG_VHOST_NET) += vhost.o
obj-y += rwhandler.o
obj-$(CONFIG_KVM) += kvm.o kvm-all.o
+obj-$(CONFIG_NO_KVM) += kvm-stub.o
LIBS+=-lz
QEMU_CFLAGS += $(VNC_TLS_CFLAGS)
@@ -51,6 +51,8 @@ typedef struct KVMSlot
typedef struct kvm_dirty_log KVMDirtyLog;
+int kvm_allowed = 0;
+
struct KVMState
{
KVMSlot slots[32];
@@ -670,6 +672,7 @@ int kvm_init(int smp_cpus)
kvm_state = s;
cpu_register_phys_memory_client(&kvm_cpu_phys_memory_client);
+ kvm_allowed = 1;
return 0;
@@ -1157,9 +1160,9 @@ int kvm_set_signal_mask(CPUState *env, const sigset_t *sigset)
return r;
}
-#ifdef KVM_IOEVENTFD
int kvm_set_ioeventfd_pio_word(int fd, uint16_t addr, uint16_t val, bool assign)
{
+#ifdef KVM_IOEVENTFD
struct kvm_ioeventfd kick = {
.datamatch = val,
.addr = addr,
@@ -1176,5 +1179,7 @@ int kvm_set_ioeventfd_pio_word(int fd, uint16_t addr, uint16_t val, bool assign)
if (r < 0)
return r;
return 0;
-}
+#else
+ return -ENOSYS;
#endif
+}
new file mode 100644
@@ -0,0 +1,135 @@
+/*
+ * QEMU KVM stub
+ *
+ * Copyright Red Hat, Inc. 2010
+ *
+ * Author: Paolo Bonzini <pbonzini@redhat.com>
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or later.
+ * See the COPYING file in the top-level directory.
+ *
+ */
+
+#include "qemu-common.h"
+#include "sysemu.h"
+#include "hw/hw.h"
+#include "gdbstub.h"
+#include "kvm.h"
+
+int kvm_irqchip_in_kernel(void)
+{
+ return 0;
+}
+
+int kvm_pit_in_kernel(void)
+{
+ return 0;
+}
+
+
+int kvm_init_vcpu(CPUState *env)
+{
+ return -ENOSYS;
+}
+
+int kvm_log_start(target_phys_addr_t phys_addr, ram_addr_t size)
+{
+ return -ENOSYS;
+}
+
+int kvm_log_stop(target_phys_addr_t phys_addr, ram_addr_t size)
+{
+ return -ENOSYS;
+}
+
+int kvm_coalesce_mmio_region(target_phys_addr_t start, ram_addr_t size)
+{
+ return -ENOSYS;
+}
+
+int kvm_uncoalesce_mmio_region(target_phys_addr_t start, ram_addr_t size)
+{
+ return -ENOSYS;
+}
+
+int kvm_check_extension(KVMState *s, unsigned int extension)
+{
+ return 0;
+}
+
+int kvm_init(int smp_cpus)
+{
+ return -ENOSYS;
+}
+
+void kvm_flush_coalesced_mmio_buffer(void)
+{
+}
+
+void kvm_cpu_synchronize_state(CPUState *env)
+{
+}
+
+void kvm_cpu_synchronize_post_reset(CPUState *env)
+{
+}
+
+void kvm_cpu_synchronize_post_init(CPUState *env)
+{
+}
+
+int kvm_cpu_exec(CPUState *env)
+{
+ abort ();
+}
+
+int kvm_has_sync_mmu(void)
+{
+ return 0;
+}
+
+int kvm_has_vcpu_events(void)
+{
+ return 0;
+}
+
+int kvm_has_robust_singlestep(void)
+{
+ return 0;
+}
+
+void kvm_setup_guest_memory(void *start, size_t size)
+{
+}
+
+int kvm_update_guest_debug(CPUState *env, unsigned long reinject_trap)
+{
+ tb_flush(env);
+ return 0;
+}
+
+int kvm_insert_breakpoint(CPUState *current_env, target_ulong addr,
+ target_ulong len, int type)
+{
+ return -EINVAL;
+}
+
+int kvm_remove_breakpoint(CPUState *current_env, target_ulong addr,
+ target_ulong len, int type)
+{
+ return -EINVAL;
+}
+
+void kvm_remove_all_breakpoints(CPUState *current_env)
+{
+}
+
+int kvm_set_signal_mask(CPUState *env, const sigset_t *sigset)
+{
+ abort();
+}
+
+int kvm_set_ioeventfd_pio_word(int fd, uint16_t addr, uint16_t val, bool assign)
+{
+ return -ENOSYS;
+}
@@ -23,8 +23,9 @@
#include <linux/kvm.h>
#endif
-#ifdef CONFIG_KVM
+#if defined CONFIG_KVM || !defined NEED_CPU_H
extern int kvm_allowed;
+
#define kvm_enabled() (kvm_allowed)
#else
#define kvm_enabled() (0)
@@ -34,8 +35,6 @@ struct kvm_run;
/* external API */
-int kvm_init(int smp_cpus);
-
#ifdef NEED_CPU_H
int kvm_init_vcpu(CPUState *env);
@@ -167,15 +166,7 @@ static inline void cpu_synchronize_post_init(CPUState *env)
}
}
-#if defined(KVM_IOEVENTFD) && defined(CONFIG_KVM)
-int kvm_set_ioeventfd_pio_word(int fd, uint16_t adr, uint16_t val, bool assign);
-#else
-static inline
-int kvm_set_ioeventfd_pio_word(int fd, uint16_t adr, uint16_t val, bool assign)
-{
- return -ENOSYS;
-}
#endif
-#endif
+int kvm_set_ioeventfd_pio_word(int fd, uint16_t adr, uint16_t val, bool assign);
#endif
@@ -243,4 +243,5 @@ void rtc_change_mon_event(struct tm *tm);
void register_devices(void);
+int kvm_init(int smp_cpus);
#endif
@@ -145,7 +145,6 @@ int main(int argc, char **argv)
#include "dma.h"
#include "audio/audio.h"
#include "migration.h"
-#include "kvm.h"
#include "balloon.h"
#include "qemu-option.h"
#include "qemu-config.h"
@@ -241,7 +240,6 @@ uint8_t qemu_uuid[16];
static QEMUBootSetHandler *boot_set_handler;
static void *boot_set_opaque;
-int kvm_allowed = 0;
uint32_t xen_domid;
enum xen_mode xen_mode = XEN_EMULATE;
@@ -2649,6 +2647,7 @@ int main(int argc, char **argv, char **envp)
#endif
int show_vnc_port = 0;
int defconfig = 1;
+ int enable_kvm = 0;
error_set_progname(argv[0]);
@@ -3235,11 +3234,7 @@ int main(int argc, char **argv, char **envp)
do_smbios_option(optarg);
break;
case QEMU_OPTION_enable_kvm:
- if (!(kvm_available())) {
- printf("Option %s not supported for this target\n", popt->name);
- exit(1);
- }
- kvm_allowed = 1;
+ enable_kvm = 1;
break;
case QEMU_OPTION_usb:
usb_enabled = 1;
@@ -3585,12 +3580,12 @@ int main(int argc, char **argv, char **envp)
exit(1);
}
- if (kvm_enabled()) {
+ if (enable_kvm) {
int ret;
ret = kvm_init(smp_cpus);
if (ret < 0) {
- fprintf(stderr, "failed to initialize KVM\n");
+ fprintf(stderr, "failed to initialize KVM: %s\n", strerror(-ret));
exit(1);
}
}
--
1.5.6.5