Message ID | 147801566367.18237.2189379113640562484.stgit@brijesh-build-machine |
---|---|
State | New |
Headers | show
Return-Path: <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3t7btH70Ssz9sxS for <incoming@patchwork.ozlabs.org>; Wed, 2 Nov 2016 03:15:19 +1100 (AEDT) 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=Qz1oeDkH; dkim-atps=neutral Received: from localhost ([::1]:49031 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>) id 1c1biW-0006te-Ui for incoming@patchwork.ozlabs.org; Tue, 01 Nov 2016 12:15:17 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33522) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <brijesh.singh@amd.com>) id 1c1bd5-0001sz-3x for qemu-devel@nongnu.org; Tue, 01 Nov 2016 12:09:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <brijesh.singh@amd.com>) id 1c1bd1-0000Ng-4h for qemu-devel@nongnu.org; Tue, 01 Nov 2016 12:09:39 -0400 Received: from mail-by2nam01on0068.outbound.protection.outlook.com ([104.47.34.68]:1328 helo=NAM01-BY2-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from <brijesh.singh@amd.com>) id 1c1bd0-0000M8-Rt for qemu-devel@nongnu.org; Tue, 01 Nov 2016 12:09:35 -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=JJL8slF40tifpUGT83IKyDVwt1ABt4OceJYdI1zpgWQ=; b=Qz1oeDkHv4oDnL7/emJxQqxek8pn5Xyeb90poB7hHZOnAVXcN3XZSD8HWfmhkU4QwzlFz5uioIqi5Ggt1LI/pKemCKLY6CUG3u6eyFJNYRRwP2bd6mHOsCITDv/gfdT4OFuVOuQxKRt6HbBQBaV47UvICQbXLg9tmTNT/Z548TM= 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_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.693.12; Tue, 1 Nov 2016 15:54:27 +0000 From: Brijesh Singh <brijesh.singh@amd.com> To: <Thomas.Lendacky@amd.com>, <ehabkost@redhat.com>, <crosthwaite.peter@gmail.com>, <armbru@redhat.com>, <mst@redhat.com>, <p.fedin@samsung.com>, <qemu-devel@nongnu.org>, <lcapitulino@redhat.com>, <pbonzini@redhat.com>, <rth@twiddle.net> Date: Tue, 1 Nov 2016 11:54:23 -0400 Message-ID: <147801566367.18237.2189379113640562484.stgit@brijesh-build-machine> In-Reply-To: <147801550845.18237.12915616525154608660.stgit@brijesh-build-machine> References: <147801550845.18237.12915616525154608660.stgit@brijesh-build-machine> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: MWHPR21CA0002.namprd21.prod.outlook.com (10.173.47.12) To CY1PR12MB0665.namprd12.prod.outlook.com (10.163.238.150) X-MS-Office365-Filtering-Correlation-Id: 5ff1f78f-b807-42ed-a4c9-08d4026f5cc8 X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0665; 2:iJcx9q7OOSH5OSo9iLSNgiztbnORGPzw1g711VrbTzjFcLNnFz98G3McY1cDj46dET+QVSzVjMLkBI5o7tSVrXl+HJyKaGBkZwTZjZnVNb13LB1Qyb2QC5FeBciJrUTqYM0I8SApKIUhzY2q0gpm7S5xufRgGuZGbRPHIPmrb0xKz1/axNljhV7kZLcRCGOt4H/Zm3DeJdgo/vj7cYbo7A==; 3:XkIN0ksaZjAtdgVqSQtGtV4B0gh9lYt6N3c/wqzxRR49l9+nlyCgp+et2xWm66fmQeFyqMK30BzWGqtOu1RqpE0dyudOjL3m7Xc527pUaRSm7euoSyW1MJBpVUmhpZ25SDJMUneSH3TpKG5ym88WkQ== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:CY1PR12MB0665; X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0665; 25:y+hVaP6Mf1SGRydQcME2atPQiV6+wL4ndAdcnwQ2FrJHt3G8aP6ZraPF/9xzn0OGcZUgRcOEmo5A/Pu70AF0ECT9xYplsX1v8qj5GA9KNfIBPoeBmeS8tv5D6S4sP57DvzVEQsJHjPcHDpysznX4ia2dZiAAJiMln+gH7W4M9xN67mtsUmF2ogkq9iZwsIS4rYuD7og9YaTd3Ng0oqjegzGQceh5e7OlwDjWWyqNl/ytEPM0S08xGSaGeoe/fj2UoLoQaWwGZXVUtX42bw6dzNLD+TTbduXUnq5MvJr5fen2zLMbvnNRcwcI7rUP0nMvpbMWTeJD7npKFc7S/pQ0qn6g3pvb3uXWXDUNGHN8qG50QhUxwaZo0r1dvCZTR9x1WDEuNtfh/cGY0z42YmshfElc751u+8Ud0fRXW2gYN7zmagxjsRq1Nd6Y79mJMICW8HpqFZn91se7ZYznDH/5+yR+JIkJqz/VY8n1U7ow5s4T8ZbDbBpGueJlpvNhTU6HRv+DWZCODO2qbCTBzG6dD9zemkqrBt/MOlCSF+QzoxgwS2Q77+XYH/beFUSlXW2TRYBlsr9OdC01PoxnAnvAm3nZu+UtUNekt0qz3oTixyGMSQ3EUiD2VcuMp/6Po4lFVyLqdYe2EG4lOLXLwXVq2bkpeKor19KrnRKI3GcoBF9Ubig5quIYEwo//7Wt/Qf24QI+OckfNlxOZz63RjuTOd7ph6lhKtTgm3wr+OTCo6M= X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0665; 31:bvydFxJFsDWF9zdwhKNtMIhVUpnlolFX5fBCGtTs7seFubbK7WV1n0myU0NgMkqIW1fbNaDJQTU6M0ZVRZtwPamnhFuckb21vV19zI6j+0kiiajw0EmCtgy86VqHzWClIBwsm+kCWv0AivBOaEetKOf3+iAytOcaMs/agKPLwqdghapJemqwiI3cgBVVjVZDCWIp84c4babx+B0wOuvUBMMraUthnczx9DdxnmRvJ9EQcO3eK5pya0PyDG4TqCu2; 20:dvsX5EVAgK3Km/V2mvmElX2kAZg1OofN7VtMdbyWuJN+e9X9lacV1DwscTuZ0Z2RNndcsDwEEjssYWz304DvWgL/2aVEmAEB0I9HyiXo3js9oMtFHsAvv9hnJ2L9vB+mKTpz5b8VvzVZ6TE9TtbUOOK9bVvJ04ILvnSb9ghx5U12zwJSIUVw2fkugYAQs2dxjFbNg8rKO5BdFznqWQmJde2ISsf7d6S7vruk24Xm1Lmy0PNc4Bl0+AJ7Y3wfWoSfqJfBTHNoq8raV2fRJpBLy/1Z++9YyQM7QYn7zL2Db4cWLe8rdY63r8HPH9Otaj1Ajdu9HhvQprkHGfiRtrEx6d5zDjvVfarfzik5wZ+8f1qzA85Yb8M1P7p+UQTobPFeGkPuGTnF8SwFwDTk+v6ASgCFNjaRUq8RMWgotlOAAI9354wbS/Ze/N2ZO1IHNPNSkJbXcTwyTpVmScj8203XprPKLoqUUXw6hID7m21Y8kNCDRxwDENb82Hn8Q8D7KnX X-Microsoft-Antispam-PRVS: <CY1PR12MB06650075C06BE77F6577AC72E5A10@CY1PR12MB0665.namprd12.prod.outlook.com> 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:yiMhhXV4fKFFK/0l7iEP2cH4aQUsvyyxVjtDBclBD9zQzvQyxf883y0Jz7o9oUbMEzjcdx9AF0u2cT359ztfY8urpv5IZc2cyOXP4AspMndq1k178RF3kfS7s35veq4a/PN6SbBn34ST491/JE7tfSC7/JOv3iVvdVy4iYcE5uYjlaE4CSNsG10aZFQJMCsiFA3ZNT5w7yUsPBQZZ9fdJ8g+ZrMlgVY9Mn9xe/qiq9cRuRyWLZjwbhxL40F721E0sgvstJvZQlKT6rX79aatR2+D1RKWHfVPlI0UDRuT4z8vgLUv0F9VDASoKA5jczTqP0kAbCJ4POAZ5SzKkMtzcs+vq0P/1wLCq05/SSpyogBpJ0vZS+GU0ArJL47c0ziAjULft0BxQ0lFhsK73omPBoRPLd9C0NIkBA3xJEqUVW+d0ub2uswVCWSqMTFWUOsVLFbSlkrRogVV3ZLIXi+9cg== X-Forefront-PRVS: 01136D2D90 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6009001)(6049001)(7916002)(189002)(199003)(103116003)(81156014)(33646002)(50986999)(47776003)(76176999)(106356001)(6116002)(42186005)(189998001)(230700001)(81166006)(4326007)(3846002)(586003)(23676002)(9686002)(105586002)(54356999)(229853001)(66066001)(68736007)(101416001)(33716001)(305945005)(19580405001)(7736002)(6666003)(77096005)(83506001)(2950100002)(50466002)(7846002)(5660300001)(7416002)(97736004)(92566002)(2906002)(86362001)(19580395003)(575784001)(8676002)(5001770100001)(4001350100001)(2201001)(921003)(217873001)(1121003); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR12MB0665; H:[127.0.1.1]; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtDWTFQUjEyTUIwNjY1OzIzOnZhd3NsbHZ2SlNFYnRPa0FrVkRwWlBvQVpM?= =?utf-8?B?U3FiUjhKdXRDNU45d2FmY1ZNZjNYa0R4TXJndmE5VjN1NnV6WE1welArK09D?= =?utf-8?B?RmNxelZ2Ym5QdkpTaEV2bjhURTN1bWExb3dRRGI3QkhpeWRzektoYzhwakQy?= =?utf-8?B?WUZud1lUL3FmQVkvL3BzWGZhMnM3VDVwNXFVd3FQUjM2RkxEV203QWJsajM3?= =?utf-8?B?blI0TnZpR2hEczVEQ1lTaEFHN1BjOXZhcnNJMHFZZ21QQnJXRUo2OTlYdm5V?= =?utf-8?B?TzdzdmNhMW9hc2hBbFArZitGd2J1TWdrVnI5SlIyVC9jUjVRdnlWNlAzVGky?= =?utf-8?B?V0ZKdFFpZTdaOVFGc0pqQzNUaksrZjBraVdUN2hPcFVCZ1U0eWRjREpYUDRZ?= =?utf-8?B?UnlCOEVXbHpudDhkNmhQSVo4V0Q2SnBLeDZZT1UyL2FncU9obWI4NktQamZO?= =?utf-8?B?UDJVVERDV0t5UDlFVHpGeTM4eFV6UjYxQXlPYVpSREVlQW00aXpMc2hneGZU?= =?utf-8?B?S3RwWVIrMCtqQ2xLTkFNN1I2dEwxUHNJRlh4dWhBYjY1RG5lOXNuVjJqZHlS?= =?utf-8?B?SnN6eXRpUG9LUXMzblE2bGxhdkdqck1wYWI1amNsZ1V1b01YQjZhTkhHVmdj?= =?utf-8?B?elpCTkNhKy9kdThad1dzZ0Y1ZG80aEpmVlV2K2NqaEtNcUFUN3BPdEYzWDdH?= =?utf-8?B?VGI3NkU3RE1qMEZ0UFpsRDFJOG9vTFMwUzhZeHFSWFlHdzd1SlVsZGNhTGdr?= =?utf-8?B?bmQ2eHlleEI0TUU4OGVNaTUxczdidEt3Sk9RWVg2bW13Z0NXLzMyZG9UMThQ?= =?utf-8?B?T1ErV09wdElnbytjUGpZL2c0WnVvSXV5MWs2RldvNXhvclg0V2VPZU1xOVlQ?= =?utf-8?B?d0dCdkpGeUh0QVJSRmhSZUJyTEFaWGhHT2lMekpkOXBnVWVVNk0zaEUyM25n?= =?utf-8?B?N0l4L3hDaWdBMTM3MFBvTjZES3JtZlVoL3o5SXg4b2JJR0I5WFd4cXlCTGdZ?= =?utf-8?B?TVRTOFlDM0VTSHNSK3NZOUErUUpCei9QaHNFZGNZWnRIR0U3L2ExR2dWd2pt?= =?utf-8?B?NFNYVlVPamJVRzZMYW5qcUdlc0NybTNZSDMvNFhCdjJUMmJmUExyelNGQXE4?= =?utf-8?B?UzFJOHB2eGplZWtVdDVLWjZJYnJvZkdBQUdTSkJxdE1COTVaTzJnQk1CVTcy?= =?utf-8?B?MnVwOHZQVnd6dnJsMHI2TExTOUpPaGE0NFZsWUpQNmZWMnlDMnlPcjdUWnRY?= =?utf-8?B?ZzRmM3h2WmI5VzZTNzl3T3ZSVUM0QlV2YS8rMmR6MFRJOUwzRUtPVFpCMm1R?= =?utf-8?B?VGxrZld0bkxVclVGamY1OFBSR09tUCtDbFdOdDgxR1NDZTZJQVBKc3pEVThz?= =?utf-8?B?S0ZtdVNQVlZ1cWI4VHdnRGRlZE1WUU54SmZJVElPc0pwdkdaQU1najE5ekMx?= =?utf-8?B?T3Nlb0FLWXpsc3JXR3lGekw4YmZpL1ZiRWVvTXkvaE1lQUttNEZWcTNQUFFw?= =?utf-8?B?S0RvZ2tnZ2xyYm80TkFQNTFYVGFtckFiT2tQblE2TEpFd1RxWk5KUXQ1NTZR?= =?utf-8?B?cVRtRzk0TnNXQXBUTXd0MzJ0TDlIbG8zeUlmWmR2Q0hYOHNrRmIweFM4VW1i?= =?utf-8?B?d3NHNWY3ZUNsN1dCY1lTZzFPZXhMNnNBYUEyQlBCMmNrazZyakV0MW5FdHo3?= =?utf-8?B?aUNzcWtKbVZpOEFvQlJmZGZVT1NQd3VWaGNyR1p4YVNsa3NoSGRxdFd0Unds?= =?utf-8?B?aXppZUsrd3pmR2d5YkZJdnllYWtncm8zZVRuR3JZVDUvZHBUaG5POGY1R25w?= =?utf-8?Q?Wz9sWKWBBUQcA?= X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0665; 6:ubN0AEZ/bfzLbbJbLzdd2NZ2k3pwmb3lymiTlxWny8z+HPbcJrR1hGTJpBwHWTYO+DY/MOl8wtSB7/D3fcrh9nVymkC8CjYuDzAfSV+HOFpHTzO6uC29OwFJc8RrOGVj6yZ0v6c9cb5MVuo/DEQfBM/OEQbDR+uMCG+EDRPsKUcggap/B/kWvrmxG/LFl0FAeD7ucnBLFPhnrglzLar6MJPAXaLnBuj6rD2m/KBiSSD5WkvsxI7N7LbCfQSHdS6c0N81jsgjlVn2Nc8Rx2lQzl1bEBP6P8xrMDpffFRzZVXpwBaoSM6DHsFeCSGY3wnAGOxysmZl/fAPqvlemwujFA==; 5:xpuVNkAdpyl7yXnrbNcs/hN3GdGbvJumzOiJViyKg/CTBJP4VoBgiAJ4tD8+rCONDLAYVX3x3oTK0jx3P2TZVhn02B5SR88lCBnODuCukiLafCzU3+2SSQMf5ERp9KFvrdDNNL8kpTw/PAMaS2CuVQ==; 24:OB9IoFuTClDy5JdaF/MFKOrDgU36+565LEQY2T5AsWIpyX6HnBsQ/c3dJSLE/pcP0oaSH53ue7qJDh/rj68XyvfKbg5Vdnomy2WJFOtva40= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0665; 7:eJUz6jbALPrYOtLxEYHeVsYuKr4w7u/JsHqzMo7DiNyD5zGXZJu8inYAY53WW31f/srNgLd1b4Bu7DsFgX31X7z/F/a6TwSwzegBDaeqEl0NfY0YBSwaWwfYXkqBA2pJz39VCMa5vNsTcA+RqFRyGar4sxUwchfzohyWEAiZjR+tATB+q55A7gNsOeZIwfKdPCkRp500YGbHREUyDwwetVpHYaTVmL5gBJ4LVWX8o+LCARoXGXoSpfs0gZW8NbEFe2qeoUsxxxSk0st560tcwgQzGGVpZqhz+7g3XvLGXasCiVAlDX4kN9zjoKUOcup94bHdQPIjFgXvNCzhisvUf+D99jp2AQkZraD0MCJcTZc=; 20:tBOx8uC5KBihqsXTUR64zoHyoLV/+v2A4/4wkOqD/rNeZuRDt1YV3sb1ZFpWBVQofLrZi2vmXrNAp9whTzTOmkETPQm5pIvD/Ki2aX17oCls4UWATUhJcuBvlr9WppxQDAhsUp5XD/RTp6cC3Qa5aJU/TRxNFEoMuApVzeL4DUhMJUJGQaADDl1mwNcPUx1CFJS5DZAo73Oqt/pl1/g5YAK1OWlKSq+yen9D4YpElLh3XXFUqzHysdLPo2zwF6ZP X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Nov 2016 15:54:27.7523 (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.34.68 Subject: [Qemu-devel] [RFC PATCH v3 15/18] i386: register memory encryption ops X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: <qemu-devel.nongnu.org> List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe> List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/> List-Post: <mailto:qemu-devel@nongnu.org> List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help> List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=subscribe> Cc: brijesh.ksingh@gmail.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> |
diff --git a/hw/i386/pc.c b/hw/i386/pc.c index f56ea0f..1b76159 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1402,6 +1402,13 @@ void pc_memory_init(PCMachineState *pcms, e820_add_entry(0x100000000ULL, pcms->above_4g_mem_size, E820_RAM); } + /* if memory encryption is enabled then set the memory encryption + * ops so that any debug read and write to guest memory from hypervisor will + * go through encryption routines. */ + if (kvm_memory_encryption_enabled()) { + kvm_memory_encryption_set_debug_ops(ram); + } + if (!pcmc->has_reserved_memory && (machine->ram_slots || (machine->maxram_size > machine->ram_size))) { diff --git a/hw/i386/pc_sysfw.c b/hw/i386/pc_sysfw.c index f915ad0..243beda 100644 --- a/hw/i386/pc_sysfw.c +++ b/hw/i386/pc_sysfw.c @@ -208,6 +208,9 @@ static void old_pc_system_rom_init(MemoryRegion *rom_memory, bool isapc_ram_fw) } g_free(filename); + if (kvm_memory_encryption_enabled()) { + kvm_memory_encryption_set_debug_ops(bios); + } /* map the last 128KB of the BIOS in ISA space */ isa_bios_size = bios_size; if (isa_bios_size > (128 * 1024)) { @@ -228,6 +231,7 @@ static void old_pc_system_rom_init(MemoryRegion *rom_memory, bool isapc_ram_fw) memory_region_add_subregion(rom_memory, (uint32_t)(-bios_size), bios); + } void pc_system_firmware_init(MemoryRegion *rom_memory, bool isapc_ram_fw)
If guest is launched with memory encryption enabled then register PC.BIOS and PC.RAM memory regions with memory encryption handler. Registering PC.BIOS memory region will ensure that memory encryption routines will be used when rom_reset copies the BIOS image into guest memory. A typical sequence look like: qemy_system_reset rom_reset cpu_physical_memory_write_rom cpu_phyiscal_memory_rw_debug_internal memory_encryption->write Similarly registering PC.RAM region will ensure that any debug accesses from qemu monitor or gdbserver will go through the memory encryption routines to decrypt/encrypt the guest RAM regions. A sequence looks like: cpu_phyiscal_memory_rw_debug cpu_phyiscal_memory_rw_debug_internal memory_encryption->write Signed-off-by: Brijesh Singh <brijesh.singh@amd.com> --- hw/i386/pc.c | 7 +++++++ hw/i386/pc_sysfw.c | 4 ++++ 2 files changed, 11 insertions(+)