commit 56c5089e237a763235bad8c912cb52b267f09b10
author Kevin O'Connor <kevin@koconnor.net> Sat Feb 09 19:25:51 2013 -0500
committer Kevin O'Connor <kevin@koconnor.net> Tue Feb 12 21:21:28 2013 -0500
tree bf7693d8b6d2d7294b281ee528fe8a23451eccb5
parent de9e705591d75e42e904deb8918af3b1ee3dcb08

Convert basic integer fw_cfg entries into romfile entries.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>

src/paravirt.c

diff --git a/src/paravirt.c b/src/paravirt.c
index e782227..79b1c56 100644
--- a/src/paravirt.c
+++ b/src/paravirt.c
@@ -172,37 +172,6 @@
     dprintf(4, "qemu_cfg_present=%d\n", qemu_cfg_present);
 }
 
-void qemu_cfg_get_uuid(u8 *uuid)
-{
-    if (!qemu_cfg_present)
-        return;
-
-    qemu_cfg_read_entry(uuid, QEMU_CFG_UUID, 16);
-}
-
-int qemu_cfg_show_boot_menu(void)
-{
-    u16 v;
-    if (!qemu_cfg_present)
-        return 1;
-
-    qemu_cfg_read_entry(&v, QEMU_CFG_BOOT_MENU, sizeof(v));
-
-    return v;
-}
-
-int qemu_cfg_irq0_override(void)
-{
-    u8 v;
-
-    if (!qemu_cfg_present)
-        return 0;
-
-    qemu_cfg_read_entry(&v, QEMU_CFG_IRQ0_OVERRIDE, sizeof(v));
-
-    return v;
-}
-
 u32 qemu_cfg_e820_entries(void)
 {
     u32 cnt;
@@ -237,18 +206,6 @@
         qemu_cfg_read((u8*)(data + i), sizeof(u64));
 }
 
-u16 qemu_cfg_get_max_cpus(void)
-{
-    u16 cnt;
-
-    if (!qemu_cfg_present)
-        return 0;
-
-    qemu_cfg_read_entry(&cnt, QEMU_CFG_MAX_CPUS, sizeof(cnt));
-
-    return cnt;
-}
-
 static int
 qemu_cfg_read_file(struct romfile_s *file, void *dst, u32 maxlen)
 {
@@ -292,6 +249,11 @@
 static void
 qemu_cfg_legacy(void)
 {
+    // Misc config items.
+    qemu_romfile_add("etc/show-boot-menu", QEMU_CFG_BOOT_MENU, 0, 2);
+    qemu_romfile_add("etc/irq0-override", QEMU_CFG_IRQ0_OVERRIDE, 0, 1);
+    qemu_romfile_add("etc/max-cpus", QEMU_CFG_MAX_CPUS, 0, 2);
+
     // ACPI tables
     char name[128];
     u16 cnt;