From patchwork Sun Sep 13 15:18:49 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Avi Kivity X-Patchwork-Id: 47160 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n8DFJ5R2027189 for ; Sun, 13 Sep 2009 15:19:05 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754660AbZIMPTA (ORCPT ); Sun, 13 Sep 2009 11:19:00 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754649AbZIMPTA (ORCPT ); Sun, 13 Sep 2009 11:19:00 -0400 Received: from mx1.redhat.com ([209.132.183.28]:50053 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754452AbZIMPSy (ORCPT ); Sun, 13 Sep 2009 11:18:54 -0400 Received: from int-mx03.intmail.prod.int.phx2.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n8DFIvdE003364 for ; Sun, 13 Sep 2009 11:18:57 -0400 Received: from cleopatra.tlv.redhat.com (cleopatra.tlv.redhat.com [10.35.255.11]) by int-mx03.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id n8DFIut3012214; Sun, 13 Sep 2009 11:18:57 -0400 Received: from localhost.localdomain (cleopatra.tlv.redhat.com [10.35.255.11]) by cleopatra.tlv.redhat.com (Postfix) with ESMTP id C2C67250051; Sun, 13 Sep 2009 18:18:55 +0300 (IDT) From: Avi Kivity To: Marcelo Tosatti Cc: kvm@vger.kernel.org Subject: [PATCH 04/10] test: add multiboot headers to startup files Date: Sun, 13 Sep 2009 18:18:49 +0300 Message-Id: <1252855135-2519-5-git-send-email-avi@redhat.com> In-Reply-To: <1252855135-2519-1-git-send-email-avi@redhat.com> References: <1252855135-2519-1-git-send-email-avi@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.16 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org With these headers, multiboot can launch us directly in protected mode. Signed-off-by: Avi Kivity --- kvm/user/test/x86/cstart.S | 9 +++++++++ kvm/user/test/x86/cstart64.S | 9 +++++++++ 2 files changed, 18 insertions(+), 0 deletions(-) diff --git a/kvm/user/test/x86/cstart.S b/kvm/user/test/x86/cstart.S index 69a6262..0471b92 100644 --- a/kvm/user/test/x86/cstart.S +++ b/kvm/user/test/x86/cstart.S @@ -3,6 +3,15 @@ .bss .section .init + +mb_magic = 0x1BADB002 +mb_flags = 0x0 + + # multiboot header + .long mb_magic, mb_flags, 0 - (mb_magic + mb_flags) + +.globl start +start: call main push %eax call exit diff --git a/kvm/user/test/x86/cstart64.S b/kvm/user/test/x86/cstart64.S index 4f116f9..805938b 100644 --- a/kvm/user/test/x86/cstart64.S +++ b/kvm/user/test/x86/cstart64.S @@ -69,6 +69,15 @@ tss_end: .section .init .code32 + +mb_magic = 0x1BADB002 +mb_flags = 0x0 + + # multiboot header + .long mb_magic, mb_flags, 0 - (mb_magic + mb_flags) + +.globl start +start: mov $stacktop, %esp call prepare_64 jmpl $8, $start64