From nobody Mon Feb 9 09:28:56 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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 170.10.133.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=1623423047; cv=none; d=zohomail.com; s=zohoarc; b=Rkjxx5RlrssdnB3MCZchFSP3MrEuAykTSiOLXQVbv5aHMj+KQkQxCAVzrACW3wpRQDEc2Rx9LC/4HRySrAieOsVgm0NcD7HJTe40cIZrIIbVq3yvjxtx+aRcJBZFsC0+a4u0A6OqSe5AGEU8d1Bp89lGuo/6qsLPkrmCGR7wsSc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623423047; 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=qsh8uGipT4tbPClSeFx6LYtItgEP58coNu+/jPfKI1A=; b=mqzQiGu9n5opmoY+G3YRuUMqrfgpBa4sDP00M6VBv/jL0Sxr4Ai2hECixwzqF5U7zhoFi+DEDMEZQk0ZzdbPzwSSYUd+4pzPcefnsNAmj8PMLvfpmJnMjvdQ5CM6NPT3wvNwD/fa5W4Er1E9JA9WyA5MdKCpN5uouMzAUo1aDXI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.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 [170.10.133.124]) by mx.zohomail.com with SMTPS id 1623423047162511.79049371559404; Fri, 11 Jun 2021 07:50:47 -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-552-qvJUEHrsOFqCJ8AU9KwvgA-1; Fri, 11 Jun 2021 10:50:44 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2CC7D800D62; Fri, 11 Jun 2021 14:50:40 +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 0F3426060F; Fri, 11 Jun 2021 14:50:40 +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 CBA9E1809CAF; Fri, 11 Jun 2021 14:50:39 +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 15BEnNNJ007667 for ; Fri, 11 Jun 2021 10:49:23 -0400 Received: by smtp.corp.redhat.com (Postfix) id A47F460FC2; Fri, 11 Jun 2021 14:49:23 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.33]) by smtp.corp.redhat.com (Postfix) with ESMTP id 12C5060C05 for ; Fri, 11 Jun 2021 14:49:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1623423046; 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=qsh8uGipT4tbPClSeFx6LYtItgEP58coNu+/jPfKI1A=; b=IDbBOlNV1s3y4dDJRJdZI+4OeQUBGntkfVK/EFJ8ewVp0nEwCddCVDV8PUi153i/+aNwRp mORUcebuajsE2al7gf23o84/9oxnuSWJXihAPz/uFG3ThhI8PsQR+cV+3EBbwQ3t6d5nqa HpriFoYJf9GVittlZxFkVJpdD/N3k2g= X-MC-Unique: qvJUEHrsOFqCJ8AU9KwvgA-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 08/22] tests: qemuxml2xml: Modernize 's390-defaultconsole' case Date: Fri, 11 Jun 2021 16:48:59 +0200 Message-Id: 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.13 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" Don't use the 's390-virtio' machine which was removed in qemu 2.6 and use real capabilities for the test. Signed-off-by: Peter Krempa --- tests/qemuxml2argvdata/s390-defaultconsole.xml | 2 +- ...efaultconsole.xml =3D> s390-defaultconsole.s390x-latest.xml} | 4 +++- tests/qemuxml2xmltest.c | 3 +-- 3 files changed, 5 insertions(+), 4 deletions(-) rename tests/qemuxml2xmloutdata/{s390-defaultconsole.xml =3D> s390-default= console.s390x-latest.xml} (82%) diff --git a/tests/qemuxml2argvdata/s390-defaultconsole.xml b/tests/qemuxml= 2argvdata/s390-defaultconsole.xml index b85509ba54..0c64e83983 100644 --- a/tests/qemuxml2argvdata/s390-defaultconsole.xml +++ b/tests/qemuxml2argvdata/s390-defaultconsole.xml @@ -5,7 +5,7 @@ 262144 1 - hvm + hvm diff --git a/tests/qemuxml2xmloutdata/s390-defaultconsole.xml b/tests/qemux= ml2xmloutdata/s390-defaultconsole.s390x-latest.xml similarity index 82% rename from tests/qemuxml2xmloutdata/s390-defaultconsole.xml rename to tests/qemuxml2xmloutdata/s390-defaultconsole.s390x-latest.xml index d34299116c..212b294291 100644 --- a/tests/qemuxml2xmloutdata/s390-defaultconsole.xml +++ b/tests/qemuxml2xmloutdata/s390-defaultconsole.s390x-latest.xml @@ -5,15 +5,17 @@ 262144 1 - hvm + hvm + destroy restart destroy /usr/bin/qemu-system-s390x + diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index dd039bd846..664cfbd3ba 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -1051,8 +1051,7 @@ mymain(void) QEMU_CAPS_CCW_CSSID_UNRESTRICTED, QEMU_CAPS_DEVICE_VFIO_AP); - DO_TEST("s390-defaultconsole", - QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390); + DO_TEST_CAPS_ARCH_LATEST("s390-defaultconsole", "s390x"); DO_TEST("s390-panic", QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390); DO_TEST("s390-panic-missing", --=20 2.31.1