From patchwork Sat Aug 15 23:28:28 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Crosthwaite X-Patchwork-Id: 507657 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 250B314012C for ; Sun, 16 Aug 2015 09:32:03 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=HnEYDx7M; dkim-atps=neutral Received: from localhost ([::1]:51034 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZQkvh-0004KW-2F for incoming@patchwork.ozlabs.org; Sat, 15 Aug 2015 19:32:01 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56970) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZQksw-00077M-K2 for qemu-devel@nongnu.org; Sat, 15 Aug 2015 19:29:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZQksv-0000jj-Ap for qemu-devel@nongnu.org; Sat, 15 Aug 2015 19:29:10 -0400 Received: from mail-pa0-x236.google.com ([2607:f8b0:400e:c03::236]:33286) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZQksv-0000j8-4c for qemu-devel@nongnu.org; Sat, 15 Aug 2015 19:29:09 -0400 Received: by pabyb7 with SMTP id yb7so82023992pab.0 for ; Sat, 15 Aug 2015 16:29:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=OK4+WPtosStRQmBHWKAy4rUTMnfbyF9yVTcqcWJkfKM=; b=HnEYDx7MQ3LUqlaYWSn5F9fTt777Imat/PNe+ksP+5y3FuUmcXuRwQnX+W4p+TMK6C mHEPrqFfwe+wNTcL/UU9Hays/2vX4uvjFSVyU8KN9OWMTovb7h2wuC0HCD1vW69Wys/K d5Ddhbvixu3hghVEpOxnE3THNJkyi8fZVVNZulLtISCVZPx1JqJodfgDpW3c2vkCvr8V gXbJ+7PRtye1yWkcuy3uBnPCgslGC+OZ2HIGFsQS4XLmUf41DSzoxjPjjQxWYwEIZJi5 Su4TYJTeiEjTUDWHEpKzmt30ZRShBsmxb9+QaUKKWW/cLMygoikq8Gm3YJHvaE7LgpAK fP8w== X-Received: by 10.66.119.105 with SMTP id kt9mr103449019pab.86.1439681348585; Sat, 15 Aug 2015 16:29:08 -0700 (PDT) Received: from pcrost-box.hsd1.ca.comcast.net (c-50-168-24-48.hsd1.ca.comcast.net. [50.168.24.48]) by smtp.gmail.com with ESMTPSA id q6sm9863304pdp.14.2015.08.15.16.29.07 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 15 Aug 2015 16:29:07 -0700 (PDT) From: Peter Crosthwaite X-Google-Original-From: Peter Crosthwaite To: qemu-devel@nongnu.org Date: Sat, 15 Aug 2015 16:28:28 -0700 Message-Id: <54d29b8eefebfbf757830df47f3f520d08277ae9.1439679104.git.crosthwaite.peter@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: References: In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400e:c03::236 Cc: Eduardo Habkost , Peter Crosthwaite , riku.voipio@iki.fi, Peter Crosthwaite , pbonzini@redhat.com, Richard Henderson Subject: [Qemu-devel] [PATCH 18/19] i386: Rename ELF_MACHINE to be x86 specific X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Peter Crosthwaite Rename ELF_MACHINE to be I386 specific. This is used as-is by the multiboot loader. Linux-user previously used this definition but will not anymore, falling back to the default bahaviour of using ELF_ARCH as ELF_MACHINE. This removes another architecture specific definition from the global namespace. Cc: Paolo Bonzini Cc: Richard Henderson Cc: Eduardo Habkost Signed-off-by: Peter Crosthwaite Reviewed-by: Eduardo Habkost Acked-by: Eduardo Habkost --- hw/i386/multiboot.c | 2 +- target-i386/cpu.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/i386/multiboot.c b/hw/i386/multiboot.c index 1adbe9e..6774a19 100644 --- a/hw/i386/multiboot.c +++ b/hw/i386/multiboot.c @@ -195,7 +195,7 @@ int load_multiboot(FWCfgState *fw_cfg, } kernel_size = load_elf(kernel_filename, NULL, NULL, &elf_entry, - &elf_low, &elf_high, 0, ELF_MACHINE, 0); + &elf_low, &elf_high, 0, I386_ELF_MACHINE, 0); if (kernel_size < 0) { fprintf(stderr, "Error while loading elf kernel\n"); exit(1); diff --git a/target-i386/cpu.h b/target-i386/cpu.h index 74b674d..bec5e72 100644 --- a/target-i386/cpu.h +++ b/target-i386/cpu.h @@ -36,10 +36,10 @@ #define TARGET_HAS_PRECISE_SMC #ifdef TARGET_X86_64 -#define ELF_MACHINE EM_X86_64 +#define I386_ELF_MACHINE EM_X86_64 #define ELF_MACHINE_UNAME "x86_64" #else -#define ELF_MACHINE EM_386 +#define I386_ELF_MACHINE EM_386 #define ELF_MACHINE_UNAME "i686" #endif