On 9/15/19 1:43 PM, Marek Marczykowski-Górecki wrote:
Signed-off-by: Marek Marczykowski-Górecki
<marmarek(a)invisiblethingslab.com>
---
tests/libxlxml2domconfigdata/fullvirt-acpi-slic.json | 54 +++++++++++++-
tests/libxlxml2domconfigdata/fullvirt-acpi-slic.xml | 32 ++++++++-
tests/libxlxml2domconfigtest.c | 2 +-
3 files changed, 88 insertions(+)
create mode 100644 tests/libxlxml2domconfigdata/fullvirt-acpi-slic.json
create mode 100644 tests/libxlxml2domconfigdata/fullvirt-acpi-slic.xml
diff --git a/tests/libxlxml2domconfigdata/fullvirt-acpi-slic.json
b/tests/libxlxml2domconfigdata/fullvirt-acpi-slic.json
new file mode 100644
index 0000000..5d85d75
--- /dev/null
+++ b/tests/libxlxml2domconfigdata/fullvirt-acpi-slic.json
@@ -0,0 +1,54 @@
+{
+ "c_info": {
+ "type": "hvm",
+ "name": "XenGuest2",
+ "uuid": "c7a5fdb2-cdaf-9455-926a-d65c16db1809"
+ },
+ "b_info": {
+ "max_vcpus": 1,
+ "avail_vcpus": [
+ 0
+ ],
+ "max_memkb": 592896,
+ "target_memkb": 403456,
+ "shadow_memkb": 5656,
+ "sched_params": {
+ },
+ "nested_hvm": "False",
I had to remove the above line otherwise 'make check' fails. Did it work for you
as is?
Regards,
Jim
+ "type.hvm": {
+ "pae": "True",
+ "apic": "True",
+ "acpi": "True",
+ "acpi_firmware": "/path/to/slic.dat",
+ "nographic": "True",
+ "vnc": {
+ "enable": "False"
+ },
+ "sdl": {
+ "enable": "False"
+ },
+ "spice": {
+
+ },
+ "boot": "c",
+ "rdm": {
+
+ }
+ },
+ "arch_arm": {
+
+ }
+ },
+ "disks": [
+ {
+ "pdev_path": "/dev/HostVG/XenGuest2",
+ "vdev": "hda",
+ "backend": "phy",
+ "format": "raw",
+ "removable": 1,
+ "readwrite": 1
+ }
+ ],
+ "on_reboot": "restart",
+ "on_crash": "restart"
+}
diff --git a/tests/libxlxml2domconfigdata/fullvirt-acpi-slic.xml
b/tests/libxlxml2domconfigdata/fullvirt-acpi-slic.xml
new file mode 100644
index 0000000..017fdb5
--- /dev/null
+++ b/tests/libxlxml2domconfigdata/fullvirt-acpi-slic.xml
@@ -0,0 +1,32 @@
+<domain type='xen'>
+ <name>XenGuest2</name>
+ <uuid>c7a5fdb2-cdaf-9455-926a-d65c16db1809</uuid>
+ <memory unit='KiB'>592896</memory>
+ <currentMemory unit='KiB'>403456</currentMemory>
+ <vcpu placement='static'>1</vcpu>
+ <os>
+ <type arch='x86_64' machine='xenfv'>hvm</type>
+ <acpi>
+ <table type='slic'>/path/to/slic.dat</table>
+ </acpi>
+ </os>
+ <features>
+ <acpi/>
+ <apic/>
+ <pae/>
+ </features>
+ <clock offset='variable' adjustment='0' basis='utc'/>
+ <on_poweroff>destroy</on_poweroff>
+ <on_reboot>restart</on_reboot>
+ <on_crash>restart</on_crash>
+ <devices>
+ <disk type='block' device='disk'>
+ <driver name='phy' type='raw'/>
+ <source dev='/dev/HostVG/XenGuest2'/>
+ <target dev='hda' bus='ide'/>
+ <address type='drive' controller='0' bus='0'
target='0' unit='0'/>
+ </disk>
+ <input type='mouse' bus='ps2'/>
+ <input type='keyboard' bus='ps2'/>
+ </devices>
+</domain>
diff --git a/tests/libxlxml2domconfigtest.c b/tests/libxlxml2domconfigtest.c
index 3b3f634..120796b 100644
--- a/tests/libxlxml2domconfigtest.c
+++ b/tests/libxlxml2domconfigtest.c
@@ -212,6 +212,8 @@ mymain(void)
DO_TEST("fullvirt-cpuid-legacy-nest");
# endif
+ DO_TEST("fullvirt-acpi-slic");
+
# ifdef LIBXL_HAVE_BUILDINFO_GRANT_LIMITS
DO_TEST("max-gntframes-hvm");
# endif