From patchwork Fri Apr 2 17:05:19 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 49315 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 375E3B7CF7 for ; Sat, 3 Apr 2010 04:07:44 +1100 (EST) Received: from localhost ([127.0.0.1]:56443 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NxkLN-0004kf-0y for incoming@patchwork.ozlabs.org; Fri, 02 Apr 2010 13:07:41 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NxkJG-0001tJ-Ok for qemu-devel@nongnu.org; Fri, 02 Apr 2010 13:05:30 -0400 Received: from [140.186.70.92] (port=56047 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NxkJE-0001r0-Kv for qemu-devel@nongnu.org; Fri, 02 Apr 2010 13:05:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1NxkJC-00018V-Es for qemu-devel@nongnu.org; Fri, 02 Apr 2010 13:05:28 -0400 Received: from mail-ew0-f227.google.com ([209.85.219.227]:50498) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1NxkJC-00018J-7A for qemu-devel@nongnu.org; Fri, 02 Apr 2010 13:05:26 -0400 Received: by ewy27 with SMTP id 27so638470ewy.10 for ; Fri, 02 Apr 2010 10:05:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:sender:from:to:cc:subject :date:message-id:x-mailer:in-reply-to:references; bh=SqW1QX06sc6bUru+gCzUmWmzCPpP1XtdrkW9LEjdkyA=; b=rQWk1GtJcSHcw+/3+LADBadCVtsexX7SHsJw7RXMXDu5iPkYX+ZaEqrMcXu0+pBRln YUu8ShCSS796OYVzoUtewfWX5UMg7jDMdhcpadXKJDlS5Fi81qfHFmT+ofmHoy7H8/Iq 3VsJ66gSOi+H/IdviDWCP3OOFYiNk+ex3gVRA= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; b=RUSqK6X7UCAue+3HvFgbgP9pLrY26ubZa5H6GqSQXV4sNyX9fMbZx4en6NzkD4/H22 lM2d/hGQNHxbn54eUrHp6PorN8PQmc5eOodfQzUuF8NMDdotgJXYrICh2HjgSg0MFTcy 3WYA0R+QjBpKA1IxeaOHxMcnYY/ayTOrGsEwk= Received: by 10.213.54.144 with SMTP id q16mr1359398ebg.68.1270227924831; Fri, 02 Apr 2010 10:05:24 -0700 (PDT) Received: from localhost.localdomain (93-34-197-68.ip51.fastwebnet.it [93.34.197.68]) by mx.google.com with ESMTPS id 15sm5054738ewy.4.2010.04.02.10.05.24 (version=TLSv1/SSLv3 cipher=RC4-MD5); Fri, 02 Apr 2010 10:05:24 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 2 Apr 2010 19:05:19 +0200 Message-Id: <1270227919-31031-1-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.6.6.1 In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) Cc: Blue Swirl Subject: [Qemu-devel] [PATCH] provide a stub version of kvm-all.c if !CONFIG_KVM X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 --- What about this instead? I don't like that kvm-stub.c is compiled per-target too, but it's basically impossible to change this without major changes to the build system. Makefile.target | 2 + kvm-all.c | 6 ++- kvm-stub.c | 135 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ kvm.h | 13 +---- vl.c | 16 +++---- 5 files changed, 151 insertions(+), 21 deletions(-) create mode 100644 kvm-stub.c diff --git a/Makefile.target b/Makefile.target index 167fc8d..c504617 100644 --- a/Makefile.target +++ b/Makefile.target @@ -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 @@ -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) diff --git a/kvm-all.c b/kvm-all.c index 7aa5e57..373fd34 100644 --- a/kvm-all.c +++ b/kvm-all.c @@ -1157,9 +1157,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 +1176,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 +} diff --git a/kvm-stub.c b/kvm-stub.c new file mode 100644 index 0000000..80bb908 --- /dev/null +++ b/kvm-stub.c @@ -0,0 +1,135 @@ +/* + * QEMU KVM stub + * + * Copyright Red Hat, Inc. 2010 + * + * Author: Paolo Bonzini + * + * 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; +} diff --git a/kvm.h b/kvm.h index 1e5be27..ea3c97d 100644 --- a/kvm.h +++ b/kvm.h @@ -23,8 +23,9 @@ #include #endif -#ifdef CONFIG_KVM extern int kvm_allowed; + +#if defined CONFIG_KVM || !defined NEED_CPU_H #define kvm_enabled() (kvm_allowed) #else #define kvm_enabled() (0) @@ -167,15 +168,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 diff --git a/vl.c b/vl.c index 6768cf1..9fe4682 100644 --- a/vl.c +++ b/vl.c @@ -3235,10 +3235,6 @@ 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; break; case QEMU_OPTION_usb: @@ -3585,12 +3581,14 @@ int main(int argc, char **argv, char **envp) exit(1); } - if (kvm_enabled()) { - int ret; - - ret = kvm_init(smp_cpus); + if (kvm_allowed) { + int ret = kvm_init(smp_cpus); if (ret < 0) { - fprintf(stderr, "failed to initialize KVM\n"); + if (!kvm_available()) { + printf("KVM not supported for this target\n"); + } else { + fprintf(stderr, "failed to initialize KVM: %s\n", strerror(-ret)); + } exit(1); } }