aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorViktor Mihajlovski <mihajlov@linux.vnet.ibm.com>2012-06-29 17:02:07 +0200
committerMichal Privoznik <mprivozn@redhat.com>2012-07-11 11:19:05 +0200
commit028ba4f375be371130d582e3b7514f971254ba08 (patch)
treed4685f7488d00948b4b82fa09733ec61fd59d75a /tests/testutilsqemu.c
parentS390: Domain Schema for s390-virtio machines. (diff)
downloadlibvirt-028ba4f375be371130d582e3b7514f971254ba08.tar.gz
libvirt-028ba4f375be371130d582e3b7514f971254ba08.tar.bz2
libvirt-028ba4f375be371130d582e3b7514f971254ba08.zip
S390: Adding testcases for s390
Add minimal s390-virtio domain testcase and testcases for virtio serial, net, disk for the virtio-s390 bus. Signed-off-by: Viktor Mihajlovski <mihajlov@linux.vnet.ibm.com>
Diffstat (limited to 'tests/testutilsqemu.c')
-rw-r--r--tests/testutilsqemu.c31
1 files changed, 31 insertions, 0 deletions
diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c
index 8b7cb3300..69c78ecf6 100644
--- a/tests/testutilsqemu.c
+++ b/tests/testutilsqemu.c
@@ -87,6 +87,34 @@ error:
return -1;
}
+static int testQemuAddS390Guest(virCapsPtr caps)
+{
+ static const char *s390_machines[] = { "s390-virtio"};
+ virCapsGuestMachinePtr *machines = NULL;
+ virCapsGuestPtr guest;
+
+ machines = virCapabilitiesAllocMachines(s390_machines,
+ ARRAY_CARDINALITY(s390_machines));
+ if (!machines)
+ goto error;
+
+ guest = virCapabilitiesAddGuest(caps, "hvm", "s390x", 64,
+ "/usr/bin/qemu-system-s390x", NULL,
+ ARRAY_CARDINALITY(s390_machines),
+ machines);
+ if (!guest)
+ goto error;
+
+ if (!virCapabilitiesAddGuestDomain(guest, "qemu", NULL, NULL, 0, NULL))
+ goto error;
+
+ return 0;
+
+error:
+ virCapabilitiesFreeMachines(machines, ARRAY_CARDINALITY(s390_machines));
+ return -1;
+}
+
virCapsPtr testQemuCapsInit(void) {
virCapsPtr caps;
virCapsGuestPtr guest;
@@ -209,6 +237,9 @@ virCapsPtr testQemuCapsInit(void) {
if (testQemuAddPPC64Guest(caps))
goto cleanup;
+ if (testQemuAddS390Guest(caps))
+ goto cleanup;
+
if (virTestGetDebug()) {
char *caps_str;