From nobody Wed Nov 27 11:44:29 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1699268957; cv=none; d=zohomail.com; s=zohoarc; b=A1zGDg+4QLbFWr99URVvzbKi8Wk/SAHmQqTFpiSGhnF0zEhCvOl89QrEKM8rYeIFEhW2fVRDlwPiCnjqi2UtALfv/ZuwrhSPM4zeBT685zl0XBEvwOeD1RCM/l+q+FTunnbr/MiqrLjb0kLmCDmB/JoaBk/N+xBL7av59LAmUH4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1699268957; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=fVCnzhVZzYM83NLjfDBn8N7f5t+G1396ppAvAy7GW2E=; b=RrZpNSWU97X0C7KQ0EERuJgYDXFxVkpD1zoG6V5aYT7XKQKddf5TzELPxAvVgWRqpf6yA3Mebfj8MLizzmQ2HZI39i6NbBJpe0EDsi79lkID6b5nftj/z/G36EGOWb0MSbSDfSLUqf76GgP6jAlsGbDLWO+RxNFLk7xcpD72jDA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1699268957560796.9146052114686; Mon, 6 Nov 2023 03:09:17 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qzxRu-0003ZW-Oy; Mon, 06 Nov 2023 06:07:18 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qzxRf-0002wC-Ta for qemu-devel@nongnu.org; Mon, 06 Nov 2023 06:07:04 -0500 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qzxRT-0004X1-Fl for qemu-devel@nongnu.org; Mon, 06 Nov 2023 06:07:03 -0500 Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-4079ed65582so32865385e9.1 for ; Mon, 06 Nov 2023 03:06:47 -0800 (PST) Received: from m1x-phil.lan (176-131-220-199.abo.bbox.fr. [176.131.220.199]) by smtp.gmail.com with ESMTPSA id n3-20020a05600c4f8300b004064288597bsm11904145wmq.30.2023.11.06.03.06.44 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 06 Nov 2023 03:06:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1699268806; x=1699873606; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=fVCnzhVZzYM83NLjfDBn8N7f5t+G1396ppAvAy7GW2E=; b=fvxWGOkBCuMWElPxE3gI9ceYPz6TEi31TOWPl2wVWF5UiY5aVqSpA5nCegYpyOxSe5 XEGDuE9wlR5g/Q2fnDTXr1eNifaGfxmI44EUjfpl0CjyMlSq/P51mqb0uns3iBw1QYya 3uDDEUPHOG5gYLr+lvjwfVlR43d+AZt2b0+eolk97cvWjePRcm72DpN8zK6EmcwpNUZF bPyQkr3giobvQ/8eUi7jsw9dYijWRm/gjywhIsDA8a3fvttJ2xJkz6gWVeih//wItInS gF1TqCOP7yEPLudBlB2w4HbN1hTwWAmxLQiJ+HCr47mLtvZl0yEZ/DpjVaMsK+F89l41 +DxA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699268806; x=1699873606; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=fVCnzhVZzYM83NLjfDBn8N7f5t+G1396ppAvAy7GW2E=; b=UDIjukn/iaG+fawcpbIWf0uUKmtEbG2pJEVPq+KVB4aheFSHfF65ydwgF8WinfBGos lvyLF5L/2AJYg3HqHN5tak3zxV53wl8fu3Ae4bF9XZfgu/CJnZawHCHsuIY6bsek9cFa DDl+20ogt/F71ABlVuZTeIXL6XH669keqlUoxPYIY8uxrbCe2HwCiPK7DshPzql5vbzq kjNSHzx77ENuyv4h7n1+JZAt4wiNIlHDKCKZkS1wkvD4paKCoendHMgCIMERkosO1vx0 ZLqgN8Z3SsMNzpUXreqil2hn6uxhaWgVLwXo6jX93mOA+RptxI7hLSf6mFe7+tQQGsZR MKyA== X-Gm-Message-State: AOJu0Yx96mo6RWbrewJ0G/LkhLv6wluJWR8qUy0z2/ygDdLB5a+/eDtf 07VcXVg5lwB1NqEUXQf3oKsj0xr2JAHu8VQNncs= X-Google-Smtp-Source: AGHT+IEuDTQrO8cfHoeslXtrcco5KNUpzx8izu/DwKSeIwxrOOJugEKrgSkn8Nrwlb1DSs8x9XejMQ== X-Received: by 2002:a05:600c:1d0e:b0:402:8896:bb7b with SMTP id l14-20020a05600c1d0e00b004028896bb7bmr22306462wms.6.1699268806095; Mon, 06 Nov 2023 03:06:46 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: kvm@vger.kernel.org, qemu-s390x@nongnu.org, qemu-block@nongnu.org, qemu-riscv@nongnu.org, qemu-ppc@nongnu.org, qemu-arm@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Zhao Liu , Cameron Esfahani , Roman Bolshakov Subject: [PULL 27/60] target/i386/hvf: Rename 'X86CPU *x86_cpu' variable as 'cpu' Date: Mon, 6 Nov 2023 12:02:59 +0100 Message-ID: <20231106110336.358-28-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231106110336.358-1-philmd@linaro.org> References: <20231106110336.358-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::334; envelope-from=philmd@linaro.org; helo=mail-wm1-x334.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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1699268957806100001 Follow the naming used by other files in target/i386/. No functional changes. Suggested-by: Zhao Liu Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Zhao Liu Message-Id: <20231020111136.44401-4-philmd@linaro.org> --- target/i386/hvf/x86_emu.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/target/i386/hvf/x86_emu.c b/target/i386/hvf/x86_emu.c index 5b82e84778..3a3f0a50d0 100644 --- a/target/i386/hvf/x86_emu.c +++ b/target/i386/hvf/x86_emu.c @@ -665,7 +665,7 @@ static void exec_lods(CPUX86State *env, struct x86_deco= de *decode) =20 void simulate_rdmsr(CPUX86State *env) { - X86CPU *x86_cpu =3D env_archcpu(env); + X86CPU *cpu =3D env_archcpu(env); CPUState *cs =3D env_cpu(env); uint32_t msr =3D ECX(env); uint64_t val =3D 0; @@ -675,10 +675,10 @@ void simulate_rdmsr(CPUX86State *env) val =3D rdtscp() + rvmcs(cs->accel->fd, VMCS_TSC_OFFSET); break; case MSR_IA32_APICBASE: - val =3D cpu_get_apic_base(x86_cpu->apic_state); + val =3D cpu_get_apic_base(cpu->apic_state); break; case MSR_IA32_UCODE_REV: - val =3D x86_cpu->ucode_rev; + val =3D cpu->ucode_rev; break; case MSR_EFER: val =3D rvmcs(cs->accel->fd, VMCS_GUEST_IA32_EFER); @@ -766,7 +766,7 @@ static void exec_rdmsr(CPUX86State *env, struct x86_dec= ode *decode) =20 void simulate_wrmsr(CPUX86State *env) { - X86CPU *x86_cpu =3D env_archcpu(env); + X86CPU *cpu =3D env_archcpu(env); CPUState *cs =3D env_cpu(env); uint32_t msr =3D ECX(env); uint64_t data =3D ((uint64_t)EDX(env) << 32) | EAX(env); @@ -775,7 +775,7 @@ void simulate_wrmsr(CPUX86State *env) case MSR_IA32_TSC: break; case MSR_IA32_APICBASE: - cpu_set_apic_base(x86_cpu->apic_state, data); + cpu_set_apic_base(cpu->apic_state, data); break; case MSR_FSBASE: wvmcs(cs->accel->fd, VMCS_GUEST_FS_BASE, data); @@ -1419,8 +1419,8 @@ static void init_cmd_handler() =20 void load_regs(CPUState *cs) { - X86CPU *x86_cpu =3D X86_CPU(cs); - CPUX86State *env =3D &x86_cpu->env; + X86CPU *cpu =3D X86_CPU(cs); + CPUX86State *env =3D &cpu->env; =20 int i =3D 0; RRX(env, R_EAX) =3D rreg(cs->accel->fd, HV_X86_RAX); @@ -1442,8 +1442,8 @@ void load_regs(CPUState *cs) =20 void store_regs(CPUState *cs) { - X86CPU *x86_cpu =3D X86_CPU(cs); - CPUX86State *env =3D &x86_cpu->env; + X86CPU *cpu =3D X86_CPU(cs); + CPUX86State *env =3D &cpu->env; =20 int i =3D 0; wreg(cs->accel->fd, HV_X86_RAX, RAX(env)); --=20 2.41.0