From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1LEY3b-00034I-1p
	for qemu-devel@nongnu.org; Sun, 21 Dec 2008 18:49:59 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1LEY3X-000346-FC
	for qemu-devel@nongnu.org; Sun, 21 Dec 2008 18:49:57 -0500
Received: from [199.232.76.173] (port=39880 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1LEY3X-000343-95
	for qemu-devel@nongnu.org; Sun, 21 Dec 2008 18:49:55 -0500
Received: from outbound-va3.frontbridge.com ([216.32.180.16]:18566
	helo=VA3EHSOBE004.bigfish.com)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_ARCFOUR_MD5:16)
	(Exim 4.60) (envelope-from <Andre.Przywara@amd.com>)
	id 1LEY3W-00036k-La
	for qemu-devel@nongnu.org; Sun, 21 Dec 2008 18:49:55 -0500
Message-ID: <494ED60F.6000509@amd.com>
Date: Mon, 22 Dec 2008 00:49:35 +0100
From: Andre Przywara <andre.przywara@amd.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="ISO-8859-1"; format=flowed
Content-Transfer-Encoding: 7bit
Subject: [Qemu-devel] [PATCH] add missing firmware configuration channel
	numbers to BIOS
Reply-To: qemu-devel@nongnu.org
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.gnu.org/pipermail/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: Anthony Liguori <anthony@codemonkey.ws>
Cc: qemu-devel@nongnu.org

Hi,

although we currently don't use firmware config channel
numbers higher than '0x02' in the PC-BIOS, add the channel
names to the BIOS source to mark already used entries.
This will make picking new number easier in the future.

Signed-off-by: Andre Przywara <andre.przywara@amd.com>

Regards,
Andre.
---
From: Andre Przywara <andre.przywara@amd.com>

     sync firmware configuration channel numbers between QEMU and BIOS

diff --git a/pc-bios/bios-pq/0006_fw_cfg_sync.patch b/pc-bios/bios-pq/0006_fw_cfg_sync.patch
new file mode 100644
index 0000000..9f958c0
--- /dev/null
+++ b/pc-bios/bios-pq/0006_fw_cfg_sync.patch
@@ -0,0 +1,19 @@
+From: Andre Przywara <andre.przywara@amd.com>
+
+    add missing qemu firmware configuration inferface channel numbers
+
+diff --git a/bios/rombios32.c b/bios/rombios32.c
+index f81b269..3d42528 100644
+--- a/bios/rombios32.c
++++ b/bios/rombios32.c
+@@ -413,6 +413,10 @@ unsigned long bios_table_end_addr;
+ #define QEMU_CFG_SIGNATURE  0x00
+ #define QEMU_CFG_ID         0x01
+ #define QEMU_CFG_UUID       0x02
++#define QEMU_CFG_RAM_SIZE   0x03
++#define QEMU_CFG_NOGRAPHIC  0x04
++#define QEMU_CFG_NB_CPUS    0x05
++#define QEMU_CFG_MACHINE_ID 0x06
+
+ int qemu_cfg_port;
+
diff --git a/pc-bios/bios-pq/series b/pc-bios/bios-pq/series
index 0e7558c..bf40a88 100644
--- a/pc-bios/bios-pq/series
+++ b/pc-bios/bios-pq/series
@@ -2,3 +2,4 @@
  0002_e820-high-mem.patch
  0003_smp-startup-poll.patch
  0005_hpet.patch
+0006_fw_cfg_sync.patch