From patchwork Wed Feb 24 15:33:06 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Przywara X-Patchwork-Id: 8409071 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 453539F52D for ; Wed, 24 Feb 2016 15:33:31 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 722F020303 for ; Wed, 24 Feb 2016 15:33:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A408F2035E for ; Wed, 24 Feb 2016 15:33:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756735AbcBXPd2 (ORCPT ); Wed, 24 Feb 2016 10:33:28 -0500 Received: from foss.arm.com ([217.140.101.70]:44869 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753475AbcBXPdT (ORCPT ); Wed, 24 Feb 2016 10:33:19 -0500 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 36EF23FB; Wed, 24 Feb 2016 07:32:25 -0800 (PST) Received: from e104803-lin.lan (unknown [10.1.203.153]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 19E7F3F246; Wed, 24 Feb 2016 07:33:16 -0800 (PST) From: Andre Przywara To: Will Deacon Cc: Oleg Nesterov , kvm@vger.kernel.org, kvmarm@lists.cs.columbia.edu Subject: [PATCH 2/4] pre_init: x86/init64.S: use defines for syscall numbers Date: Wed, 24 Feb 2016 15:33:06 +0000 Message-Id: <1456327988-31568-3-git-send-email-andre.przywara@arm.com> X-Mailer: git-send-email 2.6.4 In-Reply-To: <1456327988-31568-1-git-send-email-andre.przywara@arm.com> References: <1456327988-31568-1-git-send-email-andre.przywara@arm.com> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Instead of hardcoding the syscall numbers and providing the symbol in the comments, just include and use the symbol directly. Signed-off-by: Andre Przywara --- x86/init64.S | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/x86/init64.S b/x86/init64.S index 488a93f..1a7c40f 100644 --- a/x86/init64.S +++ b/x86/init64.S @@ -1,3 +1,11 @@ +/* + * #!/bin/sh + * mount -t 9p -o trans=virtio,version=9p2000.L hostfs /host + * /virt/init $* + */ + +#include + .data .m_dev: @@ -16,7 +24,7 @@ .globl _start _start: - mov $165, %rax # __NR_mount + mov $__NR_mount, %rax mov $.m_dev, %rdi mov $.m_dir, %rsi mov $.m_typ, %rdx @@ -24,7 +32,7 @@ _start: mov $.m_opt, %r8 syscall - mov $59, %rax # __NR_execve + mov $__NR_execve, %rax mov $.e_nam, %rdi lea 8(%rsp), %rsi # argv[] mov %rdi, (%rsi) # change argv[0] @@ -33,6 +41,6 @@ _start: lea (%rsi,%rcx,8), %rdx # envp[] syscall - mov $60, %rax # __NR_exit + mov $__NR_exit, %rax mov $1, %rdi syscall # panic