Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) client-ip=23.128.96.38;
From:   Julian Stecklina <julian.stecklina@cyberus-technology.de>
To:     Sean Christopherson <seanjc@google.com>,
        Paolo Bonzini <pbonzini@redhat.com>,
        Thomas Gleixner <tglx@linutronix.de>,
        Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>,
        Dave Hansen <dave.hansen@linux.intel.com>, x86@kernel.org,
        "H. Peter Anvin" <hpa@zytor.com>
Cc:     Julian Stecklina <julian.stecklina@cyberus-technology.de>,
        kvm@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH v2 2/2] KVM: x86: rename push to emulate_push for consistency
Date:   Mon,  9 Oct 2023 11:20:54 +0200
Message-Id: <20231009092054.556935-2-julian.stecklina@cyberus-technology.de>
In-Reply-To: <20231009092054.556935-1-julian.stecklina@cyberus-technology.de>
References: <20231004133827.107-1-julian.stecklina@cyberus-technology.de>
 <20231009092054.556935-1-julian.stecklina@cyberus-technology.de>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?rMrOBueGXmOWI86YffbwDGlNtTCxRXPaZ8vqMIGqITS6Q54uwOFreFrT+2Fr?=
 =?us-ascii?Q?vQNEAIemiQjKSQXsjGW6Zn1/55zEIZIoCNaCsQBWdWWzvQH/EFfjhxZ/ar/F?=
 =?us-ascii?Q?UOYAOp9LPcr/QPj8QxJxIbJmyfPzPV3Z1ZPfJlvP1rku1j9nQBPZl41oBedv?=
 =?us-ascii?Q?mqqHjYQ0JEp+2ift0V8F/60r/xp71xUzmcefNjZdRjP2yy/0+SFPfKVe5j8W?=
 =?us-ascii?Q?xXESQ9BLwfHRvAQ0cZVaI9KFS3UJL0qIrX1qexTOZ/jZpEWQWf4nFQqwiXR0?=
 =?us-ascii?Q?J+Fy0+DBi0Mn/E3RFaAKgUXOSPPUMxm4q18NGo1X0PTxr8tiMjJJdWFHsrBf?=
 =?us-ascii?Q?4+vkwX0P3KSxoKkji7qItjLJiEhThuj0+WjmvR9MtMONarXJYxvmJ8KWhprd?=
 =?us-ascii?Q?ksR0j0qVxUbBv8iZCjsT1zWXGJ+102D+9bLkCVS3MGKjjx8xs6VJ6bGxmnDD?=
 =?us-ascii?Q?m5diJCYBS6AyjRTYm9xnSArRt038YHxoH9YyIQknMxzzN6g2v6ALT+tI30Gk?=
 =?us-ascii?Q?Y4FXCLY2vWtMXWYanajxDBQFFl3m7OsOvIFCvIFxWaZkyIEUpLl+8aZtBhUh?=
 =?us-ascii?Q?X5hSBO9wJFWFnQcay+BikAh7eLqczBmkzeUiMzFkOnlEOonVGLTotyXb3LRh?=
 =?us-ascii?Q?V8F2yqRjtk/Zq9ZOtzDb87d28X8gKpr2B2VIGYyfNQHwsRXxsVHZ7N2xRHEZ?=
 =?us-ascii?Q?t78Fl3IrvFzL5Zb2O1uFy7Avd0Lh7SS+PMFWm+4qW1zJ17W0PmPkbUpXX9X2?=
 =?us-ascii?Q?v9VssBpLTU0kXkK6yjzdSaWOkDMqwuY8LS/fjZMckToIK6kJ/bfwQEHBtxOA?=
 =?us-ascii?Q?jyZU/zrxpKQ79ejmUGLcTcpPcIKCm9ei/i8IMHXgXKeGp9jBZlZONAOQrKhm?=
 =?us-ascii?Q?xwvtvPgMMqy7SL55GMw8CaCQMQFM7CT2yP0sAOQ4fxmMY72B/8c8R5jUrco2?=
 =?us-ascii?Q?/v/KU7KVBJ8Ujh82JYhLEv1TbGHcZQIMRMsf+t9EMYxhfCXW9MK/jiuTMBsD?=
 =?us-ascii?Q?rY0l4AkTGC7WRpKZ0jtaAYCa5aoJY0c8/nDjnYgqk6H9NIkMk/MosC84ikh8?=
 =?us-ascii?Q?VTMBx15qrbIHgdGuxgNujkykxHrXsCrTbjvrOGLfE3TOv+HSxfAdiiGp4mCT?=
 =?us-ascii?Q?JPk0Dx5eUZIAgpBydfGBYZ+D9Xrk9hqyrsJPY6eU12F8+OGYdV5meY5bbAiG?=
 =?us-ascii?Q?045TVo8eRXva5sQP2DOYtumFg6Q3BOBI9hZy3p2Vw8eWfZFJVSvElI3NUC0o?=
 =?us-ascii?Q?Q+m2yu9D4Km3Tf2zY43KdQKCX6rIclwNuxTQCOoKpxwMeNridGo/QHZqHdR8?=
 =?us-ascii?Q?QLigRIsuFyoxvUcXMFw1tsrRos0UI9rQ2KeALRQ8KD/t9ePDWwhJ2bB4Elkw?=
 =?us-ascii?Q?HeEpzUwAip3GqFfoVVeF6XLeARKGo8e43839PmRQ6yq+kZ9UrhextxRVVGSv?=
 =?us-ascii?Q?11TjfoONY1RUwpf6uzY7U6iVW8DYEVAJ9XRKxg0Ml3T6u8BvoYazjPCHDh6f?=
 =?us-ascii?Q?5doDboY3dU6r7H7E1XIaGwRaL/ViX9zYw1DLfvGhuhz9X40P5Izfnfa42CDw?=
 =?us-ascii?Q?Fnh3m2slWSOCPpgNusfwfykfubmR4fFNQbnxsTRZAdyp5CHUkmZSQYG8DOB2?=
 =?us-ascii?Q?bNs7Fw6la/l9jlgYeqCrOGQ=3D?=
