From 8a92ea2f2c7b3e185ef6f4d8d3c376b752275ec7 Mon Sep 17 00:00:00 2001
From: aliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162>
Date: Fri, 27 Feb 2009 20:12:36 +0000
Subject: [PATCH] Allow additions of ACPI tables from command line (Gleb
Natapov)
This is needed to dynamically add SLIC tables with Windows
activation keys.
Signed-off-by: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6650 c046a42c-6fe2-441c-8c8c-71466251a162
---
hw/acpi.c | 169 ++++++++++++++++++
hw/pc.c | 5 +
hw/pc.h | 1 +
...ead-additional-acpi-tables-from-a-vm.patch | 155 ++++++++++++++++
pc-bios/bios-pq/series | 1 +
pc-bios/bios.bin | Bin 131072 -> 131072 bytes
qemu-doc.texi | 3 +
vl.c | 10 ++
8 files changed, 344 insertions(+)
create mode 100644 pc-bios/bios-pq/0011_read-additional-acpi-tables-from-a-vm.patch
diff --git a/hw/acpi.c b/hw/acpi.c
index 31851585f8..52bc43ad58 100644
--- a/hw/acpi.c
+++ b/hw/acpi.c
@@ -746,3 +746,172 @@ void qemu_system_device_hot_add(int bus, int slot, int state)
qemu_set_irq(pm_state->irq, 0);
}
}
+
+struct acpi_table_header
+{
+ char signature [4]; /* ACPI signature (4 ASCII characters) */
+ uint32_t length; /* Length of table, in bytes, including header */
+ uint8_t revision; /* ACPI Specification minor version # */
+ uint8_t checksum; /* To make sum of entire table == 0 */
+ char oem_id [6]; /* OEM identification */
+ char oem_table_id [8]; /* OEM table identification */
+ uint32_t oem_revision; /* OEM revision number */
+ char asl_compiler_id [4]; /* ASL compiler vendor ID */
+ uint32_t asl_compiler_revision; /* ASL compiler revision number */
+} __attribute__((packed));
+
+char *acpi_tables;
+size_t acpi_tables_len;
+
+static int acpi_checksum(const uint8_t *data, int len)
+{
+ int sum, i;
+ sum = 0;
+ for(i = 0; i < len; i++)
+ sum += data[i];
+ return (-sum) & 0xff;
+}
+
+int acpi_table_add(const char *t)
+{
+ static const char *dfl_id = "QEMUQEMU";
+ char buf[1024], *p, *f;
+ struct acpi_table_header acpi_hdr;
+ unsigned long val;
+ size_t off;
+
+ memset(&acpi_hdr, 0, sizeof(acpi_hdr));
+
+ if (get_param_value(buf, sizeof(buf), "sig", t)) {
+ strncpy(acpi_hdr.signature, buf, 4);
+ } else {
+ strncpy(acpi_hdr.signature, dfl_id, 4);
+ }
+ if (get_param_value(buf, sizeof(buf), "rev", t)) {
+ val = strtoul(buf, &p, 10);
+ if (val > 255 || *p != '\0')
+ goto out;
+ } else {
+ val = 1;
+ }
+ acpi_hdr.revision = (int8_t)val;
+
+ if (get_param_value(buf, sizeof(buf), "oem_id", t)) {
+ strncpy(acpi_hdr.oem_id, buf, 6);
+ } else {
+ strncpy(acpi_hdr.oem_id, dfl_id, 6);
+ }
+
+ if (get_param_value(buf, sizeof(buf), "oem_table_id", t)) {
+ strncpy(acpi_hdr.oem_table_id, buf, 8);
+ } else {
+ strncpy(acpi_hdr.oem_table_id, dfl_id, 8);
+ }
+
+ if (get_param_value(buf, sizeof(buf), "oem_rev", t)) {
+ val = strtol(buf, &p, 10);
+ if(*p != '\0')
+ goto out;
+ } else {
+ val = 1;
+ }
+ acpi_hdr.oem_revision = cpu_to_le32(val);
+
+ if (get_param_value(buf, sizeof(buf), "asl_compiler_id", t)) {
+ strncpy(acpi_hdr.asl_compiler_id, buf, 4);
+ } else {
+ strncpy(acpi_hdr.asl_compiler_id, dfl_id, 4);
+ }
+
+ if (get_param_value(buf, sizeof(buf), "asl_compiler_rev", t)) {
+ val = strtol(buf, &p, 10);
+ if(*p != '\0')
+ goto out;
+ } else {
+ val = 1;
+ }
+ acpi_hdr.asl_compiler_revision = cpu_to_le32(val);
+
+ if (!get_param_value(buf, sizeof(buf), "data", t)) {
+ buf[0] = '\0';
+ }
+
+ acpi_hdr.length = sizeof(acpi_hdr);
+
+ f = buf;
+ while (buf[0]) {
+ struct stat s;
+ char *n = index(f, ':');
+ if (n)
+ *n = '\0';
+ if(stat(f, &s) < 0) {
+ fprintf(stderr, "Can't stat file '%s': %s\n", f, strerror(errno));
+ goto out;
+ }
+ acpi_hdr.length += s.st_size;
+ if (!n)
+ break;
+ *n = ':';
+ f = n + 1;
+ }
+
+ if (!acpi_tables) {
+ acpi_tables_len = sizeof(uint16_t);
+ acpi_tables = qemu_mallocz(acpi_tables_len);
+ }
+ p = acpi_tables + acpi_tables_len;
+ acpi_tables_len += sizeof(uint16_t) + acpi_hdr.length;
+ acpi_tables = qemu_realloc(acpi_tables, acpi_tables_len);
+
+ acpi_hdr.length = cpu_to_le32(acpi_hdr.length);
+ *(uint16_t*)p = acpi_hdr.length;
+ p += sizeof(uint16_t);
+ memcpy(p, &acpi_hdr, sizeof(acpi_hdr));
+ off = sizeof(acpi_hdr);
+
+ f = buf;
+ while (buf[0]) {
+ struct stat s;
+ int fd;
+ char *n = index(f, ':');
+ if (n)
+ *n = '\0';
+ fd = open(f, O_RDONLY);
+
+ if(fd < 0)
+ goto out;
+ if(fstat(fd, &s) < 0) {
+ close(fd);
+ goto out;
+ }
+
+ do {
+ int r;
+ r = read(fd, p + off, s.st_size);
+ if (r > 0) {
+ off += r;
+ s.st_size -= r;
+ } else if ((r < 0 && errno != EINTR) || r == 0) {
+ close(fd);
+ goto out;
+ }
+ } while(s.st_size);
+
+ close(fd);
+ if (!n)
+ break;
+ f = n + 1;
+ }
+
+ ((struct acpi_table_header*)p)->checksum = acpi_checksum((uint8_t*)p, off);
+ /* increase number of tables */
+ (*(uint16_t*)acpi_tables) =
+ cpu_to_le32(le32_to_cpu(*(uint16_t*)acpi_tables) + 1);
+ return 0;
+out:
+ if (acpi_tables) {
+ free(acpi_tables);
+ acpi_tables = NULL;
+ }
+ return -1;
+}
diff --git a/hw/pc.c b/hw/pc.c
index 57ba803fe6..3849390702 100644
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -50,9 +50,13 @@
/* Leave a chunk of memory at the top of RAM for the BIOS ACPI tables. */
#define ACPI_DATA_SIZE 0x10000
#define BIOS_CFG_IOPORT 0x510
+#define FW_CFG_ACPI_TABLES (FW_CFG_ARCH_LOCAL + 0)
#define MAX_IDE_BUS 2
+extern uint8_t *acpi_tables;
+extern size_t acpi_tables_len;
+
static fdctrl_t *floppy_controller;
static RTCState *rtc_state;
static PITState *pit;
@@ -438,6 +442,7 @@ static void bochs_bios_init(void)
fw_cfg = fw_cfg_init(BIOS_CFG_IOPORT, BIOS_CFG_IOPORT + 1, 0, 0);
fw_cfg_add_i32(fw_cfg, FW_CFG_ID, 1);
fw_cfg_add_i64(fw_cfg, FW_CFG_RAM_SIZE, (uint64_t)ram_size);
+ fw_cfg_add_bytes(fw_cfg, FW_CFG_ACPI_TABLES, acpi_tables, acpi_tables_len);
}
/* Generate an initial boot sector which sets state and jump to
diff --git a/hw/pc.h b/hw/pc.h
index 7f21144cfa..5578b3a936 100644
--- a/hw/pc.h
+++ b/hw/pc.h
@@ -102,6 +102,7 @@ i2c_bus *piix4_pm_init(PCIBus *bus, int devfn, uint32_t smb_io_base,
qemu_irq sci_irq);
void piix4_smbus_register_device(SMBusDevice *dev, uint8_t addr);
void acpi_bios_init(void);
+int acpi_table_add(const char *table_desc);
/* hpet.c */
extern int no_hpet;
diff --git a/pc-bios/bios-pq/0011_read-additional-acpi-tables-from-a-vm.patch b/pc-bios/bios-pq/0011_read-additional-acpi-tables-from-a-vm.patch
new file mode 100644
index 0000000000..0250021fe4
--- /dev/null
+++ b/pc-bios/bios-pq/0011_read-additional-acpi-tables-from-a-vm.patch
@@ -0,0 +1,155 @@
+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 3269be5..191707d 100644
+--- a/bios/rombios32.c
++++ b/bios/rombios32.c
+@@ -457,6 +457,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;
+
+@@ -484,6 +486,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)
+@@ -1534,8 +1557,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
+@@ -1548,10 +1571,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);
+@@ -1590,12 +1620,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);
+@@ -1607,17 +1631,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);
+@@ -1692,6 +1705,7 @@ void acpi_bios_init(void)
+ "APIC", madt_size, 1);
+ }
+
++ memset(rsdt, 0, rsdt_size);
+ #ifdef BX_QEMU
+ /* HPET */
+ memset(hpet, 0, sizeof(*hpet));
+@@ -1702,7 +1716,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);
+
+ }
+
+--
+ Gleb.
+
+
+
diff --git a/pc-bios/bios-pq/series b/pc-bios/bios-pq/series
index 4139227b07..5a29df939b 100644
--- a/pc-bios/bios-pq/series
+++ b/pc-bios/bios-pq/series
@@ -8,3 +8,4 @@
0008_qemu-bios-provide-gpe-_l0x-methods.patch
0009_qemu-bios-pci-hotplug-support.patch
0010_bios-mark-the-acpi-sci-interrupt-as-connected-to-irq-9.patch
+0011_read-additional-acpi-tables-from-a-vm.patch
diff --git a/pc-bios/bios.bin b/pc-bios/bios.bin
index 88feb45a948c232a37c982267c7847c9666987d6..d7cb1057d4dd4ba6b030627aab3454217403a917 100644
GIT binary patch
delta 2079
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
delta 1739
zcmZWpe{2(V6u<lSRtlDOZes}B7_y@)(y_ZSq>Dz{U0Xw7Y`T@-A}U#kCIrHY{sFez
zLDEZe$;>zYN<=e2Ax01=*|LJr0p2krWR4gG_eYJuZdhU`L)g%r@7q#_`bV$t`@Wy|
zzVE%ydoL6+g+eA9A3tN7L{Z(F;WKaa&X=cGFSJl+D57FAsslr&Imc`j29zkre#0;5
zJud2G{-n`94s*sC=nF2o%y>A*5}$6Nv?aQ(s|?$hkB#O9=pcumHJ4T#<}6g;wzV^7
z9|(Lu-y0Tk;j|x4Vc|)T4y2_#kUr;doB5g91Q-^IAAw39fo7#a(M#qc8Xe)HLsKu%
zLFvY-m5pN3(Xko=mfx|8gDLq%c0W0FIEm`$Af@YaI|X0yW?b?Q$RAY`%?EWRxb?Xt
zza|y1lJ~ks{jKZLPS&J)SZ0K`P>>5l0cN+c37}%)zT{0>yK-E_EAy?BTr~uzNd82`
zpOif)SMsLjdk4h0Q}VF65$^!}nYDp&a5~Dz6)30}r^WkhU?diW6y*~(@IYBRk$9F4
z(_#<ZI(8EDf!lKZ<k&%w+T|A8zwa}}jQ9umUTIY>-!Jb70)Uwg9_Su%tRV2my{mjY
zTyK(hP=HbxlzFo{FdXqFyQ|?nX)P<&+9O^~s&z!XDXEr&NMonqIY^fVfcC@#UFYNN
z3S-C^w**Ea{_EW>aHj|kS`jL!4m;F95vqrkps*+<HQJjcVL`_xP)gfbRp5@Nv8x$L
zaLNsg7&l3cu2>JeAqmT+pA=yYQiOF(vnp)Vt?+$ax2i%z;%nk_J);U+17M#GXV(}B
z2NF^kV<sS1U_>$cpchom5~RXD8pI3WJnTat^^#P4j0;?ZeFoWQ1{%_oewWFSP^v8j
zs-b*Y3fe+;F!xlsppdO&Q-STkEj}IzBp<$6<4pvHtz9LAdTChfai~6)q7vh(FK8z<
zvvytC)8A4FVRpiaB8DEtLBXfO6!s_!;8&@76pmn_32ORw4#?*3Ww$wY6M|A`T5;3n
z@EWALA-edu>V^oQ7;ZCCT=W#hg($^kpdxh%)diGNRI};=1W>A$J|u1JD5+A!pL)c(
zlW?BGvAm+9-!hq}*)0N~c;2yY!>g~HgQDWu1zRks$0~FD0sf@m$2?~hkOgi0a0ayA
zvFM&@TWKV7_+H^Q)O08M=Jdk|Rd9I5%ypLCfX*T>-NkJ)4^1;n43M=ePB_r4ckz;<
zU3mo)H)(Zf1Ya)Nh-^IOif16h2wqk^h%Vm1)g=eWnz>d|RYs-(=3;wJ%n8QQ@c#xw
z;Bn=w`)HFL&ns;~Z`q@tmGU$a_-Oy^db)5q7=_)WP3qDTX_FN^UOZ<}VFM_{bFh)f
z0EP|XIl6V!&*Qc^yDTf=Dw~x1HlA9xX7RSiRM(QaZtXOZWwB>MozCbCT=DT(ZVoW@
zdpG2;x2yzKB|cT=Kuy>2t+MCl9fFF<1tw|Q^Q5JkSabFz3)qHU7`N_z-vE8uuHhBz
zEc6wRx3CrH7?1a|^HGe)7ujK?^7xy%ader-LEDjh3O0AvNB)qmYg-c7RlXtb%70?}
zRKrKh3t1<Dd&%;r#Ph|Z8-})PuoZU@CoT(Y^A-rS{I#dZs<NKWhr(D-lN!~W4J>UP
zJ;~uW>`%Y+;e>PT)F5nsujwe*W<7TQs_X5dl3R1{?T;gMNtHApylU<v?cz0&Nz6ju
z1#4||F#3ai(q!i4Mo$y|ndhQ&s|<9se&Ml8(Z1^S^a;B8D&qOB%~$Dmn~CQuxf<%P
G<Np8xhjS$W
diff --git a/qemu-doc.texi b/qemu-doc.texi
index 8322a0888d..39a3a76ca4 100644
--- a/qemu-doc.texi
+++ b/qemu-doc.texi
@@ -896,6 +896,9 @@ only).
@item -no-hpet
Disable HPET support.
+@item -acpitable [sig=@var{str}][,rev=@var{n}][,oem_id=@var{str}][,oem_table_id=@var{str}][,oem_rev=@var{n}] [,asl_compiler_id=@var{str}][,asl_compiler_rev=@var{n}][,data=@var{file1}[:@var{file2}]...]
+Add ACPI table with specified header fields and context from specified files.
+
@end table
Linux boot specific: When using these options, you can use a given
diff --git a/vl.c b/vl.c
index ee93d6bc29..a71aa66328 100644
--- a/vl.c
+++ b/vl.c
@@ -4016,6 +4016,8 @@ static void help(int exitcode)
"-no-fd-bootchk disable boot signature checking for floppy disks\n"
"-no-acpi disable ACPI\n"
"-no-hpet disable HPET\n"
+ "-acpitable [sig=str][,rev=n][,oem_id=str][,oem_table_id=str][,oem_rev=n][,asl_compiler_id=str][,asl_compiler_rev=n][,data=file1[:file2]...]\n"
+ " ACPI table description\n"
#endif
"Linux boot specific:\n"
"-kernel bzImage use 'bzImage' as kernel image\n"
@@ -4151,6 +4153,7 @@ enum {
QEMU_OPTION_no_fd_bootchk,
QEMU_OPTION_no_acpi,
QEMU_OPTION_no_hpet,
+ QEMU_OPTION_acpitable,
/* Linux boot specific: */
QEMU_OPTION_kernel,
@@ -4269,6 +4272,7 @@ static const QEMUOption qemu_options[] = {
{ "no-fd-bootchk", 0, QEMU_OPTION_no_fd_bootchk },
{ "no-acpi", 0, QEMU_OPTION_no_acpi },
{ "no-hpet", 0, QEMU_OPTION_no_hpet },
+ { "acpitable", HAS_ARG, QEMU_OPTION_acpitable },
#endif
/* Linux boot specific: */
@@ -5127,6 +5131,12 @@ int main(int argc, char **argv, char **envp)
case QEMU_OPTION_rtc_td_hack:
rtc_td_hack = 1;
break;
+ case QEMU_OPTION_acpitable:
+ if(acpi_table_add(optarg) < 0) {
+ fprintf(stderr, "Wrong acpi table provided\n");
+ exit(1);
+ }
+ break;
#endif
#ifdef USE_KQEMU
case QEMU_OPTION_no_kqemu: