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: 571931 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 p1HL1FHc013484 for ; Thu, 17 Feb 2011 21:01:16 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758001Ab1BQVBM (ORCPT ); Thu, 17 Feb 2011 16:01:12 -0500 Received: from fmmailgate01.web.de ([217.72.192.221]:53333 "EHLO fmmailgate01.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751781Ab1BQVBL (ORCPT ); Thu, 17 Feb 2011 16:01:11 -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 CC: kvm@vger.kernel.org, qemu-devel@nongnu.org, Alexander Graf Subject: [PATCH] kvm: ppc: Fix breakage of kvm_arch_pre_run/process_irqchip_events 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= 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, 17 Feb 2011 21:01:16 +0000 (UTC) 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)