From patchwork Thu May 12 16:13:07 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 621677 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 3r5JRd2yvbz9sDb for ; Fri, 13 May 2016 02:32:13 +1000 (AEST) Received: from localhost ([::1]:58733 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b0tX1-0000PC-Il for incoming@patchwork.ozlabs.org; Thu, 12 May 2016 12:32:11 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56758) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b0tWb-00084b-U7 for qemu-devel@nongnu.org; Thu, 12 May 2016 12:31:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b0tWW-0000Sh-Oe for qemu-devel@nongnu.org; Thu, 12 May 2016 12:31:45 -0400 Received: from mail-cys01nam02on0066.outbound.protection.outlook.com ([104.47.37.66]:42418 helo=NAM02-CY1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b0tWW-0000SB-GG for qemu-devel@nongnu.org; Thu, 12 May 2016 12:31:40 -0400 Received: from CY1NAM02FT049.eop-nam02.prod.protection.outlook.com (10.152.74.58) by CY1NAM02HT226.eop-nam02.prod.protection.outlook.com (10.152.74.201) with Microsoft SMTP Server (TLS) id 15.1.492.8; Thu, 12 May 2016 16:16:35 +0000 Authentication-Results: spf=fail (sender IP is 149.199.60.96) smtp.mailfrom=xilinx.com; suse.de; dkim=none (message not signed) header.d=none; suse.de; 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 CY1NAM02FT049.mail.protection.outlook.com (10.152.75.83) with Microsoft SMTP Server (TLS) id 15.1.492.8 via Frontend Transport; Thu, 12 May 2016 16:16:34 +0000 Received: from 172-16-1-203.xilinx.com ([172.16.1.203]:36256 helo=xsj-tvapsmtp02.xilinx.com) by xsj-tvapsmtpgw01 with esmtp (Exim 4.63) (envelope-from ) id 1b0tHu-0007cm-4h; Thu, 12 May 2016 09:16:34 -0700 Received: from [127.0.0.1] (port=45097 helo=tsj-smtp-dlp1.xlnx.xilinx.com) by xsj-tvapsmtp02.xilinx.com with esmtp (Exim 4.63) (envelope-from ) id 1b0tHu-0000Yp-1Y; Thu, 12 May 2016 09:16:34 -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 u4CGAI0J004740; Thu, 12 May 2016 09:10:18 -0700 Received: from [172.19.74.182] (port=54098 helo=xsjalistai50.xlnx.xilinx.com) by xsj-tvapsmtp02 with esmtp (Exim 4.63) (envelope-from ) id 1b0tHs-0000Yl-W7; Thu, 12 May 2016 09:16:33 -0700 From: Alistair Francis To: Date: Thu, 12 May 2016 09:13:07 -0700 Message-ID: <2441e3462852d2cadaf81272df7be5da802d0259.1463069453.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-22316.005 X-TM-AS-Result: No--3.020-7.0-31-10 X-imss-scan-details: No--3.020-7.0-31-10 X-TMASE-MatchedRID: eiHJ4NstS4LHz0i32AeJEVVN8laWo90MI9yVcHNDU7baqqH/oHw+kWaS 4uH1erX9KWrPX3PpGcsnEtFE/84LtK+/EguYor8cFEUknJ/kEl7dB/CxWTRRuwihQpoXbuXFpzA xV1riZmRMqIvtYY4OcDp3qdaQLEOlKZz+YbL+7iYE7D+6dzpojXq7sLZVmCRJ3QA3VkQKNHp5jn rwToEkzGgQQvioCZlFiB6mlDKe1V7S/yytHeCN9GXv4CQeNUk7G6qTOwq/n72eqD9WtJkSIw== X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:149.199.60.96; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(2980300002)(1110001)(1109001)(339900001)(199003)(189002)(9170700003)(76176999)(11100500001)(4326007)(50986999)(2950100001)(19580405001)(19580395003)(64026002)(71366001)(2906002)(33646002)(50226002)(50466002)(48376002)(586003)(118296001)(81166006)(9786002)(1220700001)(77096005)(92566002)(8936002)(2351001)(6806005)(87936001)(85426001)(229853001)(47776003)(106466001)(105606002)(5008740100001)(5003940100001)(36756003)(86362001)(189998001)(5003600100002)(110136002)(107986001); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1NAM02HT226; H:xsj-tvapsmtpgw01; FPR:; SPF:Fail; MLV:sfv; A:1; MX:1; LANG:en; MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 1dbf6012-3e56-4a75-d645-08d37a80c9e1 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:CY1NAM02HT226; X-Microsoft-Antispam-PRVS: <7994a5dca5ab425481989b6a66407668@CY1NAM02HT226.eop-nam02.prod.protection.outlook.com> X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(13024025)(13023025)(13017025)(5005006)(13018025)(13015025)(8121501046)(3002001)(10201501046)(6055026); SRVR:CY1NAM02HT226; BCL:0; PCL:0; RULEID:; SRVR:CY1NAM02HT226; X-Forefront-PRVS: 0940A19703 X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 May 2016 16:16:34.6420 (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: CY1NAM02HT226 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.37.66 Subject: [Qemu-devel] [PATCH v5 1/3] loader: Allow ELF loader to auto-detect the ELF arch 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: peter.maydell@linaro.org, armbru@redhat.com, alistair.francis@xilinx.com, crosthwaitepeter@gmail.com, cov@codeaurora.org, pbonzini@redhat.com, afaerber@suse.de Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" If the caller didn't specify an architecture for the ELF machine the load_elf() function will auto detect it based on the ELF file. Signed-off-by: Alistair Francis --- hw/core/loader.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/hw/core/loader.c b/hw/core/loader.c index c049957..6b8be6b 100644 --- a/hw/core/loader.c +++ b/hw/core/loader.c @@ -419,6 +419,7 @@ int load_elf(const char *filename, uint64_t (*translate_fn)(void *, uint64_t), { int fd, data_order, target_data_order, must_swab, ret = ELF_LOAD_FAILED; uint8_t e_ident[EI_NIDENT]; + uint16_t e_machine; fd = open(filename, O_RDONLY | O_BINARY); if (fd < 0) { @@ -451,6 +452,15 @@ int load_elf(const char *filename, uint64_t (*translate_fn)(void *, uint64_t), goto fail; } + if (elf_machine < 1) { + /* The caller didn't specify and ARCH, we can figure it out */ + lseek(fd, 0x12, SEEK_SET); + if (read(fd, &e_machine, sizeof(e_machine)) != sizeof(e_machine)) { + goto fail; + } + elf_machine = e_machine; + } + lseek(fd, 0, SEEK_SET); if (e_ident[EI_CLASS] == ELFCLASS64) { ret = load_elf64(filename, fd, translate_fn, translate_opaque, must_swab,