From mboxrd@z Thu Jan 1 00:00:00 1970 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 Message-ID: <4D5D8C92.1080901@web.de> Date: Thu, 17 Feb 2011 22:01:06 +0100 From: Jan Kiszka MIME-Version: 1.0 References: <1407f55f19dd8f193ee33495014fd2985ec7a88c.1297077507.git.jan.kiszka@siemens.com> In-Reply-To: <1407f55f19dd8f193ee33495014fd2985ec7a88c.1297077507.git.jan.kiszka@siemens.com> Content-Type: text/plain; charset=ISO-8859-15 Sender: jan.kiszka@web.de Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH] kvm: ppc: Fix breakage of kvm_arch_pre_run/process_irqchip_events List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Avi Kivity , Marcelo Tosatti Cc: qemu-devel@nongnu.org, kvm@vger.kernel.org, Alexander Graf 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). >=20 > 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(-) >=20 ... > 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_ru= n *run) > return 0; > } > =20 > -int kvm_arch_post_run(CPUState *env, struct kvm_run *run) > +void kvm_arch_post_run(CPUState *env, struct kvm_run *run) > { > - return 0; > } > =20 > -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 =20 -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. Ho= wever, * 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; } =20 void kvm_arch_post_run(CPUState *env, struct kvm_run *run) { } =20 -void kvm_arch_process_irqchip_events(CPUState *env) +int kvm_arch_process_irqchip_events(CPUState *env) { + return 0; } =20 static int kvmppc_handle_halt(CPUState *env)