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=-15.1 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 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 50AABC433E6 for ; Thu, 25 Feb 2021 04:21:24 +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 62BF564EF1 for ; Thu, 25 Feb 2021 04:21:23 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 62BF564EF1 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:39298 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lF89S-0008RP-7p for qemu-devel@archiver.kernel.org; Wed, 24 Feb 2021 23:21:22 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:40202) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lF88B-0007Yy-Se for qemu-devel@nongnu.org; Wed, 24 Feb 2021 23:20:03 -0500 Received: from mail-pl1-x62e.google.com ([2607:f8b0:4864:20::62e]:45083) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lF889-0001Cl-6F for qemu-devel@nongnu.org; Wed, 24 Feb 2021 23:20:03 -0500 Received: by mail-pl1-x62e.google.com with SMTP id w18so2476192plc.12 for ; Wed, 24 Feb 2021 20:20:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=FBlPBSHTD3oDVy6UtSoo3pRjHBZ6f8ROVECONZ7l7cY=; b=UegsG8C3D/iKSzplKlyULqsxqDjlQzW8kOxrQsfcM/SSarDgxJz0y+NDqC4kq9UtxL eA+Z+Rak93GWgZpeUHVWP/sh2A8o1lcJrXTeBTNYB/mNu2sw6dN8fDiMzqB7wgTayIdH cezJbJqBZFPN3ex1o/RC7q9MLT4B0/U/ZUdUTZ1O89r8hMUJP0Ol10K4yH7rJBmZj/Gg DcdW26gbZQY7lwU8TxkTvVhHaL2XKTU+atNru2/SLIVsqSwzMw0+58jpB1GIiLwBEzIG 5+5x7KVAyoZgVzFasCtrBGM2NU519rZQUuUj2tl35lAleV0aoYQszjEwpZ+XmojGT54r zZvg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=FBlPBSHTD3oDVy6UtSoo3pRjHBZ6f8ROVECONZ7l7cY=; b=m0riROgaNcjfNWY+Z9XUg5V9iPfJTxKRroeQzWGKRUw8h/5FWPlu/LRMEG1wZRR4gV YS5fM8dMktdiLJabw1YESw+zZ5m3SD53uwcfOYyOCmOrLzgyQVBOM7N7SPk2/cdIj7mX WmWDqhtJTn5bzU6sS1f1M/u5atiiZ6u/UNk/fwrTOW5Y4sOPCT/9/nU9FwIPNzpi93OD cBjdYWyFSC1YmCIo30AtlduPtNRFOCeud1gZbPZt95q5FlQbAjvLvK+dXS2wD9uEcfAe ZsSopQDCyPJJA0sM+18RfKnRm311iUxqTBO68Fdlqi3Vnw3elc5xfAwa1I20aDUyEZNA JuiA== X-Gm-Message-State: AOAM531CFMrszK7TqKlHNh9qvyTvbxFztmTg8AI1owTKomiJwyS7WbHP DA8P/Sf10U/1hIKGD7zppeAVs1RssaTJ+A== X-Google-Smtp-Source: ABdhPJwpTGBIVMb7drHIU/XBxnTY9Ey/ejiLWcfGlKIAp48rDoV046G2ofWmx2i+GpLrPvZM4DjPmw== X-Received: by 2002:a17:90a:8405:: with SMTP id j5mr1322155pjn.152.1614226799479; Wed, 24 Feb 2021 20:19:59 -0800 (PST) Received: from [192.168.1.11] (174-21-84-25.tukw.qwest.net. [174.21.84.25]) by smtp.gmail.com with ESMTPSA id 6sm3944088pgv.70.2021.02.24.20.19.58 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 24 Feb 2021 20:19:59 -0800 (PST) Subject: Re: [PATCH v22 16/17] i386: gdbstub: only write CR0/CR2/CR3/EFER for SOFTMMU To: Claudio Fontana , Paolo Bonzini , =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= , Eduardo Habkost , Peter Maydell , =?UTF-8?Q?Alex_Benn=c3=a9e?= References: <20210224133428.14071-1-cfontana@suse.de> <20210224133428.14071-17-cfontana@suse.de> From: Richard Henderson Message-ID: Date: Wed, 24 Feb 2021 20:19:57 -0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 MIME-Version: 1.0 In-Reply-To: <20210224133428.14071-17-cfontana@suse.de> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Received-SPF: pass client-ip=2607:f8b0:4864:20::62e; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x62e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, NICE_REPLY_A=-0.001, RCVD_IN_DNSWL_NONE=-0.0001, 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 , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On 2/24/21 5:34 AM, Claudio Fontana wrote: > 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; It would be nice to do all these with rather less ifdefs. And let's correctly use !CONFIG_USER_ONLY. Without adding more stubs, may I suggest a new helper: static target_ulong read_long_cs64(env, buf, len) { #ifdef TARGET_X86_64 if (env->hflags & HF_CS64_MASK) { *len = 8; return ldq_p(buf); } #endif *len = 4; return ldl_p(buf); } which, even by itself allows some cleanup in this function. Then: case IDX_CTL_CR2_REG: tmp = read_long_cs64(env, mem_buf, &len); #ifndef CONFIG_USER_ONLY env->cr[2] = tmp; #endif return len; which still has one ifdef, but not 2. r~