From nobody Sun May 5 17:01:55 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1528562056304223.19881420589456; Sat, 9 Jun 2018 09:34:16 -0700 (PDT) Received: from localhost ([::1]:40975 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fRgoV-0006Lh-DY for importer@patchew.org; Sat, 09 Jun 2018 12:34:03 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46531) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fRgnb-00064n-7s for qemu-devel@nongnu.org; Sat, 09 Jun 2018 12:33:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fRgnW-0007r7-Bh for qemu-devel@nongnu.org; Sat, 09 Jun 2018 12:33:07 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:51798 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fRgnW-0007qx-6n for qemu-devel@nongnu.org; Sat, 09 Jun 2018 12:33:02 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 8654A40BC05A; Sat, 9 Jun 2018 16:33:00 +0000 (UTC) Received: from localhost (ovpn-116-35.ams2.redhat.com [10.36.116.35]) by smtp.corp.redhat.com (Postfix) with ESMTP id DF41C1C5A4; Sat, 9 Jun 2018 16:32:53 +0000 (UTC) From: Stefan Hajnoczi To: Date: Sat, 9 Jun 2018 17:32:52 +0100 Message-Id: <20180609163252.27506-1-stefanha@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.7]); Sat, 09 Jun 2018 16:33:00 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.7]); Sat, 09 Jun 2018 16:33:00 +0000 (UTC) for IP:'10.11.54.5' DOMAIN:'int-mx05.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'stefanha@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PATCH] loader: implement START_SEG_ADDR_RECORD 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: jim@groklearning.com, qemu.ml@steffen-goertz.de, Su Hang , joel@jms.id.au, Stefan Hajnoczi , jusual@mail.ru Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" It turns out that GNU binutils emits START_SEG_ADDR_RECORD when the start address is within the first megabyte (< 0x100000). Therefore we must handle this record type. Originally we thought this record type was x86-specific, but binutils also emits it on non-x86 architectures. Based-on: <1527161340-3200-1-git-send-email-suhang16@mails.ucas.ac.cn> Cc: Su Hang Signed-off-by: Stefan Hajnoczi --- Su Hang: Feel free to squash this into the next revision of your hex loader patch. Don't worry about the authorship information. hw/core/loader.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/hw/core/loader.c b/hw/core/loader.c index 3c0202caa8..7843b487b2 100644 --- a/hw/core/loader.c +++ b/hw/core/loader.c @@ -1423,8 +1423,14 @@ static int handle_record_type(HexParser *parser) break; =20 case START_SEG_ADDR_RECORD: - /* TODO: START_SEG_ADDR_RECORD is x86-specific */ - return -1; + if (line->byte_count !=3D 4 && line->address !=3D 0) { + return -1; + } + + /* x86 16-bit CS:IP segmented addressing */ + *(parser->start_addr) =3D (((line->data[0] << 8) | line->data[1]) = << 4) | + (line->data[2] << 8) | line->data[3]; + break; =20 case START_LINEAR_ADDR_RECORD: if (line->byte_count !=3D 4 && line->address !=3D 0) { --=20 2.17.1