diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model-cmt.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model-cmt.args new file mode 100644 index 0000000000000000000000000000000000000000..8f6e74f8aece1a8d9bd3b8047aee0b88f0f10ef8 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model-cmt.args @@ -0,0 +1,22 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-name QEMUGuest1 \ +-S \ +-M pc \ +-cpu Haswell,+vme,+ds,+acpi,+ss,+ht,+tm,+pbe,+dtes64,+monitor,+ds_cpl,+vmx,\ ++smx,+est,+tm2,+xtpr,+pdcm,+osxsave,+f16c,+rdrand,+cmt,+pdpe1gb,+abm \ +-m 214 \ +-smp 6,sockets=6,cores=1,threads=1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-nographic \ +-nodefaults \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-no-acpi \ +-boot n \ +-usb \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model-cmt.xml b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model-cmt.xml new file mode 100644 index 0000000000000000000000000000000000000000..7e3f617b85144cc1bbfcbd3139c105c84dbb5523 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model-cmt.xml @@ -0,0 +1,19 @@ + + QEMUGuest1 + c7a5fdbd-edaf-9455-926a-d65c16db1809 + 219100 + 219100 + 6 + + hvm + + + + + destroy + restart + destroy + + /usr/bin/qemu + + diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index d5948360072f4360cba082f1b8872bbb05359af2..75ac62e8005b8b983c292ca2b2f4be7756c25384 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1392,6 +1392,7 @@ mymain(void) DO_TEST("cpu-Haswell2", QEMU_CAPS_KVM); DO_TEST("cpu-Haswell3", QEMU_CAPS_KVM); DO_TEST("cpu-Haswell-noTSX", QEMU_CAPS_KVM); + DO_TEST("cpu-host-model-cmt", NONE); driver.caps->host.cpu = cpuDefault; DO_TEST("encrypted-disk", NONE); diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c index 133de29eb3c6d5e0f4e8cdb0699f624f1c23d1f2..11dd20e2c6c0e4be3f17f97617614bbc9c3d3540 100644 --- a/tests/testutilsqemu.c +++ b/tests/testutilsqemu.c @@ -54,6 +54,7 @@ static virCPUFeatureDef cpuHaswellFeatures[] = { { (char *) "invtsc", -1 }, { (char *) "abm", -1 }, { (char *) "pdpe1gb", -1 }, + { (char *) "cmt", -1 }, { (char *) "rdrand", -1 }, { (char *) "f16c", -1 }, { (char *) "osxsave", -1 },