From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from [140.186.70.92] (port=39549 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1PjsH1-0004Wy-1O
	for qemu-devel@nongnu.org; Mon, 31 Jan 2011 06:50:24 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gleb@redhat.com>) id 1PjsGz-0007FY-Mk
	for qemu-devel@nongnu.org; Mon, 31 Jan 2011 06:50:22 -0500
Received: from mx1.redhat.com ([209.132.183.28]:2383)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gleb@redhat.com>) id 1PjsGz-0007FI-Fk
	for qemu-devel@nongnu.org; Mon, 31 Jan 2011 06:50:21 -0500
Date: Mon, 31 Jan 2011 13:50:17 +0200
From: Gleb Natapov <gleb@redhat.com>
Subject: Re: [Qemu-devel] [PATCH] fix linuxboot.bin and multiboot.bin to
	not hijack int19
Message-ID: <20110131115017.GX14750@redhat.com>
References: <20110131090247.GT14750@redhat.com>
	<74F5EE10-5F10-4533-A980-68A7B8F00991@suse.de>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <74F5EE10-5F10-4533-A980-68A7B8F00991@suse.de>
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Alexander Graf <agraf@suse.de>
Cc: qemu-devel@nongnu.org

On Mon, Jan 31, 2011 at 12:41:46PM +0100, Alexander Graf wrote:
> > Signed-off-by: Gleb Natapov <gleb@redhat.com>
> The idea behind the OPTION_ROM and BOOT_ROM split was to have a generic header that can be used as template for random option roms or boot roms alike. Your patch munges those two use-cases together by providing bev logic in the generic option rom part.
> 
> Please split it out into the BOOT_ROM macro, or - if necessary - create a new macro.
> 
> 
Like this?

diff --git a/pc-bios/optionrom/linuxboot.S b/pc-bios/optionrom/linuxboot.S
index c109363..79b3ae8 100644
--- a/pc-bios/optionrom/linuxboot.S
+++ b/pc-bios/optionrom/linuxboot.S
@@ -22,6 +22,8 @@
 
 #include "optionrom.h"
 
+#define PRODUCT "Linux loader"
+
 BOOT_ROM_START
 
 run_linuxboot:
diff --git a/pc-bios/optionrom/multiboot.S b/pc-bios/optionrom/multiboot.S
index 9131837..069c4e8 100644
--- a/pc-bios/optionrom/multiboot.S
+++ b/pc-bios/optionrom/multiboot.S
@@ -20,6 +20,8 @@
 
 #include "optionrom.h"
 
+#define PRODUCT "multiboot loader"
+
 #define MULTIBOOT_MAGIC		0x2badb002
 
 #define GS_PROT_JUMP		0
diff --git a/pc-bios/optionrom/optionrom.h b/pc-bios/optionrom/optionrom.h
index fbdd48a..2d4f40e 100644
--- a/pc-bios/optionrom/optionrom.h
+++ b/pc-bios/optionrom/optionrom.h
@@ -97,27 +97,37 @@
 
 #define BOOT_ROM_START					\
 	OPTION_ROM_START				\
-	push		%eax;				\
-	push		%ds;				\
-							\
-	/* setup ds so we can access the IVT */		\
-	xor		%ax, %ax;			\
-	mov		%ax, %ds;			\
-							\
-	/* install our int 19 handler */		\
-	movw		$int19_handler, (0x19*4);	\
-	mov		%cs, (0x19*4+2);		\
-							\
-	pop		%ds;				\
-	pop		%eax;				\
 	lret;						\
-							\
-    int19_handler:;					\
+	.org 		0x18;				\
+	.short		0;				\
+	.short		_pnph;				\
+    _pnph:						\
+	.ascii		"$PnP";				\
+	.byte		0x01;				\
+	.byte		( _pnph_len / 16 );		\
+	.short		0x0000;				\
+	.byte		0x00;				\
+	.byte		0x00;				\
+	.long		0x00000000;			\
+	.short		_manufacturer;			\
+	.short		_product;			\
+	.long		0x00000000;			\
+	.short		0x0000;				\
+	.short		0x0000;				\
+	.short		_bev;				\
+	.short		0x0000;				\
+	.short		0x0000;				\
+	.equ		_pnph_len, . - _pnph;
+    _bev:;						\
 	/* DS = CS */					\
 	movw		%cs, %ax;			\
 	movw		%ax, %ds;
 
 #define OPTION_ROM_END					\
+    _manufacturer:;					\
+        .asciz "QEMU";					\
+    _product:;						\
+        .asciz PRODUCT;					\
     .align 512, 0;					\
     _end:
 
--
			Gleb.