Archipelago » qemu

  The patches in bios-pq have been applied. The binary is based on the revision

  in bios-pq/HEAD with the patches in bios-pq/series applied.  The git repo

  that HEAD refers to is located at

  git://git.kernel.org/pub/scm/virt/bochs/bochs.git

  To build these use the following instructions:

  using guilt:

  $ export QEMUSRC=/path/to/qemu/svn

  $ git clone git://git.kernel.org/pub/scm/virt/bochs/bochs.git

  $ cd bochs

  $ git checkout -b qemu-bios $(cat $QEMUSRC/pc-bios/bios-pq/HEAD)

  $ mkdir -p .git/patches

  $ ln -s $QEMUSRC/pc-bios/bios-pq .git/patches/qemu-bios

  $ touch .git/patches/qemu-bios/status

  $ guilt push -a

  $ ./configure

  $ cd bios

  $ make

  $ cp BIOS-bochs-latest $QEMUSRC/pc-bios/bios.bin

  or alternatively (after the git checkout):

  $ for p in $(cat $QEMUSRC/pc-bios/bios-pq/series); do git am $p; done

  $ ./configure

  $ make bios

  project (http://www.nongnu.org/vgabios/).  The binary is based on the revision

  in vgabios-pq/HEAD with the patches in vgabios-pq/series applied.  The git

  repo that HEAD refers to is located at

  git://git.kernel.org/pub/scm/virt/vgabios/vgabios.git

--- bochs-2.3.7.orig/bios/rombios.h

+++ bochs-2.3.7/bios/rombios.h

@@ -19,7 +19,7 @@

 //  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA

 /* define it to include QEMU specific code */

-//#define BX_QEMU

+#define BX_QEMU

 #ifndef LEGACY

 #  define BX_ROMBIOS32     1

update SMBIOS table to report memory above 4G (Alex Williamson)

Signed-off-by: Alex Williamson <alex.williamson@hp.com>

Signed-off-by: Avi Kivity <avi@redhat.com>

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

Index: bochs/bios/rombios32.c

===================================================================

diff --git a/bios/rombios32.c b/bios/rombios32.c

index 3269be5..9587288 100644

--- a/bios/rombios32.c

+++ b/bios/rombios32.c

@@ -429,6 +429,7 @@ uint32_t cpuid_signature;

 uint32_t cpuid_features;

 uint32_t cpuid_ext_features;

 unsigned long ram_size;

+uint64_t ram_end;

 uint8_t bios_uuid[16];

 #ifdef BX_USE_EBDA_TABLES

 unsigned long ebda_cur_addr;

@@ -571,6 +572,13 @@ void ram_probe(void)

     ram_size = (cmos_readb(0x30) | (cmos_readb(0x31) << 8)) * 1024 +

         1 * 1024 * 1024;

   BX_INFO("ram_size=0x%08lx\n", ram_size);

+  if (cmos_readb(0x5b) | cmos_readb(0x5c) | cmos_readb(0x5d))

+    ram_end = (((uint64_t)cmos_readb(0x5b) << 16) |

+               ((uint64_t)cmos_readb(0x5c) << 24) |

+               ((uint64_t)cmos_readb(0x5d) << 32)) + (1ull << 32);

+  else

+    ram_end = ram_size;

+  BX_INFO("end of ram=%ldMB\n", ram_end >> 20);

 #ifdef BX_USE_EBDA_TABLES

   ebda_cur_addr = ((*(uint16_t *)(0x40e)) << 4) + 0x380;

   BX_INFO("ebda_cur_addr: 0x%08lx\n", ebda_cur_addr);

@@ -2174,7 +2182,8 @@ void smbios_init(void)

 {

     unsigned cpu_num, nr_structs = 0, max_struct_size = 0;

     char *start, *p, *q;

-    int memsize = ram_size / (1024 * 1024);

+    int memsize = (ram_end == ram_size) ? ram_size / (1024 * 1024) :

+                  (ram_end - (1ull << 32) + ram_size) / (1024 * 1024);

 #ifdef BX_USE_EBDA_TABLES

     ebda_cur_addr = align(ebda_cur_addr, 16);

@@ -2201,8 +2210,8 @@ void smbios_init(void)

         add_struct(smbios_type_4_init(p, cpu_num));

     add_struct(smbios_type_16_init(p, memsize));

     add_struct(smbios_type_17_init(p, memsize));

-    add_struct(smbios_type_19_init(p, memsize));

-    add_struct(smbios_type_20_init(p, memsize));

+    add_struct(smbios_type_19_init(p, ram_end / (1024 * 1024)));

+    add_struct(smbios_type_20_init(p, ram_end / (1024 * 1024)));

     add_struct(smbios_type_32_init(p));

     add_struct(smbios_type_127_init(p));

generate mptable unconditionally (Avi Kivity)

VMware ESX requires an mptable even for uniprocessor guests.

Signed-off-by: Avi Kivity <avi@qumranet.com>

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

Index: bochs/bios/rombios32.c

===================================================================

--- bochs.orig/bios/rombios32.c

+++ bochs/bios/rombios32.c

@@ -970,11 +970,6 @@ static void mptable_init(void)

     int ioapic_id, i, len;

     int mp_config_table_size;

-#ifdef BX_QEMU

-    if (smp_cpus <= 1)

-        return;

-#endif

-

 #ifdef BX_USE_EBDA_TABLES

     mp_config_table = (uint8_t *)(ram_size - ACPI_DATA_SIZE - MPTABLE_MAX_SIZE);

 #else

resolve memory device roll over reporting  issues with >32G guests (Bill Rieske)

The field within the Memory Device type 17 is only a word with the MSB being

used to report MB/KB.  Thereby, a guest with 32G and greater would report

incorrect memory device information rolling over to 0.

This presents more than one memory device and associated memory structures

if the memory is larger than 16G

Signed-off-by: Bill Rieske <brieske@novell.com>

Signed-off-by: Avi Kivity <avi@redhat.com>

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

Index: bochs/bios/rombios32.c

===================================================================

--- bochs.orig/bios/rombios32.c

+++ bochs/bios/rombios32.c

@@ -381,6 +381,17 @@ int vsnprintf(char *buf, int buflen, con

     return buf - buf0;

 }

+int snprintf(char * buf, size_t size, const char *fmt, ...)

+{

+	va_list args;

+	int i;

+

+	va_start(args, fmt);

+	i=vsnprintf(buf,size,fmt,args);

+	va_end(args);

+	return i;

+}

+

 void bios_printf(int flags, const char *fmt, ...)

 {

     va_list ap;

@@ -2039,7 +2050,7 @@ smbios_type_4_init(void *start, unsigned

 /* Type 16 -- Physical Memory Array */

 static void *

-smbios_type_16_init(void *start, uint32_t memsize)

+smbios_type_16_init(void *start, uint32_t memsize, int nr_mem_devs)

 {

     struct smbios_type_16 *p = (struct smbios_type_16*)start;

@@ -2052,7 +2063,7 @@ smbios_type_16_init(void *start, uint32_

     p->error_correction = 0x01; /* other */

     p->maximum_capacity = memsize * 1024;

     p->memory_error_information_handle = 0xfffe; /* none provided */

-    p->number_of_memory_devices = 1;

+    p->number_of_memory_devices = nr_mem_devs;

     start += sizeof(struct smbios_type_16);

     *((uint16_t *)start) = 0;

@@ -2062,20 +2073,19 @@ smbios_type_16_init(void *start, uint32_

 /* Type 17 -- Memory Device */

 static void *

-smbios_type_17_init(void *start, uint32_t memory_size_mb)

+smbios_type_17_init(void *start, uint32_t memory_size_mb, int instance)

 {

     struct smbios_type_17 *p = (struct smbios_type_17 *)start;

     p->header.type = 17;

     p->header.length = sizeof(struct smbios_type_17);

-    p->header.handle = 0x1100;

+    p->header.handle = 0x1100 + instance;

     p->physical_memory_array_handle = 0x1000;

     p->total_width = 64;

     p->data_width = 64;

-    /* truncate memory_size_mb to 16 bits and clear most significant

-       bit [indicates size in MB] */

-    p->size = (uint16_t) memory_size_mb & 0x7fff;

+/* TODO: should assert in case something is wrong   ASSERT((memory_size_mb & ~0x7fff) == 0); */

+    p->size = memory_size_mb;

     p->form_factor = 0x09; /* DIMM */

     p->device_set = 0;

     p->device_locator_str = 1;

@@ -2084,8 +2094,8 @@ smbios_type_17_init(void *start, uint32_

     p->type_detail = 0;

     start += sizeof(struct smbios_type_17);

-    memcpy((char *)start, "DIMM 1", 7);

-    start += 7;

+    snprintf(start, 8, "DIMM %d", instance);

+    start += strlen(start) + 1;

     *((uint8_t *)start) = 0;

     return start+1;

@@ -2093,16 +2103,16 @@ smbios_type_17_init(void *start, uint32_

 /* Type 19 -- Memory Array Mapped Address */

 static void *

-smbios_type_19_init(void *start, uint32_t memory_size_mb)

+smbios_type_19_init(void *start, uint32_t memory_size_mb, int instance)

 {

     struct smbios_type_19 *p = (struct smbios_type_19 *)start;

     p->header.type = 19;

     p->header.length = sizeof(struct smbios_type_19);

-    p->header.handle = 0x1300;

+    p->header.handle = 0x1300 + instance;

-    p->starting_address = 0;

-    p->ending_address = (memory_size_mb * 1024) - 1;

+    p->starting_address = instance << 24;

+    p->ending_address = p->starting_address + (memory_size_mb << 10) - 1;

     p->memory_array_handle = 0x1000;

     p->partition_width = 1;

@@ -2114,18 +2124,18 @@ smbios_type_19_init(void *start, uint32_

 /* Type 20 -- Memory Device Mapped Address */

 static void *

-smbios_type_20_init(void *start, uint32_t memory_size_mb)

+smbios_type_20_init(void *start, uint32_t memory_size_mb, int instance)

 {

     struct smbios_type_20 *p = (struct smbios_type_20 *)start;

     p->header.type = 20;

     p->header.length = sizeof(struct smbios_type_20);

-    p->header.handle = 0x1400;

+    p->header.handle = 0x1400 + instance;

-    p->starting_address = 0;

-    p->ending_address = (memory_size_mb * 1024) - 1;

-    p->memory_device_handle = 0x1100;

-    p->memory_array_mapped_address_handle = 0x1300;

+    p->starting_address = instance << 24;

+    p->ending_address = p->starting_address + (memory_size_mb << 10) - 1;

+    p->memory_device_handle = 0x1100 + instance;

+    p->memory_array_mapped_address_handle = 0x1300 + instance;

     p->partition_row_position = 1;

     p->interleave_position = 0;

     p->interleaved_data_depth = 0;

@@ -2176,6 +2186,7 @@ void smbios_init(void)

     char *start, *p, *q;

     int memsize = (ram_end == ram_size) ? ram_size / (1024 * 1024) :

                   (ram_end - (1ull << 32) + ram_size) / (1024 * 1024);

+    int i, nr_mem_devs;

 #ifdef BX_USE_EBDA_TABLES

     ebda_cur_addr = align(ebda_cur_addr, 16);

@@ -2187,23 +2198,32 @@ void smbios_init(void)

 	p = (char *)start + sizeof(struct smbios_entry_point);

-#define add_struct(fn) { \

+#define add_struct(fn) do{ \

     q = (fn); \

     nr_structs++; \

     if ((q - p) > max_struct_size) \

         max_struct_size = q - p; \

     p = q; \

-}

+}while (0)

     add_struct(smbios_type_0_init(p));

     add_struct(smbios_type_1_init(p));

     add_struct(smbios_type_3_init(p));

     for (cpu_num = 1; cpu_num <= smp_cpus; cpu_num++)

         add_struct(smbios_type_4_init(p, cpu_num));

-    add_struct(smbios_type_16_init(p, memsize));

-    add_struct(smbios_type_17_init(p, memsize));

-    add_struct(smbios_type_19_init(p, ram_end / (1024 * 1024)));

-    add_struct(smbios_type_20_init(p, ram_end / (1024 * 1024)));

+

+    /* Each 'memory device' covers up to 16GB of address space. */

+    nr_mem_devs = (memsize + 0x3fff) >> 14;

+    add_struct(smbios_type_16_init(p, memsize, nr_mem_devs));

+    for ( i = 0; i < nr_mem_devs; i++ )

+    {

+        uint32_t dev_memsize = ((i == (nr_mem_devs - 1))

+                                ? (memsize & 0x3fff) : 0x4000);

+        add_struct(smbios_type_17_init(p, dev_memsize, i));

+        add_struct(smbios_type_19_init(p, dev_memsize, i));

+        add_struct(smbios_type_20_init(p, dev_memsize, i));

+    }

+

     add_struct(smbios_type_32_init(p));

     add_struct(smbios_type_127_init(p));

fix smbios memory device length boundary  condition (Bill Rieske)

dev_memsize ends up 0 when it shouldn't be on 16G boundary conditions.

Signed-off-by: Bill Rieske <brieske@novell.com>

Signed-off-by: Avi Kivity <avi@redhat.com>

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

Index: bochs/bios/rombios32.c

===================================================================

--- bochs.orig/bios/rombios32.c

+++ bochs/bios/rombios32.c

@@ -2218,7 +2218,7 @@ void smbios_init(void)

     for ( i = 0; i < nr_mem_devs; i++ )

     {

         uint32_t dev_memsize = ((i == (nr_mem_devs - 1))

-                                ? (memsize & 0x3fff) : 0x4000);

+                                ? (((memsize-1) & 0x3fff)+1) : 0x4000);

         add_struct(smbios_type_17_init(p, dev_memsize, i));

         add_struct(smbios_type_19_init(p, dev_memsize, i));

         add_struct(smbios_type_20_init(p, dev_memsize, i));

qemu: bios: use preprocessor for pci link routing (Avi Kivity)

Signed-off-by: Avi Kivity <avi@qumranet.com>

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

Index: bochs/bios/acpi-dsdt.dsl

===================================================================

--- bochs.orig/bios/acpi-dsdt.dsl

+++ bochs/bios/acpi-dsdt.dsl

@@ -47,42 +47,22 @@ DefinitionBlock (

                    section 6.2.8.1 */

                 /* Note: we provide the same info as the PCI routing

                    table of the Bochs BIOS */

-

-                // PCI Slot 0

-                Package() {0x0000ffff, 0, LNKD, 0},

-                Package() {0x0000ffff, 1, LNKA, 0},

-                Package() {0x0000ffff, 2, LNKB, 0},

-                Package() {0x0000ffff, 3, LNKC, 0},

-

-                // PCI Slot 1

-                Package() {0x0001ffff, 0, LNKA, 0},

-                Package() {0x0001ffff, 1, LNKB, 0},

-                Package() {0x0001ffff, 2, LNKC, 0},

-                Package() {0x0001ffff, 3, LNKD, 0},

-

-                // PCI Slot 2

-                Package() {0x0002ffff, 0, LNKB, 0},

-                Package() {0x0002ffff, 1, LNKC, 0},

-                Package() {0x0002ffff, 2, LNKD, 0},

-                Package() {0x0002ffff, 3, LNKA, 0},

-

-                // PCI Slot 3

-                Package() {0x0003ffff, 0, LNKC, 0},

-                Package() {0x0003ffff, 1, LNKD, 0},

-                Package() {0x0003ffff, 2, LNKA, 0},

-                Package() {0x0003ffff, 3, LNKB, 0},

-

-                // PCI Slot 4

-                Package() {0x0004ffff, 0, LNKD, 0},

-                Package() {0x0004ffff, 1, LNKA, 0},

-                Package() {0x0004ffff, 2, LNKB, 0},

-                Package() {0x0004ffff, 3, LNKC, 0},

-

-                // PCI Slot 5

-                Package() {0x0005ffff, 0, LNKA, 0},

-                Package() {0x0005ffff, 1, LNKB, 0},

-                Package() {0x0005ffff, 2, LNKC, 0},

-                Package() {0x0005ffff, 3, LNKD, 0},

+#define prt_slot(nr, lnk0, lnk1, lnk2, lnk3) \

+       Package() { nr##ffff, 0, lnk0, 0 }, \

+       Package() { nr##ffff, 1, lnk1, 0 }, \

+       Package() { nr##ffff, 2, lnk2, 0 }, \

+       Package() { nr##ffff, 3, lnk3, 0 }

+

+#define prt_slot0(nr) prt_slot(nr, LNKD, LNKA, LNKB, LNKC)

+#define prt_slot1(nr) prt_slot(nr, LNKA, LNKB, LNKC, LNKD)

+#define prt_slot2(nr) prt_slot(nr, LNKB, LNKC, LNKD, LNKA)

+#define prt_slot3(nr) prt_slot(nr, LNKC, LNKD, LNKA, LNKB)

+               prt_slot0(0x0000),

+               prt_slot1(0x0001),

+               prt_slot2(0x0002),

+               prt_slot3(0x0003),

+               prt_slot0(0x0004),

+               prt_slot1(0x0005),

             })

             Name (_CRS, ResourceTemplate ()

-- 

bios: add 26 pci slots, bringing the total to 32 (Avi Kivity)

lack of pci slots causes Windows to complain when installing too many devices.

Signed-off-by: Avi Kivity <avi@qumranet.com>

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

Index: bochs/bios/acpi-dsdt.dsl

===================================================================

--- bochs.orig/bios/acpi-dsdt.dsl

+++ bochs/bios/acpi-dsdt.dsl

@@ -63,6 +63,32 @@ DefinitionBlock (

                prt_slot3(0x0003),

                prt_slot0(0x0004),

                prt_slot1(0x0005),

+               prt_slot2(0x0006),

+               prt_slot3(0x0007),

+               prt_slot0(0x0008),

+               prt_slot1(0x0009),

+               prt_slot2(0x000a),

+               prt_slot3(0x000b),

+               prt_slot0(0x000c),

+               prt_slot1(0x000d),

+               prt_slot2(0x000e),

+               prt_slot3(0x000f),

+               prt_slot0(0x0010),

+               prt_slot1(0x0011),

+               prt_slot2(0x0012),

+               prt_slot3(0x0013),

+               prt_slot0(0x0014),

+               prt_slot1(0x0015),

+               prt_slot2(0x0016),

+               prt_slot3(0x0017),

+               prt_slot0(0x0018),

+               prt_slot1(0x0019),

+               prt_slot2(0x001a),

+               prt_slot3(0x001b),

+               prt_slot0(0x001c),

+               prt_slot1(0x001d),

+               prt_slot2(0x001e),

+               prt_slot3(0x001f),

             })

             Name (_CRS, ResourceTemplate ()

-- 

qemu: bios: provide gpe _L0x methods (Glauber Costa)

provide methods for gpe blk 0, even though they do nothing atm

Signed-off-by: Glauber Costa <gcosta@redhat.com>

Signed-off-by: Avi Kivity <avi@qumranet.com>

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

Index: bochs/bios/acpi-dsdt.dsl

===================================================================

--- bochs.orig/bios/acpi-dsdt.dsl

+++ bochs/bios/acpi-dsdt.dsl

@@ -597,4 +597,59 @@ DefinitionBlock (

         Zero,  /* reserved */

         Zero   /* reserved */

     })

+

+    Scope (\_GPE)

+    {

+        Name(_HID, "ACPI0006")

+

+        Method(_L00) {

+            Return(0x01)

+        }

+        Method(_L01) {

+            Return(0x01)

+        }

+        Method(_L02) {

+            Return(0x01)

+        }

+        Method(_L03) {

+            Return(0x01)

+        }

+        Method(_L04) {

+            Return(0x01)

+        }

+        Method(_L05) {

+            Return(0x01)

+        }

+        Method(_L06) {

+            Return(0x01)

+        }

+        Method(_L07) {

+            Return(0x01)

+        }

+        Method(_L08) {

+            Return(0x01)

+        }

+        Method(_L09) {

+            Return(0x01)

+        }

+        Method(_L0A) {

+            Return(0x01)

+        }

+        Method(_L0B) {

+            Return(0x01)

+        }

+        Method(_L0C) {

+            Return(0x01)

+        }

+        Method(_L0D) {

+            Return(0x01)

+        }

+        Method(_L0E) {

+            Return(0x01)

+        }

+        Method(_L0F) {

+            Return(0x01)

+        }

+    }

+

 }

Index: bochs/bios/rombios32.c

===================================================================

--- bochs.orig/bios/rombios32.c

+++ bochs/bios/rombios32.c

@@ -1647,6 +1647,8 @@ void acpi_bios_init(void)

     fadt->pm_tmr_len = 4;

     fadt->plvl2_lat = cpu_to_le16(0xfff); // C2 state not supported

     fadt->plvl3_lat = cpu_to_le16(0xfff); // C3 state not supported

+    fadt->gpe0_blk = cpu_to_le32(0xafe0);

+    fadt->gpe0_blk_len = 4;

     /* WBINVD + PROC_C1 + PWR_BUTTON + SLP_BUTTON + FIX_RTC */

     fadt->flags = cpu_to_le32((1 << 0) | (1 << 2) | (1 << 4) | (1 << 5) | (1 << 6));

     acpi_build_table_header((struct acpi_table_header *)fadt, "FACP",

-- 

qemu: bios: pci hotplug support (Marcelo Tosatti)

Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

Index: bochs/bios/acpi-dsdt.dsl

===================================================================

--- bochs.orig/bios/acpi-dsdt.dsl

+++ bochs/bios/acpi-dsdt.dsl

@@ -91,6 +91,61 @@ DefinitionBlock (

                prt_slot3(0x001f),

             })

+            OperationRegion(PCST, SystemIO, 0xae00, 0x08)

+            Field (PCST, DWordAcc, NoLock, WriteAsZeros)

+            {

+                PCIU, 32,

+                PCID, 32,

+            }

+

+            OperationRegion(SEJ, SystemIO, 0xae08, 0x04)

+            Field (SEJ, DWordAcc, NoLock, WriteAsZeros)

+            {

+                B0EJ, 32,

+            }

+

+#define hotplug_slot(name, nr) \

+            Device (S##name) {                    \

+               Name (_ADR, nr##0000)              \

+               Method (_EJ0,1) {                  \

+                    Store(ShiftLeft(1, nr), B0EJ) \

+                    Return (0x0)                  \

+               }                                  \

+               Name (_SUN, name)                  \

+            }

+

+	    hotplug_slot(1, 0x0001)

+	    hotplug_slot(2, 0x0002)

+	    hotplug_slot(3, 0x0003)

+	    hotplug_slot(4, 0x0004)

+	    hotplug_slot(5, 0x0005)

+	    hotplug_slot(6, 0x0006)

+	    hotplug_slot(7, 0x0007)

+	    hotplug_slot(8, 0x0008)

+	    hotplug_slot(9, 0x0009)

+	    hotplug_slot(10, 0x000a)

+	    hotplug_slot(11, 0x000b)

+	    hotplug_slot(12, 0x000c)

+	    hotplug_slot(13, 0x000d)

+	    hotplug_slot(14, 0x000e)

+	    hotplug_slot(15, 0x000f)

+	    hotplug_slot(16, 0x0010)

+	    hotplug_slot(17, 0x0011)

+	    hotplug_slot(18, 0x0012)

+	    hotplug_slot(19, 0x0013)

+	    hotplug_slot(20, 0x0014)

+	    hotplug_slot(21, 0x0015)

+	    hotplug_slot(22, 0x0016)

+	    hotplug_slot(23, 0x0017)

+	    hotplug_slot(24, 0x0018)

+	    hotplug_slot(25, 0x0019)

+	    hotplug_slot(26, 0x001a)

+	    hotplug_slot(27, 0x001b)

+	    hotplug_slot(28, 0x001c)

+	    hotplug_slot(29, 0x001d)

+	    hotplug_slot(30, 0x001e)

+	    hotplug_slot(31, 0x001f)

+

             Name (_CRS, ResourceTemplate ()

             {

                 WordBusNumber (ResourceProducer, MinFixed, MaxFixed, PosDecode,

@@ -605,8 +660,50 @@ DefinitionBlock (

         Method(_L00) {

             Return(0x01)

         }

+

+#define gen_pci_hotplug(nr)                                       \

+            If (And(\_SB.PCI0.PCIU, ShiftLeft(1, nr))) {          \

+                Notify(\_SB.PCI0.S##nr, 1)                        \

+            }                                                     \

+            If (And(\_SB.PCI0.PCID, ShiftLeft(1, nr))) {          \

+                Notify(\_SB.PCI0.S##nr, 3)                        \

+            }

+

         Method(_L01) {

-            Return(0x01)

+            gen_pci_hotplug(1)

+            gen_pci_hotplug(2)

+            gen_pci_hotplug(3)

+            gen_pci_hotplug(4)

+            gen_pci_hotplug(5)

+            gen_pci_hotplug(6)

+            gen_pci_hotplug(7)

+            gen_pci_hotplug(8)

+            gen_pci_hotplug(9)

+            gen_pci_hotplug(10)

+            gen_pci_hotplug(11)

+            gen_pci_hotplug(12)

+            gen_pci_hotplug(13)

+            gen_pci_hotplug(14)

+            gen_pci_hotplug(15)

+            gen_pci_hotplug(16)

+            gen_pci_hotplug(17)

+            gen_pci_hotplug(18)

+            gen_pci_hotplug(19)

+            gen_pci_hotplug(20)

+            gen_pci_hotplug(21)

+            gen_pci_hotplug(22)

+            gen_pci_hotplug(23)

+            gen_pci_hotplug(24)

+            gen_pci_hotplug(25)

+            gen_pci_hotplug(26)

+            gen_pci_hotplug(27)

+            gen_pci_hotplug(28)

+            gen_pci_hotplug(29)

+            gen_pci_hotplug(30)

+            gen_pci_hotplug(31)

+

+            Return (0x01)

+

         }

         Method(_L02) {

             Return(0x01)

-- 

bios: mark the acpi sci interrupt as connected to irq 9 (Avi Kivity)

Due to a chipset bug, the sci interrupt is hardwired to irq 9.  Set the

pci interrupt line register accordingly.

Signed-off-by: Avi Kivity <avi@qumranet.com>

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

Index: bochs/bios/rombios32.c

===================================================================

--- bochs.orig/bios/rombios32.c

+++ bochs/bios/rombios32.c

@@ -981,6 +981,8 @@ static void pci_bios_init_device(PCIDevi

         /* PIIX4 Power Management device (for ACPI) */

         pm_io_base = PM_IO_BASE;

         smb_io_base = SMB_IO_BASE;

+        // acpi sci is hardwired to 9

+        pci_config_writeb(d, PCI_INTERRUPT_LINE, 9);

         pm_sci_int = pci_config_readb(d, PCI_INTERRUPT_LINE);

         piix4_pm_enable(d);

         acpi_enabled = 1;

-- 

Read additional ACPI tables from a VM (Gleb Natapov)

Signed-off-by: Gleb Natapov <gleb@redhat.com>

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

diff --git a/bios/rombios32.c b/bios/rombios32.c

index 27c5952..7be4216 100644

--- a/bios/rombios32.c

+++ b/bios/rombios32.c

@@ -469,6 +469,8 @@ void wrmsr_smp(uint32_t index, uint64_t val)

 #define QEMU_CFG_SIGNATURE  0x00

 #define QEMU_CFG_ID         0x01

 #define QEMU_CFG_UUID       0x02

+#define QEMU_CFG_ARCH_LOCAL     0x8000

+#define QEMU_CFG_ACPI_TABLES  (QEMU_CFG_ARCH_LOCAL + 0)

 int qemu_cfg_port;

@@ -496,6 +498,27 @@ void qemu_cfg_read(uint8_t *buf, int len)

     while (len--)

         *(buf++) = inb(QEMU_CFG_DATA_PORT);

 }

+

+static uint16_t acpi_additional_tables(void)

+{

+    uint16_t cnt;

+

+    qemu_cfg_select(QEMU_CFG_ACPI_TABLES);

+    qemu_cfg_read((uint8_t*)&cnt, sizeof(cnt));

+

+    return cnt;

+}

+

+static int acpi_load_table(int i, uint32_t addr, uint16_t *len)

+{

+    qemu_cfg_read((uint8_t*)len, sizeof(*len));

+

+    if (!*len)

+        return -1;

+

+    qemu_cfg_read((uint8_t*)addr, *len);

+    return 0;

+}

 #endif

 void uuid_probe(void)

@@ -1550,8 +1573,8 @@ void acpi_bios_init(void)

     uint32_t hpet_addr;

 #endif

     uint32_t base_addr, rsdt_addr, fadt_addr, addr, facs_addr, dsdt_addr, ssdt_addr;

-    uint32_t acpi_tables_size, madt_addr, madt_size;

-    int i;

+    uint32_t acpi_tables_size, madt_addr, madt_size, rsdt_size;

+    uint16_t i, external_tables;

     /* reserve memory space for tables */

 #ifdef BX_USE_EBDA_TABLES

@@ -1564,10 +1587,17 @@ void acpi_bios_init(void)

     bios_table_cur_addr += sizeof(*rsdp);

 #endif

+#ifdef BX_QEMU

+    external_tables = acpi_additional_tables();

+#else

+    external_tables = 0;

+#endif

+

     addr = base_addr = ram_size - ACPI_DATA_SIZE;

     rsdt_addr = addr;

     rsdt = (void *)(addr);

-    addr += sizeof(*rsdt);

+    rsdt_size = sizeof(*rsdt) + external_tables * 4;

+    addr += rsdt_size;

     fadt_addr = addr;

     fadt = (void *)(addr);

@@ -1606,12 +1636,6 @@ void acpi_bios_init(void)

     addr += sizeof(*hpet);

 #endif

-    acpi_tables_size = addr - base_addr;

-

-    BX_INFO("ACPI tables: RSDP addr=0x%08lx ACPI DATA addr=0x%08lx size=0x%x\n",

-            (unsigned long)rsdp,

-            (unsigned long)rsdt, acpi_tables_size);

-

     /* RSDP */

     memset(rsdp, 0, sizeof(*rsdp));

     memcpy(rsdp->signature, "RSD PTR ", 8);

@@ -1623,17 +1647,6 @@ void acpi_bios_init(void)

     rsdp->rsdt_physical_address = cpu_to_le32(rsdt_addr);

     rsdp->checksum = acpi_checksum((void *)rsdp, 20);

-    /* RSDT */

-    memset(rsdt, 0, sizeof(*rsdt));

-    rsdt->table_offset_entry[0] = cpu_to_le32(fadt_addr);

-    rsdt->table_offset_entry[1] = cpu_to_le32(madt_addr);

-    rsdt->table_offset_entry[2] = cpu_to_le32(ssdt_addr);

-#ifdef BX_QEMU

-    rsdt->table_offset_entry[3] = cpu_to_le32(hpet_addr);

-#endif

-    acpi_build_table_header((struct acpi_table_header *)rsdt,

-                            "RSDT", sizeof(*rsdt), 1);

-

     /* FADT */

     memset(fadt, 0, sizeof(*fadt));

     fadt->firmware_ctrl = cpu_to_le32(facs_addr);

@@ -1710,6 +1723,7 @@ void acpi_bios_init(void)

                                 "APIC", madt_size, 1);

     }

+    memset(rsdt, 0, rsdt_size);

 #ifdef BX_QEMU

     /* HPET */

     memset(hpet, 0, sizeof(*hpet));

@@ -1720,7 +1734,34 @@ void acpi_bios_init(void)

     hpet->addr.address = cpu_to_le32(ACPI_HPET_ADDRESS);

     acpi_build_table_header((struct  acpi_table_header *)hpet,

                              "HPET", sizeof(*hpet), 1);

+

+    acpi_additional_tables(); /* resets cfg to required entry */

+    for(i = 0; i < external_tables; i++) {

+        uint16_t len;

+        if(acpi_load_table(i, addr, &len) < 0)

+            BX_PANIC("Failed to load ACPI table from QEMU\n");

+        rsdt->table_offset_entry[i+4] = cpu_to_le32(addr);

+        addr += len;

+        if(addr >= ram_size)

+            BX_PANIC("ACPI table overflow\n");

+    }

+#endif

+

+    /* RSDT */

+    rsdt->table_offset_entry[0] = cpu_to_le32(fadt_addr);

+    rsdt->table_offset_entry[1] = cpu_to_le32(madt_addr);

+    rsdt->table_offset_entry[2] = cpu_to_le32(ssdt_addr);

+#ifdef BX_QEMU

+    rsdt->table_offset_entry[3] = cpu_to_le32(hpet_addr);

 #endif

+    acpi_build_table_header((struct acpi_table_header *)rsdt,

+                            "RSDT", rsdt_size, 1);

+

+    acpi_tables_size = addr - base_addr;

+

+    BX_INFO("ACPI tables: RSDP addr=0x%08lx ACPI DATA addr=0x%08lx size=0x%x\n",

+            (unsigned long)rsdp,

+            (unsigned long)rsdt, acpi_tables_size);

 }

qemu:bios: Load SMBIOS entries and files from qemu (Alex Williamson)

Allow SMBIOS fields to be overridden and entries replaced by those

read from qemu.

Signed-off-by: Alex Williamson <alex.williamson@hp.com>

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

diff --git a/bios/rombios32.c b/bios/rombios32.c

index 7be4216..1a1ed64 100644

--- a/bios/rombios32.c

+++ b/bios/rombios32.c

@@ -441,7 +441,6 @@ uint32_t cpuid_features;

 uint32_t cpuid_ext_features;

 unsigned long ram_size;

 uint64_t ram_end;

-uint8_t bios_uuid[16];

 #ifdef BX_USE_EBDA_TABLES

 unsigned long ebda_cur_addr;

 #endif

@@ -471,6 +470,7 @@ void wrmsr_smp(uint32_t index, uint64_t val)

 #define QEMU_CFG_UUID       0x02

 #define QEMU_CFG_ARCH_LOCAL     0x8000

 #define QEMU_CFG_ACPI_TABLES  (QEMU_CFG_ARCH_LOCAL + 0)

+#define QEMU_CFG_SMBIOS_ENTRIES  (QEMU_CFG_ARCH_LOCAL + 1)

 int qemu_cfg_port;

@@ -519,19 +519,17 @@ static int acpi_load_table(int i, uint32_t addr, uint16_t *len)

     qemu_cfg_read((uint8_t*)addr, *len);

     return 0;

 }

-#endif

-void uuid_probe(void)

+static uint16_t smbios_entries(void)

 {

-#ifdef BX_QEMU

-    if(qemu_cfg_port) {

-        qemu_cfg_select(QEMU_CFG_UUID);

-        qemu_cfg_read(bios_uuid, 16);

-        return;

-    }

-#endif

-    memset(bios_uuid, 0, 16);

+    uint16_t cnt;

+

+    qemu_cfg_select(QEMU_CFG_SMBIOS_ENTRIES);

+    qemu_cfg_read((uint8_t*)&cnt, sizeof(cnt));

+

+    return cnt;

 }

+#endif

 void cpu_probe(void)

 {

@@ -1963,21 +1961,105 @@ smbios_entry_point_init(void *start,

     ep->intermediate_checksum = -sum;

     }

+struct smbios_header {

+    uint16_t length;

+    uint8_t type;

+} __attribute__((__packed__));

+

+struct smbios_field {

+    struct smbios_header header;

+    uint8_t type;

+    uint16_t offset;

+    uint8_t data[];

+} __attribute__((__packed__));

+

+struct smbios_table {

+    struct smbios_header header;

+    uint8_t data[];

+} __attribute__((__packed__));

+

+#define SMBIOS_FIELD_ENTRY 0

+#define SMBIOS_TABLE_ENTRY 1

+

+static size_t

+smbios_load_field(int type, size_t offset, void *addr)

+{

+#ifdef BX_QEMU

+    int i;

+

+    for (i = smbios_entries(); i > 0; i--) {

+        struct smbios_field field;

+

+        qemu_cfg_read((uint8_t *)&field, sizeof(struct smbios_header));

+        field.header.length -= sizeof(struct smbios_header);

+

+        if (field.header.type != SMBIOS_FIELD_ENTRY) {

+            while (field.header.length--)

+                inb(QEMU_CFG_DATA_PORT);

+            continue;

+        }

+

+        qemu_cfg_read((uint8_t *)&field.type,

+                      sizeof(field) - sizeof(struct smbios_header));

+        field.header.length -= sizeof(field) - sizeof(struct smbios_header);

+

+        if (field.type != type || field.offset != offset) {

+            while (field.header.length--)

+                inb(QEMU_CFG_DATA_PORT);

+            continue;

+        }

+

+        qemu_cfg_read(addr, field.header.length);

+        return (size_t)field.header.length;

+    }

+#endif

+    return 0;

+}

+ 

+#define load_str_field_with_default(type, field, def) do {             \

+    size = smbios_load_field(type, offsetof(struct smbios_type_##type, \

+                                            field), end);              \

+    if (size > 0) {                                                    \

+        end += size;                                                   \

+    } else {                                                           \

+        memcpy(end, def, sizeof(def));                                 \

+        end += sizeof(def);                                            \

+    }                                                                  \

+    p->field = ++str_index;                                            \

+} while (0)

+

+#define load_str_field_or_skip(type, field) do {                       \

+    size = smbios_load_field(type, offsetof(struct smbios_type_##type, \

+                                            field), end);              \

+    if (size > 0) {                                                    \

+        end += size;                                                   \

+        p->field = ++str_index;                                        \

+    } else {                                                           \

+        p->field = 0;                                                  \

+    }                                                                  \

+} while (0)

+

 /* Type 0 -- BIOS Information */

 #define RELEASE_DATE_STR "01/01/2007"

 static void *

-smbios_type_0_init(void *start)

+smbios_init_type_0(void *start)

 {

     struct smbios_type_0 *p = (struct smbios_type_0 *)start;

+    char *end = (char *)start + sizeof(struct smbios_type_0);

+    size_t size;

+    int str_index = 0;

     p->header.type = 0;

     p->header.length = sizeof(struct smbios_type_0);

     p->header.handle = 0;

-    p->vendor_str = 1;

-    p->bios_version_str = 1;

+    load_str_field_with_default(0, vendor_str, BX_APPNAME);

+    load_str_field_with_default(0, bios_version_str, BX_APPNAME);

+

     p->bios_starting_address_segment = 0xe800;

-    p->bios_release_date_str = 2;

+

+    load_str_field_with_default(0, bios_release_date_str, RELEASE_DATE_STR);

+

     p->bios_rom_size = 0; /* FIXME */

     memset(p->bios_characteristics, 0, 8);

@@ -1985,50 +2067,66 @@ smbios_type_0_init(void *start)

     p->bios_characteristics_extension_bytes[0] = 0;

     p->bios_characteristics_extension_bytes[1] = 0;

-    p->system_bios_major_release = 1;

-    p->system_bios_minor_release = 0;

+    if (!smbios_load_field(0, offsetof(struct smbios_type_0,

+                                       system_bios_major_release),

+                           &p->system_bios_major_release))

+        p->system_bios_major_release = 1;

+

+    if (!smbios_load_field(0, offsetof(struct smbios_type_0,

+                                       system_bios_minor_release),

+                           &p->system_bios_minor_release))

+        p->system_bios_minor_release = 0;

+

     p->embedded_controller_major_release = 0xff;

     p->embedded_controller_minor_release = 0xff;

-    start += sizeof(struct smbios_type_0);

-    memcpy((char *)start, BX_APPNAME, sizeof(BX_APPNAME));

-    start += sizeof(BX_APPNAME);

-    memcpy((char *)start, RELEASE_DATE_STR, sizeof(RELEASE_DATE_STR));

-    start += sizeof(RELEASE_DATE_STR);

-    *((uint8_t *)start) = 0;

+    *end = 0;

+    end++;

-    return start+1;

+    return end;

 }

 /* Type 1 -- System Information */

 static void *

-smbios_type_1_init(void *start)

+smbios_init_type_1(void *start)

 {

     struct smbios_type_1 *p = (struct smbios_type_1 *)start;

+    char *end = (char *)start + sizeof(struct smbios_type_1);

+    size_t size;

+    int str_index = 0;

+

     p->header.type = 1;

     p->header.length = sizeof(struct smbios_type_1);

     p->header.handle = 0x100;

-    p->manufacturer_str = 0;

-    p->product_name_str = 0;

-    p->version_str = 0;

-    p->serial_number_str = 0;

+    load_str_field_or_skip(1, manufacturer_str);

+    load_str_field_or_skip(1, product_name_str);

+    load_str_field_or_skip(1, version_str);

+    load_str_field_or_skip(1, serial_number_str);

-    memcpy(p->uuid, bios_uuid, 16);

+    size = smbios_load_field(1, offsetof(struct smbios_type_1,

+                                         uuid), &p->uuid);

+    if (size == 0)

+        memset(p->uuid, 0, 16);

     p->wake_up_type = 0x06; /* power switch */

-    p->sku_number_str = 0;

-    p->family_str = 0;

-    start += sizeof(struct smbios_type_1);

-    *((uint16_t *)start) = 0;

+    load_str_field_or_skip(1, sku_number_str);

+    load_str_field_or_skip(1, family_str);

-    return start+2;

+    *end = 0;

+    end++;

+    if (!str_index) {

+        *end = 0;

+        end++;

+    }

+

+    return end;

 }

 /* Type 3 -- System Enclosure */

 static void *

-smbios_type_3_init(void *start)

+smbios_init_type_3(void *start)

 {

     struct smbios_type_3 *p = (struct smbios_type_3 *)start;

@@ -2058,7 +2156,7 @@ smbios_type_3_init(void *start)

 /* Type 4 -- Processor Information */

 static void *

-smbios_type_4_init(void *start, unsigned int cpu_number)

+smbios_init_type_4(void *start, unsigned int cpu_number)

 {

     struct smbios_type_4 *p = (struct smbios_type_4 *)start;

@@ -2098,7 +2196,7 @@ smbios_type_4_init(void *start, unsigned int cpu_number)

 /* Type 16 -- Physical Memory Array */

 static void *

-smbios_type_16_init(void *start, uint32_t memsize, int nr_mem_devs)

+smbios_init_type_16(void *start, uint32_t memsize, int nr_mem_devs)

 {

     struct smbios_type_16 *p = (struct smbios_type_16*)start;

@@ -2121,7 +2219,7 @@ smbios_type_16_init(void *start, uint32_t memsize, int nr_mem_devs)

 /* Type 17 -- Memory Device */

 static void *

-smbios_type_17_init(void *start, uint32_t memory_size_mb, int instance)

+smbios_init_type_17(void *start, uint32_t memory_size_mb, int instance)

 {

     struct smbios_type_17 *p = (struct smbios_type_17 *)start;

@@ -2151,7 +2249,7 @@ smbios_type_17_init(void *start, uint32_t memory_size_mb, int instance)

 /* Type 19 -- Memory Array Mapped Address */

 static void *

-smbios_type_19_init(void *start, uint32_t memory_size_mb, int instance)

+smbios_init_type_19(void *start, uint32_t memory_size_mb, int instance)

 {

     struct smbios_type_19 *p = (struct smbios_type_19 *)start;

@@ -2172,7 +2270,7 @@ smbios_type_19_init(void *start, uint32_t memory_size_mb, int instance)

 /* Type 20 -- Memory Device Mapped Address */

 static void *

-smbios_type_20_init(void *start, uint32_t memory_size_mb, int instance)

+smbios_init_type_20(void *start, uint32_t memory_size_mb, int instance)

 {

     struct smbios_type_20 *p = (struct smbios_type_20 *)start;

@@ -2196,7 +2294,7 @@ smbios_type_20_init(void *start, uint32_t memory_size_mb, int instance)

 /* Type 32 -- System Boot Information */

 static void *

-smbios_type_32_init(void *start)

+smbios_init_type_32(void *start)

 {

     struct smbios_type_32 *p = (struct smbios_type_32 *)start;

@@ -2214,7 +2312,7 @@ smbios_type_32_init(void *start)

 /* Type 127 -- End of Table */

 static void *

-smbios_type_127_init(void *start)

+smbios_init_type_127(void *start)

 {

     struct smbios_type_127 *p = (struct smbios_type_127 *)start;

@@ -2228,6 +2326,78 @@ smbios_type_127_init(void *start)

     return start + 2;

 }

+static int

+smbios_load_external(int type, char **p, unsigned *nr_structs,

+                     unsigned *max_struct_size)

+{

+#ifdef BX_QEMU

+    static uint64_t used_bitmap[4] = { 0 };

+    char *start = *p;

+    int i;

+

+    /* Check if we've already reported these tables */

+    if (used_bitmap[(type >> 6) & 0x3] & (1ULL << (type & 0x3f)))

+        return 1;

+

+    /* Don't introduce spurious end markers */

+    if (type == 127)

+        return 0;

+

+    for (i = smbios_entries(); i > 0; i--) {

+        struct smbios_table table;

+        struct smbios_structure_header *header = (void *)*p;

+        int string;

+

+        qemu_cfg_read((uint8_t *)&table, sizeof(struct smbios_header));

+        table.header.length -= sizeof(struct smbios_header);

+

+        if (table.header.type != SMBIOS_TABLE_ENTRY) {

+            while (table.header.length--)

+                inb(QEMU_CFG_DATA_PORT);

+            continue;

+        }

+

+        qemu_cfg_read((uint8_t *)*p, sizeof(struct smbios_structure_header));

+        table.header.length -= sizeof(struct smbios_structure_header);

+

+        if (header->type != type) {

+            while (table.header.length--)

+                inb(QEMU_CFG_DATA_PORT);

+            continue;

+        }

+

+        *p += sizeof(struct smbios_structure_header);

+

+        /* Entries end with a double NULL char, if there's a string at

+         * the end (length is greater than formatted length), the string

+         * terminator provides the first NULL. */

+        string = header->length < table.header.length +

+                 sizeof(struct smbios_structure_header);

+

+        /* Read the rest and terminate the entry */

+        qemu_cfg_read((uint8_t *)*p, table.header.length);

+        *p += table.header.length;

+        *((uint8_t*)*p) = 0;

+        (*p)++;

+        if (!string) {

+            *((uint8_t*)*p) = 0;

+            (*p)++;

+        }

+

+        (*nr_structs)++;

+        if (*p - (char *)header > *max_struct_size)

+            *max_struct_size = *p - (char *)header;

+    }

+

+    /* Mark that we've reported on this type */

+    used_bitmap[(type >> 6) & 0x3] |= (1ULL << (type & 0x3f));

+

+    return (start != *p);

+#else /* !BX_QEMU */

+    return 0;

+#endif

+}

+

 void smbios_init(void)

 {

     unsigned cpu_num, nr_structs = 0, max_struct_size = 0;

@@ -2246,34 +2416,39 @@ void smbios_init(void)

 	p = (char *)start + sizeof(struct smbios_entry_point);

-#define add_struct(fn) do{ \

-    q = (fn); \

-    nr_structs++; \

-    if ((q - p) > max_struct_size) \

-        max_struct_size = q - p; \

-    p = q; \

-}while (0)

-

-    add_struct(smbios_type_0_init(p));

-    add_struct(smbios_type_1_init(p));

-    add_struct(smbios_type_3_init(p));

+#define add_struct(type, args...) do {                                    \

+    if (!smbios_load_external(type, &p, &nr_structs, &max_struct_size)) { \

+        q = smbios_init_type_##type(args);                                \

+        nr_structs++;                                                     \

+        if ((q - p) > max_struct_size)                                    \

+            max_struct_size = q - p;                                      \

+        p = q;                                                            \

+    }                                                                     \

+} while (0)

+

+    add_struct(0, p);

+    add_struct(1, p);

+    add_struct(3, p);

     for (cpu_num = 1; cpu_num <= smp_cpus; cpu_num++)

-        add_struct(smbios_type_4_init(p, cpu_num));

+        add_struct(4, p, cpu_num);

     /* Each 'memory device' covers up to 16GB of address space. */

     nr_mem_devs = (memsize + 0x3fff) >> 14;

-    add_struct(smbios_type_16_init(p, memsize, nr_mem_devs));

+    add_struct(16, p, memsize, nr_mem_devs);

     for ( i = 0; i < nr_mem_devs; i++ )

     {

         uint32_t dev_memsize = ((i == (nr_mem_devs - 1))

                                 ? (((memsize-1) & 0x3fff)+1) : 0x4000);

-        add_struct(smbios_type_17_init(p, dev_memsize, i));

-        add_struct(smbios_type_19_init(p, dev_memsize, i));

-        add_struct(smbios_type_20_init(p, dev_memsize, i));

+        add_struct(17, p, dev_memsize, i);

+        add_struct(19, p, dev_memsize, i);

+        add_struct(20, p, dev_memsize, i);

     }

-    add_struct(smbios_type_32_init(p));

-    add_struct(smbios_type_127_init(p));

+    add_struct(32, p);

+    /* Add any remaining provided entries before the end marker */

+    for (i = 0; i < 256; i++)

+        smbios_load_external(i, &p, &nr_structs, &max_struct_size);

+    add_struct(127, p);

 #undef add_struct

@@ -2380,8 +2555,6 @@ void rombios32_init(uint32_t *s3_resume_vector, uint8_t *shutdown_flag)

         mptable_init();

-        uuid_probe();

-

         smbios_init();

         if (acpi_enabled)

--

To unsubscribe from this list: send the line "unsubscribe kvm" in

the body of a message to majordomo@vger.kernel.org

More majordomo info at  http://vger.kernel.org/majordomo-info.html

From c09142004a409bf27070939f470c5e0b37595a5a Mon Sep 17 00:00:00 2001

From: Beth Kon <eak@us.ibm.com>

Date: Fri, 19 Jun 2009 14:22:00 -0400

Subject: [PATCH] Fix non-ACPI Timer Interrupt Routing - v3

Replicate ACPI irq0->inti2 override in mp table for non-acpi case.

v1 -> v2 adds comment suggested by Ryan.

v2 -> v3 clarifies comment and corrects entry count

Signed-off-by: Beth Kon <eak@us.ibm.com>

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

---

 bios/rombios32.c |   14 ++++++++++++++

 1 files changed, 14 insertions(+), 0 deletions(-)

diff --git a/bios/rombios32.c b/bios/rombios32.c

index 1a1ed64..d789e20 100644

--- a/bios/rombios32.c

+++ b/bios/rombios32.c

@@ -1124,7 +1124,11 @@ static void mptable_init(void)

     putstr(&q, "0.1         "); /* vendor id */

     putle32(&q, 0); /* OEM table ptr */

     putle16(&q, 0); /* OEM table size */

+#ifdef BX_QEMU

+    putle16(&q, smp_cpus + 17); /* entry count */

+#else

     putle16(&q, smp_cpus + 18); /* entry count */

+#endif

     putle32(&q, 0xfee00000); /* local APIC addr */

     putle16(&q, 0); /* ext table length */

     putb(&q, 0); /* ext table checksum */

@@ -1166,6 +1170,12 @@ static void mptable_init(void)