[libvirt] [PATCHv2 2/3] qemu: format SLIC ACPI table command line
<os>
<acpi>
<table type="slic">/path/to/acpi/table/file</table>
</acpi>
</os>
will result in:
-acpitable sig=SLIC,file=/path/to/acpi/table/file
This option was introduced by QEMU commit 8a92ea2 in 2009.
https://bugzilla.redhat.com/show_bug.cgi?id=1327537
---
src/qemu/qemu_command.c | 7 +++++++
tests/qemuxml2argvdata/qemuxml2argv-acpi-table.args | 19 +++++++++++++++++++
tests/qemuxml2argvtest.c | 2 ++
3 files changed, 28 insertions(+)
create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-acpi-table.args
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 102837b..368bd87 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -6222,6 +6222,13 @@ qemuBuildBootCommandLine(virCommandPtr cmd,
goto error;
}
}
+ if (def->os.slic_table) {
+ virBuffer buf = VIR_BUFFER_INITIALIZER;
+ virCommandAddArg(cmd, "-acpitable");
+ virBufferAddLit(&buf, "sig=SLIC,file=");
+ qemuBufferEscapeComma(&buf, def->os.slic_table);
+ virCommandAddArgBuffer(cmd, &buf);
+ }
return 0;
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-acpi-table.args
b/tests/qemuxml2argvdata/qemuxml2argv-acpi-table.args
new file mode 100644
index 0000000..31902ba
--- /dev/null
+++ b/tests/qemuxml2argvdata/qemuxml2argv-acpi-table.args
@@ -0,0 +1,19 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/home/test \
+USER=test \
+LOGNAME=test \
+QEMU_AUDIO_DRV=none \
+/usr/bin/qemu \
+-name QEMUGuest1 \
+-S \
+-M pc \
+-m 214 \
+-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-nographic \
+-nodefaults \
+-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \
+-boot c \
+-acpitable sig=SLIC,file=/var/lib/libvirt/acpi/slic.dat \
+-usb
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index bce11c3..db0a7f7 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1972,6 +1972,8 @@ mymain(void)
DO_TEST("master-key", QEMU_CAPS_OBJECT_SECRET);
+ DO_TEST("acpi-table", NONE);
+
qemuTestDriverFree(&driver);
return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
--
2.7.3