diff options
| author | aliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162> | 2009-02-27 20:12:36 +0000 |
|---|---|---|
| committer | aliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162> | 2009-02-27 20:12:36 +0000 |
| commit | 8a92ea2f2c7b3e185ef6f4d8d3c376b752275ec7 (patch) | |
| tree | 5697ae67cc99b9478efaa73725b1cbf5e9a79edf /vl.c | |
| parent | 680c30692dc9e8f6d63ad0eb6ddb2a9ace0503cf (diff) | |
| download | qemu-8a92ea2f2c7b3e185ef6f4d8d3c376b752275ec7.tar.gz | |
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
Diffstat (limited to 'vl.c')
| -rw-r--r-- | vl.c | 10 |
1 files changed, 10 insertions, 0 deletions
@@ -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: |