From patchwork Sat Dec 14 15:56:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 11292325 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 3FC3D13B6 for ; Sat, 14 Dec 2019 15:58:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1C06B24656 for ; Sat, 14 Dec 2019 15:58:23 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="G9YbJwNp" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726890AbfLNP6W (ORCPT ); Sat, 14 Dec 2019 10:58:22 -0500 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:28290 "EHLO us-smtp-delivery-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726814AbfLNP6W (ORCPT ); Sat, 14 Dec 2019 10:58:22 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576339101; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=cFyYhSJaR8h39Rbqagf85ifWXxR+w0L7k4hKSrlfago=; b=G9YbJwNp/9mPd05ITp4rG3PhAx2NjKBAUypWRGHQS1KiMTAhEo7lFaLCXGm1eOkTGdZ5kx iIUTmuCFGVqvc3BKeAl0MPRDvc2BakTrJMSV7UwdY2bJSTZ0CyXEtOgxwrwoS+3tFCoqwB 9W4mLl51Ued0l5a8KQCaQfC6WaQSqL8= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-205-GKZmRrbXNv-VBjqVcGU-Mg-1; Sat, 14 Dec 2019 10:58:20 -0500 X-MC-Unique: GKZmRrbXNv-VBjqVcGU-Mg-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3AAA1801E74; Sat, 14 Dec 2019 15:58:18 +0000 (UTC) Received: from x1w.redhat.com (ovpn-205-147.brq.redhat.com [10.40.205.147]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E18B066A1A; Sat, 14 Dec 2019 15:58:05 +0000 (UTC) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Peter Maydell , Andrew Baumann , Aurelien Jarno , kvm@vger.kernel.org, Alex Williamson , Aleksandar Markovic , Joel Stanley , qemu-arm@nongnu.org, Marcelo Tosatti , Alistair Francis , "Michael S. Tsirkin" , Eduardo Habkost , Richard Henderson , Aleksandar Rikalo , =?utf-8?q?Philippe_Mathieu?= =?utf-8?q?-Daud=C3=A9?= , Paul Burton , Marcel Apfelbaum , "Edgar E. Iglesias" , Paolo Bonzini Subject: [PATCH 8/8] target/i386/cpu: Use 'mr' for MemoryRegion variables Date: Sat, 14 Dec 2019 16:56:14 +0100 Message-Id: <20191214155614.19004-9-philmd@redhat.com> In-Reply-To: <20191214155614.19004-1-philmd@redhat.com> References: <20191214155614.19004-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org The codebase use 'as' in variable names for AddressSpace objects, and 'mr' for MemoryRegion objects. Since these variables are MemoryRegion objects, rename them as 'mr' to avoid confusion with AddressSpace objects. Signed-off-by: Philippe Mathieu-Daudé --- target/i386/cpu.h | 2 +- target/i386/cpu.c | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/target/i386/cpu.h b/target/i386/cpu.h index cde2a16b94..1e5ded6e84 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -1713,7 +1713,7 @@ struct X86CPU { /* in order to simplify APIC support, we leave this pointer to the user */ struct DeviceState *apic_state; - struct MemoryRegion *cpu_as_root, *cpu_as_mem, *smram; + MemoryRegion *cpu_mr_root, *cpu_mr_mem, *smram; Notifier machine_done; struct kvm_msrs *kvm_msr_buf; diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 6131c62f9d..b5d22740b8 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -5983,7 +5983,7 @@ static void x86_cpu_machine_done(Notifier *n, void *unused) memory_region_init_alias(cpu->smram, OBJECT(cpu), "smram", smram, 0, 1ull << 32); memory_region_set_enabled(cpu->smram, true); - memory_region_add_subregion_overlap(cpu->cpu_as_root, 0, cpu->smram, 1); + memory_region_add_subregion_overlap(cpu->cpu_mr_root, 0, cpu->smram, 1); } } #else @@ -6471,24 +6471,24 @@ static void x86_cpu_realizefn(DeviceState *dev, Error **errp) #ifndef CONFIG_USER_ONLY if (tcg_enabled()) { - cpu->cpu_as_mem = g_new(MemoryRegion, 1); - cpu->cpu_as_root = g_new(MemoryRegion, 1); + cpu->cpu_mr_mem = g_new(MemoryRegion, 1); + cpu->cpu_mr_root = g_new(MemoryRegion, 1); /* Outer container... */ - memory_region_init(cpu->cpu_as_root, OBJECT(cpu), "memory", ~0ull); - memory_region_set_enabled(cpu->cpu_as_root, true); + memory_region_init(cpu->cpu_mr_root, OBJECT(cpu), "memory", ~0ull); + memory_region_set_enabled(cpu->cpu_mr_root, true); /* ... with two regions inside: normal system memory with low * priority, and... */ - memory_region_init_alias(cpu->cpu_as_mem, OBJECT(cpu), "memory", + memory_region_init_alias(cpu->cpu_mr_mem, OBJECT(cpu), "memory", get_system_memory(), 0, ~0ull); - memory_region_add_subregion(cpu->cpu_as_root, 0, cpu->cpu_as_mem); - memory_region_set_enabled(cpu->cpu_as_mem, true); + memory_region_add_subregion(cpu->cpu_mr_root, 0, cpu->cpu_mr_mem); + memory_region_set_enabled(cpu->cpu_mr_mem, true); cs->num_ases = 2; cpu_address_space_init(cs, 0, "cpu-memory", cs->memory); - cpu_address_space_init(cs, 1, "cpu-smm", cpu->cpu_as_root); + cpu_address_space_init(cs, 1, "cpu-smm", cpu->cpu_mr_root); /* ... SMRAM with higher priority, linked from /machine/smram. */ cpu->machine_done.notify = x86_cpu_machine_done;