From nobody Sun Feb 8 22:08:39 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.39 as permitted sender) client-ip=209.132.183.39; envelope-from=libvir-list-bounces@redhat.com; helo=mx6-phx2.redhat.com; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.39 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; Return-Path: Received: from mx6-phx2.redhat.com (mx6-phx2.redhat.com [209.132.183.39]) by mx.zohomail.com with SMTPS id 148951095782826.89693221419634; Tue, 14 Mar 2017 10:02:37 -0700 (PDT) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by mx6-phx2.redhat.com (8.14.4/8.14.4) with ESMTP id v2EGwSfg017498; Tue, 14 Mar 2017 12:58:28 -0400 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v2EGvt5l002612 for ; Tue, 14 Mar 2017 12:57:55 -0400 Received: from virval.usersys.redhat.com (dhcp129-92.brq.redhat.com [10.34.129.92]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id v2EGvrhL020462 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO) for ; Tue, 14 Mar 2017 12:57:54 -0400 Received: by virval.usersys.redhat.com (Postfix, from userid 500) id 8193A1062D1; Tue, 14 Mar 2017 17:57:53 +0100 (CET) From: Jiri Denemark To: libvir-list@redhat.com Date: Tue, 14 Mar 2017 17:57:43 +0100 Message-Id: <39b6be4e29fade110ba0f0ac510e210847b55128.1489510598.git.jdenemar@redhat.com> In-Reply-To: References: In-Reply-To: References: Mail-Followup-To: libvir-list@redhat.com X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 04/12] qemu: Set default values for CPU check attribute X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Jiri Denemark --- src/qemu/qemu_domain.c | 42 ++++++++++++++++++= ++++ src/qemu/qemu_process.c | 13 +++---- .../qemuxml2argv-aarch64-gic-host.xml | 2 +- .../qemuxml2argv-aarch64-gic-v2.xml | 2 +- .../qemuxml2argv-aarch64-gic-v3.xml | 2 +- .../qemuxml2argv-cpu-check-default-none.args | 21 +++++++++++ .../qemuxml2argv-cpu-check-default-none.xml | 19 ++++++++++ .../qemuxml2argv-cpu-check-default-none2.args | 21 +++++++++++ .../qemuxml2argv-cpu-check-default-none2.xml | 21 +++++++++++ .../qemuxml2argv-cpu-check-default-partial.args | 22 ++++++++++++ .../qemuxml2argv-cpu-check-default-partial.xml | 19 ++++++++++ .../qemuxml2argv-cpu-check-default-partial2.args | 21 +++++++++++ .../qemuxml2argv-cpu-check-default-partial2.xml | 21 +++++++++++ .../qemuxml2argv-cpu-check-full.args | 1 + .../qemuxml2argv-cpu-check-full.xml | 21 +++++++++++ .../qemuxml2argv-cpu-check-none.args | 21 +++++++++++ .../qemuxml2argv-cpu-check-none.xml | 21 +++++++++++ .../qemuxml2argv-cpu-check-partial.args | 1 + .../qemuxml2argv-cpu-check-partial.xml | 21 +++++++++++ tests/qemuxml2argvtest.c | 8 +++++ .../qemuxml2xmlout-aarch64-aavmf-virtio-mmio.xml | 2 +- ...qemuxml2xmlout-aarch64-video-virtio-gpu-pci.xml | 2 +- .../qemuxml2xmlout-aarch64-virtio-pci-default.xml | 2 +- ...2xmlout-aarch64-virtio-pci-manual-addresses.xml | 2 +- .../qemuxml2xmlout-cpu-check-default-none.xml | 28 +++++++++++++++ .../qemuxml2xmlout-cpu-check-default-none2.xml | 30 ++++++++++++++++ .../qemuxml2xmlout-cpu-check-default-partial.xml | 30 ++++++++++++++++ .../qemuxml2xmlout-cpu-check-default-partial2.xml | 30 ++++++++++++++++ .../qemuxml2xmlout-cpu-check-full.xml | 30 ++++++++++++++++ .../qemuxml2xmlout-cpu-check-none.xml | 30 ++++++++++++++++ .../qemuxml2xmlout-cpu-check-partial.xml | 30 ++++++++++++++++ .../qemuxml2xmlout-cpu-eoi-disabled.xml | 2 +- .../qemuxml2xmlout-cpu-eoi-enabled.xml | 2 +- .../qemuxml2xmlout-cpu-host-kvmclock.xml | 2 +- .../qemuxml2xmlout-cpu-host-model-features.xml | 2 +- ...emuxml2xmlout-cpu-host-passthrough-features.xml | 2 +- .../qemuxml2xmlout-cpu-kvmclock.xml | 2 +- .../qemuxml2xmlout-graphics-spice-timeout.xml | 2 +- tests/qemuxml2xmltest.c | 8 +++++ 39 files changed, 536 insertions(+), 22 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-check-default-n= one.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-check-default-n= one.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-check-default-n= one2.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-check-default-n= one2.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-check-default-p= artial.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-check-default-p= artial.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-check-default-p= artial2.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-check-default-p= artial2.xml create mode 120000 tests/qemuxml2argvdata/qemuxml2argv-cpu-check-full.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-check-full.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-check-none.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-check-none.xml create mode 120000 tests/qemuxml2argvdata/qemuxml2argv-cpu-check-partial.a= rgs create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-check-partial.x= ml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-check-defau= lt-none.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-check-defau= lt-none2.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-check-defau= lt-partial.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-check-defau= lt-partial2.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-check-full.= xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-check-none.= xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-check-parti= al.xml diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 07ce22417..8ebc92479 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -2675,6 +2675,45 @@ qemuDomainDefVcpusPostParse(virDomainDefPtr def) =20 =20 static int +qemuDomainDefCPUPostParse(virDomainDefPtr def) +{ + if (!def->cpu) + return 0; + + /* Nothing to be done if only CPU topology is specified. */ + if (def->cpu->mode =3D=3D VIR_CPU_MODE_CUSTOM && + !def->cpu->model) + return 0; + + if (def->cpu->check !=3D VIR_CPU_CHECK_DEFAULT) + return 0; + + switch ((virCPUMode) def->cpu->mode) { + case VIR_CPU_MODE_HOST_PASSTHROUGH: + def->cpu->check =3D VIR_CPU_CHECK_NONE; + break; + + case VIR_CPU_MODE_HOST_MODEL: + def->cpu->check =3D VIR_CPU_CHECK_PARTIAL; + break; + + case VIR_CPU_MODE_CUSTOM: + /* Custom CPUs in TCG mode are not compared to host CPU by default= . */ + if (def->virtType =3D=3D VIR_DOMAIN_VIRT_QEMU) + def->cpu->check =3D VIR_CPU_CHECK_NONE; + else + def->cpu->check =3D VIR_CPU_CHECK_PARTIAL; + break; + + case VIR_CPU_MODE_LAST: + break; + } + + return 0; +} + + +static int qemuDomainDefPostParse(virDomainDefPtr def, virCapsPtr caps, unsigned int parseFlags, @@ -2738,6 +2777,9 @@ qemuDomainDefPostParse(virDomainDefPtr def, if (qemuDomainDefVcpusPostParse(def) < 0) goto cleanup; =20 + if (qemuDomainDefCPUPostParse(def) < 0) + goto cleanup; + ret =3D 0; cleanup: virObjectUnref(qemuCaps); diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index b9c1847bb..e9631c111 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -5184,14 +5184,11 @@ qemuProcessUpdateGuestCPU(virDomainDefPtr def, if (def->cpu->mode =3D=3D VIR_CPU_MODE_HOST_PASSTHROUGH) return 0; =20 - /* custom CPUs in TCG mode don't need to be compared to host CPU */ - if (def->virtType !=3D VIR_DOMAIN_VIRT_QEMU || - def->cpu->mode !=3D VIR_CPU_MODE_CUSTOM) { - if (virCPUCompare(caps->host.arch, - virQEMUCapsGetHostModel(qemuCaps, def->virtType), - def->cpu, true) < 0) - return -1; - } + if (def->cpu->check =3D=3D VIR_CPU_CHECK_PARTIAL && + virCPUCompare(caps->host.arch, + virQEMUCapsGetHostModel(qemuCaps, def->virtType), + def->cpu, true) < 0) + return -1; =20 if (virCPUUpdate(def->os.arch, def->cpu, virQEMUCapsGetHostModel(qemuCaps, def->virtType)) < 0) diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-host.xml b/tes= ts/qemuxml2argvdata/qemuxml2argv-aarch64-gic-host.xml index 445b35857..b14d14281 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-host.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-host.xml @@ -11,7 +11,7 @@ - + destroy restart diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-v2.xml b/tests= /qemuxml2argvdata/qemuxml2argv-aarch64-gic-v2.xml index 9ccba9904..8b9983752 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-v2.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-v2.xml @@ -11,7 +11,7 @@ - + destroy restart diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-v3.xml b/tests= /qemuxml2argvdata/qemuxml2argv-aarch64-gic-v3.xml index 7c9ee92b3..bde94e16c 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-v3.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-v3.xml @@ -11,7 +11,7 @@ - + destroy restart diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-check-default-none.arg= s b/tests/qemuxml2argvdata/qemuxml2argv-cpu-check-default-none.args new file mode 100644 index 000000000..24d9f5306 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-check-default-none.args @@ -0,0 +1,21 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/home/test \ +USER=3Dtest \ +LOGNAME=3Dtest \ +QEMU_AUDIO_DRV=3Dnone \ +/usr/bin/qemu-kvm \ +-name QEMUGuest1 \ +-S \ +-M pc \ +-cpu host \ +-m 214 \ +-smp 6,sockets=3D6,cores=3D1,threads=3D1 \ +-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=3Dballoon0,bus=3Dpci.0,addr=3D0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-check-default-none.xml= b/tests/qemuxml2argvdata/qemuxml2argv-cpu-check-default-none.xml new file mode 100644 index 000000000..314cdf52a --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-check-default-none.xml @@ -0,0 +1,19 @@ + + QEMUGuest1 + c7a5fdbd-edaf-9455-926a-d65c16db1809 + 219100 + 219100 + 6 + + hvm + + + + + destroy + restart + destroy + + /usr/bin/qemu-kvm + + diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-check-default-none2.ar= gs b/tests/qemuxml2argvdata/qemuxml2argv-cpu-check-default-none2.args new file mode 100644 index 000000000..b6a5d4dd4 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-check-default-none2.args @@ -0,0 +1,21 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/home/test \ +USER=3Dtest \ +LOGNAME=3Dtest \ +QEMU_AUDIO_DRV=3Dnone \ +/usr/bin/qemu \ +-name QEMUGuest1 \ +-S \ +-M pc \ +-cpu core2duo \ +-m 214 \ +-smp 6,sockets=3D6,cores=3D1,threads=3D1 \ +-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=3Dballoon0,bus=3Dpci.0,addr=3D0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-check-default-none2.xm= l b/tests/qemuxml2argvdata/qemuxml2argv-cpu-check-default-none2.xml new file mode 100644 index 000000000..286d2d5d7 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-check-default-none2.xml @@ -0,0 +1,21 @@ + + QEMUGuest1 + c7a5fdbd-edaf-9455-926a-d65c16db1809 + 219100 + 219100 + 6 + + hvm + + + + core2duo + + + destroy + restart + destroy + + /usr/bin/qemu + + diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-check-default-partial.= args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-check-default-partial.args new file mode 100644 index 000000000..decf7fdd4 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-check-default-partial.args @@ -0,0 +1,22 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/home/test \ +USER=3Dtest \ +LOGNAME=3Dtest \ +QEMU_AUDIO_DRV=3Dnone \ +/usr/bin/qemu-kvm \ +-name QEMUGuest1 \ +-S \ +-M pc \ +-cpu core2duo,+ds,+acpi,+ss,+ht,+tm,+pbe,+ds_cpl,+vmx,+est,+tm2,+cx16,+xtp= r,\ ++lahf_lm \ +-m 214 \ +-smp 6,sockets=3D6,cores=3D1,threads=3D1 \ +-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=3Dballoon0,bus=3Dpci.0,addr=3D0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-check-default-partial.= xml b/tests/qemuxml2argvdata/qemuxml2argv-cpu-check-default-partial.xml new file mode 100644 index 000000000..3dd45a704 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-check-default-partial.xml @@ -0,0 +1,19 @@ + + QEMUGuest1 + c7a5fdbd-edaf-9455-926a-d65c16db1809 + 219100 + 219100 + 6 + + hvm + + + + + destroy + restart + destroy + + /usr/bin/qemu-kvm + + diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-check-default-partial2= .args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-check-default-partial2.args new file mode 100644 index 000000000..bd4cefaeb --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-check-default-partial2.args @@ -0,0 +1,21 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/home/test \ +USER=3Dtest \ +LOGNAME=3Dtest \ +QEMU_AUDIO_DRV=3Dnone \ +/usr/bin/qemu-kvm \ +-name QEMUGuest1 \ +-S \ +-M pc \ +-cpu core2duo \ +-m 214 \ +-smp 6,sockets=3D6,cores=3D1,threads=3D1 \ +-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=3Dballoon0,bus=3Dpci.0,addr=3D0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-check-default-partial2= .xml b/tests/qemuxml2argvdata/qemuxml2argv-cpu-check-default-partial2.xml new file mode 100644 index 000000000..6c7690a95 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-check-default-partial2.xml @@ -0,0 +1,21 @@ + + QEMUGuest1 + c7a5fdbd-edaf-9455-926a-d65c16db1809 + 219100 + 219100 + 6 + + hvm + + + + core2duo + + + destroy + restart + destroy + + /usr/bin/qemu-kvm + + diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-check-full.args b/test= s/qemuxml2argvdata/qemuxml2argv-cpu-check-full.args new file mode 120000 index 000000000..dd946106e --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-check-full.args @@ -0,0 +1 @@ +qemuxml2argv-cpu-check-none.args \ No newline at end of file diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-check-full.xml b/tests= /qemuxml2argvdata/qemuxml2argv-cpu-check-full.xml new file mode 100644 index 000000000..653c2aaad --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-check-full.xml @@ -0,0 +1,21 @@ + + QEMUGuest1 + c7a5fdbd-edaf-9455-926a-d65c16db1809 + 219100 + 219100 + 6 + + hvm + + + + core2duo + + + destroy + restart + destroy + + /usr/bin/qemu-kvm + + diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-check-none.args b/test= s/qemuxml2argvdata/qemuxml2argv-cpu-check-none.args new file mode 100644 index 000000000..bd4cefaeb --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-check-none.args @@ -0,0 +1,21 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/home/test \ +USER=3Dtest \ +LOGNAME=3Dtest \ +QEMU_AUDIO_DRV=3Dnone \ +/usr/bin/qemu-kvm \ +-name QEMUGuest1 \ +-S \ +-M pc \ +-cpu core2duo \ +-m 214 \ +-smp 6,sockets=3D6,cores=3D1,threads=3D1 \ +-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=3Dballoon0,bus=3Dpci.0,addr=3D0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-check-none.xml b/tests= /qemuxml2argvdata/qemuxml2argv-cpu-check-none.xml new file mode 100644 index 000000000..632074626 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-check-none.xml @@ -0,0 +1,21 @@ + + QEMUGuest1 + c7a5fdbd-edaf-9455-926a-d65c16db1809 + 219100 + 219100 + 6 + + hvm + + + + core2duo + + + destroy + restart + destroy + + /usr/bin/qemu-kvm + + diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-check-partial.args b/t= ests/qemuxml2argvdata/qemuxml2argv-cpu-check-partial.args new file mode 120000 index 000000000..dd946106e --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-check-partial.args @@ -0,0 +1 @@ +qemuxml2argv-cpu-check-none.args \ No newline at end of file diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-check-partial.xml b/te= sts/qemuxml2argvdata/qemuxml2argv-cpu-check-partial.xml new file mode 100644 index 000000000..8e7850df8 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-check-partial.xml @@ -0,0 +1,21 @@ + + QEMUGuest1 + c7a5fdbd-edaf-9455-926a-d65c16db1809 + 219100 + 219100 + 6 + + hvm + + + + core2duo + + + destroy + restart + destroy + + /usr/bin/qemu-kvm + + diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 6bd746599..db21edbbf 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -2468,6 +2468,14 @@ mymain(void) DO_TEST("fd-memory-no-numa-topology", QEMU_CAPS_MEM_PATH, QEMU_CAPS_OB= JECT_MEMORY_FILE, QEMU_CAPS_KVM); =20 + DO_TEST("cpu-check-none", QEMU_CAPS_KVM); + DO_TEST("cpu-check-partial", QEMU_CAPS_KVM); + DO_TEST("cpu-check-full", QEMU_CAPS_KVM); + DO_TEST("cpu-check-default-none", QEMU_CAPS_KVM); + DO_TEST("cpu-check-default-none2", NONE); + DO_TEST("cpu-check-default-partial", QEMU_CAPS_KVM); + DO_TEST("cpu-check-default-partial2", QEMU_CAPS_KVM); + qemuTestDriverFree(&driver); =20 return ret =3D=3D 0 ? EXIT_SUCCESS : EXIT_FAILURE; diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-aavmf-virtio-m= mio.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-aavmf-virtio-mmio= .xml index 2f1f8dd3d..bea65990e 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-aavmf-virtio-mmio.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-aavmf-virtio-mmio.xml @@ -18,7 +18,7 @@ - + cortex-a53 diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-video-virtio-g= pu-pci.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-video-virtio-g= pu-pci.xml index 26f6a5162..2c765e7c3 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-video-virtio-gpu-pci.= xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-video-virtio-gpu-pci.= xml @@ -11,7 +11,7 @@ - + cortex-a57 diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-virtio-pci-def= ault.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-virtio-pci-defau= lt.xml index f7fbdc7a9..88a6a6a0c 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-virtio-pci-default.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-virtio-pci-default.xml @@ -18,7 +18,7 @@ - + cortex-a53 diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-virtio-pci-man= ual-addresses.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-virtio-= pci-manual-addresses.xml index 1b50f75f0..83cf0d1f5 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-virtio-pci-manual-add= resses.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-virtio-pci-manual-add= resses.xml @@ -18,7 +18,7 @@ - + cortex-a53 diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-check-default-none= .xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-check-default-none.xml new file mode 100644 index 000000000..b25cdd599 --- /dev/null +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-check-default-none.xml @@ -0,0 +1,28 @@ + + QEMUGuest1 + c7a5fdbd-edaf-9455-926a-d65c16db1809 + 219100 + 219100 + 6 + + hvm + + + + + destroy + restart + destroy + + /usr/bin/qemu-kvm + +
+ + + + + +
+ + + diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-check-default-none= 2.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-check-default-none2.xml new file mode 100644 index 000000000..310b95e58 --- /dev/null +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-check-default-none2.xml @@ -0,0 +1,30 @@ + + QEMUGuest1 + c7a5fdbd-edaf-9455-926a-d65c16db1809 + 219100 + 219100 + 6 + + hvm + + + + core2duo + + + destroy + restart + destroy + + /usr/bin/qemu + +
+ + + + + +
+ + + diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-check-default-part= ial.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-check-default-partial= .xml new file mode 100644 index 000000000..f4bfe54ee --- /dev/null +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-check-default-partial.xml @@ -0,0 +1,30 @@ + + QEMUGuest1 + c7a5fdbd-edaf-9455-926a-d65c16db1809 + 219100 + 219100 + 6 + + hvm + + + + + + + destroy + restart + destroy + + /usr/bin/qemu-kvm + +
+ + + + + +
+ + + diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-check-default-part= ial2.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-check-default-partia= l2.xml new file mode 100644 index 000000000..8619f009c --- /dev/null +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-check-default-partial2.xml @@ -0,0 +1,30 @@ + + QEMUGuest1 + c7a5fdbd-edaf-9455-926a-d65c16db1809 + 219100 + 219100 + 6 + + hvm + + + + core2duo + + + destroy + restart + destroy + + /usr/bin/qemu-kvm + +
+ + + + + +
+ + + diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-check-full.xml b/t= ests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-check-full.xml new file mode 100644 index 000000000..3fd13f27e --- /dev/null +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-check-full.xml @@ -0,0 +1,30 @@ + + QEMUGuest1 + c7a5fdbd-edaf-9455-926a-d65c16db1809 + 219100 + 219100 + 6 + + hvm + + + + core2duo + + + destroy + restart + destroy + + /usr/bin/qemu-kvm + +
+ + + + + +
+ + + diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-check-none.xml b/t= ests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-check-none.xml new file mode 100644 index 000000000..d71ad5fde --- /dev/null +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-check-none.xml @@ -0,0 +1,30 @@ + + QEMUGuest1 + c7a5fdbd-edaf-9455-926a-d65c16db1809 + 219100 + 219100 + 6 + + hvm + + + + core2duo + + + destroy + restart + destroy + + /usr/bin/qemu-kvm + +
+ + + + + +
+ + + diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-check-partial.xml = b/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-check-partial.xml new file mode 100644 index 000000000..8619f009c --- /dev/null +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-check-partial.xml @@ -0,0 +1,30 @@ + + QEMUGuest1 + c7a5fdbd-edaf-9455-926a-d65c16db1809 + 219100 + 219100 + 6 + + hvm + + + + core2duo + + + destroy + restart + destroy + + /usr/bin/qemu-kvm + +
+ + + + + +
+ + + diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-eoi-disabled.xml b= /tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-eoi-disabled.xml index 7a51e3ddf..b29a24e52 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-eoi-disabled.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-eoi-disabled.xml @@ -13,7 +13,7 @@ - + qemu32 diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-eoi-enabled.xml b/= tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-eoi-enabled.xml index ae8ab6aee..efba9e5db 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-eoi-enabled.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-eoi-enabled.xml @@ -13,7 +13,7 @@ - + qemu32 diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-host-kvmclock.xml = b/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-host-kvmclock.xml index c2bdad91f..df0aecb3e 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-host-kvmclock.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-host-kvmclock.xml @@ -8,7 +8,7 @@ hvm - + diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-host-model-feature= s.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-host-model-features.xml index 161fcfe39..b1e194910 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-host-model-features.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-host-model-features.xml @@ -13,7 +13,7 @@ hvm - + diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-host-passthrough-f= eatures.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-host-passthrough-= features.xml index 935f8cd39..98189c43f 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-host-passthrough-features= .xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-host-passthrough-features= .xml @@ -13,7 +13,7 @@ hvm - + diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-kvmclock.xml b/tes= ts/qemuxml2xmloutdata/qemuxml2xmlout-cpu-kvmclock.xml index 4d222de4a..a483025a0 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-kvmclock.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-kvmclock.xml @@ -8,7 +8,7 @@ hvm - + core2duo diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-spice-timeout= .xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-spice-timeout.xml index 5f881f1fb..b807ac31b 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-spice-timeout.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-spice-timeout.xml @@ -15,7 +15,7 @@ - + core2duo Intel diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 4353ad245..af56dd4e5 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -1108,6 +1108,14 @@ mymain(void) QEMU_CAPS_MACHINE_OPT, QEMU_CAPS_MACHINE_IOMMU); =20 + DO_TEST("cpu-check-none", NONE); + DO_TEST("cpu-check-partial", NONE); + DO_TEST("cpu-check-full", NONE); + DO_TEST("cpu-check-default-none", NONE); + DO_TEST("cpu-check-default-none2", NONE); + DO_TEST("cpu-check-default-partial", NONE); + DO_TEST("cpu-check-default-partial2", NONE); + qemuTestDriverFree(&driver); =20 return ret =3D=3D 0 ? EXIT_SUCCESS : EXIT_FAILURE; --=20 2.12.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list