Re: [libvirt] [PATCH v2 11/11] tests: domain capabilities: qemu 2.8 on s390x

[Jiri Denemark]

On Fri, Dec 09, 2016 at 14:38:40 -0500, Jason J. Herne wrote:
> From: "Collin L. Walling" 
> 
> Tests the domain capabilities on s390x using the Qemu 2.8 capabilities data.
> 
> Signed-off-by: Collin L. Walling 
> Signed-off-by: Jason J. Herne 
> ---
>  tests/domaincapsschemadata/qemu_2.8.0.s390x.xml | 159 
> 
>  tests/domaincapstest.c  |  14 +++
>  2 files changed, 173 insertions(+)
>  create mode 100644 tests/domaincapsschemadata/qemu_2.8.0.s390x.xml

I'd add a test case for 2.7.0 too and moved this patch (or possibly two
patches for easier review) before 3/11 just after the patches which
introduce the new replies.

Jirka

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

[libvirt] [PATCH v2 11/11] tests: domain capabilities: qemu 2.8 on s390x

[Jason J. Herne]

From: "Collin L. Walling" 

Tests the domain capabilities on s390x using the Qemu 2.8 capabilities data.

Signed-off-by: Collin L. Walling 
Signed-off-by: Jason J. Herne 
---
 tests/domaincapsschemadata/qemu_2.8.0.s390x.xml | 159 
 tests/domaincapstest.c  |  14 +++
 2 files changed, 173 insertions(+)
 create mode 100644 tests/domaincapsschemadata/qemu_2.8.0.s390x.xml

diff --git a/tests/domaincapsschemadata/qemu_2.8.0.s390x.xml 
b/tests/domaincapsschemadata/qemu_2.8.0.s390x.xml
new file mode 100644
index 000..efe3459
--- /dev/null
+++ b/tests/domaincapsschemadata/qemu_2.8.0.s390x.xml
@@ -0,0 +1,159 @@
+
+  /usr/bin/qemu-system-s390x
+  kvm
+  s390-ccw-virtio-2.8
+  s390x
+  
+  
+
+  /usr/share/AAVMF/AAVMF_CODE.fd
+  /usr/share/OVMF/OVMF_CODE.fd
+  
+rom
+pflash
+  
+  
+yes
+no
+  
+
+  
+  
+
+
+  zEC12.2-base
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+
+
+  z10EC-base
+  z9EC-base
+  z196.2-base
+  z900-base
+  z990
+  z900.2-base
+  z900.3
+  z114
+  z890-base
+  z13.2-base
+  zEC12.2
+  z900.2
+  z10BC
+  z10BC.2
+  z196
+  z9EC
+  z990-base
+  z10EC.3
+  z900
+  z9EC.3-base
+  z990.5-base
+  z10EC.2
+  z9BC.2
+  z10EC
+  z990.3-base
+  z13s
+  z10EC.3-base
+  zEC12.2-base
+  z890.3-base
+  z9EC.3
+  z990.5
+  z13
+  z13s-base
+  z9EC.2
+  z990.4
+  zEC12-base
+  z9EC.2-base
+  zBC12
+  z196.2
+  z990.3
+  z990.2-base
+  z900.3-base
+  z890.3
+  z10EC.2-base
+  z990.2
+  z890.2
+  zBC12-base
+  z800-base
+  zEC12
+  z9BC.2-base
+  z9BC
+  z10BC.2-base
+  z990.4-base
+  qemu
+  z10BC-base
+  z9BC-base
+  z800
+  z890.2-base
+  z13.2
+  z114-base
+  z196-base
+  z13-base
+  z890
+
+  
+  
+
+  
+disk
+cdrom
+floppy
+lun
+  
+  
+ide
+fdc
+scsi
+virtio
+  
+
+
+  
+sdl
+vnc
+  
+
+
+  
+virtio
+  
+
+
+  
+subsystem
+  
+  
+default
+mandatory
+requisite
+optional
+  
+  
+usb
+pci
+scsi
+  
+  
+  
+default
+kvm
+vfio
+  
+
+  
+  
+
+  
+
diff --git a/tests/domaincapstest.c b/tests/domaincapstest.c
index fea5120..9ba26db 100644
--- a/tests/domaincapstest.c
+++ b/tests/domaincapstest.c
@@ -134,6 +134,12 @@ static virCPUDef x86Cpu = {
 NULL, 0, NULL, 1, 1, 1, 0, 0, NULL,
 };
 
+static virCPUDef s390Cpu = {
+VIR_CPU_TYPE_HOST, 0, 0,
+VIR_ARCH_S390X, (char *) "zEC12.2-base",
+NULL, 0, NULL, 1, 1, 1, 0, 0, NULL,
+};
+
 static int
 fakeHostCPU(virCapsPtr caps,
 virArch arch)
@@ -153,6 +159,10 @@ fakeHostCPU(virCapsPtr caps,
 cpu = 
 break;
 
+case VIR_ARCH_S390X:
+cpu = 
+break;
+
 default:
 virReportError(VIR_ERR_INTERNAL_ERROR,
"cannot fake host CPU for arch %s",
@@ -443,6 +453,10 @@ mymain(void)
  "/usr/bin/qemu-system-x86_64", NULL,
  "x86_64", VIR_DOMAIN_VIRT_QEMU);
 
+DO_TEST_QEMU("2.8.0", "caps_2.8.0",
+ "/usr/bin/qemu-system-s390x", NULL,
+ "s390x", VIR_DOMAIN_VIRT_KVM);
+
 #endif /* WITH_QEMU */
 
 #if WITH_LIBXL
-- 
2.7.4

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list