From nobody Tue Feb 10 00:23:26 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.67 as permitted sender) client-ip=209.85.128.67; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f67.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.67 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1607971070; cv=none; d=zohomail.com; s=zohoarc; b=jazmeqrBmXlZV6rvPUunVaRW9S4sRMPoTlsFUN6lkiRDB2Rj9FYNKi9xnXXdTvagY2/yYiwEnsTnVEN9510A93MTMW06LLJK7PTBXobpnU8vQXYy5nXTNUQlTIsqiQFsdRSgu33yMxp5xyZeRxfH95Vlblh8ScB9gFAKweufVC4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607971070; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=PkbswluQKWjRx3dBtHaGXoEp5nk30ZYfIfOdkw/Z4mE=; b=aIGZNPtbFOiKZlfuYyEei3xuY+Cx+i1GWcTeQ/NLBoduKMedwNUDCDZleZ3uCCziR9+Y9eCqZ0UWBkLBKQdq6kRLflf2cLn5giyh9DvzFFEnXwTAeSvdSld4bTDp/tXUaqMD3ho+4HCaCgyFIp90mIyJVVfvpMdTaD9t3+0tu8w= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.67 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by mx.zohomail.com with SMTPS id 1607971070246643.948847832296; Mon, 14 Dec 2020 10:37:50 -0800 (PST) Received: by mail-wm1-f67.google.com with SMTP id g185so16200120wmf.3 for ; Mon, 14 Dec 2020 10:37:48 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (101.red-88-21-206.staticip.rima-tde.net. [88.21.206.101]) by smtp.gmail.com with ESMTPSA id y7sm33139083wmb.37.2020.12.14.10.37.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Dec 2020 10:37:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=PkbswluQKWjRx3dBtHaGXoEp5nk30ZYfIfOdkw/Z4mE=; b=so87HLcUDeHLMSRrrBIoaQWUwBf8G3+RiGUHx0pXI0M8i8oVclm5u38oWxGVU+nRE9 H1/I+bkvfeohZvPRDLGNrptdMb+bS/XgK3I3hemaCE4VuYbp+oP8+OEm6BaxdYpVWC5q 7kdq8C+VkX1BkPWurVnCHTbxnFpB1RkgtRNapuqHjZDaFp5gokompzmmnRBHp7irMovG HplSBu+h5qd5YPQpXjbyjrz2Qx+8dbFmeEToshnQT5AEFmjWT8/8pf5RXYihAN8NPqqV XW+aOXYWZUP/uJ/OYB3uskd5w4ddXWksjA52rV84hF4Rzc6VUX3VxpFwzSY8JvoiQx3F TryQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=PkbswluQKWjRx3dBtHaGXoEp5nk30ZYfIfOdkw/Z4mE=; b=m2YPUTLkQEQUMqaD/M1asp6uQjoM9QJ0anfx3WnZNl432rQTf9RrI33oVxxncXoSgi X15U9zrhVTLYaMx271lk81vGBgwcE+GNG0Kh6T2Gj/7ly13UvpwM1DTCwSpQo2zsDhOp UF3B0RMuUJR8Y3afDST//vK0keaycXWJy89v5CQJ1fMF8gAkJLDwQfgiedt4tCHNICTo 2f6Rj+MjirUh+UMdDoOZBOgkuAWkJkc/KJpLl/Wbjk/INbhM8hhFVOLrPQIsu+zDthbm HUZYem6uXcAUZWPZyH9ukGT7ZEZr8HXe5TO53+1QBAXD3BghMJuTtxMmeS+0I/cHDPrq ClMg== X-Gm-Message-State: AOAM533726Uo1tq6nM0QxG4tCOGiZYz2Yj7Drh868z1LHUUN+XSaqL0z U1t06mdyPYJxZw4DJEDfj8M= X-Google-Smtp-Source: ABdhPJwGXLAxo6yN+sLIdbUznMxVePFYOVX87wckAVWiT7wsnNmHFrE3HhgsbKkK5tMFh6Kt4WouSg== X-Received: by 2002:a1c:2c83:: with SMTP id s125mr29306057wms.161.1607971067021; Mon, 14 Dec 2020 10:37:47 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: kvm@vger.kernel.org, Aurelien Jarno , Huacai Chen , Aleksandar Rikalo , Jiaxun Yang , Laurent Vivier , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 01/16] target/mips: Inline cpu_state_reset() in mips_cpu_reset() Date: Mon, 14 Dec 2020 19:37:24 +0100 Message-Id: <20201214183739.500368-2-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201214183739.500368-1-f4bug@amsat.org> References: <20201214183739.500368-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- target/mips/cpu.c | 26 +++++++++----------------- 1 file changed, 9 insertions(+), 17 deletions(-) diff --git a/target/mips/cpu.c b/target/mips/cpu.c index aadc6f8e74d..7a0dcb11ecd 100644 --- a/target/mips/cpu.c +++ b/target/mips/cpu.c @@ -104,10 +104,16 @@ static bool mips_cpu_has_work(CPUState *cs) =20 #include "translate_init.c.inc" =20 -/* TODO QOM'ify CPU reset and remove */ -static void cpu_state_reset(CPUMIPSState *env) +static void mips_cpu_reset(DeviceState *dev) { - CPUState *cs =3D env_cpu(env); + CPUState *cs =3D CPU(dev); + MIPSCPU *cpu =3D MIPS_CPU(cs); + MIPSCPUClass *mcc =3D MIPS_CPU_GET_CLASS(cpu); + CPUMIPSState *env =3D &cpu->env; + + mcc->parent_reset(dev); + + memset(env, 0, offsetof(CPUMIPSState, end_reset_fields)); =20 /* Reset registers to their default values */ env->CP0_PRid =3D env->cpu_model->CP0_PRid; @@ -330,20 +336,6 @@ static void cpu_state_reset(CPUMIPSState *env) /* UHI interface can be used to obtain argc and argv */ env->active_tc.gpr[4] =3D -1; } -} - -static void mips_cpu_reset(DeviceState *dev) -{ - CPUState *s =3D CPU(dev); - MIPSCPU *cpu =3D MIPS_CPU(s); - MIPSCPUClass *mcc =3D MIPS_CPU_GET_CLASS(cpu); - CPUMIPSState *env =3D &cpu->env; - - mcc->parent_reset(dev); - - memset(env, 0, offsetof(CPUMIPSState, end_reset_fields)); - - cpu_state_reset(env); =20 #ifndef CONFIG_USER_ONLY if (kvm_enabled()) { --=20 2.26.2