From patchwork Fri Mar 15 09:57:40 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Cornelia Huck X-Patchwork-Id: 227944 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id D9A932C00E4 for ; Fri, 15 Mar 2013 20:58:05 +1100 (EST) Received: from localhost ([::1]:42103 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UGROm-0000yk-4s for incoming@patchwork.ozlabs.org; Fri, 15 Mar 2013 05:58:04 -0400 Received: from eggs.gnu.org ([208.118.235.92]:48072) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UGROW-0000yT-E9 for qemu-devel@nongnu.org; Fri, 15 Mar 2013 05:57:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UGROV-0001ig-6e for qemu-devel@nongnu.org; Fri, 15 Mar 2013 05:57:48 -0400 Received: from e06smtp13.uk.ibm.com ([195.75.94.109]:43101) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UGROU-0001hz-VG for qemu-devel@nongnu.org; Fri, 15 Mar 2013 05:57:47 -0400 Received: from /spool/local by e06smtp13.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 15 Mar 2013 09:55:38 -0000 Received: from d06dlp03.portsmouth.uk.ibm.com (9.149.20.15) by e06smtp13.uk.ibm.com (192.168.101.143) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Fri, 15 Mar 2013 09:55:36 -0000 Received: from b06cxnps4075.portsmouth.uk.ibm.com (d06relay12.portsmouth.uk.ibm.com [9.149.109.197]) by d06dlp03.portsmouth.uk.ibm.com (Postfix) with ESMTP id 450681B08067 for ; Fri, 15 Mar 2013 09:57:41 +0000 (GMT) Received: from d06av07.portsmouth.uk.ibm.com (d06av07.portsmouth.uk.ibm.com [9.149.37.248]) by b06cxnps4075.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r2F9vVZX48300272 for ; Fri, 15 Mar 2013 09:57:31 GMT Received: from d06av07.portsmouth.uk.ibm.com (d06av07.portsmouth.uk.ibm.com [127.0.0.1]) by d06av07.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id r2F8ndFP019062 for ; Fri, 15 Mar 2013 04:49:39 -0400 Received: from tuxmaker.boeblingen.de.ibm.com (tuxmaker.boeblingen.de.ibm.com [9.152.85.9]) by d06av07.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id r2F8ncUC019048; Fri, 15 Mar 2013 04:49:38 -0400 From: Cornelia Huck To: =?UTF-8?q?Andreas=20F=C3=A4rber?= , Alexander Graf Date: Fri, 15 Mar 2013 10:57:40 +0100 Message-Id: <1363341460-51903-1-git-send-email-cornelia.huck@de.ibm.com> X-Mailer: git-send-email 1.7.12.4 MIME-Version: 1.0 X-TM-AS-MML: No X-Content-Scanned: Fidelis XPS MAILER x-cbid: 13031509-2966-0000-0000-00000702B4DB X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 195.75.94.109 Cc: qemu-devel Subject: [Qemu-devel] [PATCH] s390: Fix cpu refactoring fallout. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Commit 259186a7 "cpu: Move halted and interrupt_request fields to CPUState" seems to have missed one instance in target-s390x/kvm.c: /home/cohuck/git/qemu/target-s390x/kvm.c: In function ‘kvm_arch_process_async_events’: /home/cohuck/git/qemu/target-s390x/kvm.c:319: error: ‘CPUS390XState’ has no member named ‘halted’ /home/cohuck/git/qemu/target-s390x/kvm.c:320: warning: control reaches end of non-void function make[1]: *** [target-s390x/kvm.o] Error 1 Let's just switch to cs->halted. Signed-off-by: Cornelia Huck Acked-by: Alexander Graf Acked-by: Andreas Färber --- target-s390x/kvm.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/target-s390x/kvm.c b/target-s390x/kvm.c index 8f111ae..644f484 100644 --- a/target-s390x/kvm.c +++ b/target-s390x/kvm.c @@ -315,8 +315,7 @@ void kvm_arch_post_run(CPUState *cpu, struct kvm_run *run) int kvm_arch_process_async_events(CPUState *cs) { - S390CPU *cpu = S390_CPU(cs); - return cpu->env.halted; + return cs->halted; } void kvm_s390_interrupt_internal(S390CPU *cpu, int type, uint32_t parm,