Merge pull request #1136 from ldoktor/s390x

Some s390x related tweaks and one bugfix

generic/deps/clock_getres/clock_getres.c

@@ -43,6 +43,8 @@ int main(void) {
 	if (!strncmp(clocksource, "timebase", strlen("timebase"))) {
 #elif defined(__aarch64__)
 	if (!strncmp(clocksource, "arch_sys_counter", strlen("arch_sys_counter"))) {
+#elif defined(__s390x__)
+    if (!strncmp(clocksource, "tod", strlen("tod"))) {
 #else
 	if (!strncmp(clocksource, "kvm-clock", strlen("kvm-clock"))) {
 #endif

generic/tests/cfg/autotest_control.cfg

@@ -46,6 +46,8 @@
         - tsc:
             test_control_file = tsc.control
         - hwclock:
+            # No hwclock support on s390x
+            no s390x
             test_control_file = hwclock.control
         - rtc:
             test_control_file = rtc.control

qemu/tests/cfg/nic_hotplug.cfg

@@ -18,6 +18,8 @@
             match_string = "Virtio network device"
             Host_RHEL.m5:
                 pci_model = virtio
+            s390x:
+                pci_model = virtio-net-ccw
         - nic_e1000:
             no ppc64 ppc64le
             pci_model = e1000

qemu/tests/cfg/qmp_command.cfg

@@ -15,6 +15,8 @@
             cmd_result_check = equal
             cmd_return_value = "{u'enabled': True, u'present': True}"
         - qmp_query-mice:
+            # No mouse support on s390x
+            no s390x
             qmp_cmd = "query-mice"
             post_cmd = "info mice"
             cmd_result_check = contain
@@ -189,6 +191,9 @@
             qmp_cmd = "device-list-properties typename=virtio-balloon-pci"
             cmd_result_check = contain
             cmd_return_value = "command_serr_enable;multifunction"
+            s390x:
+                qmp_cmd = "device-list-properties typename=virtio-balloon-ccw"
+                cmd_return_value = "notify_on_empty;ioeventfd;any_layout;devno;indirect_desc;guest-stats;guest-stats-polling-interval;event_idx;virtio-backend;iommu_platform;deflate-on-oom;max_revision"
         - qmp_query-command-line-options:
             qmp_cmd = "query-command-line-options"
             cmd_result_check = contain

qemu/tests/cfg/smbios.cfg

 - smbios_table: install setup image_copy unattended_install.cdrom
     only Linux
+    # dmidecode not available (and no plans for it) on s390x
+    no s390x
     type = smbios_table
     requires_root = yes
     start_vm = no

qemu/tests/qmp_command.py

@@ -210,7 +210,7 @@ def run(test, params, env):
         hmp_port = hmp_ports[0]
     else:
         raise exceptions.TestError("Incorrect configuration, no QMP monitor found.")
-    callback = {"host_cmd": process.system_output,
+    callback = {"host_cmd": lambda cmd: process.system_output(cmd, shell=True),
                 "guest_cmd": session.get_command_output,
                 "monitor_cmd": hmp_port.send_args_cmd,
                 "qmp_cmd": qmp_port.send_args_cmd}