From nobody Sun Feb 8 15:46:49 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.49 as permitted sender) client-ip=209.85.128.49; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f49.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.49 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1646571772; cv=none; d=zohomail.com; s=zohoarc; b=nbyKnxdCFyPjmxYUttC1bs2xeTnOGuDA5MEIOMvZIOy4f/F3qHlwih0X2RtyunPSiCcJL9CAIid5iAMq2xxY0pUQR9eL9/aitZbj3bX4ruU4y6Bpi4o63e8qOxDrGJ/vhnFnxU3VXpeFmMnvcxazW/wSMeWctl8YJSohtRHTt7M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1646571772; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=tu+dcsbHyVQvgi6pp/9x0jcimoaLaKVIamSRlZrE4n8=; b=AtewkAmHj+0bz3AWaFJZZT+lMVFDYz+O16lIne3xHxPYh8W7CaT+C+jp/q8d84xurcvUFgUKELgl/Sipe4SbRCsT/+uQljIvxNNnDxPy9KPj8eN1RFzGI0dhrzleueoP7PcEgY1PWIipiQuHfyj9Wy6pPdPWs61trDp+kwlp6aU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.49 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=pass header.from= (p=none dis=none) Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) by mx.zohomail.com with SMTPS id 1646571772565665.2174317838385; Sun, 6 Mar 2022 05:02:52 -0800 (PST) Received: by mail-wm1-f49.google.com with SMTP id m42-20020a05600c3b2a00b00382ab337e14so8611074wms.3 for ; Sun, 06 Mar 2022 05:02:51 -0800 (PST) Return-Path: Return-Path: Received: from nuc.lan ([185.126.107.38]) by smtp.gmail.com with ESMTPSA id o18-20020a05600c511200b00352ec3b4c5asm12522643wms.7.2022.03.06.05.02.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 06 Mar 2022 05:02:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=tu+dcsbHyVQvgi6pp/9x0jcimoaLaKVIamSRlZrE4n8=; b=gB8MWXjC1SrR0JlaCQGCHXCcBUGs2rWyuv3kGv6wOtkcqxzV96h8H5T1B/PYAnUOz0 Tfy5F0/HJaRyZUTxs4kEnNMf/aTLBtJY+zs1wLDPXnTZmzx2iBTwf43XUYrDwMquyrqX HH965PSo9TNPlksOkRdanjLhUglQzv7mK6ACKLbAtIBLbC5e2IM7EFx5q35G2LaszzPF NwbuyWfO9+s2k8P+1rsfZD/d0Zx8aQhM0bgyf8aTV5JbbbxxTN4UaNJtpOGe+h/7pMJX f6aYdKkk5PvMKyC8GwTbtD1np+Nps+CHAnR8KB6tplmb8vkjP3IBiZ/PF4zkoE3uR0xA Jjpg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=tu+dcsbHyVQvgi6pp/9x0jcimoaLaKVIamSRlZrE4n8=; b=Ds7EjhlzSz1UiH30aqbJ6qBfzIoiwrC2Yxg2u8RqqUCieXCTVi+60alyxq1lMlVlOP NLnsqSNaJTk88MfLUTcWIeF3Lv+q0nhvviKk/CrMvJGhHVVy9wHZhP+xMJzsYTXFZzZw kj1pLMV4j5XnHD4gYn6AI2FMOdiIhEqEABw9xJgjD8ejcoidRi17Ggn+qcwtTIE8KwM6 vhWOPrngHJV0zWsUqnJOwqKi8fhnGhaEjzWhAKNLicNI/7zGvJxYy7b6REscv3jTSXB2 E4tFethnFOfcCupOC/wBDMMNuZTan3ddN3wfA+058EUjgTcp1a93zmUbIXIcyYo2+6Ta +FLA== X-Gm-Message-State: AOAM532Ua8lVh2DQiZ/+oaaw4BShTDiAabPH4KxrmTEAvT7tq23r45vB O1d8sOqjQkXshK0CpTfJfp0= X-Google-Smtp-Source: ABdhPJzLyZKoDtosQ9RJ2uzn3XKJatNCS+WUwEvzzXZvRzmwosPm9xK6m8qlW2dFD3IbHel6mq9ULA== X-Received: by 2002:a7b:cd94:0:b0:380:b241:8c52 with SMTP id y20-20020a7bcd94000000b00380b2418c52mr14801281wmj.2.1646571770743; Sun, 06 Mar 2022 05:02:50 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Thomas Huth , Eduardo Habkost , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 32/33] target/i386: Remove pointless CPUArchState casts Date: Sun, 6 Mar 2022 13:59:59 +0100 Message-Id: <20220306130000.8104-33-philippe.mathieu.daude@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220306130000.8104-1-philippe.mathieu.daude@gmail.com> References: <20220306130000.8104-1-philippe.mathieu.daude@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1646571774779100001 From: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20220305233415.64627-3-philippe.mathieu.daude@gmail.com> --- target/i386/hax/hax-all.c | 4 ++-- target/i386/nvmm/nvmm-all.c | 14 +++++++------- target/i386/whpx/whpx-all.c | 18 +++++++++--------- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/target/i386/hax/hax-all.c b/target/i386/hax/hax-all.c index ccdcb6afabc..81f665e2124 100644 --- a/target/i386/hax/hax-all.c +++ b/target/i386/hax/hax-all.c @@ -222,7 +222,7 @@ int hax_init_vcpu(CPUState *cpu) =20 cpu->hax_vcpu =3D hax_global.vm->vcpus[cpu->cpu_index]; cpu->vcpu_dirty =3D true; - qemu_register_reset(hax_reset_vcpu_state, (CPUArchState *) (cpu->env_p= tr)); + qemu_register_reset(hax_reset_vcpu_state, cpu->env_ptr); =20 return ret; } @@ -669,7 +669,7 @@ void hax_cpu_synchronize_pre_loadvm(CPUState *cpu) =20 int hax_smp_cpu_exec(CPUState *cpu) { - CPUArchState *env =3D (CPUArchState *) (cpu->env_ptr); + CPUArchState *env =3D cpu->env_ptr; int fatal; int ret; =20 diff --git a/target/i386/nvmm/nvmm-all.c b/target/i386/nvmm/nvmm-all.c index e159dd2b939..b97d091a502 100644 --- a/target/i386/nvmm/nvmm-all.c +++ b/target/i386/nvmm/nvmm-all.c @@ -85,7 +85,7 @@ nvmm_set_segment(struct nvmm_x64_state_seg *nseg, const S= egmentCache *qseg) static void nvmm_set_registers(CPUState *cpu) { - CPUX86State *env =3D (CPUArchState *)cpu->env_ptr; + CPUX86State *env =3D cpu->env_ptr; struct nvmm_machine *mach =3D get_nvmm_mach(); struct qemu_vcpu *qcpu =3D get_qemu_vcpu(cpu); struct nvmm_vcpu *vcpu =3D &qcpu->vcpu; @@ -222,7 +222,7 @@ nvmm_get_segment(SegmentCache *qseg, const struct nvmm_= x64_state_seg *nseg) static void nvmm_get_registers(CPUState *cpu) { - CPUX86State *env =3D (CPUArchState *)cpu->env_ptr; + CPUX86State *env =3D cpu->env_ptr; struct nvmm_machine *mach =3D get_nvmm_mach(); struct qemu_vcpu *qcpu =3D get_qemu_vcpu(cpu); struct nvmm_vcpu *vcpu =3D &qcpu->vcpu; @@ -347,7 +347,7 @@ nvmm_get_registers(CPUState *cpu) static bool nvmm_can_take_int(CPUState *cpu) { - CPUX86State *env =3D (CPUArchState *)cpu->env_ptr; + CPUX86State *env =3D cpu->env_ptr; struct qemu_vcpu *qcpu =3D get_qemu_vcpu(cpu); struct nvmm_vcpu *vcpu =3D &qcpu->vcpu; struct nvmm_machine *mach =3D get_nvmm_mach(); @@ -394,7 +394,7 @@ nvmm_can_take_nmi(CPUState *cpu) static void nvmm_vcpu_pre_run(CPUState *cpu) { - CPUX86State *env =3D (CPUArchState *)cpu->env_ptr; + CPUX86State *env =3D cpu->env_ptr; struct nvmm_machine *mach =3D get_nvmm_mach(); struct qemu_vcpu *qcpu =3D get_qemu_vcpu(cpu); struct nvmm_vcpu *vcpu =3D &qcpu->vcpu; @@ -480,7 +480,7 @@ static void nvmm_vcpu_post_run(CPUState *cpu, struct nvmm_vcpu_exit *exit) { struct qemu_vcpu *qcpu =3D get_qemu_vcpu(cpu); - CPUX86State *env =3D (CPUArchState *)cpu->env_ptr; + CPUX86State *env =3D cpu->env_ptr; X86CPU *x86_cpu =3D X86_CPU(cpu); uint64_t tpr; =20 @@ -652,7 +652,7 @@ static int nvmm_handle_halted(struct nvmm_machine *mach, CPUState *cpu, struct nvmm_vcpu_exit *exit) { - CPUX86State *env =3D (CPUArchState *)cpu->env_ptr; + CPUX86State *env =3D cpu->env_ptr; int ret =3D 0; =20 qemu_mutex_lock_iothread(); @@ -685,7 +685,7 @@ nvmm_inject_ud(struct nvmm_machine *mach, struct nvmm_v= cpu *vcpu) static int nvmm_vcpu_loop(CPUState *cpu) { - CPUX86State *env =3D (CPUArchState *)cpu->env_ptr; + CPUX86State *env =3D cpu->env_ptr; struct nvmm_machine *mach =3D get_nvmm_mach(); struct qemu_vcpu *qcpu =3D get_qemu_vcpu(cpu); struct nvmm_vcpu *vcpu =3D &qcpu->vcpu; diff --git a/target/i386/whpx/whpx-all.c b/target/i386/whpx/whpx-all.c index a8222461440..c7e25abf42c 100644 --- a/target/i386/whpx/whpx-all.c +++ b/target/i386/whpx/whpx-all.c @@ -221,7 +221,7 @@ static SegmentCache whpx_seg_h2q(const WHV_X64_SEGMENT_= REGISTER *hs) =20 static int whpx_set_tsc(CPUState *cpu) { - CPUX86State *env =3D (CPUArchState *)(cpu->env_ptr); + CPUX86State *env =3D cpu->env_ptr; WHV_REGISTER_NAME tsc_reg =3D WHvX64RegisterTsc; WHV_REGISTER_VALUE tsc_val; HRESULT hr; @@ -260,7 +260,7 @@ static void whpx_set_registers(CPUState *cpu, int level) { struct whpx_state *whpx =3D &whpx_global; struct whpx_vcpu *vcpu =3D get_whpx_vcpu(cpu); - CPUX86State *env =3D (CPUArchState *)(cpu->env_ptr); + CPUX86State *env =3D cpu->env_ptr; X86CPU *x86_cpu =3D X86_CPU(cpu); struct whpx_register_set vcxt; HRESULT hr; @@ -428,7 +428,7 @@ static void whpx_set_registers(CPUState *cpu, int level) =20 static int whpx_get_tsc(CPUState *cpu) { - CPUX86State *env =3D (CPUArchState *)(cpu->env_ptr); + CPUX86State *env =3D cpu->env_ptr; WHV_REGISTER_NAME tsc_reg =3D WHvX64RegisterTsc; WHV_REGISTER_VALUE tsc_val; HRESULT hr; @@ -449,7 +449,7 @@ static void whpx_get_registers(CPUState *cpu) { struct whpx_state *whpx =3D &whpx_global; struct whpx_vcpu *vcpu =3D get_whpx_vcpu(cpu); - CPUX86State *env =3D (CPUArchState *)(cpu->env_ptr); + CPUX86State *env =3D cpu->env_ptr; X86CPU *x86_cpu =3D X86_CPU(cpu); struct whpx_register_set vcxt; uint64_t tpr, apic_base; @@ -760,7 +760,7 @@ static int whpx_handle_portio(CPUState *cpu, =20 static int whpx_handle_halt(CPUState *cpu) { - CPUX86State *env =3D (CPUArchState *)(cpu->env_ptr); + CPUX86State *env =3D cpu->env_ptr; int ret =3D 0; =20 qemu_mutex_lock_iothread(); @@ -781,7 +781,7 @@ static void whpx_vcpu_pre_run(CPUState *cpu) HRESULT hr; struct whpx_state *whpx =3D &whpx_global; struct whpx_vcpu *vcpu =3D get_whpx_vcpu(cpu); - CPUX86State *env =3D (CPUArchState *)(cpu->env_ptr); + CPUX86State *env =3D cpu->env_ptr; X86CPU *x86_cpu =3D X86_CPU(cpu); int irq; uint8_t tpr; @@ -903,7 +903,7 @@ static void whpx_vcpu_pre_run(CPUState *cpu) static void whpx_vcpu_post_run(CPUState *cpu) { struct whpx_vcpu *vcpu =3D get_whpx_vcpu(cpu); - CPUX86State *env =3D (CPUArchState *)(cpu->env_ptr); + CPUX86State *env =3D cpu->env_ptr; X86CPU *x86_cpu =3D X86_CPU(cpu); =20 env->eflags =3D vcpu->exit_ctx.VpContext.Rflags; @@ -927,7 +927,7 @@ static void whpx_vcpu_post_run(CPUState *cpu) =20 static void whpx_vcpu_process_async_events(CPUState *cpu) { - CPUX86State *env =3D (CPUArchState *)(cpu->env_ptr); + CPUX86State *env =3D cpu->env_ptr; X86CPU *x86_cpu =3D X86_CPU(cpu); struct whpx_vcpu *vcpu =3D get_whpx_vcpu(cpu); =20 @@ -1333,7 +1333,7 @@ int whpx_init_vcpu(CPUState *cpu) struct whpx_state *whpx =3D &whpx_global; struct whpx_vcpu *vcpu =3D NULL; Error *local_error =3D NULL; - CPUX86State *env =3D (CPUArchState *)(cpu->env_ptr); + CPUX86State *env =3D cpu->env_ptr; X86CPU *x86_cpu =3D X86_CPU(cpu); UINT64 freq =3D 0; int ret; --=20 2.35.1