X-OriginatorOrg: cyberus-technology.de
X-MS-Exchange-CrossTenant-Network-Message-Id: 9c07968e-9169-4ff1-a6ef-08dbc8a9305a
X-MS-Exchange-CrossTenant-AuthSource: FR3P281MB1567.DEUP281.PROD.OUTLOOK.COM
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Oct 2023 09:21:59.0521
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: f4e0f4e0-9d68-4bd6-a95b-0cba36dbac2e
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: usZcrUmY7aJd0DqmsjdJQtdWvVdg7eze7J2d91fASy/mp7p6H/6MtVEdxbYbhInZ9uZ5qJyzl2CESc7ml/KzBTt6Nrogpb+D6yFXAfQjOXzH0uKV/wMGO8aJU7nuApuA
X-MS-Exchange-Transport-CrossTenantHeadersStamped: FR0P281MB1983
X-Spam-Status: No, score=2.7 required=5.0 tests=DKIM_SIGNED,DKIM_VALID,
	DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,
	RCVD_IN_SBL_CSS,SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no
	version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.vger.email
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (fry.vger.email [0.0.0.0]); Mon, 09 Oct 2023 02:22:27 -0700 (PDT)
X-Spam-Level: **

push and emulate_pop are counterparts. Rename push to emulate_push and
harmonize its function signature with emulate_pop. This should remove
a bit of cognitive load when reading this code.

Signed-off-by: Julian Stecklina <julian.stecklina@cyberus-technology.de>
---
 arch/x86/kvm/emulate.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c
index 86d0ee9f1a6a..1b42d85694c2 100644
--- a/arch/x86/kvm/emulate.c
+++ b/arch/x86/kvm/emulate.c
@@ -1819,22 +1819,23 @@ static int writeback(struct x86_emulate_ctxt *ctxt, struct operand *op)
 	return X86EMUL_CONTINUE;
 }
 
-static int push(struct x86_emulate_ctxt *ctxt, void *data, int bytes)
+static int emulate_push(struct x86_emulate_ctxt *ctxt, const void *data,
+			int len)
 {
 	struct segmented_address addr;
 
-	rsp_increment(ctxt, -bytes);
+	rsp_increment(ctxt, -len);
 	addr.ea = reg_read(ctxt, VCPU_REGS_RSP) & stack_mask(ctxt);
 	addr.seg = VCPU_SREG_SS;
 
-	return segmented_write(ctxt, addr, data, bytes);
+	return segmented_write(ctxt, addr, data, len);
 }
 
 static int em_push(struct x86_emulate_ctxt *ctxt)
 {
 	/* Disable writeback. */
 	ctxt->dst.type = OP_NONE;
-	return push(ctxt, &ctxt->src.val, ctxt->op_bytes);
+	return emulate_push(ctxt, &ctxt->src.val, ctxt->op_bytes);
 }
 
 static int emulate_pop(struct x86_emulate_ctxt *ctxt,
@@ -1920,7 +1921,7 @@ static int em_enter(struct x86_emulate_ctxt *ctxt)
 		return X86EMUL_UNHANDLEABLE;
 
 	rbp = reg_read(ctxt, VCPU_REGS_RBP);
-	rc = push(ctxt, &rbp, stack_size(ctxt));
+	rc = emulate_push(ctxt, &rbp, stack_size(ctxt));
 	if (rc != X86EMUL_CONTINUE)
 		return rc;
 	assign_masked(reg_rmw(ctxt, VCPU_REGS_RBP), reg_read(ctxt, VCPU_REGS_RSP),
-- 
2.40.1