[virt-tools-list] [virt-manager PATCH v2 2/4] tests: Adjust vcpu number

Fabiano Fidêncio fidencio at redhat.com
Mon Dec 10 09:36:15 UTC 2018


The vcpu number has to be adjusted because the old code always defaults
to vcpu as 1 and now this info comes from libosinfo.

Signed-off-by: Fabiano Fidêncio <fidencio at redhat.com>
---
 .../cli-test-xml/compare/virt-install-aarch64-kvm-import.xml  | 2 +-
 tests/cli-test-xml/compare/virt-install-arm-kvm-import.xml    | 2 +-
 tests/cli-test-xml/compare/virt-install-f21-kvm-remote.xml    | 2 +-
 .../compare/virt-install-kvm-session-defaults.xml             | 4 ++--
 tests/cli-test-xml/compare/virt-install-kvm-win10.xml         | 4 ++--
 .../cli-test-xml/compare/virt-install-ppc64le-kvm-import.xml  | 2 +-
 tests/cli-test-xml/compare/virt-install-qemu-32-on-64.xml     | 2 +-
 .../cli-test-xml/compare/virt-install-s390x-cdrom-KVMIBM.xml  | 2 +-
 tests/cli-test-xml/compare/virt-install-s390x-cdrom.xml       | 2 +-
 tests/cli-test-xml/compare/virt-install-win7-uefi.xml         | 4 ++--
 10 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/tests/cli-test-xml/compare/virt-install-aarch64-kvm-import.xml b/tests/cli-test-xml/compare/virt-install-aarch64-kvm-import.xml
index e63c4d6f..f4fc88e0 100644
--- a/tests/cli-test-xml/compare/virt-install-aarch64-kvm-import.xml
+++ b/tests/cli-test-xml/compare/virt-install-aarch64-kvm-import.xml
@@ -8,7 +8,7 @@
   </metadata>
   <memory>65536</memory>
   <currentMemory>65536</currentMemory>
-  <vcpu>1</vcpu>
+  <vcpu>2</vcpu>
   <os>
     <type arch="aarch64" machine="virt">hvm</type>
     <loader readonly="yes" type="pflash">/usr/share/AAVMF/AAVMF_CODE.fd</loader>
diff --git a/tests/cli-test-xml/compare/virt-install-arm-kvm-import.xml b/tests/cli-test-xml/compare/virt-install-arm-kvm-import.xml
index 8d6e06f9..d613b33e 100644
--- a/tests/cli-test-xml/compare/virt-install-arm-kvm-import.xml
+++ b/tests/cli-test-xml/compare/virt-install-arm-kvm-import.xml
@@ -8,7 +8,7 @@
   </metadata>
   <memory>65536</memory>
   <currentMemory>65536</currentMemory>
-  <vcpu>1</vcpu>
+  <vcpu>2</vcpu>
   <os>
     <type arch="armv7l" machine="virt">hvm</type>
     <loader readonly="yes" type="pflash">/usr/share/edk2/arm/QEMU_EFI-pflash.raw</loader>
diff --git a/tests/cli-test-xml/compare/virt-install-f21-kvm-remote.xml b/tests/cli-test-xml/compare/virt-install-f21-kvm-remote.xml
index d5c16fca..0c22ba95 100644
--- a/tests/cli-test-xml/compare/virt-install-f21-kvm-remote.xml
+++ b/tests/cli-test-xml/compare/virt-install-f21-kvm-remote.xml
@@ -8,7 +8,7 @@
   </metadata>
   <memory>65536</memory>
   <currentMemory>65536</currentMemory>
-  <vcpu>1</vcpu>
+  <vcpu>2</vcpu>
   <os>
     <type arch="x86_64" machine="pc">hvm</type>
     <boot dev="hd"/>
diff --git a/tests/cli-test-xml/compare/virt-install-kvm-session-defaults.xml b/tests/cli-test-xml/compare/virt-install-kvm-session-defaults.xml
index d1f016a8..cee1e513 100644
--- a/tests/cli-test-xml/compare/virt-install-kvm-session-defaults.xml
+++ b/tests/cli-test-xml/compare/virt-install-kvm-session-defaults.xml
@@ -8,7 +8,7 @@
   </metadata>
   <memory>65536</memory>
   <currentMemory>65536</currentMemory>
-  <vcpu>1</vcpu>
+  <vcpu>2</vcpu>
   <os>
     <type arch="x86_64" machine="pc">hvm</type>
     <boot dev="cdrom"/>
@@ -81,7 +81,7 @@
   </metadata>
   <memory>65536</memory>
   <currentMemory>65536</currentMemory>
-  <vcpu>1</vcpu>
+  <vcpu>2</vcpu>
   <os>
     <type arch="x86_64" machine="pc">hvm</type>
     <boot dev="hd"/>
