From patchwork Thu Feb 17 21:01:06 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 83486 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 EC698B716E for ; Fri, 18 Feb 2011 08:02:47 +1100 (EST) Received: from localhost ([127.0.0.1]:47888 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PqAzt-0007Kz-3M for incoming@patchwork.ozlabs.org; Thu, 17 Feb 2011 16:02:45 -0500 Received: from [140.186.70.92] (port=54006 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PqAyQ-0006Y6-GP for qemu-devel@nongnu.org; Thu, 17 Feb 2011 16:01:16 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PqAyO-0006PV-43 for qemu-devel@nongnu.org; Thu, 17 Feb 2011 16:01:13 -0500 Received: from fmmailgate01.web.de ([217.72.192.221]:53335) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PqAyN-0006PJ-NU for qemu-devel@nongnu.org; Thu, 17 Feb 2011 16:01:12 -0500 Received: from smtp07.web.de ( [172.20.5.215]) by fmmailgate01.web.de (Postfix) with ESMTP id 1589D189048E8; Thu, 17 Feb 2011 22:01:10 +0100 (CET) Received: from [88.65.40.244] (helo=mchn199C.mchp.siemens.de) by smtp07.web.de with asmtp (TLSv1:AES256-SHA:256) (WEB.DE 4.110 #2) id 1PqAyL-0002s6-00; Thu, 17 Feb 2011 22:01:10 +0100 Message-ID: <4D5D8C92.1080901@web.de> Date: Thu, 17 Feb 2011 22:01:06 +0100 From: Jan Kiszka User-Agent: Mozilla/5.0 (X11; U; Linux i686 (x86_64); de; rv:1.8.1.12) Gecko/20080226 SUSE/2.0.0.12-1.1 Thunderbird/2.0.0.12 Mnenhy/0.7.5.666 MIME-Version: 1.0 To: Avi Kivity , Marcelo Tosatti References: <1407f55f19dd8f193ee33495014fd2985ec7a88c.1297077507.git.jan.kiszka@siemens.com> In-Reply-To: <1407f55f19dd8f193ee33495014fd2985ec7a88c.1297077507.git.jan.kiszka@siemens.com> X-Enigmail-Version: 1.1.2 X-Sender: jan.kiszka@web.de X-Provags-ID: V01U2FsdGVkX18oSx835GxFVkh5pG15Qc4OW2PyDMKyqK7oR/Qc gkbPHOr91RV3TjQlt7VWzJ5n4L6FpALouVMxn1MAOUZtYiUNui C1Cpv+Sco= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4-2.6 X-Received-From: 217.72.192.221 Cc: qemu-devel@nongnu.org, kvm@vger.kernel.org, Alexander Graf Subject: [Qemu-devel] [PATCH] kvm: ppc: Fix breakage of kvm_arch_pre_run/process_irqchip_events 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 On 2011-02-07 12:19, Jan Kiszka wrote: > We do not check them, and the only arch with non-empty implementations > always returns 0 (this is also true for qemu-kvm). > > Signed-off-by: Jan Kiszka > CC: Alexander Graf > --- > kvm.h | 5 ++--- > target-i386/kvm.c | 8 ++------ > target-ppc/kvm.c | 6 ++---- > target-s390x/kvm.c | 6 ++---- > 4 files changed, 8 insertions(+), 17 deletions(-) > ... > diff --git a/target-ppc/kvm.c b/target-ppc/kvm.c > index 93ecc57..bd4012a 100644 > --- a/target-ppc/kvm.c > +++ b/target-ppc/kvm.c > @@ -256,14 +256,12 @@ int kvm_arch_pre_run(CPUState *env, struct kvm_run *run) > return 0; > } > > -int kvm_arch_post_run(CPUState *env, struct kvm_run *run) > +void kvm_arch_post_run(CPUState *env, struct kvm_run *run) > { > - return 0; > } > > -int kvm_arch_process_irqchip_events(CPUState *env) > +void kvm_arch_process_irqchip_events(CPUState *env) > { > - return 0; > } Oops. Do we already have a built-bot for KVM-enabled PPC (and s390) targets somewhere? Jan -------8<---------- From: Jan Kiszka Commit 7a39fe5882 failed to convert the right arch function. Signed-off-by: Jan Kiszka --- target-ppc/kvm.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/target-ppc/kvm.c b/target-ppc/kvm.c index bd4012a..3924f4b 100644 --- a/target-ppc/kvm.c +++ b/target-ppc/kvm.c @@ -222,7 +222,7 @@ int kvmppc_set_interrupt(CPUState *env, int irq, int level) #define PPC_INPUT_INT PPC6xx_INPUT_INT #endif -int kvm_arch_pre_run(CPUState *env, struct kvm_run *run) +void kvm_arch_pre_run(CPUState *env, struct kvm_run *run) { int r; unsigned irq; @@ -253,15 +253,15 @@ int kvm_arch_pre_run(CPUState *env, struct kvm_run *run) /* We don't know if there are more interrupts pending after this. However, * the guest will return to userspace in the course of handling this one * anyways, so we will get a chance to deliver the rest. */ - return 0; } void kvm_arch_post_run(CPUState *env, struct kvm_run *run) { } -void kvm_arch_process_irqchip_events(CPUState *env) +int kvm_arch_process_irqchip_events(CPUState *env) { + return 0; } static int kvmppc_handle_halt(CPUState *env)