Allow additions of ACPI tables from command line
PATCH v2 1/1 Allow additions of ACPI tables from command line
This is needed to dynamically add SLIC tables with Windows activation keys.
hw/acpi.c +167 -0
@@ -561,3 +561,170 @@ void qemu_system_powerdown(void) } }#endif + +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 */ +}; + +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 = 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 = 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); + + *(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)++; +return 0 ; +out: +if (acpi_tables) { +free (acpi_tables); + acpi_tables =NULL ; + } +return -1 ; +}
hw/pc.c +5 -0
@@ -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
hw/pc.h +1 -0
@@ -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;
qemu-doc.texi +3 -0
@@ -893,6 +893,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
vl.c +10 -0
@@ -3957,6 +3957,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"
@@ -4092,6 +4094,7 @@ enum { QEMU_OPTION_no_fd_bootchk, QEMU_OPTION_no_acpi, QEMU_OPTION_no_hpet, + QEMU_OPTION_acpitable,/* Linux boot specific: */ QEMU_OPTION_kernel,
@@ -4210,6 +4213,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: */
@@ -5069,6 +5073,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:
--
Gleb.
Quoted 16 lines · Gleb Natapov
This is needed to dynamically add SLIC tables with Windows activation keys.
Signed-off-by Gleb Natapov <[email protected]>hw/acpi.c +3
-0@@ -561,3 +561,170 @@ void qemu_system_powerdown(void) } }#endif + +struct acpi_table_header +{
hw/acpi.c void qemu_system_powerdown(void) · line 576
Quoted 10 lines
hw/acpi.c +10
-0+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 */ +};
I don't have a lot of confidence that this table is going to be padded correctly by all compilers on all architectures. I'd suggest explicit padding.
Quoted 14 lines
hw/acpi.c +13
-0+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 {
hw/acpi.c void qemu_system_powerdown(void) · line 612
Quoted 10 lines
hw/acpi.c +10
-0+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;
You're filling this table out in host endianness, not guest endianness. The table gets passed directly to the guest's BIOS though.
hw/acpi.c void qemu_system_powerdown(void) · line 615
Quoted 3 lines
hw/acpi.c +2
-0+if (get_param_value (buf,sizeof (buf),"oem_id" , t)) { +strncpy (acpi_hdr.oem_id, buf,6 );
is oem_id supposed to be NULL terminated or just NULL padded?
Regards,
Anthony Liguori
Quoted 23 lines · Anthony Liguori
Quoted 22 lines · Gleb Natapov
This is needed to dynamically add SLIC tables with Windows activation keys.
Signed-off-by Gleb Natapov <[email protected]>hw/acpi.c +10
-0@@ -561,3 +561,170 @@ void qemu_system_powerdown(void) } }#endif + +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 */
Quoted 9 lines
hw/acpi.c void qemu_system_powerdown(void) · line 576
Quoted 4 lines
hw/acpi.c +3
-0+char asl_compiler_id [4 ];/* ASL compiler vendor ID */ +uint32_t asl_compiler_revision;/* ASL compiler revision number */ +};I don't have a lot of confidence that this table is going to be padded correctly by all compilers on all architectures. I'd suggest explicit padding.
__attribute_((packed)) should be enough, no?
Quoted 5 lines
hw/acpi.c void qemu_system_powerdown(void) · line 615
Quoted 3 lines
hw/acpi.c +2
-0+if (get_param_value (buf,sizeof (buf),"oem_id" , t)) { +strncpy (acpi_hdr.oem_id, buf,6 );is
oem_idsupposed to be NULL terminated or just NULL padded?
ACPI spec rev 3.0b 18.2.1:
OEM ID of up to 6 characters. If the OEM ID is shorter than 6 characters, it can be terminated with a NULL character.
--
Gleb.
Quoted 34 lines · Gleb Natapov
Quoted 22 lines · Anthony Liguori
Quoted 20 lines · Gleb Natapov
This is needed to dynamically add SLIC tables with Windows activation keys.
Signed-off-by Gleb Natapov <[email protected]>hw/acpi.c +8
-0@@ -561,3 +561,170 @@ void qemu_system_powerdown(void) } }#endif + +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 */ Quoted 10 lines
hw/acpi.c void qemu_system_powerdown(void) · line 576
Quoted 7 lines
hw/acpi.c +5
-0+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 */ +};I don't have a lot of confidence that this table is going to be padded correctly by all compilers on all architectures. I'd suggest explicit padding.
Quoted 2 lines
__attribute_((packed)) should be enough, no?
Yup.
Quoted 11 lines
Quoted 6 lines
hw/acpi.c void qemu_system_powerdown(void) · line 615
Quoted 4 lines
hw/acpi.c +2
-0+if (get_param_value (buf,sizeof (buf),"oem_id" , t)) { +strncpy (acpi_hdr.oem_id, buf,6 );is
oem_idsupposed to be NULL terminated or just NULL padded?ACPI spec rev 3.0b 18.2.1:
OEM ID of up to 6 characters. If the OEM ID is shorter than 6 characters, it can be terminated with a NULL character.
Ok, I figured as much but wanted to double check.
Regards,
Anthony Liguori
Quoted 5 lines
--
Gleb.