From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.7 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0D622C433DB for ; Wed, 24 Feb 2021 14:04:14 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 661BA601FB for ; Wed, 24 Feb 2021 14:04:13 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 661BA601FB Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=suse.de Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:41484 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lEulw-0007md-Dx for qemu-devel@archiver.kernel.org; Wed, 24 Feb 2021 09:04:12 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:53718) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lEuJc-0004qr-EG for qemu-devel@nongnu.org; Wed, 24 Feb 2021 08:34:56 -0500 Received: from mx2.suse.de ([195.135.220.15]:43038) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lEuJV-0005EE-RL for qemu-devel@nongnu.org; Wed, 24 Feb 2021 08:34:56 -0500 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 3E7BEAEB3; Wed, 24 Feb 2021 13:34:36 +0000 (UTC) From: Claudio Fontana To: Paolo Bonzini , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Eduardo Habkost , Peter Maydell , =?UTF-8?q?Alex=20Benn=C3=A9e?= Subject: [PATCH v22 16/17] i386: gdbstub: only write CR0/CR2/CR3/EFER for SOFTMMU Date: Wed, 24 Feb 2021 14:34:27 +0100 Message-Id: <20210224133428.14071-17-cfontana@suse.de> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210224133428.14071-1-cfontana@suse.de> References: <20210224133428.14071-1-cfontana@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=195.135.220.15; envelope-from=cfontana@suse.de; helo=mx2.suse.de X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier , Thomas Huth , Roman Bolshakov , Claudio Fontana , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Claudio Fontana Cc: Paolo Bonzini --- target/i386/gdbstub.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/target/i386/gdbstub.c b/target/i386/gdbstub.c index 41e265fc67..9f505d6ee3 100644 --- a/target/i386/gdbstub.c +++ b/target/i386/gdbstub.c @@ -383,26 +383,38 @@ int x86_cpu_gdb_write_register(CPUState *cs, uint8_t *mem_buf, int n) case IDX_CTL_CR0_REG: if (env->hflags & HF_CS64_MASK) { +#ifdef CONFIG_SOFTMMU cpu_x86_update_cr0(env, ldq_p(mem_buf)); +#endif return 8; } +#ifdef CONFIG_SOFTMMU cpu_x86_update_cr0(env, ldl_p(mem_buf)); +#endif return 4; case IDX_CTL_CR2_REG: if (env->hflags & HF_CS64_MASK) { +#ifdef CONFIG_SOFTMMU env->cr[2] = ldq_p(mem_buf); +#endif return 8; } +#ifdef CONFIG_SOFTMMU env->cr[2] = ldl_p(mem_buf); +#endif return 4; case IDX_CTL_CR3_REG: if (env->hflags & HF_CS64_MASK) { +#ifdef CONFIG_SOFTMMU cpu_x86_update_cr3(env, ldq_p(mem_buf)); +#endif return 8; } +#ifdef CONFIG_SOFTMMU cpu_x86_update_cr3(env, ldl_p(mem_buf)); +#endif return 4; case IDX_CTL_CR4_REG: @@ -427,10 +439,14 @@ int x86_cpu_gdb_write_register(CPUState *cs, uint8_t *mem_buf, int n) case IDX_CTL_EFER_REG: if (env->hflags & HF_CS64_MASK) { +#ifdef CONFIG_SOFTMMU cpu_load_efer(env, ldq_p(mem_buf)); +#endif return 8; } +#ifdef CONFIG_SOFTMMU cpu_load_efer(env, ldl_p(mem_buf)); +#endif return 4; } -- 2.26.2