From patchwork Wed Dec 18 13:27:36 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Graf X-Patchwork-Id: 302888 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 7EC1E2C00B2 for ; Thu, 19 Dec 2013 00:29:58 +1100 (EST) Received: from localhost ([::1]:38791 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VtHCF-00047R-G9 for incoming@patchwork.ozlabs.org; Wed, 18 Dec 2013 08:29:55 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34992) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VtHAG-000146-NP for qemu-devel@nongnu.org; Wed, 18 Dec 2013 08:27:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VtHA8-0002uE-I7 for qemu-devel@nongnu.org; Wed, 18 Dec 2013 08:27:52 -0500 Received: from cantor2.suse.de ([195.135.220.15]:36105 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VtHA8-0002tk-Bn for qemu-devel@nongnu.org; Wed, 18 Dec 2013 08:27:44 -0500 Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id F2356AC29; Wed, 18 Dec 2013 13:27:43 +0000 (UTC) From: Alexander Graf To: QEMU Developers Date: Wed, 18 Dec 2013 14:27:36 +0100 Message-Id: <1387373261-26398-4-git-send-email-agraf@suse.de> X-Mailer: git-send-email 1.7.12.4 In-Reply-To: <1387373261-26398-1-git-send-email-agraf@suse.de> References: <1387373261-26398-1-git-send-email-agraf@suse.de> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 195.135.220.15 Cc: Blue Swirl , Jens Freimann , Aurelien Jarno , Anthony Liguori , Thomas Huth Subject: [Qemu-devel] [PULL 3/8] s390x/kvm: Removed s390_store_status stub 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 From: Thomas Huth The SIGP order STORE STATUS AT ADDRESS will be handled in kernel space, so we do not need the stub in QEMU anymore. Signed-off-by: Thomas Huth Reviewed-by: Cornelia Huck Signed-off-by: Jens Freimann Signed-off-by: Alexander Graf --- target-s390x/kvm.c | 22 ---------------------- 1 files changed, 0 insertions(+), 22 deletions(-) diff --git a/target-s390x/kvm.c b/target-s390x/kvm.c index 52d93a7..5b243b4 100644 --- a/target-s390x/kvm.c +++ b/target-s390x/kvm.c @@ -597,13 +597,6 @@ int kvm_s390_cpu_restart(S390CPU *cpu) return 0; } -static int s390_store_status(CPUS390XState *env, uint32_t parameter) -{ - /* XXX */ - fprintf(stderr, "XXX SIGP store status\n"); - return -1; -} - static int s390_cpu_initial_reset(S390CPU *cpu) { CPUState *cs = CPU(cpu); @@ -629,12 +622,9 @@ static int handle_sigp(S390CPU *cpu, struct kvm_run *run, uint8_t ipa1) { CPUS390XState *env = &cpu->env; uint8_t order_code; - uint32_t parameter; uint16_t cpu_addr; - uint8_t t; int r = -1; S390CPU *target_cpu; - CPUS390XState *target_env; cpu_synchronize_state(CPU(cpu)); @@ -645,28 +635,16 @@ static int handle_sigp(S390CPU *cpu, struct kvm_run *run, uint8_t ipa1) } order_code += (run->s390_sieic.ipb & 0x0fff0000) >> 16; - /* get parameters */ - t = (ipa1 & 0xf0) >> 4; - if (!(t % 2)) { - t++; - } - - parameter = env->regs[t] & 0x7ffffe00; cpu_addr = env->regs[ipa1 & 0x0f]; - target_cpu = s390_cpu_addr2state(cpu_addr); if (target_cpu == NULL) { goto out; } - target_env = &target_cpu->env; switch (order_code) { case SIGP_RESTART: r = kvm_s390_cpu_restart(target_cpu); break; - case SIGP_STORE_STATUS_ADDR: - r = s390_store_status(target_env, parameter); - break; case SIGP_SET_ARCH: /* make the caller panic */ return -1;