diff --git a/tests/cli-test-xml/compare/virt-install-kvm-win10.xml b/tests/cli-test-xml/compare/virt-install-kvm-win10.xml
index 7164b463..22f993d4 100644
--- a/tests/cli-test-xml/compare/virt-install-kvm-win10.xml
+++ b/tests/cli-test-xml/compare/virt-install-kvm-win10.xml
@@ -8,7 +8,7 @@
   </metadata>
   <memory>65536</memory>
   <currentMemory>65536</currentMemory>
-  <vcpu>1</vcpu>
+  <vcpu>2</vcpu>
   <os>
     <type arch="x86_64" machine="q35">hvm</type>
     <boot dev="cdrom"/>
@@ -78,7 +78,7 @@
   </metadata>
   <memory>65536</memory>
   <currentMemory>65536</currentMemory>
-  <vcpu>1</vcpu>
+  <vcpu>2</vcpu>
   <os>
     <type arch="x86_64" machine="q35">hvm</type>
     <boot dev="hd"/>
diff --git a/tests/cli-test-xml/compare/virt-install-ppc64le-kvm-import.xml b/tests/cli-test-xml/compare/virt-install-ppc64le-kvm-import.xml
index 4a47ec50..37f993f5 100644
--- a/tests/cli-test-xml/compare/virt-install-ppc64le-kvm-import.xml
+++ b/tests/cli-test-xml/compare/virt-install-ppc64le-kvm-import.xml
@@ -8,7 +8,7 @@
   </metadata>
   <memory>65536</memory>
   <currentMemory>65536</currentMemory>
-  <vcpu>1</vcpu>
+  <vcpu>2</vcpu>
   <os>
     <type arch="ppc64le" machine="pseries">hvm</type>
     <boot dev="hd"/>
diff --git a/tests/cli-test-xml/compare/virt-install-qemu-32-on-64.xml b/tests/cli-test-xml/compare/virt-install-qemu-32-on-64.xml
index 54ccc61a..a4f4c4cd 100644
--- a/tests/cli-test-xml/compare/virt-install-qemu-32-on-64.xml
+++ b/tests/cli-test-xml/compare/virt-install-qemu-32-on-64.xml
@@ -8,7 +8,7 @@
   </metadata>
   <memory>65536</memory>
   <currentMemory>65536</currentMemory>
-  <vcpu>1</vcpu>
+  <vcpu>2</vcpu>
   <os>
     <type arch="i686" machine="pc">hvm</type>
     <boot dev="network"/>
diff --git a/tests/cli-test-xml/compare/virt-install-s390x-cdrom-KVMIBM.xml b/tests/cli-test-xml/compare/virt-install-s390x-cdrom-KVMIBM.xml
index a8038855..26028728 100644
--- a/tests/cli-test-xml/compare/virt-install-s390x-cdrom-KVMIBM.xml
+++ b/tests/cli-test-xml/compare/virt-install-s390x-cdrom-KVMIBM.xml
@@ -8,7 +8,7 @@
   </metadata>
   <memory>65536</memory>
   <currentMemory>65536</currentMemory>
-  <vcpu>1</vcpu>
+  <vcpu>2</vcpu>
   <os>
     <type arch="s390x" machine="s390-ccw-virtio">hvm</type>
     <kernel>/kernel.img</kernel>
diff --git a/tests/cli-test-xml/compare/virt-install-s390x-cdrom.xml b/tests/cli-test-xml/compare/virt-install-s390x-cdrom.xml
index 6c4e9572..10b0ddc1 100644
--- a/tests/cli-test-xml/compare/virt-install-s390x-cdrom.xml
+++ b/tests/cli-test-xml/compare/virt-install-s390x-cdrom.xml
@@ -8,7 +8,7 @@
   </metadata>
   <memory>65536</memory>
   <currentMemory>65536</currentMemory>
-  <vcpu>1</vcpu>
+  <vcpu>2</vcpu>
   <os>
     <type arch="s390x" machine="s390-ccw-virtio">hvm</type>
     <kernel>/kernel.img</kernel>
diff --git a/tests/cli-test-xml/compare/virt-install-win7-uefi.xml b/tests/cli-test-xml/compare/virt-install-win7-uefi.xml
index 39c9cc9b..c741130c 100644
--- a/tests/cli-test-xml/compare/virt-install-win7-uefi.xml
+++ b/tests/cli-test-xml/compare/virt-install-win7-uefi.xml
@@ -8,7 +8,7 @@
   </metadata>
   <memory>65536</memory>
   <currentMemory>65536</currentMemory>
-  <vcpu>1</vcpu>
+  <vcpu>2</vcpu>
   <os>
     <type arch="x86_64" machine="q35">hvm</type>
     <loader type="pflash">CODE.fd</loader>
@@ -83,7 +83,7 @@
   </metadata>
   <memory>65536</memory>
   <currentMemory>65536</currentMemory>
-  <vcpu>1</vcpu>
+  <vcpu>2</vcpu>
   <os>
     <type arch="x86_64" machine="q35">hvm</type>
     <loader type="pflash">CODE.fd</loader>
-- 
2.19.1




More information about the virt-tools-list mailing list