From patchwork Thu Jan 27 13:09:51 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 512071 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p0RDAaVr022788 for ; Thu, 27 Jan 2011 13:10:59 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753254Ab1A0NK3 (ORCPT ); Thu, 27 Jan 2011 08:10:29 -0500 Received: from david.siemens.de ([192.35.17.14]:19778 "EHLO david.siemens.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753002Ab1A0NK1 (ORCPT ); Thu, 27 Jan 2011 08:10:27 -0500 Received: from mail1.siemens.de (localhost [127.0.0.1]) by david.siemens.de (8.12.11.20060308/8.12.11) with ESMTP id p0RDABWs029852; Thu, 27 Jan 2011 14:10:11 +0100 Received: from mchn199C.mchp.siemens.de ([139.25.109.49]) by mail1.siemens.de (8.13.6/8.13.6) with ESMTP id p0RDA72r009974; Thu, 27 Jan 2011 14:10:11 +0100 From: Jan Kiszka To: Avi Kivity , Marcelo Tosatti Cc: kvm@vger.kernel.org, qemu-devel@nongnu.org Subject: [PATCH 07/22] kvm: Handle kvm_init_vcpu errors Date: Thu, 27 Jan 2011 14:09:51 +0100 Message-Id: <25813a6271888dd15033536ed2bd984b64b37b0b.1296133797.git.jan.kiszka@siemens.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: References: In-Reply-To: References: Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Thu, 27 Jan 2011 13:11:06 +0000 (UTC) diff --git a/cpus.c b/cpus.c index cd3f89b..f89826a 100644 --- a/cpus.c +++ b/cpus.c @@ -273,12 +273,18 @@ void qemu_main_loop_start(void) void qemu_init_vcpu(void *_env) { CPUState *env = _env; + int r; env->nr_cores = smp_cores; env->nr_threads = smp_threads; - if (kvm_enabled()) - kvm_init_vcpu(env); - return; + + if (kvm_enabled()) { + r = kvm_init_vcpu(env); + if (r < 0) { + fprintf(stderr, "kvm_init_vcpu failed: %s\n", strerror(-r)); + exit(1); + } + } } int qemu_cpu_self(void *env) @@ -603,11 +609,16 @@ static int qemu_cpu_exec(CPUState *env); static void *kvm_cpu_thread_fn(void *arg) { CPUState *env = arg; + int r; qemu_mutex_lock(&qemu_global_mutex); qemu_thread_self(env->thread); - kvm_init_vcpu(env); + r = kvm_init_vcpu(env); + if (r < 0) { + fprintf(stderr, "kvm_init_vcpu failed: %s\n", strerror(-r)); + exit(1); + } kvm_init_ipi(env);