From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LWXAG-0004Do-9D for qemu-devel@nongnu.org; Mon, 09 Feb 2009 09:31:12 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LWXAD-0004Ci-EE for qemu-devel@nongnu.org; Mon, 09 Feb 2009 09:31:11 -0500 Received: from [199.232.76.173] (port=33496 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LWXAD-0004Cf-8Z for qemu-devel@nongnu.org; Mon, 09 Feb 2009 09:31:09 -0500 Received: from mx2.redhat.com ([66.187.237.31]:45252) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1LWXAC-0002oe-Cv for qemu-devel@nongnu.org; Mon, 09 Feb 2009 09:31:09 -0500 Received: from int-mx2.corp.redhat.com (int-mx2.corp.redhat.com [172.16.27.26]) by mx2.redhat.com (8.13.8/8.13.8) with ESMTP id n19EV7p7002908 for ; Mon, 9 Feb 2009 09:31:07 -0500 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx2.corp.redhat.com (8.13.1/8.13.1) with ESMTP id n19EV7DY018014 for ; Mon, 9 Feb 2009 09:31:07 -0500 Received: from dhcp-1-237.tlv.redhat.com (dhcp-1-237.tlv.redhat.com [10.35.1.237]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id n19EV4tV025666 for ; Mon, 9 Feb 2009 09:31:05 -0500 Date: Mon, 9 Feb 2009 16:28:32 +0200 From: Gleb Natapov Message-ID: <20090209142832.GF28969@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Subject: [Qemu-devel] [PATCH v2] Allow additions of ACPI tables from command line Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org This is needed to dynamically add SLIC tables with Windows activation keys. Signed-off-by: Gleb Natapov diff --git a/hw/acpi.c b/hw/acpi.c index 4338d02..7175598 100644 --- a/hw/acpi.c +++ b/hw/acpi.c @@ -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; +} diff --git a/hw/pc.c b/hw/pc.c index 176730e..c403305 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 c67294d..7d2ed44 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/qemu-doc.texi b/qemu-doc.texi index efb88d2..44e9a82 100644 --- a/qemu-doc.texi +++ b/qemu-doc.texi @@ -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 diff --git a/vl.c b/vl.c index aff2b2c..8cc4d50 100644 --- a/vl.c +++ b/vl.c @@ -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.