From nobody Mon Feb 9 04:18:02 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1623422983; cv=none; d=zohomail.com; s=zohoarc; b=hTlbOWu19yDXcimLBR2p2aFxC1lX9sLhSrIxpZMKwaJMv5NCjKR7dPuxtEKjTXEtOAWTt3IiErKALL0NHZBK1R2hXUsiDu35u0JU1Xa//q0guiWF2445aVCloT4stvs4mKrFdBKbg21S/9VnsJOl62UWkEvqHQDF/R/YeZzbIZw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623422983; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=thBeXiu6YlQ2BDWMEsts8SU7TI6gxi6m+AgjDb4ruKg=; b=OBFS94PzogdljCLfOkUIGfeXzKx1AuFJE07m30yMbK2F7pcDbf9tyGFo6vUaznk9lEpKm4x6ZV4Ll3jrFy2BZyXOfI2I0JwsgMaVL4ZlzCdBjcFf2CwNKOCnyJBCvW4wFC6NMtfUwAXAIRJZr9jfEU2wQmYXDk9K9t/zbYXG8N4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1623422983216249.61220861803668; Fri, 11 Jun 2021 07:49:43 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-193-w73tipS6NqCmJkSLUv-8vg-1; Fri, 11 Jun 2021 10:49:39 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 43470A40E6; Fri, 11 Jun 2021 14:49:27 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0E4C15D719; Fri, 11 Jun 2021 14:49:27 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id C8A5D1809CAE; Fri, 11 Jun 2021 14:49:26 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 15BEnJq6007622 for ; Fri, 11 Jun 2021 10:49:19 -0400 Received: by smtp.corp.redhat.com (Postfix) id 7518360FC2; Fri, 11 Jun 2021 14:49:19 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.33]) by smtp.corp.redhat.com (Postfix) with ESMTP id D8F2060C05 for ; Fri, 11 Jun 2021 14:49:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1623422982; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=thBeXiu6YlQ2BDWMEsts8SU7TI6gxi6m+AgjDb4ruKg=; b=MHG6bEyIJL7RBGtRHphF4+wh0q3bx06zBz/02F79CCxmyyKThqQZL4odk+dhoGYtJEkz// 8cSBqMKO1VceOfViC71F7Av3OAVWWsgRGJkW09sNBuYfkvy8LxQkTdIP7GvhAEX9Y/vEE4 tccx1D619QAMK6It/aSMX4IJMroo09k= X-MC-Unique: w73tipS6NqCmJkSLUv-8vg-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 04/22] tests: qemuxml2argv: Modernize 'watchdog-diag288' test Date: Fri, 11 Jun 2021 16:48:55 +0200 Message-Id: <6577e86a8f916fb6b6eb8963efe472fd4c076d78.1623422565.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com 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: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" The 's390-virtio' machine was removed from qemu in the 2.6 release. Modernize the test for diag288 since there isn't any other test for it. Signed-off-by: Peter Krempa --- tests/qemuxml2argvdata/watchdog-diag288.args | 28 --------------- .../watchdog-diag288.s390x-latest.args | 36 +++++++++++++++++++ tests/qemuxml2argvdata/watchdog-diag288.xml | 2 +- tests/qemuxml2argvtest.c | 2 +- 4 files changed, 38 insertions(+), 30 deletions(-) delete mode 100644 tests/qemuxml2argvdata/watchdog-diag288.args create mode 100644 tests/qemuxml2argvdata/watchdog-diag288.s390x-latest.ar= gs diff --git a/tests/qemuxml2argvdata/watchdog-diag288.args b/tests/qemuxml2a= rgvdata/watchdog-diag288.args deleted file mode 100644 index e070f26e25..0000000000 --- a/tests/qemuxml2argvdata/watchdog-diag288.args +++ /dev/null @@ -1,28 +0,0 @@ -LC_ALL=3DC \ -PATH=3D/bin \ -HOME=3D/tmp/lib/domain--1-QEMUGuest1 \ -USER=3Dtest \ -LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \ -XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \ -XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -QEMU_AUDIO_DRV=3Dnone \ -/usr/bin/qemu-system-s390x \ --name QEMUGuest1 \ --S \ --machine s390-virtio,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ --m 214 \ --realtime mlock=3Doff \ --smp 1,sockets=3D1,cores=3D1,threads=3D1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --display none \ --no-user-config \ --nodefaults \ --chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-QEMUGuest1/moni= tor.sock,server=3Don,wait=3Doff \ --mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ --rtc base=3Dutc \ --no-shutdown \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-vir= tio-disk0 \ --device virtio-blk-s390,drive=3Ddrive-virtio-disk0,id=3Dvirtio-disk0,booti= ndex=3D1 \ --device diag288,id=3Dwatchdog0 \ --watchdog-action inject-nmi diff --git a/tests/qemuxml2argvdata/watchdog-diag288.s390x-latest.args b/te= sts/qemuxml2argvdata/watchdog-diag288.s390x-latest.args new file mode 100644 index 0000000000..b6ed866918 --- /dev/null +++ b/tests/qemuxml2argvdata/watchdog-diag288.s390x-latest.args @@ -0,0 +1,36 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/tmp/lib/domain--1-QEMUGuest1 \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-s390x \ +-name guest=3DQEMUGuest1,debug-threads=3Don \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine s390-ccw-virtio,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memor= y-backend=3Ds390.ram \ +-cpu qemu \ +-m 214 \ +-object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":224395264= }' \ +-overcommit mem-lock=3Doff \ +-smp 1,sockets=3D1,cores=3D1,threads=3D1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ +-rtc base=3Dutc \ +-no-shutdown \ +-boot strict=3Don \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device virtio-blk-ccw,devno=3Dfe.0.0000,drive=3Dlibvirt-1-format,id=3Dvir= tio-disk0,bootindex=3D1 \ +-audiodev id=3Daudio1,driver=3Dnone \ +-device diag288,id=3Dwatchdog0 \ +-watchdog-action inject-nmi \ +-device virtio-balloon-ccw,id=3Dballoon0,devno=3Dfe.0.0001 \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/watchdog-diag288.xml b/tests/qemuxml2ar= gvdata/watchdog-diag288.xml index d9935260ee..ec89cdd196 100644 --- a/tests/qemuxml2argvdata/watchdog-diag288.xml +++ b/tests/qemuxml2argvdata/watchdog-diag288.xml @@ -4,7 +4,7 @@ 219100 219100 - hvm + hvm destroy diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 357098f819..82e549e219 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1905,7 +1905,7 @@ mymain(void) DO_TEST("watchdog-device", NONE); DO_TEST("watchdog-dump", NONE); DO_TEST("watchdog-injectnmi", NONE); - DO_TEST("watchdog-diag288", QEMU_CAPS_VIRTIO_S390); + DO_TEST_CAPS_ARCH_LATEST("watchdog-diag288", "s390x"); DO_TEST("balloon-device", NONE); DO_TEST("balloon-device-deflate", QEMU_CAPS_VIRTIO_BALLOON_AUTODEFLATE); --=20 2.31.1