From: Avi Kivity 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> References: <1252855135-2519-1-git-send-email-avi@redhat.com> Cc: kvm@vger.kernel.org To: Marcelo Tosatti Return-path: 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 In-Reply-To: <1252855135-2519-1-git-send-email-avi@redhat.com> Sender: kvm-owner@vger.kernel.org List-ID: 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 -- 1.6.1.1