From patchwork Wed Aug 3 20:06:38 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 9262161 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id D9ED960754 for ; Wed, 3 Aug 2016 20:08:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CB8842808C for ; Wed, 3 Aug 2016 20:08:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BFE9428210; Wed, 3 Aug 2016 20:08:10 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 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 mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 1BEE22808C for ; Wed, 3 Aug 2016 20:08:10 +0000 (UTC) Received: from localhost ([::1]:36459 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bV2SW-0000iE-Ai for patchwork-qemu-devel@patchwork.kernel.org; Wed, 03 Aug 2016 16:08:08 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:32847) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bV2Rv-0000gI-Bn for qemu-devel@nongnu.org; Wed, 03 Aug 2016 16:07:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bV2Rs-0001bB-5I for qemu-devel@nongnu.org; Wed, 03 Aug 2016 16:07:31 -0400 Received: from mail-sn1nam02on0040.outbound.protection.outlook.com ([104.47.36.40]:30896 helo=NAM02-SN1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bV2Rr-0001aw-RU for qemu-devel@nongnu.org; Wed, 03 Aug 2016 16:07:28 -0400 Received: from SN1NAM02FT018.eop-nam02.prod.protection.outlook.com (10.152.72.60) by SN1NAM02HT072.eop-nam02.prod.protection.outlook.com (10.152.72.225) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.1.557.8; Wed, 3 Aug 2016 20:07:21 +0000 Authentication-Results: spf=fail (sender IP is 149.199.60.96) smtp.mailfrom=xilinx.com; redhat.com; dkim=none (message not signed) header.d=none; redhat.com; dmarc=none action=none header.from=xilinx.com; Received-SPF: Fail (protection.outlook.com: domain of xilinx.com does not designate 149.199.60.96 as permitted sender) receiver=protection.outlook.com; client-ip=149.199.60.96; helo=xsj-tvapsmtpgw01; Received: from xsj-tvapsmtpgw01 (149.199.60.96) by SN1NAM02FT018.mail.protection.outlook.com (10.152.72.122) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.567.7 via Frontend Transport; Wed, 3 Aug 2016 20:07:20 +0000 Received: from 172-16-1-203.xilinx.com ([172.16.1.203]:38977 helo=xsj-tvapsmtp02.xilinx.com) by xsj-tvapsmtpgw01 with esmtp (Exim 4.63) (envelope-from ) id 1bV2Rk-00026E-Bi; Wed, 03 Aug 2016 13:07:20 -0700 Received: from [127.0.0.1] (port=35805 helo=tsj-smtp-dlp1.xlnx.xilinx.com) by xsj-tvapsmtp02.xilinx.com with esmtp (Exim 4.63) (envelope-from ) id 1bV2Rk-0000l1-7c; Wed, 03 Aug 2016 13:07:20 -0700 Received: from xsj-tvapsmtp02 (smtptest.xilinx.com [172.16.1.203]) by tsj-smtp-dlp1.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id u73K0WRn006695; Wed, 3 Aug 2016 13:00:32 -0700 Received: from [172.19.74.182] (port=45292 helo=xsjalistai50.xilinx.com) by xsj-tvapsmtp02 with esmtp (Exim 4.63) (envelope-from ) id 1bV2Rj-0000ky-CJ; Wed, 03 Aug 2016 13:07:19 -0700 From: Alistair Francis To: , Date: Wed, 3 Aug 2016 13:06:38 -0700 Message-ID: <5715d9919341e067e737fcccbb001a322cce3916.1470253246.git.alistair.francis@xilinx.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: References: X-RCIS-Action: ALLOW X-TM-AS-MML: disable X-TM-AS-Product-Ver: IMSS-7.1.0.1679-8.0.0.1202-22490.005 X-TM-AS-Result: No--1.148-7.0-31-10 X-imss-scan-details: No--1.148-7.0-31-10 X-TMASE-MatchedRID: P5qCxWx4duOzMsBjmgeEEHTnOygHVQpO6SXuwUgGH0hYYjdv4zyRO1O4 BD7nLMxnX5ZfmW1Ym4W6dYPAwfh0fvWfKuqzviIengIgpj8eDcAZ1CdBJOsoY9mzcdRxL+xwKra uXd3MZDV4Py3to8DV3fTGn/gayJNWHuleq5uJ1S1VXSVqjN4qIVGjyp7xOjhs5IU+dc+6iPY3hF WrcXWev4L+24CzhyEuGTIY8cK4XQDo4DGSOCid9FPJnXL2yNYdkuo847l05tDEzMyAmsz+FCp60 PS4RsxcQwymtxuJ6y0= X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:149.199.60.96; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(7916002)(2980300002)(1109001)(1110001)(339900001)(199003)(189002)(11100500001)(7696003)(4326007)(9786002)(5003940100001)(71366001)(2906002)(50466002)(305945005)(92566002)(8676002)(81166006)(64026002)(356003)(50226002)(19580405001)(7846002)(36756003)(106466001)(19580395003)(586003)(33646002)(50986999)(229853001)(118296001)(77096005)(5001770100001)(189998001)(2950100001)(86362001)(575784001)(105606002)(87936001)(76176999)(8936002)(48376002)(47776003)(81156014)(85426001)(107986001); DIR:OUT; SFP:1101; SCL:1; SRVR:SN1NAM02HT072; H:xsj-tvapsmtpgw01; FPR:; SPF:Fail; PTR:unknown-60-96.xilinx.com; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; SN1NAM02FT018; 1:BLnHk/F/qkPVOhtghkga8Db3sijiqsiZh5XeOhOTXF8bs7bSE9LxIEBKVOTaz2x1xj8a0G2aElqp/39zYiprxBP0zryJi+2IxJkduxE6kRqcAqRtu+4wg9Nx88aW/LHW1JP7u6lPK12no8m/lkUkkGSB30ILUrhSdsc52uYQNs7S5vOdBBQC3GGSyoS4RsYltf0akHQdMv+oHZ/F2z2gmSWozOguJfeCvjykQ/Qs7L8zaAT24njZ1URO26PPwEY1fWBYUUUq+iYUtERV5xFg7heuCArAKM3q+q1ExihMgxN244kyMs8me6fb7M3In8LW4Tp/FRYjTI6QCwJKpVpS86YYwmNLkOGmB/HK2MjrTibFm8AnLYpuHgDOQYjsBza3i1/mFvTFgOW8eS6R5AakWv94NHamhagDlltfvyStZJFyd2BjuvydnLAi5PMmP7md6TzBQJHU39/2+wQHkb2/ppllMkTYbr9qE82l7N+OklLZgQmPZiyFbP6rEmrC4JNPZod0eMGxZp6l898iBCzF4fy9rqT6e+md9b8i6mu3BipGGRicrPNAEDtomiRiIYc1W7irDxPRTU742YSnlWHh9ONqWjBY7IiS7sEA7pGB0rQ= MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: b37c8f54-3963-4141-7b99-08d3bbd9c70e X-Microsoft-Exchange-Diagnostics: 1; SN1NAM02HT072; 2:8H57/8cHQJr7oQAXMOVws8tTvxPumYTKyl6L4EPqjpssknh1FHMr4WkN/lzYrf3L5zhdjk5z1DMY5uPlcW3z/71NLotjziOBfUccg+SuhbaIYlBvx++Cpmju1ieBY7jGGKaZm3ZEqrfmboXREoBh26WcYJlKxTodl74rb/A5+83QgTz3eukmh+LicMR6fvdk; 3:jEoe25jjzK2Qxa4vl/2DyDgnNcChrHBrgNQQiWDIETtKZy51jySpqihtvwkyLcsNBxPPnrvQRSnoycRAP3Y3YhRgvnf4dUhlwbl+5I6l2bwB1lNCxMXipYQx4bo2FOhfZByNFFUGFLtW5rHMOJWJ+KwwKMEo7kQrMJnwoeGmlpkOB2T5Nor8zYUJ/T1Q/x3iRbpqxkPv8a/YVTipHw149AFvOeql9PrGp/AMdmyPT9U= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:SN1NAM02HT072; X-Microsoft-Exchange-Diagnostics: 1; SN1NAM02HT072; 25:PRNXaAXluibxrMqm6YzBFlS1DrBK0qa77/Wq8lYzOGttcLuWLcOP/E8f9nvODRGaxlS4K5PFTogg1lmgr1XOEk6aVl/mDjVU5u0YFQXWYf9QnlWSqiwEdisk2DHdXDKQngbB8wSlvvmkNi5pGR6hdJU1CRRoqBKDOs0LQ9FyzCpge2olmhG9q16J7MuVD+yN7yFOMmAjpR7L8RVdYpZL1n7VE+AVnuMe52C6K2aUeMTRuF3oaMPyT3zAowjjLp/lEjrMWsn0SzreAhR+hfbfCwkqDu8di+0VKVaWLI+b6Ay9dlLIloCIZoAYtFQKXEtbDxjl2DAv++tYaH4g81GG99oP1PANeKYLIULlFT5MkTc6txOJQkmhnlnKHWqxM2vWEnl+nB6pZZpj+UN6rrmW7R+LV6L3ufpccmNADQeezvANdy5ty0eFr+H18CIfem1ITSWiza2WH/PuflI514ca9bcfxFAZbLVgAsqCThpL0spLQeaVksJBQ3phF5BPUPPTqWh8GLMjpfVCl39ne+0+lV7YaSx+jNjvG86nmIsya69K+G0QHlzT3NB/+Ecx8dykykJERXV4rR0jRBjO1dZ29hE5UGZDOUO1Tb35uNWncZ7hC7QYWFCanw8fFxTHWQ7qiY2XONiKbvqmD1siJTIEeJWgbukSt1jizsnt3bjdarlgKCu1gM68tEPfyk3rrWs3BfcfmNFgEFgfk+F80Zy7j3JqDffM2wFbKiFm9q3zOPaFmY35vzrrPHLiaWlS2U8LruvzTiaayfWE1IOPPWsdxR11Lq9P0xkbfImtA+lJxGs= X-Microsoft-Exchange-Diagnostics: 1; SN1NAM02HT072; 31:pKZIfXmoZdee7BBMCTtJuJaSfJMl570ubxMyHKVbeX5e4+hf/6nD5nG4cE4Wcb/g7J6+kVYDr9MsGSDJquNejmnMlIR5+IKcuibRN7TxjwFqD9KnnQvSjUDenlefY5P8m0gLSSvyjlHUCi/6NEWlnfHQJV1s6gErhyS1TuVyriAAM25FzpMJIA1kk9UFmt7ov0hm1NQFJsTXVIcxh2gImGuJqkIJXlkraK+eSAZiyvY=; 20:pOlFiXYtoyZxyureCT0lvkeraJa6HJJdQicsWdaqh024opeCgb/NKboq+lxqO/9lhN8iqu8CGO1ZDTLCLmHaBNZAS45nzFa/DY2qJsxTuvwDzws+iAxbKmL+occtU3KXfZFt6zLABOsi7bHzb7TfYfRUKTqoj3j2vTSO27a+Gp9lO9ndAv0/z3KrxTkDW8Nl7AamISJzZErHglMuBl4tNbSBfXaVAL6vfEpz1f9xNdg5AlMaFn4KYlNVnZfg0QV5IeqL1EvrPQkAHDzCY2okXCZ8+9fFvWOnfDeJogto4m9Oa+8lYZn0BwBYzTUzub5TogiEbEZcu+mtVjVF8yyoVblfA+AYnQkoURX+GI5/23qlpukJqhZDbNghgBFqzJf9J2YB/jZ3Quf9fzIv2PhE4yCg+VSRJXRNTObphkzTdLESSmcnKbS7522BElM8s2qaeCjFFYdnwPzl3S8fRx1cQbIrfHAo6x9AWqWqml5k/3bqumr5rrf4dgZTU2scwzil X-Microsoft-Antispam-PRVS: <4b8bd49b8e0a41ae9db2875695f5166f@SN1NAM02HT072.eop-nam02.prod.protection.outlook.com> X-Exchange-Antispam-Report-Test: UriScan:(192813158149592); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040151)(601004)(2401047)(13023025)(13017025)(13024025)(13018025)(8121501046)(13015025)(5005006)(10201501046)(3002001)(6055026); SRVR:SN1NAM02HT072; BCL:0; PCL:0; RULEID:; SRVR:SN1NAM02HT072; X-Microsoft-Exchange-Diagnostics: 1; SN1NAM02HT072; 4:T09lTEfnbp6cdU57/5b+sslnun1pGOYMDldbDSx5RAw2JtHIpIqSaOpQqOR/N1wT8EI6t3wDDXvHFLjyLrRK0/hFLEQQzKepALgP34MnDJzTSYVj3dyyWdunDfJoUUeiTsJL2Bi+8vI+VhlykyDhfI7Nt206m6pYsMUkBOwscRkPO41X5Mw7tRAU8zgppYI2rZljSU2K8baAwZaXjzpVSQSZSwi05VNzufXzZDPGH+ZxTnm1S8mE5hGQeXAsQ7/6Vk4jpC0jIeWtB9GVzHYbwIsUwyq5yhNCka/ZWY/TxdsLUUfwMGqybFlQmSZGbLpp/qnDHZksSVAonhJnNAyexAdgL+154arNOIiO5NgYmtYUGGwXNsVZPydzvs8JkbJUY/BnzO+Oi9DK4NJaWQihTKzjGODoQormsuB6VCZlzBtCH42ZDYOStgbsoVbySoR5Ilbz63C+kgNfFEgO58KkFoeaTDa6bpsmseZGFZcNlUN7C3Yif74m6tSS/o34P6Fub0c/jjiQF+4r1N/MIa83tepcX7zsMQxdy4u98E2Cvtk= X-Forefront-PRVS: 00235A1EEF X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SN1NAM02HT072; 23:hBLKNY+bEvS7gsKTeQOtpU55AUXsHNrNu0KvtKsJK?= =?us-ascii?Q?OTCOVsRlBx4e+U1WyC6mSNjJho8y4etwsovI4qtWmVSF3xBzf7fZtAh03cnP?= =?us-ascii?Q?q/v0BP1rXqrCR/SzuvidyPUrL/C2XtpTyoPYth0zBtRWHY4veeLaKTR+ytYK?= =?us-ascii?Q?uVrg8PHq7hHmz2+2vC/urXY2sa2DCaqlWHoW/MGUAMzK0/IYUDXEueHGMtTN?= =?us-ascii?Q?sw04jerJNdOe7GPDKoQa3g4Fe4aPQ5D9521Mg+Kl+H8WoIxgjsn9GnWKE7jk?= =?us-ascii?Q?n0ahghrL4cwjY6FMKbs3BRi3/iOs5V3we6U+Er35WOd82b7d5x1G326aFZx+?= =?us-ascii?Q?aChPZbrBBhLVlbEnpMniDgdcvxUgkZvyLkfXfI0nVH/Jch3aXi5qlJVC4c6Q?= =?us-ascii?Q?LK8ctqfa3ZTEDfO3FK5UMo7R4xYvtXnVKjdX30s/1o3Z5U8uMnDHg3qMqoKV?= =?us-ascii?Q?Qr6FCe3th4k8We6x5/tzEhoRXz1Q3QKbDlcbHUjczTBUzlskaoeQOWJNrYfv?= =?us-ascii?Q?LAAqZWyzCeFv7uvxMklal5JdyobmfkZi2JwwnhJnSPgOdxR1cDYXqdxZ7pRa?= =?us-ascii?Q?sN6sECy6ldRSHLrI+APRgPjZ1grpCIgk81Jn6CILglbn2g2smaUVcAuVcdV8?= =?us-ascii?Q?YttwEfloXzpC/rCbJQ8jQqXubN33au4l54nTzRQx2tjVXcMNhJsS7JwUOzmg?= =?us-ascii?Q?t0ambrA3uYw4ECNdFCiVtrd8C+Og1Z5vrI9ZhPm///bNaQ+JWn+0EsvGTUdD?= =?us-ascii?Q?UPlduMuIitki7Oeoj1gzaPRI1e3cQZ0yu4dv48dPqabRzuuKu3+Xg5krtDfj?= =?us-ascii?Q?fAtpu6F10vsbm33iZcj1SNLbO/CviL+Zth2MjWf3s02LRxr1vt9JqltBz4I6?= =?us-ascii?Q?Vm58Z5PZ2kIl1AmQUAbDqvCEZGbb9O02VF7KorEYMC8tkiRc1c5fHggBKvu6?= =?us-ascii?Q?SrBHUHtK5ng7bdPNC95cWUKgiZxMol8QUsPVlM/xVJOCKJvmrG3b9wMABXVj?= =?us-ascii?Q?b2mGRlWHifY+5WFSmCDDnxNydlC91eXOPgm3YG+J9xaG7YPk2rRcrjvhzvUG?= =?us-ascii?Q?GTRO8neRo3U4th60j//TryOZ0rZhKsvkUaE8t/IsSvcQVkR7aJbGThF+hgTU?= =?us-ascii?Q?O7rvbMaMrHr8eQPBDvhWafpg/kjwYG8WgTgeVqTjNi/Ydf5AJN/AeMWRsKZM?= =?us-ascii?Q?EetZ/65ZV8Ut88ujhSSN19WdeDd5mASydu5?= X-Microsoft-Exchange-Diagnostics: 1; SN1NAM02HT072; 6:T9qAX0r6O1jEdlSlcRJ6BEOaXR9E9SDLjFIrWFuirI8L4pqdQD5RtNdQ6Z2eKqn5nsB24kgP/jThaXovPZLGU1uyiYC1ujnOyM5/AqQwpHqpJ1TdI7ScbGluL2RQwOkGQu//6IzKuUUp2ofrMXTXdxirgqAhEtQkAd1xHsOIL6w93fEMNmXFKPXXTmsiZC9mKE+Ql2c1+OjJC2AxfG0JAOsuEJL+jqaNNvuKGHCpoc93zzK8k9adRxfopvdm4i93RkUY+91BdkaQF6iaLqiTgSjPywxFq1BOoOzaK3t/v3xnkNOI5c9w4kjBcMDSTiXAUDa7zj3OXZPeT1rIONucuA==; 5:MJtOJvizoojCSR/7nzuU/muTdUS0vqoppJWYamBxhZF9Fi8bt8bpTTOyd+0GgBjXEO70WBPHDsj0RfxdCcnuUhrAcZLMdF1mtVJNjx34LmIoUgwLc/137vAghGjcGlqzXxzmKnEw8I/B0GOChduSQg==; 24:e5HOhY06P77DbAx23JGAah6HzI1pS0otFBd/lkRa6wXiB4vxcwShjswcaGuuMF/G5gPRD0RtPNQ6sWjrlNRW3rvAswcr9FPc8yDdqjMsUhk=; 7:AjGv2kGc8TXqWTU3GdkQs6RkP5vYk0trj9I8M8MCc392aR41TPZEom5GM2c9F3R+LNy9mPF8Ba9nLQnpgTdWgZ3eDfGGI+v0dYMk+rwerMTOsVrDwms5JMik6R40ctexPT3S5eAK/vxVSx/+mfgRfoHWP68IFrwNGDyG3Tg9BcGHU99+sFKHwTRoIo/wZ54KP9qzlaD4zvrhdgzI8cZdRuj285B5fvfpY9EYPOyHVZH2vwVdtaQklKGRCW0ewCPf SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Aug 2016 20:07:20.8471 (UTC) X-MS-Exchange-CrossTenant-Id: 657af505-d5df-48d0-8300-c31994686c5c X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=657af505-d5df-48d0-8300-c31994686c5c; Ip=[149.199.60.96]; Helo=[xsj-tvapsmtpgw01] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1NAM02HT072 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.36.40 Subject: [Qemu-devel] [PATCH v10 2/8] loader: Use the specified MemoryRegion 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: , Cc: cov@codeaurora.org, crosthwaitepeter@gmail.com, pbonzini@redhat.com, armbru@redhat.com, alistair.francis@xilinx.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Prevously the specified MemoryRegion was ignored during the rom register reset. This patch uses the rom MemoryRegion is avaliable. Signed-off-by: Alistair Francis Reviewed-by: Peter Maydell --- hw/core/loader.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hw/core/loader.c b/hw/core/loader.c index 53e0e41..6b61f29 100644 --- a/hw/core/loader.c +++ b/hw/core/loader.c @@ -1045,7 +1045,8 @@ int rom_check_and_register_reset(void) } addr = rom->addr; addr += rom->romsize; - section = memory_region_find(get_system_memory(), rom->addr, 1); + section = memory_region_find(rom->mr ? rom->mr : get_system_memory(), + rom->addr, 1); rom->isrom = int128_nz(section.size) && memory_region_is_rom(section.mr); memory_region_unref(section.mr); }