From patchwork Wed Sep 16 09:25:39 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Avi Kivity X-Patchwork-Id: 47869 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 n8G9QPmP009577 for ; Wed, 16 Sep 2009 09:26:25 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758454AbZIPJ0S (ORCPT ); Wed, 16 Sep 2009 05:26:18 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1758426AbZIPJ0R (ORCPT ); Wed, 16 Sep 2009 05:26:17 -0400 Received: from mx1.redhat.com ([209.132.183.28]:41924 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758217AbZIPJ0J (ORCPT ); Wed, 16 Sep 2009 05:26:09 -0400 Received: from int-mx05.intmail.prod.int.phx2.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.18]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n8G9QCUS008700 for ; Wed, 16 Sep 2009 05:26:12 -0400 Received: from cleopatra.tlv.redhat.com (cleopatra.tlv.redhat.com [10.35.255.11]) by int-mx05.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id n8G9QBMn015542; Wed, 16 Sep 2009 05:26:12 -0400 Received: from localhost.localdomain (cleopatra.tlv.redhat.com [10.35.255.11]) by cleopatra.tlv.redhat.com (Postfix) with ESMTP id 9AB6E250051; Wed, 16 Sep 2009 12:26:10 +0300 (IDT) From: Avi Kivity To: Marcelo Tosatti Cc: kvm@vger.kernel.org Subject: [PATCH QEMU-KVM 04/34] test: add multiboot headers to startup files Date: Wed, 16 Sep 2009 12:25:39 +0300 Message-Id: <1253093169-1423-5-git-send-email-avi@redhat.com> In-Reply-To: <1253093169-1423-1-git-send-email-avi@redhat.com> References: <1253093169-1423-1-git-send-email-avi@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.18 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