From patchwork Sat Nov 12 02:51:20 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 694008 Return-Path: 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 3tG2K853pKz9t0q for ; Sat, 12 Nov 2016 14:27:22 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=xilinx.onmicrosoft.com header.i=@xilinx.onmicrosoft.com header.b="H2yk3ool"; dkim-atps=neutral Received: from localhost ([::1]:56562 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c5OyK-0008VJ-53 for incoming@patchwork.ozlabs.org; Fri, 11 Nov 2016 22:27:16 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37788) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c5Oxg-00086p-AO for qemu-devel@nongnu.org; Fri, 11 Nov 2016 22:26:37 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1c5Oxb-00072e-Cy for qemu-devel@nongnu.org; Fri, 11 Nov 2016 22:26:36 -0500 Received: from mail-co1nam03on0052.outbound.protection.outlook.com ([104.47.40.52]:45929 helo=NAM03-CO1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1c5Oxa-00072N-SV for qemu-devel@nongnu.org; Fri, 11 Nov 2016 22:26:31 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=xilinx.onmicrosoft.com; s=selector1-xilinx-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=qCUlPvLAmhS0a83E5c+aOXjAAF14FTBd1oLsrZJ9LNI=; b=H2yk3oolfqAv5hy79qao+Hw6mbtpn99FsOtCfaUL+jR+i6ZesX4yzxygesepR2pXsjEU5vv9YZS+OXPy9QZWkT/4JdplvFdTOZ0o8EXi+ppm9xkcnjob4hA3wYnNP9+io/nzpWc7RJ3PDp8Wsc0Lqfif+9rciMtzXT4sNPoQZxM= Received: from BN6PR02CA0041.namprd02.prod.outlook.com (10.173.146.155) by BY2PR02MB011.namprd02.prod.outlook.com (10.242.44.154) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.707.6; Sat, 12 Nov 2016 02:53:01 +0000 Received: from SN1NAM02FT017.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e44::203) by BN6PR02CA0041.outlook.office365.com (2603:10b6:404:5f::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.721.10 via Frontend Transport; Sat, 12 Nov 2016 02:53:00 +0000 Authentication-Results: spf=pass (sender IP is 149.199.60.83) smtp.mailfrom=xilinx.com; gmail.com; dkim=none (message not signed) header.d=none;gmail.com; dmarc=bestguesspass action=none header.from=xilinx.com; Received-SPF: Pass (protection.outlook.com: domain of xilinx.com designates 149.199.60.83 as permitted sender) receiver=protection.outlook.com; client-ip=149.199.60.83; helo=xsj-pvapsmtpgw01; Received: from xsj-pvapsmtpgw01 (149.199.60.83) by SN1NAM02FT017.mail.protection.outlook.com (10.152.72.115) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.707.3 via Frontend Transport; Sat, 12 Nov 2016 02:53:00 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:; UpperCasedChecksum:; SizeAsReceived:1450; Count:15 Received: from unknown-38-66.xilinx.com ([149.199.38.66] helo=xsj-pvapsmtp01) by xsj-pvapsmtpgw01 with esmtp (Exim 4.63) (envelope-from ) id 1c5OR9-0000uK-UC; Fri, 11 Nov 2016 18:52:59 -0800 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1c5OR9-0000FK-QI; Fri, 11 Nov 2016 18:52:59 -0800 Received: from xsj-pvapsmtp01 (smtp3.xilinx.com [149.199.38.66]) by xsj-smtp-dlp2.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id uAC2qq59017849; Fri, 11 Nov 2016 18:52:52 -0800 Received: from [172.19.74.182] (helo=xsjalistai50.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1c5OR2-0000EV-7M; Fri, 11 Nov 2016 18:52:52 -0800 From: Alistair Francis To: , Date: Fri, 11 Nov 2016 18:51:20 -0800 Message-ID: <537bf4d08be7acf7a89b590cff69e19db7f0a6cd.1478908712.git.alistair.francis@xilinx.com> X-Mailer: git-send-email 2.7.4 X-RCIS-Action: ALLOW X-TM-AS-Product-Ver: IMSS-7.1.0.1224-8.0.0.1202-22692.006 X-TM-AS-User-Approved-Sender: Yes;Yes X-IncomingHeaderCount: 15 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:149.199.60.83; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(7916002)(2980300002)(438002)(189002)(199003)(5003940100001)(9786002)(106466001)(50986999)(33646002)(4326007)(36756003)(50226002)(118296001)(63266004)(81156014)(81166006)(8936002)(6666003)(8676002)(92566002)(189998001)(77096005)(47776003)(36386004)(48376002)(50466002)(586003)(5001770100001)(5660300001)(626004)(305945005)(2906002)(87936001)(356003)(7846002)(41533002)(107986001); DIR:OUT; SFP:1101; SCL:1; SRVR:BY2PR02MB011; H:xsj-pvapsmtpgw01; FPR:; SPF:Pass; PTR:unknown-60-83.xilinx.com; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; SN1NAM02FT017; 1:Ndw2KLM/1nweTjcbBiZo+8Sor3rRRu6elClWTqqcgURumpLT7sAzw0w2Mh0ZMqbia3KWuU1KsGtYXgwyS1WwA5JkQu6gSrdsuAWHvXhqfJvpn07zmxZZgh6mwRMfFr60/o25q2Ii2K9+0ouO4jHbDRb/ojjEx8zEWqC3Bgf+PkkaS+MI30HDSB6+lZ4yrV24MTd18LhqP8ZzcUXrMF3jLo6qm3BuJ5kqB4hwyBKsyvS5UExLeziAy8O0x05jMhtU7sz9gb7Sm6sNSHB6qcIkb896JTebjZWiaSAWBazCTHDdTBt0rnI4DOZjAqNkG3YJ4v2ZmvkShebNCle9sqhDN0hPm+dWw521FKKlRgDRyOxVlOUnGyFmEhriJERzqUUeXSwEwXTyl8z9qQ9m19ryhs6IF6pbWyMjn9MkRPFq4FSN+0oiMscrhr607pGMYC0GVVfXB+aDeuEWkRd4feIsR0eKAq9cF1J17H+yuMJ2f3LNQAa50xZcO0m7+UEONXTeIkDShNEJsIXhfR8VSlMKlw8I/kG/qi0ZfK/bH3c6OXyWA8bmcezGwiK/diLJHITRUNlSPp6HH6bxem5vMUXJM8fR1ewlCP4XSbA8BZfGosA= MIME-Version: 1.0 X-Microsoft-Exchange-Diagnostics: 1; BY2PR02MB011; 2:CoZ0HZZn1F0iMJRuPQd5nGihLV/iGvq2r2lrOryxWIRCPkglq59kNjgB6wAoTNEZ5T5++cTwvfDTcAjjXiJwipPn1G9OzjfejPpRMlqHvhZb9OFiiDfZ2pWdIz29Dee+Gk8Rs7jqfRqV0/mos8NadNkSFH94bBAAdNRuHTI4MyU=; 3:HNgCWpBNoMGaAYxiqa8ZkOhTuBb99j3bT+ye3CiJf+FToWB5WRv74/4Zgudw4HvxCluzTbvd+AvSLGrWuzr7JOk8U9ruIZ9z+GCqPEqy9LOGnIR1TLU6bfGWHGYtKjQmU8asLKqHAGhlZpF9FHnb5a/ER+gTsGHhRSNd5tRDe0mk3lzDBYJy8o9AZ4lAV8d4Wjs7D++++t5WU2ONU9EKo7wIUCA7Mf8F+DYlQUFBqICe8vSNj15PMVnN5WFwrdGNDawmiIL0HmhYFftpKot4iUAWo8s3VWW0VxXLEOIst9o=; 25:KQ4tL7w1xLh9oKRK8oYrgF6l43N9YIUlW3kMDSECetN7j2RO0p9dFm43DRjGnaVGd1MIdrmRI9XWORbcNTjby8xP4jPQd6s40JwlNscImbyBDMvWc9toCvJBDdGkp8JXK9KF0scOzckTZR12Z7tggYa2krGtwN9b4EIIjOG39NFAXXIj5qNQTStKBqvN19xbaajwbG2OiHyGvkyuxY9f3HVpc5eCMHGDBW4XHcGxoejhRLQSLW9pzt7yMXtDJEqzdJF5oY7Ae38azyudYRwzGkX8JDnYuN1YzlHi0BztMUoSltnVqX6AN1sDq0axu8rcEhnTh1OefBPoSm7tD8PxLcmA7jumNk7Fb/GrY+wD5bSyGsz6NRoYzaU145bpgbJX8hTGlggO3pXFvMxZxTFgEOefwBKzruzb1HYxo1S/SD3LQIxxNHONzJmWAS2I3Xsx X-MS-Office365-Filtering-Correlation-Id: 4e094535-115f-40a9-5f9b-08d40aa70407 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(8251501002); SRVR:BY2PR02MB011; X-Microsoft-Exchange-Diagnostics: 1; BY2PR02MB011; 31:so2Ah1NMRHy3gy8hiQmf9YY5/4E/JJhY8MjQ1o0QpFv+vkoa+EgXJ0XTyPFiCC5XE/6+yMYCeJ3aAuYS/iK0wvG1nvH5FSR/nN+MEZ/gU+AMh2ky/LN279+zvc9L4Vq/SZ69T8e6/GYsvqh+wcLu/jr5p8EYFkfw+9RAaSrnCu/aMP2OD2YUkm2PXNVrhe4cSCfQ28JF+PL3AvJbmqcbyxzgDMqDCVpl8aiBGZU5914OsEwxGlwU6NGxngt0XCcF; 20:RhhcUrvMb2T6WVXlvDY7WP4pF50KpotrEsRhgqIPCURzQ08zBdlNp551o9rQmpEBzE8h1NqNCX4rD30aYBZ6P7oQrjuNLbmS9Wmh0Q500N3oRnpDvuR2VOvfY5Q8pS1fpPtrXRqnaksZwICPbYrriJKqvfrJq2HgTH7MoE7H8dwiFRlMBDpRxeRI55U4qH6H+z1hoTIlqS9NmsUnghTPUhZZ0kV+Da49HNjKHsbbQE4nmqn0jN7S91PJn3B2+Bkm0EnpOlNXUNdwNspgLrpYNn7oCP7rq5xfLOPPTIp+j4YmvaED0YzUFlM7ZZJb975mep3hFr7dv4fD/KEqPfAQ1+0LTbM91Sk676jLvlCtEYHRhFZwkN4l9z4SvzkbQ3NfJO+PviRCHdRuKbeySG9xQ+0tCkqO8+PT8Nn6Pyl13L0lwKgNzHn9LLhOnIK/sNHzKsvC0mQ5eISOtdW7ogph9fOoEhPVipazi0cJdUXVeF72OE7KoEyf/g77W9jkT3Tn X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(192813158149592); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040176)(601004)(2401047)(13017025)(5005006)(13023025)(13018025)(13015025)(8121501046)(13024025)(10201501046)(3002001)(6055026); SRVR:BY2PR02MB011; BCL:0; PCL:0; RULEID:; SRVR:BY2PR02MB011; X-Microsoft-Exchange-Diagnostics: 1; BY2PR02MB011; 4:z2g9Zd3+QgKIzJZvEK85UyO+5VS9zLlxRFbU48KhnZmhiIpWBta0ElMKiYetT+QGgMrY0PwowjaCDsw6actV8pIrDwMzccBpdwrFOkt7Ri1Pm4ZjBdQdsAwJklQ+dEMfz7VS9ZSL/YEvXtM+gxUm+o9nN2kAUp+/aWfoJ2fSxAHeeZOG6orbyZta6vrCPIY+WC23gF0hzuJY7IcKzOBSuHid9RODzXVeYq1JbvNO4k3HtqHQ0Wt8z3ybNl/HQC9kGnv3+gkj1DRLz8UrFxos2N02WkPqLbg5txjD2E5MUCYBQDYxkMO36hgWC+2vvo22oYA7js2GzioJTeQ/3KNvO2+iDizmaiwkr6aUTRSHSsuXbRm1bMvTYP83MqSsepwfJ68pldOVnf6uFskUm6M2Q0zuQrDN4WAuV39qp+IrZMtlZzLycltk1l2XjODBQbEWX/Odm8MQi8zwNZllDiS9yTgWA2GStCdOVek2YmD6GW08eUxP15bYpJU+B5oPVeAemaqTG0wDnAHQgRici8NzNj4S9S1WDhJeovwlc0iFSD5Z5o/cApXGpMiODbtVvmZZ X-Forefront-PRVS: 01244308DF X-Microsoft-Exchange-Diagnostics: 1; BY2PR02MB011; 23:3sdwrhL7PVoVj3V15jWJ2GTUaQArpEQ85d3xupf4jCX2c4TU9L7KOlny73TFgak3mhac4eI/nEwq/6d3TOEPxTDcYUPyv3+02mrgUYVNtmcxsusLAQdp2gNO6NZgbF/dDd/Jgf7KfdTQZYKFCtdkBGI+jSfB7Qqa8+s6f2tttQeUP5GIMsheWmmgtU3piGMqrLskmchQhk6Or5GlUaOXFkLHaeanMcv3c4qlzWluMxsWRmTrB2ska/eNck3tEdMf3ErYWApLmLZ3CVFD04Db3oUuI7jRsQMhR7rRmqSQCopIScd4W6C2MQB7uSIt8wU0pIMFQ9cz8RTEVEGFu/wD/xvN+Wc230MQe2d8QVrz1Qzijw9PdCQtkY5P6NMaMQAlcb2FmmaU10zkJW+qZrC1QnkGOFCWXIIPuvXW+lAEZZlC7dZjgoQm03sAJSUONu0mjjCOen6ms+1fD2WXMNe5R1EDOcNI0+hRmTa7cToad8XdZhequ3uoYmK9UuCkI5zX1FzeFmlbsfppQBKBvF8GTDsbC49kFcFAoT8kgtCvUKrYh/8LBuzw4iJfFlkTwBnYybH9kwvyC2UgdIXoMhPftWsXMaKzaAZVZpthazqNog4BsE8zl8wYdRY3QdU/69f0qt3PAjmeoaLICde5iMqLw0JN4vZPBUwwKR3R71GfDr4uZETkW4a6Uyx22j2zgccmePIx12kTgpPNugGcxJN2ubzlaOFiwguKpDXKa7Ce6EFVbMMYXrnRI7vZ7araUPM5cQAI4+vsDQJMHLmDzDI7fisWO5bHI7HUDUoP/0qrIqOywF7/rC+PuDIC9mXdggKpcYo+DIr66g67XH4I2RAnrTyObsDsyivMk0+4hz+jjVcJQUHUvksaJnPD7EiOD83TZbamVj9t6nfa6V9kdfCW4Uz3VAJr8fLYEDXeX0fTfLBOgkZdq/cdkHyyHQ/iNue2 X-Microsoft-Exchange-Diagnostics: 1; BY2PR02MB011; 6:YEhLryBBhi839BRL6kYpz74MNDf4K+CAssNY8GIcE6E8tDFwGXSliLF58/SCp0nTo2sfoQxSR0QfRW2QOSw3rNbi6lKZsdjO/Cu9LMLI84po8VGPEFcfaQD3QGMJbVYhriUIga5wCGTe2txU1q+6UoUbYWyLK4q28usMaNQALtCli5lXWnQzv6AZ7oUjGz2wzZOHWupgEexr+CbRJF0uHyN2nFIFQaCDZvzs43o5ITPIXfrwBW+g4eFV9QLxmuufUXD3EwMAsV2NiT149CbqGiWbRmg+3BLaTP+qMScir0jJ+WFe0sw+xnpXH9f9RWeUPlKuMSis8jXiuoEJ/OWG187mQjeXX9globPCe2mJ3fE=; 5:ImfNTZEcWROjlIkUDDQZ+8Vk8RjQZH+g+ZCcI01Ds6Nzr0NohM8pcXJyotc1G5GYi+TX3WijGOHmPVwFdQ2uvnTCNlZyIkYOssVw38G+PuxDm2RQb7f3S9gZiHNtuoGTgOMevV0rrEobNmjkPHlTew==; 24:plWnrKotXB23oc5rnpPWEcG0Dbr+PYBM3Hcvn9D20ChSlBzS4hYq4BYAJHIVASsTw3U+JadRzjBc5ezn4haijtd0dkiUhr9Api8DSukTuyg= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BY2PR02MB011; 7:3TX2wSiVe58A1w0wSLl+ILQjLK9H+NkjIUkLSlZ1C4qQv+aFEJNrVuSSW0LK/gtXYXqUcDU99ELiIQIAItXURXPCSVlf6u/39KrZk81E5sjiskYMqqMHiCIfcTtAZMEE+2wwy2wgi7t+zL+rGeGpT+/Zo0UcXv0EZxs8NwlJ+f4bN2FI5fmnkltLOZOEnsYLKZKZw2lPu6U6v6fNqjVKFr07z59Ock2/HQEWvQsxzjdhlJHKuzLgnUkhtLD6vHow/QtkBl7TclHLjJDfUKY+7eLAMZylHNwN65XsTDINXyDyW4UuRy0riFfqvvrd81x30X9kCPnw7XBYjfqWfaM+c/Qh37SEtX1cw28tQ8bvjlg= X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Nov 2016 02:53:00.7771 (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.83]; Helo=[xsj-pvapsmtpgw01] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY2PR02MB011 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.40.52 Subject: [Qemu-devel] [PATCH v1 1/1] generic-loader: file: Only set a PC if a CPU is specified 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: edgar.iglesias@xilinx.com, alistair23@gmail.com, edgar.iglesias@gmail.com, alistair.francis@xilinx.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" This patch fixes the generic-loader file loading to only set the program counter if a CPU is specified. This follows what is written in the documentation and was always part of the original intention. Signed-off-by: Alistair Francis Reviewed-by: Edgar E. Iglesias --- hw/core/generic-loader.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/hw/core/generic-loader.c b/hw/core/generic-loader.c index 79ab6df..208f549 100644 --- a/hw/core/generic-loader.c +++ b/hw/core/generic-loader.c @@ -93,7 +93,12 @@ static void generic_loader_realize(DeviceState *dev, Error **errp) "image"); return; } - s->set_pc = true; + /* The user specified a file, only set the PC if they also specified + * a CPU to use. + */ + if (s->cpu_num != CPU_NONE) { + s->set_pc = true; + } } else if (s->addr) { /* User is setting the PC */ if (s->data || s->data_len || s->data_be) {