From patchwork Tue Sep 13 14:47:15 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brijesh Singh X-Patchwork-Id: 669428 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3sYTnX0vKwz9sC3 for ; Wed, 14 Sep 2016 01:56:48 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=amdcloud.onmicrosoft.com header.i=@amdcloud.onmicrosoft.com header.b=qQhhZMr0; dkim-atps=neutral Received: from localhost ([::1]:49791 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bjq4j-0008FI-OL for incoming@patchwork.ozlabs.org; Tue, 13 Sep 2016 11:56:45 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54493) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bjpVx-0003FP-Eb for qemu-devel@nongnu.org; Tue, 13 Sep 2016 11:20:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bjpVr-0007Re-9n for qemu-devel@nongnu.org; Tue, 13 Sep 2016 11:20:48 -0400 Received: from mail-co1nam03on0042.outbound.protection.outlook.com ([104.47.40.42]:60576 helo=NAM03-CO1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bjpVq-0007Ld-Pj for qemu-devel@nongnu.org; Tue, 13 Sep 2016 11:20:43 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amdcloud.onmicrosoft.com; s=selector1-amd-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=EyHqByNhbZ2gWX1gGvzXu+644Re8UQS6Ms7fEZkQL88=; b=qQhhZMr0H1X6VFba/pznf4JyDrFXTNpAo4lMJl3w1G/vkuLoDjuVFK4MpmXgq8dv6ca3GOB7U+j6HPR3f/LkNpGVRWGeeeQKprvc6fzF1QDzxnOKtUvhHeVzgXKs1RF9tkHtegpyxGx7GUqswDUSNDib7pvXK6igLkPYJLrZJqY= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=brijesh.singh@amd.com; Received: from [127.0.1.1] (165.204.77.1) by CY1PR12MB0665.namprd12.prod.outlook.com (10.163.238.150) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.1.609.9; Tue, 13 Sep 2016 14:47:19 +0000 From: Brijesh Singh To: , , , , , , , , Date: Tue, 13 Sep 2016 10:47:15 -0400 Message-ID: <147377803542.11859.1344712637300704065.stgit@brijesh-build-machine> In-Reply-To: <147377800565.11859.4411044563640180545.stgit@brijesh-build-machine> References: <147377800565.11859.4411044563640180545.stgit@brijesh-build-machine> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: CY1PR08CA0035.namprd08.prod.outlook.com (10.163.94.173) To CY1PR12MB0665.namprd12.prod.outlook.com (10.163.238.150) X-MS-Office365-Filtering-Correlation-Id: a6c6715b-9a08-41e2-b23a-08d3dbe4dcdb X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0665; 2:SjN1fw2JYx1TEtXNFOji4AzwmM0e71tTueIU78nq9UqstH7YYCx8e9fmpCDFTqigxy1DdWHeIdCC5hvSq/tU0Vwzb9cdH7451uMUdVcneXGoTeZjQqkYf4MM/YX4D5d+DCznYHwyoS9rVljHSGUzQSH+83nUUL3Ssit+5atKRdWZcBhC8Ai1D87Fik1Kr2lT; 3:38TQKot2XkiNKTaIB8Mc2mfhNikxfxqBThW3ifkM+P/qs/vwHQBq/3vlPtCcuACYIyYG3wPwy7KVSZa2ir+226bufWsuebRcw12AjNHTpmGveM1Gg8HjqJcq3KjuH3H5; 25:Af30KwhIQMURzLHGOvactAHG8HAzeotp4Sfl//rXX8fjPyRlyEfzCojinl6pwHwcMDuRhhALBGFS30QOgUMP+Z8GCwHUFqkueuhO4t9+AJwRHEW4DnDikflWHjOIL3AplfrujJbFFMGYzdmHCbdYz0IVu6zlyDzB7qw7mNkuvKlJmdwIxb0u8q7hXw+f7+llgM9CmkAKOXP5ltx+f0aD7A5l0jPr7qL9N8lb2hZeOMARF9PqeA0kSHVybrRr3wqBhcya4N6Jr7N3ayJxFquzEjIOhOX6ctfIQ0pYTOKKa6iZu7ORAW35mmovSKbgvhp7I4ffo5iyejPXf68vMpVwfuFKf6Wv8l6mhUplrOO7lCjbpbnD/Vzys1WWQwH0BGS/PbhroG6F4BER5Wclv+4Ux/fmh1jDv6ElXypDGjqwczw= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:CY1PR12MB0665; X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0665; 31:XYf+mlZJ3LHahWgSBt1j8HdBg5/GcuQPld8NFbrgZqs2GvX0phPOoOVDgfHDvaYzI7f51x4lkUHNlKJw3BLageoGcC4EiFjJNyTuPLoxk2Dx47aS05xTJhATn5ZmFbn2DibjEl6bslYxOHkBAhpBioFgtwgfqOUk97sxx8X/n+lM+oWo6mhdKJg8Jced2ycnXOhLra0lhXzCDddxwTLVTtbiGMVZ/hb2pooXlhdxj8Q=; 20:WupilHCK7Tmjl5nGfBN/sqfBIFGhd51d/mZ3KHRy6pqQ3ngv865Pj+OMpwvgqp0FCkaxlUowQia54B0acqFnytg/2dkFfJZnsaxt1pYryuY1DNfB5oSbCT1Kkom13oFbiUWu22+yINnqWrEk59Ul7XHDYZUZmG6cXp0ATqpMqbfl5sgVu9yGNKq4nrCNqzxMeQZNs/mxsZ63P0/HQOy4KiviXf9AIHfSJaAtvh+Z80Kda9xteEMM8rYn+OvmpKEpLowotWKI0gd9CIHaBSlO2yNGWVt1zXvZXA20vY7oXI6hjudtFGlD4eOXFOwNNK+XjYIUMWeTKTp6Y37jmdsy7tPRnrNDz3Y1CTuGQA1FTBEf+OqxrjG4fO6rTh2oxtfGakItHyQ08BPiljKnAkJE2X9Y00VzXHqiTUKVADJB04S08Iix07SJwP4BYlq3ZW7Va/WgbiOT6l62jSHwVp0v824L31IhV6mFd/5aZqTX2zAleDUz8QtXv/OWrX2VTs9t X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(767451399110); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040176)(601004)(2401047)(8121501046)(5005006)(10201501046)(3002001)(6055026); SRVR:CY1PR12MB0665; BCL:0; PCL:0; RULEID:; SRVR:CY1PR12MB0665; X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0665; 4:SmH2KLuY2/UXjgT3l0CGmJvyD1o3ruvzpbjP1OXHiWxy5sjSGgn/KrMeWkFekaYmOVVd1Ien/CsDKG+t+KIXXa5UWx/n/iRDL9gfUOxyDPSWjxfgvcSeGwFAawJQxAOS7agRU/T4zezc3bDavokM7ihBPtYnQViN+nVviTUD9raNmcFk0tkKwlwZ3Te7m2H8kscALGSHkvC4f5mCxBkKTXd6nsdfz/5SQKcOYTwTjZKAU4fRxfbjdm6d04RbY0soteYp+JZG7GctdBpyky2okIYJ9X4ZWO/bKRLFauVbiltccEMo4dlNe4Xq1CjgQ5zsT6bMtyopAOOdI0TYKeinjYsMrF0PpedwC3LePfl+NgLuOxvCOvaqcioFX3zLvTxJWURf9ndbP6C3cU1PAc/drEd7QrJuY2H1QAw9+DhmAydqcDFZFjIlf7KPDaKQ0MeU X-Forefront-PRVS: 0064B3273C X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6009001)(6049001)(7916002)(199003)(189002)(33716001)(2201001)(86362001)(2950100001)(83506001)(42186005)(81166006)(92566002)(81156014)(5660300001)(189998001)(305945005)(7846002)(103116003)(19580395003)(7736002)(229853001)(107886002)(50466002)(230700001)(33646002)(4001350100001)(76176999)(106356001)(105586002)(19580405001)(66066001)(8676002)(68736007)(23676002)(2906002)(97736004)(54356999)(6116002)(3846002)(5001770100001)(50986999)(47776003)(9686002)(77096005)(101416001)(586003)(217873001); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR12MB0665; H:[127.0.1.1]; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtDWTFQUjEyTUIwNjY1OzIzOlZMV1NDL1Y3ZTM3TWMydURESHVVdzZIM2Z0?= =?utf-8?B?bEdCTjVISGp4N3QyY0xyZUxHOXNMNEJsNENsNU1aV1JGKzhZVTZ1bWI3bzJl?= =?utf-8?B?cmJZSnk4akJDSWtxRXFXcEtMQS9wVldoZDVLWC9weWorckxnSkJJamY1bldy?= =?utf-8?B?NTNWQXFoaTZzMjRzRk5waWpvNlVDSEZOY0ZMdWtENEQwNlFpTFJQT25ZUTYr?= =?utf-8?B?bHRuVGEzM21KTHh5ZnpFRGZyOStXZ2RzMkZFNWFIWjluLzc0Z2NuMFZaWWRN?= =?utf-8?B?ZWVRZUE4N2xqRXhEekhLYTNydWdaSXRpUlhMTGF1RExkOWZ1VVpJdkdVQTJh?= =?utf-8?B?R1gxOFNiQjRoRTRDRjJ3S1FOVWs4ejArNG9RN1R3T3hiTUVRbW9UWlRJckN2?= =?utf-8?B?RXhsMys2aGFRM1Y4VlVEeEsyWkYrZHY2QVMvT0tYMlNaaitVbnRTNlFsWmdz?= =?utf-8?B?RGxYdlpBdkdaWDZGZlVYVVhrNDd3d1llbGkrMFl2K3lwbUVoV2M1eC9oMXZ2?= =?utf-8?B?UHdZS1Vnb1N4V2E4N2lnRTBONjlER3NtazhMZHUxcEF4SXJwV0Qzdk45L0Ro?= =?utf-8?B?aFNoaTFPVk5pMXNqRncraFJlYTFmQ3BiTUVqbFFTNDBUNUJBa3ZpckNDSTFG?= =?utf-8?B?VVd4SkpzN0pFWUs5aHk4cVZmeHUyRlZRK1VwM09HdU1SSjgyMURSSmxSSzZm?= =?utf-8?B?eXJ3bDhDaE4vR0lpS3ByVkt2VjFQZEpMQmRJbW51T05zL2lQdW5UZXRxUXBy?= =?utf-8?B?Y0RFV2JSbDhpQnNEd0FVS0haM0QwT0VUWjk5eVF0YWlUeGpoZGpXTU5SaVlu?= =?utf-8?B?dUdra09JRlRnYmF5dzBVQnpEVkdsSHpiSzhLaUlLMWlmc2lPSlFaZDRjNmZS?= =?utf-8?B?YUNIQUo3Q3JBV2pTMjgxMmJhazJNTkZvdEdPanpaUTdsT1RYZ1FFR0RRemx6?= =?utf-8?B?SlRJVjZ6OHZMVVZkS2w3U3lnOTY3MkF2aEJabFFoT1luemNmK0JiRlVuZElr?= =?utf-8?B?QVJoYk1PZXozcmdpMzdJUWlabEc4ODVWemRMT3Zvclg2Ly9KcVppdXBnbldH?= =?utf-8?B?VHNYUDh0eldXeUwwWDdJODFZWEpKc3MxVzA3TXJZVGorNWpCV2tieWhKbXB1?= =?utf-8?B?aitZdTdSS1g1ZDh1UjNIVnNTUTRFK20zWk53c1FkZS9jQ2dlYmllUFdvTDVJ?= =?utf-8?B?QVBYbVdkNUJvMXE4RlNnUlU0OFFwVHBiY1FKQkJtNXpSQTQ5QzdEeGdUVmZI?= =?utf-8?B?STAzeW9WZWNkTG9aMjA3aktjdlROaDMydDVNNTc2dXdJTHA3QU81V0tRV1dF?= =?utf-8?B?T1N0QmszdkhNbkhMQXV5NmhoZHEzRVI1dGRSL2ZuTlY3MGF3K1FuVytaM24w?= =?utf-8?B?ZlBFZGpDY0VoOWVMWkVZZEU0eHYvdVVNOElVY0lKa25scmorUWF5UkEzOFVT?= =?utf-8?B?Z2J2OUdTYm9JeHNSNzI2QWIwWXN4NXZleWh4NnA0ZzR4azl5dDRHY3A4OG4y?= =?utf-8?B?MmFKcXJ4d1NKNUlrdkxoamRQeU1kYWJSNjBpdGxTNGhLQ1J0bk1KR3ByZmZC?= =?utf-8?B?WEpjY2N1TW5CS0R3dGVuN1RpcXRZUTVBQ1M2N3FqNER6c1NMclY5SmxoOXJy?= =?utf-8?B?RTVCSnRvdWQxY2xOVDU5dXlPblBnaE9vOERTcFl3WGpac3ZodWIycWRRPT0=?= X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0665; 6:e/pOQfhfG14Kj8vFOEOqIa9jb9Jbho3jJMcRTsVk9kj/rUDBcIlfxN666vydVhId/CnWSKskQMivGoRDD/68JjnIYxqVtmFxYWAtYOScDhMo85vPabhcQxJeX+4bi0UW8QpIFRAdJkCRUEl08KKjpoVRSmgRwNpMjtSuk+mv4uzraSiqDk0g2crTiyqV6nR02kdSu+kXPEGvjILGGmC9a8j2LXajakdWco7dUUDhjR5+HAo9LD9W8gPQPFt4njiBFtDNdCBACONk5U/FuTHt0BCUs68+FcV/QrQFueQCPUjfwHRlIM5M52y3EPpFqpz5tK0I9te8oP8M6LtxRrn7Fg==; 5:DwjilBrcVyyg3ouVeXeShYC1TTQNy6ECs1Ib3mPlmAmXnpuQaHzd2MJIob1B3azh6Ns7BGR7qLL0OJ5wQe/SQ4JY20WajgSEwm5f9Ho1hyVAiDtDlqyrqT3wx36nvsfNNABTwZCCYs9NnZNqvmT5QQ==; 24:3pI6vxMP56o0arYJCqep6zB1hWErkLxRaLu4n0V4JBMKuNpPUyQ5QBnPGAGqsJTJtLnyXhtrlNFbjZZtBubl8qhW9Prce2e4TCuETb/hqnY=; 7:tjcTscKcKt3mwXTz4yxtJEQECq+jK2OasHhpEQoUlT5yC9iytvcLhLGFKdCsJI56XvC9omo1ogwyn0SGx8Za5f97wqMVqIc7rRn84M2VfKnmJyAmV0hsb/1wa/uikB+J5MtQhuIQXs3p1U78oQtOFNVTdTDVCo0bQAA2J4KT9fgs8Gf9yUbd/4VHm5Q6U0J9F3OBIWFOxyYPWkMI0nBjCmN3uES8ari+7DosMhrk24gdrPLbUq5E8/XUkGoMO7I4 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0665; 20:k5MR/GDl6VrViJ1eK7uOguij5OxcisGoSX6QiuOVjTEBJUqUUbHSB+iulrJjv7Eun7SfFje8T5oN/IBSYh82CXzpW39z0t22rhmrSiLaDZmzHxt+HnKyeTci/PYY3JgKa+iHI6L0WU2SCO0MsuLta1EIWJk1qda/hYt+ZBel4wULf3AS2YFfCNX6mbm2/m1bLFLiCJVSkyQ4CffGrFORYWbtPKtFiUZkvOgffff4EKFvVcgLGTpKSdI5XTDUWkVJ X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Sep 2016 14:47:19.0641 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR12MB0665 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.40.42 X-Mailman-Approved-At: Tue, 13 Sep 2016 11:45:46 -0400 Subject: [Qemu-devel] [RFC PATCH v1 03/22] monitor: use debug version of physical memory read api X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" This patch updates hmp monitor to use cpu_physical_memory_read_debug() when accessing the guest memory for debug dumps. Signed-off-by: Brijesh Singh --- disas.c | 2 +- monitor.c | 2 +- target-i386/monitor.c | 18 ++++++++++-------- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/disas.c b/disas.c index 05a7a12..382cc2c 100644 --- a/disas.c +++ b/disas.c @@ -356,7 +356,7 @@ monitor_read_memory (bfd_vma memaddr, bfd_byte *myaddr, int length, CPUDebug *s = container_of(info, CPUDebug, info); if (monitor_disas_is_physical) { - cpu_physical_memory_read(memaddr, myaddr, length); + cpu_physical_memory_read_debug(memaddr, myaddr, length); } else { cpu_memory_rw_debug(s->cpu, memaddr, myaddr, length, 0); } diff --git a/monitor.c b/monitor.c index 5c00373..4773ee1 100644 --- a/monitor.c +++ b/monitor.c @@ -1299,7 +1299,7 @@ static void memory_dump(Monitor *mon, int count, int format, int wsize, if (l > line_size) l = line_size; if (is_physical) { - cpu_physical_memory_read(addr, buf, l); + cpu_physical_memory_read_debug(addr, buf, l); } else { if (cpu_memory_rw_debug(mon_get_cpu(), addr, buf, l, 0) < 0) { monitor_printf(mon, " Cannot access memory\n"); diff --git a/target-i386/monitor.c b/target-i386/monitor.c index fccfe40..47d3c2d 100644 --- a/target-i386/monitor.c +++ b/target-i386/monitor.c @@ -130,12 +130,12 @@ static void tlb_info_64(Monitor *mon, CPUArchState *env) pml4_addr = env->cr[3] & 0x3fffffffff000ULL; for (l1 = 0; l1 < 512; l1++) { - cpu_physical_memory_read(pml4_addr + l1 * 8, &pml4e, 8); + cpu_physical_memory_read_debug(pml4_addr + l1 * 8, &pml4e, 8); pml4e = le64_to_cpu(pml4e); if (pml4e & PG_PRESENT_MASK) { pdp_addr = pml4e & 0x3fffffffff000ULL; for (l2 = 0; l2 < 512; l2++) { - cpu_physical_memory_read(pdp_addr + l2 * 8, &pdpe, 8); + cpu_physical_memory_read_debug(pdp_addr + l2 * 8, &pdpe, 8); pdpe = le64_to_cpu(pdpe); if (pdpe & PG_PRESENT_MASK) { if (pdpe & PG_PSE_MASK) { @@ -145,7 +145,8 @@ static void tlb_info_64(Monitor *mon, CPUArchState *env) } else { pd_addr = pdpe & 0x3fffffffff000ULL; for (l3 = 0; l3 < 512; l3++) { - cpu_physical_memory_read(pd_addr + l3 * 8, &pde, 8); + cpu_physical_memory_read_debug(pd_addr + l3 * 8, + &pde, 8); pde = le64_to_cpu(pde); if (pde & PG_PRESENT_MASK) { if (pde & PG_PSE_MASK) { @@ -156,7 +157,7 @@ static void tlb_info_64(Monitor *mon, CPUArchState *env) } else { pt_addr = pde & 0x3fffffffff000ULL; for (l4 = 0; l4 < 512; l4++) { - cpu_physical_memory_read(pt_addr + cpu_physical_memory_read_debug(pt_addr + l4 * 8, &pte, 8); pte = le64_to_cpu(pte); @@ -335,13 +336,13 @@ static void mem_info_64(Monitor *mon, CPUArchState *env) last_prot = 0; start = -1; for (l1 = 0; l1 < 512; l1++) { - cpu_physical_memory_read(pml4_addr + l1 * 8, &pml4e, 8); + cpu_physical_memory_read_debug(pml4_addr + l1 * 8, &pml4e, 8); pml4e = le64_to_cpu(pml4e); end = l1 << 39; if (pml4e & PG_PRESENT_MASK) { pdp_addr = pml4e & 0x3fffffffff000ULL; for (l2 = 0; l2 < 512; l2++) { - cpu_physical_memory_read(pdp_addr + l2 * 8, &pdpe, 8); + cpu_physical_memory_read_debug(pdp_addr + l2 * 8, &pdpe, 8); pdpe = le64_to_cpu(pdpe); end = (l1 << 39) + (l2 << 30); if (pdpe & PG_PRESENT_MASK) { @@ -353,7 +354,8 @@ static void mem_info_64(Monitor *mon, CPUArchState *env) } else { pd_addr = pdpe & 0x3fffffffff000ULL; for (l3 = 0; l3 < 512; l3++) { - cpu_physical_memory_read(pd_addr + l3 * 8, &pde, 8); + cpu_physical_memory_read_debug(pd_addr + l3 * 8, + &pde, 8); pde = le64_to_cpu(pde); end = (l1 << 39) + (l2 << 30) + (l3 << 21); if (pde & PG_PRESENT_MASK) { @@ -365,7 +367,7 @@ static void mem_info_64(Monitor *mon, CPUArchState *env) } else { pt_addr = pde & 0x3fffffffff000ULL; for (l4 = 0; l4 < 512; l4++) { - cpu_physical_memory_read(pt_addr + cpu_physical_memory_read_debug(pt_addr + l4 * 8, &pte, 8); pte = le64_to_cpu(pte);