diff mbox

[2/2] Add support for passing additional acpi tables from qemu.

Message ID 1254921704-18810-2-git-send-email-gleb@redhat.com
State Not Applicable
Headers show

Commit Message

Gleb Natapov Oct. 7, 2009, 1:21 p.m. UTC 
Signed-off-by: Gleb Natapov <gleb@redhat.com>
---
 src/acpi.c     |   18 +++++++++++++++++-
 src/config.h   |    2 +-
 src/paravirt.c |   27 +++++++++++++++++++++++++++
 src/paravirt.h |    3 +++
 4 files changed, 48 insertions(+), 2 deletions(-)

Comments

Kevin O'Connor Oct. 7, 2009, 11:48 p.m. UTC | #1 
On Wed, Oct 07, 2009 at 03:21:44PM +0200, Gleb Natapov wrote:
> --- a/src/config.h
> +++ b/src/config.h
> @@ -13,7 +13,7 @@
>  #define CONFIG_APPNAME4 "BXPC"
>  
>  // Configure for use with KVM.
> -#define CONFIG_KVM 0
> +#define CONFIG_KVM 1

Was this change intentional?  If so, please explain why it's needed.

I have noticed that qemu-0.11 only works properly if CONFIG_KVM is
enabled.  However, this option pulls in some settings that really are
specific to kvm.

Otherwise, the patch looks good to me.

-Kevin
Gleb Natapov Oct. 8, 2009, 6:10 a.m. UTC | #2 
On Wed, Oct 07, 2009 at 07:48:49PM -0400, Kevin O'Connor wrote:
> On Wed, Oct 07, 2009 at 03:21:44PM +0200, Gleb Natapov wrote:
> > --- a/src/config.h
> > +++ b/src/config.h
> > @@ -13,7 +13,7 @@
> >  #define CONFIG_APPNAME4 "BXPC"
> >  
> >  // Configure for use with KVM.
> > -#define CONFIG_KVM 0
> > +#define CONFIG_KVM 1
> 
> Was this change intentional?  If so, please explain why it's needed.
> 
It was not!

> I have noticed that qemu-0.11 only works properly if CONFIG_KVM is
> enabled.  However, this option pulls in some settings that really are
> specific to kvm.
> 
I plan to get rid of CONFIG_KVM entirely.

> Otherwise, the patch looks good to me.
> 
> -Kevin

--
			Gleb.
diff mbox

Patch

diff --git a/src/acpi.c b/src/acpi.c
index b9d449f..dafd8c8 100644
--- a/src/acpi.c
+++ b/src/acpi.c
@@ -11,7 +11,7 @@ 
 #include "biosvar.h" // GET_EBDA
 #include "pci_ids.h" // PCI_VENDOR_ID_INTEL
 #include "pci_regs.h" // PCI_INTERRUPT_LINE
-
+#include "paravirt.h"
 
 /****************************************************/
 /* ACPI tables init */
@@ -444,6 +444,22 @@  acpi_bios_init(void)
     ACPI_INIT_TABLE(build_ssdt());
     ACPI_INIT_TABLE(build_madt());
 
+    u16 i, external_tables = qemu_cfg_acpi_additional_tables();
+
+    for(i = 0; i < external_tables; i++) {
+        u16 len = qemu_cfg_next_acpi_table_len();
+        void *addr = malloc_high(len);
+        if (!addr) {
+            dprintf(1, "Not enogh memory of ext acpi table of size %d!\n", len);
+            continue;
+        }
+        ACPI_INIT_TABLE(qemu_cfg_next_acpi_table_load(addr, len));
+        if (tbl_idx == MAX_ACPI_TABLES) {
+            dprintf(1, "To many external table!\n");
+            break;
+        }
+    }
+
     struct rsdt_descriptor_rev1 *rsdt;
     size_t rsdt_len = sizeof(*rsdt) + sizeof(u32) * tbl_idx;
     rsdt = malloc_high(rsdt_len);
diff --git a/src/config.h b/src/config.h
index e93b080..10b2232 100644
--- a/src/config.h
+++ b/src/config.h
@@ -13,7 +13,7 @@ 
 #define CONFIG_APPNAME4 "BXPC"
 
 // Configure for use with KVM.
-#define CONFIG_KVM 0
+#define CONFIG_KVM 1
 // Configure as a coreboot payload.
 #define CONFIG_COREBOOT 0
 
diff --git a/src/paravirt.c b/src/paravirt.c
index 56d8421..cd1f263 100644
--- a/src/paravirt.c
+++ b/src/paravirt.c
@@ -72,3 +72,30 @@  int qemu_cfg_show_boot_menu(void)
     return v;
 }
 
+u16 qemu_cfg_acpi_additional_tables(void)
+{
+    u16 cnt;
+
+    if (!qemu_cfg_present)
+        return 0;
+
+    qemu_cfg_read_entry(&cnt, QEMU_CFG_ACPI_TABLES, sizeof(cnt));
+
+    return cnt;
+}
+
+u16 qemu_cfg_next_acpi_table_len(void)
+{
+    u16 len;
+
+    qemu_cfg_read((u8*)&len, sizeof(len));
+
+    return len;
+}
+
+void* qemu_cfg_next_acpi_table_load(void *addr, u16 len)
+{
+    qemu_cfg_read(addr, len);
+    return addr;
+}
+
diff --git a/src/paravirt.h b/src/paravirt.h
index 6997cff..c2bab71 100644
--- a/src/paravirt.h
+++ b/src/paravirt.h
@@ -40,5 +40,8 @@  extern int qemu_cfg_present;
 void qemu_cfg_port_probe(void);
 int qemu_cfg_show_boot_menu(void);
 void qemu_cfg_get_uuid(u8 *uuid);
+u16 qemu_cfg_acpi_additional_tables(void);
+u16 qemu_cfg_next_acpi_table_len(void);
+void *qemu_cfg_next_acpi_table_load(void *addr, u16 len);
 
 #endif