From patchwork Mon Jan 29 20:43:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anatol Pomozov X-Patchwork-Id: 867289 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="M+3zuN7O"; dkim-atps=neutral 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 3zVhMt5xfRz9s75 for ; Tue, 30 Jan 2018 07:44:58 +1100 (AEDT) Received: from localhost ([::1]:37767 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1egGIS-0002Wn-RY for incoming@patchwork.ozlabs.org; Mon, 29 Jan 2018 15:44:56 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39587) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1egGHm-0002Un-BT for qemu-devel@nongnu.org; Mon, 29 Jan 2018 15:44:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1egGHl-0001EA-Jy for qemu-devel@nongnu.org; Mon, 29 Jan 2018 15:44:14 -0500 Received: from mail-pg0-x243.google.com ([2607:f8b0:400e:c05::243]:46420) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1egGHl-0001E2-Dt for qemu-devel@nongnu.org; Mon, 29 Jan 2018 15:44:13 -0500 Received: by mail-pg0-x243.google.com with SMTP id s9so5380035pgq.13 for ; Mon, 29 Jan 2018 12:44:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=LgTuK9VZqjSJoMWM/37e8/fe1fwxbo+4tb9VMHSta7Q=; b=M+3zuN7OaziOVOFm4wR4JADjNwsdswlUDgY9zXxI0W8OuyaQGSQ296MOABkadZH98j dRCWp5N09VvDfA/MxojtbI/LojVQU/aDijfWoeEWZISTpkXR4+P6ZNKaX+nYalhU8oAz 7v3iIMESP38d2K9/uAQOB9JiiZtPhLzKyWLjZfNFsSTPzDTyNUIV7XlgGaJWg83HD6Ip 7Y9PwDYIXyp3IQahGNSAglnmWt9fSzsBSi92nd0KLw9VHS/3AlNDzKFV+smKrmXvTy3K 9m7muc8A1G1VSwePwhpVod+zBBBFsnWBGa+zOHJ1rittMLmqomrWOMFGjZKhqwOqkw8M oS2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=LgTuK9VZqjSJoMWM/37e8/fe1fwxbo+4tb9VMHSta7Q=; b=hv4miqUsKgzgiHPyYlonQX+oRHzl5tukPmWWiXpu8q9fRmwWud2zJ3a8pxZfQJOCBB f84ibekNFIbTP+W1wkrR8lp1CuGkwrz9DF7mSoEZjH1N9a0UG+XZH9VRYZzeMA3G4ooX yWEQfG1BxRmToCj0BFGIqVUfRllcNdaW5LuZjFU/vh5JOv+TUgKEu6dBGb/svQUY0CxK t29QkfabrLodvAEet1dmVyIE82bI/d8vtZZPCAai76zfyKX2BdXs5gvPjRkV3J2502mW 7EHz15qokI/0nytsdBq4Al2BHdzPlhmWbf6/jiRbsmkfT1hPgUqKrNIZCCEPJbrAmWPh nwSQ== X-Gm-Message-State: AKwxytezxPu7/58YetiqTGzD0uw3KlONRWOzwLLRu7KYgVMI8Lvebgov R5zrhqVPS+K1J8SGp71wk+/12cOgnJA= X-Google-Smtp-Source: AH8x225K8t8sjK5MpfgDBLooryYpE+nJ3p7EZfLIc+hyN/1hG25/Xjts+EprCfJ/t29zFnaGUq+npA== X-Received: by 2002:a17:902:68cb:: with SMTP id x11-v6mr22834870plm.198.1517258651915; Mon, 29 Jan 2018 12:44:11 -0800 (PST) Received: from anatol.mtv.corp.google.com ([2620:15c:202:1:a4ef:a3cf:87b8:ef77]) by smtp.gmail.com with ESMTPSA id t1sm37436140pfj.21.2018.01.29.12.44.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 29 Jan 2018 12:44:11 -0800 (PST) From: Anatol Pomozov To: qemu-devel@nongnu.org Date: Mon, 29 Jan 2018 12:43:44 -0800 Message-Id: <20180129204344.196196-4-anatol.pomozov@gmail.com> X-Mailer: git-send-email 2.16.0.rc1.238.g530d649a79-goog In-Reply-To: <20180129204344.196196-1-anatol.pomozov@gmail.com> References: <20180129204344.196196-1-anatol.pomozov@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c05::243 Subject: [Qemu-devel] [PATCH 4/4] multiboot: Make elf64 loading functionality compatible with GRUB 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: kwolf@redhat.com, Anatol Pomozov , jack.schwartz@oracle.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" GRUB is a reference multiboot implementation and supports loading elf64 binaries. Make QEMU to work similar was as GRUB. --- hw/i386/multiboot.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/hw/i386/multiboot.c b/hw/i386/multiboot.c index 79b89e4fee..676ac7c48d 100644 --- a/hw/i386/multiboot.c +++ b/hw/i386/multiboot.c @@ -168,11 +168,6 @@ int load_multiboot(FWCfgState *fw_cfg, int kernel_size; fclose(f); - if (((struct elf64_hdr*)header)->e_machine == EM_X86_64) { - fprintf(stderr, "Cannot load x86-64 image, give a 32bit one.\n"); - exit(1); - } - kernel_size = load_elf_ram(kernel_filename, NULL, NULL, &elf_entry, &elf_low, &elf_high, 0, I386_ELF_MACHINE, 0, 0, NULL, true, §ions);