From nobody Tue Apr 30 00:40:07 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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.129.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=1664548725; cv=none; d=zohomail.com; s=zohoarc; b=OHlVxc1rV92awjKP6iH7nXdd5L1fnFEOX2ES/QYVMR4CSLuLdmJCm/o/atg1E1hQ3t3UG4vPjpu1MNIw/dE0WqoKLVjcdpOSdbObmCbRLlFqGCRT2ocpZSXrqMKuJqGDK5P5XuiRJ78sh6xNjjlRx1wHbZV9HwbaXRla/gGwHVI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1664548725; 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=Nt5tDBaRueMmWZ1FFVlM2/Xok8e5VR3GpE4nlkhmBUo=; b=M9i5U89bt8jHPnDwCemBC/CjHrlyotlpltIzCWTQ6xVkXucFGNy70eTQ2kL1T8i5KD038Xa+usry9ugP72FQr6new+Bf4i106z3y7CNPIQ/IEPZE/hbb5pFUWfbY4vtiPAjDcNEU+ZU2UQM1IJcsrNCi0VnYOqZHUe2NHgPEdXA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.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.129.124]) by mx.zohomail.com with SMTPS id 1664548725828695.7452100308124; Fri, 30 Sep 2022 07:38:45 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-335-XHwk6Y5cNbGPiwn8XHO3wQ-1; Fri, 30 Sep 2022 10:38:39 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 146C480A0BF; Fri, 30 Sep 2022 14:38:37 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id A5FD9C15BA8; Fri, 30 Sep 2022 14:38:36 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id E36841946A71; Fri, 30 Sep 2022 14:38:35 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 28D4A1946A52 for ; Fri, 30 Sep 2022 14:38:34 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 0C6A9207B34B; Fri, 30 Sep 2022 14:38:34 +0000 (UTC) Received: from hjs.redhat.com (unknown [10.43.2.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8D72D207B34A for ; Fri, 30 Sep 2022 14:38:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1664548724; 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=Nt5tDBaRueMmWZ1FFVlM2/Xok8e5VR3GpE4nlkhmBUo=; b=LK4HKNYiCCl/NSrte6Ggi2jEGqUStx2MijNQS1QuGtUSI4hn5ENU/Uhr8IOmBuI+Sgxfby h2CF3d+tE+4jtEScYNdkTtdlVBpMUtl7ZoLJJQSdtg9Nl2rDmFTPDZAMtYIc/RAriNJegn FaTUkXU6ifmhbytC1uI5jSwd0EpdQuc= X-MC-Unique: XHwk6Y5cNbGPiwn8XHO3wQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 1/6] tests: qemuxml2argvdata: switch zpci address generation to real caps Date: Fri, 30 Sep 2022 16:38:26 +0200 Message-Id: <1968ea37b7987c147b0879bcd1b39b34edc59e79.1664548661.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1664548727630100001 Among the usual changes, this puts the virtio memballoon on the CCW bus. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- ...-zpci-autogenerate-fids.s390x-latest.args} | 10 +++++---- ...-zpci-autogenerate-uids.s390x-latest.args} | 10 +++++---- ...-vfio-zpci-autogenerate.s390x-latest.args} | 10 +++++---- ...ci-invalid-uid-valid-fid.s390x-latest.err} | 0 ...o-zpci-multidomain-many.s390x-latest.args} | 10 +++++---- tests/qemuxml2argvtest.c | 21 +++++-------------- 6 files changed, 29 insertions(+), 32 deletions(-) rename tests/qemuxml2argvdata/{hostdev-vfio-zpci-autogenerate-fids.args = =3D> hostdev-vfio-zpci-autogenerate-fids.s390x-latest.args} (69%) rename tests/qemuxml2argvdata/{hostdev-vfio-zpci-autogenerate-uids.args = =3D> hostdev-vfio-zpci-autogenerate-uids.s390x-latest.args} (69%) rename tests/qemuxml2argvdata/{hostdev-vfio-zpci-autogenerate.args =3D> ho= stdev-vfio-zpci-autogenerate.s390x-latest.args} (66%) rename tests/qemuxml2argvdata/{hostdev-vfio-zpci-invalid-uid-valid-fid.err= =3D> hostdev-vfio-zpci-invalid-uid-valid-fid.s390x-latest.err} (100%) rename tests/qemuxml2argvdata/{hostdev-vfio-zpci-multidomain-many.args =3D= > hostdev-vfio-zpci-multidomain-many.s390x-latest.args} (79%) diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate-fids.arg= s b/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate-fids.s390x-latest= .args similarity index 69% rename from tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate-fids.args rename to tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate-fids.s390x-= latest.args index 0b9cca797d..91ddb8b54f 100644 --- a/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate-fids.args +++ b/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate-fids.s390x-late= st.args @@ -9,10 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-s390x \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine s390-ccw-virtio,usb=3Doff,dump-guest-core=3Doff \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine s390-ccw-virtio,usb=3Doff,dump-guest-core=3Doff,memory-backend=3D= s390.ram \ -accel tcg \ +-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 \ @@ -29,6 +31,6 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -device vfio-pci,host=3D0000:00:00.0,id=3Dhostdev0,bus=3Dpci.0,addr=3D0x1 \ -device zpci,uid=3D5,fid=3D1,target=3Dhostdev1,id=3Dzpci5 \ -device vfio-pci,host=3D0001:00:00.0,id=3Dhostdev1,bus=3Dpci.0,addr=3D0x2 \ --device zpci,uid=3D2,fid=3D2,target=3Dballoon0,id=3Dzpci2 \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ +-device virtio-balloon-ccw,id=3Dballoon0,devno=3Dfe.0.0000 \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate-uids.arg= s b/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate-uids.s390x-latest= .args similarity index 69% rename from tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate-uids.args rename to tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate-uids.s390x-= latest.args index da7a684394..f675780af6 100644 --- a/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate-uids.args +++ b/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate-uids.s390x-late= st.args @@ -9,10 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-s390x \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine s390-ccw-virtio,usb=3Doff,dump-guest-core=3Doff \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine s390-ccw-virtio,usb=3Doff,dump-guest-core=3Doff,memory-backend=3D= s390.ram \ -accel tcg \ +-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 \ @@ -29,6 +31,6 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -device vfio-pci,host=3D0000:00:00.0,id=3Dhostdev0,bus=3Dpci.0,addr=3D0x1 \ -device zpci,uid=3D2,fid=3D31,target=3Dhostdev1,id=3Dzpci2 \ -device vfio-pci,host=3D0000:00:01.0,id=3Dhostdev1,bus=3Dpci.0,addr=3D0x2 \ --device zpci,uid=3D3,fid=3D1,target=3Dballoon0,id=3Dzpci3 \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ +-device virtio-balloon-ccw,id=3Dballoon0,devno=3Dfe.0.0000 \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate.args b/t= ests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate.s390x-latest.args similarity index 66% rename from tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate.args rename to tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate.s390x-lates= t.args index 44c7416881..4b255a3a00 100644 --- a/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate.args +++ b/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate.s390x-latest.ar= gs @@ -9,10 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-s390x \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine s390-ccw-virtio,usb=3Doff,dump-guest-core=3Doff \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine s390-ccw-virtio,usb=3Doff,dump-guest-core=3Doff,memory-backend=3D= s390.ram \ -accel tcg \ +-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 \ @@ -27,6 +29,6 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -audiodev '{"id":"audio1","driver":"none"}' \ -device zpci,uid=3D1,fid=3D0,target=3Dhostdev0,id=3Dzpci1 \ -device vfio-pci,host=3D0000:00:00.0,id=3Dhostdev0,bus=3Dpci.0,addr=3D0x1 \ --device zpci,uid=3D2,fid=3D1,target=3Dballoon0,id=3Dzpci2 \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device virtio-balloon-ccw,id=3Dballoon0,devno=3Dfe.0.0000 \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci-invalid-uid-valid-fid= .err b/tests/qemuxml2argvdata/hostdev-vfio-zpci-invalid-uid-valid-fid.s390x= -latest.err similarity index 100% rename from tests/qemuxml2argvdata/hostdev-vfio-zpci-invalid-uid-valid-fid.= err rename to tests/qemuxml2argvdata/hostdev-vfio-zpci-invalid-uid-valid-fid.s3= 90x-latest.err diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci-multidomain-many.args= b/tests/qemuxml2argvdata/hostdev-vfio-zpci-multidomain-many.s390x-latest.a= rgs similarity index 79% rename from tests/qemuxml2argvdata/hostdev-vfio-zpci-multidomain-many.args rename to tests/qemuxml2argvdata/hostdev-vfio-zpci-multidomain-many.s390x-l= atest.args index 8761df3267..df28472055 100644 --- a/tests/qemuxml2argvdata/hostdev-vfio-zpci-multidomain-many.args +++ b/tests/qemuxml2argvdata/hostdev-vfio-zpci-multidomain-many.s390x-lates= t.args @@ -9,10 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-s390x \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine s390-ccw-virtio,usb=3Doff,dump-guest-core=3Doff \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine s390-ccw-virtio,usb=3Doff,dump-guest-core=3Doff,memory-backend=3D= s390.ram \ -accel tcg \ +-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 \ @@ -41,6 +43,6 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -device vfio-pci,host=3D0007:00:00.0,id=3Dhostdev6,bus=3Dpci.0,addr=3D0x4 \ -device zpci,uid=3D4,fid=3D40,target=3Dhostdev7,id=3Dzpci4 \ -device vfio-pci,host=3D0008:00:00.0,id=3Dhostdev7,bus=3Dpci.0,addr=3D0x6 \ --device zpci,uid=3D5,fid=3D4,target=3Dballoon0,id=3Dzpci5 \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x8 \ +-device virtio-balloon-ccw,id=3Dballoon0,devno=3Dfe.0.0000 \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index c8b69bbd7a..52922f48a6 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1875,22 +1875,11 @@ mymain(void) QEMU_CAPS_DEVICE_ZPCI); DO_TEST_PARSE_ERROR("hostdev-vfio-zpci-autogenerate-fids", QEMU_CAPS_DEVICE_VFIO_PCI); - DO_TEST_PARSE_ERROR("hostdev-vfio-zpci-invalid-uid-valid-fid", - QEMU_CAPS_DEVICE_VFIO_PCI, - QEMU_CAPS_DEVICE_ZPCI); - DO_TEST("hostdev-vfio-zpci-multidomain-many", - QEMU_CAPS_DEVICE_VFIO_PCI, - QEMU_CAPS_DEVICE_PCI_BRIDGE, - QEMU_CAPS_DEVICE_ZPCI); - DO_TEST("hostdev-vfio-zpci-autogenerate", - QEMU_CAPS_DEVICE_VFIO_PCI, - QEMU_CAPS_DEVICE_ZPCI); - DO_TEST("hostdev-vfio-zpci-autogenerate-uids", - QEMU_CAPS_DEVICE_VFIO_PCI, - QEMU_CAPS_DEVICE_ZPCI); - DO_TEST("hostdev-vfio-zpci-autogenerate-fids", - QEMU_CAPS_DEVICE_VFIO_PCI, - QEMU_CAPS_DEVICE_ZPCI); + DO_TEST_CAPS_ARCH_LATEST_PARSE_ERROR("hostdev-vfio-zpci-invalid-uid-va= lid-fid", "s390x"); + DO_TEST_CAPS_ARCH_LATEST("hostdev-vfio-zpci-multidomain-many", "s390x"= ); + DO_TEST_CAPS_ARCH_LATEST("hostdev-vfio-zpci-autogenerate", "s390x"); + DO_TEST_CAPS_ARCH_LATEST("hostdev-vfio-zpci-autogenerate-uids", "s390x= "); + DO_TEST_CAPS_ARCH_LATEST("hostdev-vfio-zpci-autogenerate-fids", "s390x= "); DO_TEST_PARSE_ERROR("hostdev-vfio-zpci-uid-set-zero", QEMU_CAPS_DEVICE_VFIO_PCI, QEMU_CAPS_DEVICE_ZPCI); --=20 2.37.3 From nobody Tue Apr 30 00:40:07 2024 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=1664548734; cv=none; d=zohomail.com; s=zohoarc; b=P60FDlwVV2gapU19686T33lW92WPTUYCImlo9ZlTmJzf1FYutpQS6W6kQ/GU327sfJ8rQUu2exD9fqxqdD8+SJY/O7S/HmpqniiQZdFjQSWva6YWWMnKiuC2txUGqUvwWACblFXD+ygAlrGxmhRbkxGr8xEq0Y+Ob1cHxH0pK7Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1664548734; 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=+8XzDw6pssypQvFZ/fc6WeFUxi9hiTa/ybU0Q7CtApc=; b=M5uswBoCJj/8+z9sJm46CPBlXurGqvWTOzGHCrj8yBdvoCTNjrNrSUSEZQ3Hve7i5aG/UimVKPi+Hl6mfyUPjNJ9d5K1FTWMJmOgUH3QCQ/ilShIFAc+xDeQgCFeR7S5mD6vz/Itf0/UO+OwO8IVHZ6LQxVkXnitwfHH71v26AI= 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 1664548734227322.4561491695599; Fri, 30 Sep 2022 07:38:54 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-286-5_hNA4oEO0-npLsj0wqHVw-1; Fri, 30 Sep 2022 10:38:41 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 5E9FD185A7AE; Fri, 30 Sep 2022 14:38:37 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4B164207B34B; Fri, 30 Sep 2022 14:38:37 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 382011947048; Fri, 30 Sep 2022 14:38:36 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id C643C1946A71 for ; Fri, 30 Sep 2022 14:38:34 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id B5FDA207B34B; Fri, 30 Sep 2022 14:38:34 +0000 (UTC) Received: from hjs.redhat.com (unknown [10.43.2.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 42FA2207B34A for ; Fri, 30 Sep 2022 14:38:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1664548730; 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=+8XzDw6pssypQvFZ/fc6WeFUxi9hiTa/ybU0Q7CtApc=; b=NoxZp/Wp9gV0gkEm/9CSEc1E59ZW5ZIJDV/pW5xHZ79A7CL+k0yGlUgq0lgE6PZLUAjMKq msd0WzkH9zwM9dV/HEMbCDgE/zwirzJUhbTx/9Q5KAXA1lQfWXHORHnmvcx/RraIK2rNfq 092MF9o3UAzD0TdC7feLE75A26KjjRs= X-MC-Unique: 5_hNA4oEO0-npLsj0wqHVw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 2/6] qemu: convert some s390x tests to use real capability data Date: Fri, 30 Sep 2022 16:38:27 +0200 Message-Id: <5eae4cdce0661da31e0843368d87c338934b4ea7.1664548661.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1664548735674100001 Signed-off-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- ... =3D> balloon-ccw-deflate.s390x-latest.args} | 7 +++-- ...s =3D> console-virtio-ccw.s390x-latest.args} | 9 ++++--- ...ev-subsys-mdev-vfio-ccw.s390x-latest.args} | 7 +++-- ...fio-zpci-ccw-memballoon.s390x-latest.args} | 7 +++-- ...othreads-disk-virtio-ccw.s390x-4.2.0.args} | 8 +++--- ....args =3D> net-virtio-ccw.s390x-latest.args} | 7 +++-- ...> non-x86_64-timer-error.s390x-latest.err} | 0 ....args =3D> virtio-rng-ccw.s390x-latest.args} | 9 +++++-- tests/qemuxml2argvtest.c | 27 ++++++------------- 9 files changed, 45 insertions(+), 36 deletions(-) rename tests/qemuxml2argvdata/{balloon-ccw-deflate.args =3D> balloon-ccw-d= eflate.s390x-latest.args} (68%) rename tests/qemuxml2argvdata/{virtio-rng-ccw.args =3D> console-virtio-ccw= .s390x-latest.args} (77%) rename tests/qemuxml2argvdata/{hostdev-subsys-mdev-vfio-ccw.args =3D> host= dev-subsys-mdev-vfio-ccw.s390x-latest.args} (70%) rename tests/qemuxml2argvdata/{hostdev-vfio-zpci-ccw-memballoon.args =3D> = hostdev-vfio-zpci-ccw-memballoon.s390x-latest.args} (54%) rename tests/qemuxml2argvdata/{iothreads-disk-virtio-ccw.args =3D> iothrea= ds-disk-virtio-ccw.s390x-4.2.0.args} (79%) rename tests/qemuxml2argvdata/{net-virtio-ccw.args =3D> net-virtio-ccw.s39= 0x-latest.args} (73%) rename tests/qemuxml2argvdata/{non-x86_64-timer-error.err =3D> non-x86_64-= timer-error.s390x-latest.err} (100%) rename tests/qemuxml2argvdata/{console-virtio-ccw.args =3D> virtio-rng-ccw= .s390x-latest.args} (71%) diff --git a/tests/qemuxml2argvdata/balloon-ccw-deflate.args b/tests/qemuxm= l2argvdata/balloon-ccw-deflate.s390x-latest.args similarity index 68% rename from tests/qemuxml2argvdata/balloon-ccw-deflate.args rename to tests/qemuxml2argvdata/balloon-ccw-deflate.s390x-latest.args index 558fd23a06..cff227c3ef 100644 --- a/tests/qemuxml2argvdata/balloon-ccw-deflate.args +++ b/tests/qemuxml2argvdata/balloon-ccw-deflate.s390x-latest.args @@ -9,10 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-s390x \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine s390-ccw-virtio,usb=3Doff,dump-guest-core=3Doff \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine s390-ccw-virtio,usb=3Doff,dump-guest-core=3Doff,memory-backend=3D= s390.ram \ -accel tcg \ +-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 \ @@ -26,4 +28,5 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -boot strict=3Don \ -audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-ccw,id=3Dballoon0,deflate-on-oom=3Don,devno=3Dfe.0.= 000a \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/virtio-rng-ccw.args b/tests/qemuxml2arg= vdata/console-virtio-ccw.s390x-latest.args similarity index 77% rename from tests/qemuxml2argvdata/virtio-rng-ccw.args rename to tests/qemuxml2argvdata/console-virtio-ccw.s390x-latest.args index a8de4a3789..d017e9a2bd 100644 --- a/tests/qemuxml2argvdata/virtio-rng-ccw.args +++ b/tests/qemuxml2argvdata/console-virtio-ccw.s390x-latest.args @@ -9,10 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-s390x \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine s390-ccw-virtio,usb=3Doff,dump-guest-core=3Doff \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine s390-ccw-virtio,usb=3Doff,dump-guest-core=3Doff,memory-backend=3D= s390.ram \ -accel tcg \ +-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 \ @@ -32,6 +34,5 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -device virtconsole,chardev=3Dcharconsole0,id=3Dconsole0 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-ccw,id=3Dballoon0,devno=3Dfe.0.000a \ --object rng-random,id=3Dobjrng0,filename=3D/dev/hwrng \ --device virtio-rng-ccw,rng=3Dobjrng0,id=3Drng0,devno=3Dfe.0.0002 \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw.args b/tes= ts/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw.s390x-latest.args similarity index 70% rename from tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw.args rename to tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw.s390x-latest.= args index 59e17b65fd..653fdb7c33 100644 --- a/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw.args +++ b/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw.s390x-latest.args @@ -9,10 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-s390x \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine s390-ccw-virtio,usb=3Doff,dump-guest-core=3Doff \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine s390-ccw-virtio,usb=3Doff,dump-guest-core=3Doff,memory-backend=3D= s390.ram \ -accel tcg \ +-cpu qemu \ -m 512 \ +-object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":536870912= }' \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -27,4 +29,5 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -audiodev '{"id":"audio1","driver":"none"}' \ -device vfio-ccw,id=3Dhostdev0,sysfsdev=3D/sys/bus/mdev/devices/90c6c135-a= d44-41d0-b1b7-bae47de48627,devno=3Dfe.0.0000 \ -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/hostdev-vfio-zpci-ccw-memballoon.args b= /tests/qemuxml2argvdata/hostdev-vfio-zpci-ccw-memballoon.s390x-latest.args similarity index 54% rename from tests/qemuxml2argvdata/hostdev-vfio-zpci-ccw-memballoon.args rename to tests/qemuxml2argvdata/hostdev-vfio-zpci-ccw-memballoon.s390x-lat= est.args index 95ab50cb92..8b4a1a3bff 100644 --- a/tests/qemuxml2argvdata/hostdev-vfio-zpci-ccw-memballoon.args +++ b/tests/qemuxml2argvdata/hostdev-vfio-zpci-ccw-memballoon.s390x-latest.= args @@ -9,10 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-KVMGuest1/.config \ /usr/bin/qemu-system-s390x \ -name guest=3DKVMGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-KVMG= uest1/master-key.aes \ --machine s390-ccw-virtio,usb=3Doff,dump-guest-core=3Doff \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-KVMGuest1/master-key.aes"}' \ +-machine s390-ccw-virtio,usb=3Doff,dump-guest-core=3Doff,memory-backend=3D= s390.ram \ -accel kvm \ +-cpu gen15a-base,aen=3Don,cmmnt=3Don,vxpdeh=3Don,aefsi=3Don,diag318=3Don,c= sske=3Don,mepoch=3Don,msa9=3Don,msa8=3Don,msa7=3Don,msa6=3Don,msa5=3Don,msa= 4=3Don,msa3=3Don,msa2=3Don,msa1=3Don,sthyi=3Don,edat=3Don,ri=3Don,deflate= =3Don,edat2=3Don,etoken=3Don,vx=3Don,ipter=3Don,mepochptff=3Don,ap=3Don,vxe= h=3Don,vxpd=3Don,esop=3Don,msa9_pckmo=3Don,vxeh2=3Don,esort=3Don,apqi=3Don,= apft=3Don,els=3Don,iep=3Don,apqci=3Don,cte=3Don,ais=3Don,bpb=3Don,gs=3Don,p= pa15=3Don,zpci=3Don,sea_esop2=3Don,te=3Don,cmm=3Don \ -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 \ @@ -28,4 +30,5 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-KVMGuest1/.config \ -device zpci,uid=3D1,fid=3D0,target=3Dhostdev0,id=3Dzpci1 \ -device vfio-pci,host=3D0000:00:00.0,id=3Dhostdev0,bus=3Dpci.0,addr=3D0x1 \ -device virtio-balloon-ccw,id=3Dballoon0,devno=3Dfe.0.0000 \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/iothreads-disk-virtio-ccw.args b/tests/= qemuxml2argvdata/iothreads-disk-virtio-ccw.s390x-4.2.0.args similarity index 79% rename from tests/qemuxml2argvdata/iothreads-disk-virtio-ccw.args rename to tests/qemuxml2argvdata/iothreads-disk-virtio-ccw.s390x-4.2.0.args index 4bd4749d2b..204a125b09 100644 --- a/tests/qemuxml2argvdata/iothreads-disk-virtio-ccw.args +++ b/tests/qemuxml2argvdata/iothreads-disk-virtio-ccw.s390x-4.2.0.args @@ -10,8 +10,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine s390-ccw-virtio,usb=3Doff,dump-guest-core=3Doff \ +-machine s390-ccw-virtio-4.2,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ +-cpu qemu \ -m 214 \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ @@ -28,10 +29,11 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -boot strict=3Don \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw= ","file":"libvirt-2-storage"}' \ --device virtio-blk-ccw,iothread=3Diothread1,devno=3Dfe.0.0000,drive=3Dlibv= irt-2-format,id=3Dvirtio-disk0,bootindex=3D1 \ +-device virtio-blk-ccw,iothread=3Diothread1,scsi=3Doff,devno=3Dfe.0.0000,d= rive=3Dlibvirt-2-format,id=3Dvirtio-disk0,bootindex=3D1 \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","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,iothread=3Diothread2,devno=3D0.0.0007,drive=3Dlibvi= rt-1-format,id=3Dvirtio-disk1 \ +-device virtio-blk-ccw,iothread=3Diothread2,scsi=3Doff,devno=3D0.0.0007,dr= ive=3Dlibvirt-1-format,id=3Dvirtio-disk1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-ccw,id=3Dballoon0,devno=3Dfe.0.000a \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/net-virtio-ccw.args b/tests/qemuxml2arg= vdata/net-virtio-ccw.s390x-latest.args similarity index 73% rename from tests/qemuxml2argvdata/net-virtio-ccw.args rename to tests/qemuxml2argvdata/net-virtio-ccw.s390x-latest.args index f7cc0a8e7a..00a3ba6b5e 100644 --- a/tests/qemuxml2argvdata/net-virtio-ccw.args +++ b/tests/qemuxml2argvdata/net-virtio-ccw.s390x-latest.args @@ -9,10 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-s390x \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine s390-ccw-virtio,usb=3Doff,dump-guest-core=3Doff \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine s390-ccw-virtio,usb=3Doff,dump-guest-core=3Doff,memory-backend=3D= s390.ram \ -accel tcg \ +-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 \ @@ -30,4 +32,5 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -device virtio-net-ccw,netdev=3Dhostnet1,id=3Dnet1,mac=3D00:11:22:33:44:54= ,devno=3Dfe.0.0000 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-ccw,id=3Dballoon0,devno=3Dfe.0.000a \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/non-x86_64-timer-error.err b/tests/qemu= xml2argvdata/non-x86_64-timer-error.s390x-latest.err similarity index 100% rename from tests/qemuxml2argvdata/non-x86_64-timer-error.err rename to tests/qemuxml2argvdata/non-x86_64-timer-error.s390x-latest.err diff --git a/tests/qemuxml2argvdata/console-virtio-ccw.args b/tests/qemuxml= 2argvdata/virtio-rng-ccw.s390x-latest.args similarity index 71% rename from tests/qemuxml2argvdata/console-virtio-ccw.args rename to tests/qemuxml2argvdata/virtio-rng-ccw.s390x-latest.args index f8e012f4b7..788bb1061f 100644 --- a/tests/qemuxml2argvdata/console-virtio-ccw.args +++ b/tests/qemuxml2argvdata/virtio-rng-ccw.s390x-latest.args @@ -9,10 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-s390x \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine s390-ccw-virtio,usb=3Doff,dump-guest-core=3Doff \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine s390-ccw-virtio,usb=3Doff,dump-guest-core=3Doff,memory-backend=3D= s390.ram \ -accel tcg \ +-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 \ @@ -32,4 +34,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -device virtconsole,chardev=3Dcharconsole0,id=3Dconsole0 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-ccw,id=3Dballoon0,devno=3Dfe.0.000a \ +-object '{"qom-type":"rng-random","id":"objrng0","filename":"/dev/hwrng"}'= \ +-device virtio-rng-ccw,rng=3Dobjrng0,id=3Drng0,devno=3Dfe.0.0002 \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 52922f48a6..64ad473b0e 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1305,7 +1305,7 @@ mymain(void) DO_TEST_CAPS_LATEST("hugepages-nvdimm"); DO_TEST_NOCAPS("nosharepages"); =20 - DO_TEST_PARSE_ERROR("non-x86_64-timer-error", QEMU_CAPS_CCW); + DO_TEST_CAPS_ARCH_LATEST_PARSE_ERROR("non-x86_64-timer-error", "s390x"= ); =20 DO_TEST_CAPS_LATEST("disk-cdrom"); DO_TEST_CAPS_LATEST("disk-cdrom-empty-network-invalid"); @@ -1530,7 +1530,7 @@ mymain(void) DO_TEST_NOCAPS("net-virtio-device"); DO_TEST_NOCAPS("net-virtio-disable-offloads"); DO_TEST_NOCAPS("net-virtio-netdev"); - DO_TEST("net-virtio-ccw", QEMU_CAPS_CCW); + DO_TEST_CAPS_ARCH_LATEST("net-virtio-ccw", "s390x"); DO_TEST("net-virtio-rxtxqueuesize", QEMU_CAPS_VIRTIO_NET_RX_QUEUE_SIZE, QEMU_CAPS_VIRTIO_NET_TX_QUEUE_SIZE); @@ -1668,7 +1668,7 @@ mymain(void) DO_TEST_NOCAPS("console-virtio"); DO_TEST("console-virtio-many", QEMU_CAPS_DEVICE_ISA_SERIAL); - DO_TEST("console-virtio-ccw", QEMU_CAPS_CCW); + DO_TEST_CAPS_ARCH_LATEST("console-virtio-ccw", "s390x"); DO_TEST_CAPS_LATEST("console-virtio-unix"); DO_TEST_CAPS_ARCH_LATEST("console-sclp", "s390x"); DO_TEST("channel-spicevmc", @@ -1821,8 +1821,7 @@ mymain(void) DO_TEST_NOCAPS("balloon-device"); DO_TEST("balloon-device-deflate", QEMU_CAPS_VIRTIO_BALLOON_AUTODEFLATE); - DO_TEST("balloon-ccw-deflate", - QEMU_CAPS_VIRTIO_BALLOON_AUTODEFLATE, QEMU_CAPS_CCW); + DO_TEST_CAPS_ARCH_LATEST("balloon-ccw-deflate", "s390x"); DO_TEST("balloon-mmio-deflate", QEMU_CAPS_DEVICE_VIRTIO_MMIO, QEMU_CAPS_VIRTIO_BALLOON_AUTODEFLATE); @@ -1895,19 +1894,13 @@ mymain(void) DO_TEST_PARSE_ERROR("hostdev-vfio-zpci-set-zero", QEMU_CAPS_DEVICE_VFIO_PCI, QEMU_CAPS_DEVICE_ZPCI); - DO_TEST("hostdev-vfio-zpci-ccw-memballoon", - QEMU_CAPS_CCW, - QEMU_CAPS_DEVICE_VFIO_PCI, - QEMU_CAPS_DEVICE_ZPCI); + DO_TEST_CAPS_ARCH_LATEST("hostdev-vfio-zpci-ccw-memballoon", "s390x"); =20 DO_TEST("pci-rom", QEMU_CAPS_DEVICE_VFIO_PCI); DO_TEST_NOCAPS("pci-rom-disabled"); DO_TEST_NOCAPS("pci-rom-disabled-invalid"); =20 - DO_TEST("hostdev-subsys-mdev-vfio-ccw", - QEMU_CAPS_CCW, - QEMU_CAPS_CCW_CSSID_UNRESTRICTED, - QEMU_CAPS_DEVICE_VFIO_CCW); + DO_TEST_CAPS_ARCH_LATEST("hostdev-subsys-mdev-vfio-ccw", "s390x"); DO_TEST_CAPS_ARCH_LATEST("hostdev-subsys-mdev-vfio-ccw-boot", "s390x"); DO_TEST_PARSE_ERROR("hostdev-subsys-mdev-vfio-ccw", @@ -1963,8 +1956,7 @@ mymain(void) DO_TEST_CAPS_LATEST("iothreads-ids-pool-sizes"); DO_TEST_FAILURE_NOCAPS("iothreads-nocap"); DO_TEST("iothreads-disk", QEMU_CAPS_OBJECT_IOTHREAD); - DO_TEST("iothreads-disk-virtio-ccw", QEMU_CAPS_OBJECT_IOTHREAD, - QEMU_CAPS_CCW); + DO_TEST_CAPS_ARCH_VER("iothreads-disk-virtio-ccw", "s390x", "4.2.0"); DO_TEST_CAPS_VER("iothreads-virtio-scsi-pci", "5.2.0"); DO_TEST_CAPS_LATEST("iothreads-virtio-scsi-pci"); DO_TEST_CAPS_ARCH_LATEST("iothreads-virtio-scsi-ccw", "s390x"); @@ -2422,10 +2414,7 @@ mymain(void) DO_TEST_PARSE_ERROR("virtio-rng-egd-crash", QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_EGD); - DO_TEST("virtio-rng-ccw", - QEMU_CAPS_CCW, - QEMU_CAPS_DEVICE_VIRTIO_RNG, - QEMU_CAPS_OBJECT_RNG_RANDOM); + DO_TEST_CAPS_ARCH_LATEST("virtio-rng-ccw", "s390x"); =20 DO_TEST_CAPS_ARCH_LATEST("s390-allow-bogus-usb-none", "s390x"); DO_TEST_CAPS_ARCH_LATEST("s390-allow-bogus-usb-controller", "s390x"); --=20 2.37.3 From nobody Tue Apr 30 00:40:07 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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.129.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=1664548747; cv=none; d=zohomail.com; s=zohoarc; b=a51Xp7ivoGMHaSLs8EvsVhNE3pqhYgAH7zFIi3WNQik1p+JWzsXxvHs/TuCW1cWWCGBiFUXCSMl8537pG7RphGqsA+HWUQU1tkKjNF8X44dUFaZl4455eHIv3mc5vgGQcYEidZxy3N6BkKBJeMsbNa1ddGunIHM/qdIWqnG/ZBQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1664548747; 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=p+YCa2Wmg3wZ++UoKj5GT/hDSxzvOM47gqWLtU/hH+Y=; b=MwxHvU14jnCXEqX81Nasr8/XsHT7/r5r7wZsraH5g2WoESY1+SZFE05XHG17n4wgT8YNqCI1Uv2pz13JC6NIa5x0V0A/D5YGm9ysRkuzwyJ1BzPA/NC1kA/i44hpxzgLg75vkD1zDnX138EyeC5/HKlPu4mV1litMiM51oj+FvI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.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.129.124]) by mx.zohomail.com with SMTPS id 1664548747502684.086295710397; Fri, 30 Sep 2022 07:39:07 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-500-leU53fRAN5ejwkcmky4kpw-1; Fri, 30 Sep 2022 10:38:42 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 1932C855458; Fri, 30 Sep 2022 14:38:38 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 042D640C6EC6; Fri, 30 Sep 2022 14:38:38 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 89BB2194705D; Fri, 30 Sep 2022 14:38:36 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 6AF8D1946A71 for ; Fri, 30 Sep 2022 14:38:35 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 505AF207B34B; Fri, 30 Sep 2022 14:38:35 +0000 (UTC) Received: from hjs.redhat.com (unknown [10.43.2.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id EC7A5207B34A for ; Fri, 30 Sep 2022 14:38:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1664548746; 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=p+YCa2Wmg3wZ++UoKj5GT/hDSxzvOM47gqWLtU/hH+Y=; b=QN3dEoGSuX8KFF2Q2nIVS+6/j/9emmsPNkWBTnmMrYE6zbpTrxMbu+fnPc6qX+cCwg7FFF wIeq1HhBwQ+SiMpPgq3sf3HkDVuUyxMIuL1CIUoJD67DEDln2hYtHfnYQmGAALl/l1hmq6 M+UDMyholzIzEdxNXfj3hadU9Y8jpp0= X-MC-Unique: leU53fRAN5ejwkcmky4kpw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 3/6] qemu: Assume QEMU_CAPS_CCW_CSSID_UNRESTRICTED Date: Fri, 30 Sep 2022 16:38:28 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1664548749658100003 This capability was introduced by libvirt commit: commit 263e65fd204a27713db89064796c1d386bb541d8 qemu: introduce vfio-ccw capability It probes for the cssid-unrestricted property of virtual-css-bridge, which was introduced in QEMU v2.12 by: commit 99577c492fb2916165ed9bc215f058877f0a4106 s390x/css: unrestrict cssids Since we bumped the minimum QEMU version to 4.2.0, assume this property is always present. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- src/qemu/qemu_capabilities.c | 2 -- tests/qemuxml2argvtest.c | 5 +---- tests/qemuxml2xmltest.c | 2 -- 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index e84310c79a..f8521587a9 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -5247,8 +5247,6 @@ virQEMUCapsInitProcessCaps(virQEMUCaps *qemuCaps) if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_CCW) && virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_CCW)) virQEMUCapsSet(qemuCaps, QEMU_CAPS_CCW); - if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_CCW_CSSID_UNRESTRICTED)) - virQEMUCapsClear(qemuCaps, QEMU_CAPS_DEVICE_VFIO_CCW); } =20 if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_CPU_UNAVAILABLE_FEATURES)) diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 64ad473b0e..d1cd1456a0 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1904,15 +1904,12 @@ mymain(void) DO_TEST_CAPS_ARCH_LATEST("hostdev-subsys-mdev-vfio-ccw-boot", "s390x"); DO_TEST_PARSE_ERROR("hostdev-subsys-mdev-vfio-ccw", - QEMU_CAPS_CCW, - QEMU_CAPS_CCW_CSSID_UNRESTRICTED); + QEMU_CAPS_CCW); DO_TEST_PARSE_ERROR("hostdev-subsys-mdev-vfio-ccw-duplicate-address", QEMU_CAPS_CCW, - QEMU_CAPS_CCW_CSSID_UNRESTRICTED, QEMU_CAPS_DEVICE_VFIO_CCW); DO_TEST_PARSE_ERROR("hostdev-subsys-mdev-vfio-ccw-invalid-address", QEMU_CAPS_CCW, - QEMU_CAPS_CCW_CSSID_UNRESTRICTED, QEMU_CAPS_DEVICE_VFIO_CCW); =20 DO_TEST_CAPS_ARCH_LATEST("hostdev-subsys-mdev-vfio-ap", diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 85a57be87a..d3876d2f03 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -893,13 +893,11 @@ mymain(void) =20 DO_TEST("hostdev-subsys-mdev-vfio-ccw", QEMU_CAPS_CCW, - QEMU_CAPS_CCW_CSSID_UNRESTRICTED, QEMU_CAPS_DEVICE_VFIO_CCW); DO_TEST_CAPS_ARCH_LATEST("hostdev-subsys-mdev-vfio-ccw-boot", "s390x"); DO_TEST("hostdev-subsys-mdev-vfio-ap", QEMU_CAPS_CCW, - QEMU_CAPS_CCW_CSSID_UNRESTRICTED, QEMU_CAPS_DEVICE_VFIO_AP); =20 DO_TEST_CAPS_ARCH_LATEST("s390-defaultconsole", "s390x"); --=20 2.37.3 From nobody Tue Apr 30 00:40:07 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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.129.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=1664548725; cv=none; d=zohomail.com; s=zohoarc; b=guXsJZonQgpzwL3uWoCB3xAsASfEKGkHvvtfJXfmJZ/InF3RP79mF3QoTA0H7obngqP8y8PJc6W3IS5Hy3ap1ZbvmzBqfIxpjVfUkrJF2AZJ0AMnHGFkPDaAVWnkjS5z30CxEg8Jj9XqH3eBxiRViQCFCvX1ywp4n9blK8II8CU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1664548725; 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=9JZq68Vk/UgdGj/HZ+PN8VPP7BuyxOzN1mjTh4OvwZQ=; b=G8ppRCrXU+0ciiB9cTud0M8gm4e1GveYLA3JHtblVxTxPh+Ul8MXqfFXJ7rIjY0kxC85PUksBiSFIEarAduVx5z2e1OO8sAc+Rfwv9sF4ZwsIbo7HRw0GLBZ2vrJ/Z9UFcyZKhzdnUKMWQ8eNALY4qbEqgSHpl3eFbbZZExP6LQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.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.129.124]) by mx.zohomail.com with SMTPS id 1664548725847820.13127551293; Fri, 30 Sep 2022 07:38:45 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-219-_TRxItspNxusOSwckz_H8Q-1; Fri, 30 Sep 2022 10:38:42 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 5D8A32A59575; Fri, 30 Sep 2022 14:38:38 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4A3A214583FB; Fri, 30 Sep 2022 14:38:38 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id B5E8F1947064; Fri, 30 Sep 2022 14:38:36 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id EF0821946A7B for ; Fri, 30 Sep 2022 14:38:35 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id DF66B207B34A; Fri, 30 Sep 2022 14:38:35 +0000 (UTC) Received: from hjs.redhat.com (unknown [10.43.2.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 87128207B34B for ; Fri, 30 Sep 2022 14:38:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1664548724; 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=9JZq68Vk/UgdGj/HZ+PN8VPP7BuyxOzN1mjTh4OvwZQ=; b=gvyhG8TWPJWBgix1xxSUiEyzNhIZMjYktVQq3IcBwVpfEs7Pp67zZCe7MV8rsmpGVdqJD3 EoIf5Nt2q7OO6dJhrfS4nKYaouVbuYME1PsnMt3//lOW3ZLjIZmEGPzbj13wtSwwfcCmfV OZas997CU1rHtQmMpu/2FqM5ftuuXD8= X-MC-Unique: _TRxItspNxusOSwckz_H8Q-1 X-Original-To: libvir-list@listman.corp.redhat.com From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 4/6] qemu: Assume QEMU_CAPS_CCW Date: Fri, 30 Sep 2022 16:38:29 +0200 Message-Id: <973f5fb3488c3eea2a3df66e6391421f3d5fa1ed.1664548661.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1664548729587100005 Introduced in libvirt by: commit f245a9791c23ba08858f7cf7b16b1c449967ab35 qemu: introduce capability for virtual-css-bridge Which mentions that its support was in QEMU 2.7. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- src/qemu/qemu_capabilities.c | 7 --- src/qemu/qemu_domain_address.c | 7 +-- src/qemu/qemu_hotplug.c | 6 +- src/qemu/qemu_validate.c | 6 -- tests/qemuhotplugtest.c | 1 - .../hostdev-vfio-zpci-boundaries.args | 5 +- tests/qemuxml2argvdata/hostdev-vfio-zpci.args | 3 +- tests/qemuxml2argvtest.c | 61 ++++++------------- .../hostdev-vfio-zpci-autogenerate-fids.xml | 4 +- .../hostdev-vfio-zpci-autogenerate-uids.xml | 4 +- .../hostdev-vfio-zpci-autogenerate.xml | 4 +- .../hostdev-vfio-zpci-boundaries.xml | 4 +- .../hostdev-vfio-zpci-multidomain-many.xml | 4 +- tests/qemuxml2xmltest.c | 39 +++++------- 14 files changed, 46 insertions(+), 109 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index f8521587a9..d254f38f92 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -5242,13 +5242,6 @@ virQEMUCapsInitProcessCaps(virQEMUCaps *qemuCaps) virQEMUCapsSet(qemuCaps, QEMU_CAPS_CPU_CACHE); } =20 - if (ARCH_IS_S390(qemuCaps->arch)) { - /* Legacy assurance for QEMU_CAPS_CCW */ - if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_CCW) && - virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_CCW)) - virQEMUCapsSet(qemuCaps, QEMU_CAPS_CCW); - } - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_CPU_UNAVAILABLE_FEATURES)) virQEMUCapsSet(qemuCaps, QEMU_CAPS_CANONICAL_CPU_FEATURES); =20 diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c index 228ac07cd5..d8ec6ec71c 100644 --- a/src/qemu/qemu_domain_address.c +++ b/src/qemu/qemu_domain_address.c @@ -420,8 +420,7 @@ qemuDomainAssignS390Addresses(virDomainDef *def, int ret =3D -1; virDomainCCWAddressSet *addrs =3D NULL; =20 - if (qemuDomainIsS390CCW(def) && - virQEMUCapsGet(qemuCaps, QEMU_CAPS_CCW)) { + if (qemuDomainIsS390CCW(def)) { if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_VFIO_CCW)) qemuDomainPrimeVfioDeviceAddresses(def, VIR_DOMAIN_DEVICE_ADDR= ESS_TYPE_CCW); =20 @@ -3289,13 +3288,11 @@ qemuDomainEnsureVirtioAddress(bool *releaseAddr, virDomainDeviceDef *dev) { virDomainDeviceInfo *info =3D virDomainDeviceGetInfo(dev); - qemuDomainObjPrivate *priv =3D vm->privateData; virDomainCCWAddressSet *ccwaddrs =3D NULL; int ret =3D -1; =20 if (!info->type) { - if (qemuDomainIsS390CCW(vm->def) && - virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_CCW)) + if (qemuDomainIsS390CCW(vm->def)) info->type =3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW; } =20 diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 9b508dc8f0..00727f6ddc 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1143,8 +1143,7 @@ qemuDomainAttachNetDevice(virQEMUDriver *driver, } =20 if (qemuDomainIsS390CCW(vm->def) && - net->info.type !=3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI && - virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_CCW)) { + net->info.type !=3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI) { net->info.type =3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW; if (!(ccwaddrs =3D virDomainCCWAddressSetCreateFromDomain(vm->def)= )) goto cleanup; @@ -2571,8 +2570,7 @@ qemuDomainAttachSCSIVHostDevice(virQEMUDriver *driver, vhostfdName =3D g_strdup_printf("vhostfd-%d", vhostfd); =20 if (hostdev->info->type =3D=3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) { - if (qemuDomainIsS390CCW(vm->def) && - virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_CCW)) + if (qemuDomainIsS390CCW(vm->def)) hostdev->info->type =3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW; } =20 diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index 34fa10ae32..cb4e32c0ff 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -1655,12 +1655,6 @@ qemuValidateDomainDeviceDefAddress(const virDomainDe= viceDef *dev, return -1; } =20 - if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_CCW)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("CCW address type is not supported by this QE= MU")); - return -1; - } - break; =20 case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_DRIVE: diff --git a/tests/qemuhotplugtest.c b/tests/qemuhotplugtest.c index e59158dca0..163b5e8091 100644 --- a/tests/qemuhotplugtest.c +++ b/tests/qemuhotplugtest.c @@ -75,7 +75,6 @@ qemuHotplugCreateObjects(virDomainXMLOption *xmlopt, =20 virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_VIRTIO_SCSI); virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_DEVICE_USB_STORAGE); - virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_CCW); virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_DEVICE_IVSHMEM_PLAIN); virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_DEVICE_IVSHMEM_DOORBELL); virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_SCSI_DISK_WWN); diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci-boundaries.args b/tes= ts/qemuxml2argvdata/hostdev-vfio-zpci-boundaries.args index 62b2472959..ca31f35d75 100644 --- a/tests/qemuxml2argvdata/hostdev-vfio-zpci-boundaries.args +++ b/tests/qemuxml2argvdata/hostdev-vfio-zpci-boundaries.args @@ -24,13 +24,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --device zpci,uid=3D3,fid=3D2,target=3Dpci.1,id=3Dzpci3 \ +-device zpci,uid=3D2,fid=3D1,target=3Dpci.1,id=3Dzpci2 \ -device pci-bridge,chassis_nr=3D1,id=3Dpci.1,bus=3Dpci.0,addr=3D0x1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device zpci,uid=3D65535,fid=3D4294967295,target=3Dhostdev0,id=3Dzpci65535= \ -device vfio-pci,host=3Dffff:00:00.0,id=3Dhostdev0,bus=3Dpci.1,addr=3D0x1f= \ -device zpci,uid=3D1,fid=3D0,target=3Dhostdev1,id=3Dzpci1 \ -device vfio-pci,host=3D0000:00:00.0,id=3Dhostdev1,bus=3Dpci.0,addr=3D0x2 \ --device zpci,uid=3D2,fid=3D1,target=3Dballoon0,id=3Dzpci2 \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ +-device virtio-balloon-ccw,id=3Dballoon0,devno=3Dfe.0.0000 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci.args b/tests/qemuxml2= argvdata/hostdev-vfio-zpci.args index 9df47029be..e19c848aa8 100644 --- a/tests/qemuxml2argvdata/hostdev-vfio-zpci.args +++ b/tests/qemuxml2argvdata/hostdev-vfio-zpci.args @@ -27,6 +27,5 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -audiodev '{"id":"audio1","driver":"none"}' \ -device zpci,uid=3D25,fid=3D31,target=3Dhostdev0,id=3Dzpci25 \ -device vfio-pci,host=3D0000:00:00.0,id=3Dhostdev0,bus=3Dpci.0,addr=3D0x8 \ --device zpci,uid=3D1,fid=3D0,target=3Dballoon0,id=3Dzpci1 \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x1 \ +-device virtio-balloon-ccw,id=3Dballoon0,devno=3Dfe.0.0000 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index d1cd1456a0..b96ec69fa7 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1903,13 +1903,10 @@ mymain(void) DO_TEST_CAPS_ARCH_LATEST("hostdev-subsys-mdev-vfio-ccw", "s390x"); DO_TEST_CAPS_ARCH_LATEST("hostdev-subsys-mdev-vfio-ccw-boot", "s390x"); - DO_TEST_PARSE_ERROR("hostdev-subsys-mdev-vfio-ccw", - QEMU_CAPS_CCW); + DO_TEST_PARSE_ERROR_NOCAPS("hostdev-subsys-mdev-vfio-ccw"); DO_TEST_PARSE_ERROR("hostdev-subsys-mdev-vfio-ccw-duplicate-address", - QEMU_CAPS_CCW, QEMU_CAPS_DEVICE_VFIO_CCW); DO_TEST_PARSE_ERROR("hostdev-subsys-mdev-vfio-ccw-invalid-address", - QEMU_CAPS_CCW, QEMU_CAPS_DEVICE_VFIO_CCW); =20 DO_TEST_CAPS_ARCH_LATEST("hostdev-subsys-mdev-vfio-ap", @@ -2009,7 +2006,7 @@ mymain(void) DO_TEST_FAILURE("cpu-qemu-host-passthrough", QEMU_CAPS_KVM); =20 qemuTestSetHostArch(&driver, VIR_ARCH_S390X); - DO_TEST("cpu-s390-zEC12", QEMU_CAPS_KVM, QEMU_CAPS_CCW); + DO_TEST("cpu-s390-zEC12", QEMU_CAPS_KVM); DO_TEST("cpu-s390-features", QEMU_CAPS_KVM, QEMU_CAPS_QUERY_CPU_MODEL_= EXPANSION); DO_TEST_FAILURE("cpu-s390-features", QEMU_CAPS_KVM); qemuTestSetHostArch(&driver, VIR_ARCH_NONE); @@ -2416,17 +2413,15 @@ mymain(void) DO_TEST_CAPS_ARCH_LATEST("s390-allow-bogus-usb-none", "s390x"); DO_TEST_CAPS_ARCH_LATEST("s390-allow-bogus-usb-controller", "s390x"); =20 - DO_TEST("s390-panic-no-address", QEMU_CAPS_CCW); - DO_TEST_PARSE_ERROR("s390-panic-address", QEMU_CAPS_CCW); - DO_TEST("s390-panic-missing", QEMU_CAPS_CCW); - DO_TEST_PARSE_ERROR("s390-no-parallel", QEMU_CAPS_CCW); - DO_TEST("s390-serial", QEMU_CAPS_CCW, QEMU_CAPS_DEVICE_SCLPCONSOLE); + DO_TEST_NOCAPS("s390-panic-no-address"); + DO_TEST_PARSE_ERROR_NOCAPS("s390-panic-address"); + DO_TEST_NOCAPS("s390-panic-missing"); + DO_TEST_PARSE_ERROR_NOCAPS("s390-no-parallel"); + DO_TEST("s390-serial", QEMU_CAPS_DEVICE_SCLPCONSOLE); DO_TEST("s390-serial-2", - QEMU_CAPS_CCW, QEMU_CAPS_DEVICE_SCLPCONSOLE, QEMU_CAPS_DEVICE_SCLPLMCONSOLE); DO_TEST("s390-serial-console", - QEMU_CAPS_CCW, QEMU_CAPS_DEVICE_SCLPCONSOLE); =20 DO_TEST("ppc-dtb", @@ -2630,8 +2625,7 @@ mymain(void) DO_TEST_CAPS_LATEST("hostdev-scsi-virtio-scsi"); =20 DO_TEST("hostdev-scsi-vhost-scsi-ccw", - QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_DEVICE_VHOST_SCSI, - QEMU_CAPS_CCW); + QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_DEVICE_VHOST_SCSI); DO_TEST("hostdev-scsi-vhost-scsi-pci", QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_DEVICE_VHOST_SCSI); @@ -2889,66 +2883,51 @@ mymain(void) DO_TEST("machine-aeskeywrap-on-caps", QEMU_CAPS_AES_KEY_WRAP, QEMU_CAPS_DEA_KEY_WRAP, - QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_CCW); + QEMU_CAPS_VIRTIO_SCSI); =20 DO_TEST("machine-aeskeywrap-on-cap", QEMU_CAPS_AES_KEY_WRAP, - QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_CCW); + QEMU_CAPS_VIRTIO_SCSI); =20 DO_TEST("machine-aeskeywrap-off-caps", QEMU_CAPS_AES_KEY_WRAP, QEMU_CAPS_DEA_KEY_WRAP, - QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_CCW); + QEMU_CAPS_VIRTIO_SCSI); =20 DO_TEST("machine-aeskeywrap-off-cap", QEMU_CAPS_AES_KEY_WRAP, - QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_CCW); + QEMU_CAPS_VIRTIO_SCSI); =20 DO_TEST("machine-deakeywrap-on-caps", QEMU_CAPS_AES_KEY_WRAP, QEMU_CAPS_DEA_KEY_WRAP, - QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_CCW); + QEMU_CAPS_VIRTIO_SCSI); =20 DO_TEST("machine-deakeywrap-on-cap", QEMU_CAPS_DEA_KEY_WRAP, - QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_CCW); + QEMU_CAPS_VIRTIO_SCSI); =20 DO_TEST("machine-deakeywrap-off-caps", QEMU_CAPS_AES_KEY_WRAP, QEMU_CAPS_DEA_KEY_WRAP, - QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_CCW); + QEMU_CAPS_VIRTIO_SCSI); =20 DO_TEST("machine-deakeywrap-off-cap", QEMU_CAPS_DEA_KEY_WRAP, - QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_CCW); + QEMU_CAPS_VIRTIO_SCSI); =20 DO_TEST("machine-keywrap-none-caps", QEMU_CAPS_AES_KEY_WRAP, QEMU_CAPS_DEA_KEY_WRAP, - QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_CCW); + QEMU_CAPS_VIRTIO_SCSI); DO_TEST("machine-keywrap-none", - QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_CCW); + QEMU_CAPS_VIRTIO_SCSI); =20 DO_TEST("machine-loadparm-s390", - QEMU_CAPS_CCW, QEMU_CAPS_LOADPARM); DO_TEST("machine-loadparm-net-s390", - QEMU_CAPS_CCW, QEMU_CAPS_LOADPARM); DO_TEST("machine-loadparm-multiple-disks-nets-s390", - QEMU_CAPS_CCW, QEMU_CAPS_LOADPARM); DO_TEST_PARSE_ERROR("machine-loadparm-s390-char-invalid", - QEMU_CAPS_CCW, QEMU_CAPS_LOADPARM); DO_TEST_PARSE_ERROR("machine-loadparm-s390-len-invalid", - QEMU_CAPS_CCW, QEMU_CAPS_LOADPARM); =20 DO_TEST_NOCAPS("qemu-ns-domain-ns0"); @@ -3106,12 +3085,12 @@ mymain(void) DO_TEST_CAPS_LATEST_PARSE_ERROR("tseg-i440fx"); DO_TEST_CAPS_LATEST_PARSE_ERROR("tseg-invalid-size"); =20 - DO_TEST("video-virtio-gpu-ccw", QEMU_CAPS_CCW, + DO_TEST("video-virtio-gpu-ccw", QEMU_CAPS_DEVICE_VIRTIO_GPU, QEMU_CAPS_VNC, QEMU_CAPS_DEVICE_VIRTIO_GPU_CCW); =20 - DO_TEST("input-virtio-ccw", QEMU_CAPS_CCW, + DO_TEST("input-virtio-ccw", QEMU_CAPS_VIRTIO_KEYBOARD, QEMU_CAPS_VIRTIO_MOUSE, QEMU_CAPS_VIRTIO_TABLET, diff --git a/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-autogenerate-fids.x= ml b/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-autogenerate-fids.xml index 594be6a6b7..cc3687db95 100644 --- a/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-autogenerate-fids.xml +++ b/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-autogenerate-fids.xml @@ -35,9 +35,7 @@ -
- -
+
diff --git a/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-autogenerate-uids.x= ml b/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-autogenerate-uids.xml index b0ec9850ee..5b03616d1e 100644 --- a/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-autogenerate-uids.xml +++ b/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-autogenerate-uids.xml @@ -35,9 +35,7 @@
-
- -
+
diff --git a/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-autogenerate.xml b/= tests/qemuxml2xmloutdata/hostdev-vfio-zpci-autogenerate.xml index 3cf7ada929..acee69fd86 100644 --- a/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-autogenerate.xml +++ b/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-autogenerate.xml @@ -26,9 +26,7 @@
-
- -
+
diff --git a/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-boundaries.xml b/te= sts/qemuxml2xmloutdata/hostdev-vfio-zpci-boundaries.xml index 094d6f1ce4..09ee053c92 100644 --- a/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-boundaries.xml +++ b/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-boundaries.xml @@ -40,9 +40,7 @@
-
- -
+
diff --git a/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-multidomain-many.xm= l b/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-multidomain-many.xml index 759589242d..72bcf30b43 100644 --- a/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-multidomain-many.xml +++ b/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-multidomain-many.xml @@ -89,9 +89,7 @@
-
- -
+
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index d3876d2f03..3a2d029c4f 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -242,7 +242,7 @@ mymain(void) DO_TEST_NOCAPS("machine-core-off"); DO_TEST_CAPS_LATEST("machine-smm-on"); DO_TEST_CAPS_LATEST("machine-smm-off"); - DO_TEST("machine-loadparm-multiple-disks-nets-s390", QEMU_CAPS_CCW); + DO_TEST_NOCAPS("machine-loadparm-multiple-disks-nets-s390"); DO_TEST_NOCAPS("default-kvm-host-arch"); DO_TEST_NOCAPS("default-qemu-host-arch"); DO_TEST_NOCAPS("boot-cdrom"); @@ -358,8 +358,7 @@ mymain(void) QEMU_CAPS_SCSI_BLOCK); DO_TEST("controller-virtio-scsi", QEMU_CAPS_VIRTIO_SCSI); DO_TEST("disk-virtio-s390-zpci", - QEMU_CAPS_DEVICE_ZPCI, - QEMU_CAPS_CCW); + QEMU_CAPS_DEVICE_ZPCI); DO_TEST_NOCAPS("disk-mirror-old"); DO_TEST_NOCAPS("disk-mirror"); DO_TEST_NOCAPS("disk-active-commit"); @@ -532,8 +531,7 @@ mymain(void) DO_TEST("hostdev-vfio", QEMU_CAPS_DEVICE_VFIO_PCI); DO_TEST("hostdev-vfio-zpci", QEMU_CAPS_DEVICE_VFIO_PCI, - QEMU_CAPS_DEVICE_ZPCI, - QEMU_CAPS_CCW); + QEMU_CAPS_DEVICE_ZPCI); DO_TEST("hostdev-vfio-zpci-multidomain-many", QEMU_CAPS_DEVICE_VFIO_PCI, QEMU_CAPS_DEVICE_PCI_BRIDGE, @@ -552,7 +550,6 @@ mymain(void) QEMU_CAPS_DEVICE_PCI_BRIDGE, QEMU_CAPS_DEVICE_ZPCI); DO_TEST("hostdev-vfio-zpci-ccw-memballoon", - QEMU_CAPS_CCW, QEMU_CAPS_DEVICE_VFIO_PCI, QEMU_CAPS_DEVICE_ZPCI); DO_TEST("hostdev-mdev-precreated", QEMU_CAPS_DEVICE_VFIO_PCI); @@ -597,11 +594,11 @@ mymain(void) DO_TEST_NOCAPS("iothreads-ids-partial"); DO_TEST_NOCAPS("cputune-iothreads"); DO_TEST_NOCAPS("iothreads-disk"); - DO_TEST("iothreads-disk-virtio-ccw", QEMU_CAPS_CCW); + DO_TEST_NOCAPS("iothreads-disk-virtio-ccw"); DO_TEST("iothreads-virtio-scsi-pci", QEMU_CAPS_VIRTIO_SCSI); DO_TEST("iothreads-virtio-scsi-ccw", - QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_CCW); + QEMU_CAPS_VIRTIO_SCSI); DO_TEST_NOCAPS("lease"); DO_TEST_NOCAPS("event_idx"); DO_TEST_NOCAPS("vhost_queues"); @@ -867,8 +864,7 @@ mymain(void) QEMU_CAPS_HDA_DUPLEX); =20 DO_TEST("hostdev-scsi-vhost-scsi-ccw", - QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_DEVICE_VHOST_SCSI, - QEMU_CAPS_CCW); + QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_DEVICE_VHOST_SCSI); DO_TEST("hostdev-scsi-vhost-scsi-pci", QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_DEVICE_VHOST_SCSI); @@ -892,21 +888,19 @@ mymain(void) QEMU_CAPS_SCSI_LSI); =20 DO_TEST("hostdev-subsys-mdev-vfio-ccw", - QEMU_CAPS_CCW, QEMU_CAPS_DEVICE_VFIO_CCW); DO_TEST_CAPS_ARCH_LATEST("hostdev-subsys-mdev-vfio-ccw-boot", "s390x"); DO_TEST("hostdev-subsys-mdev-vfio-ap", - QEMU_CAPS_CCW, QEMU_CAPS_DEVICE_VFIO_AP); =20 DO_TEST_CAPS_ARCH_LATEST("s390-defaultconsole", "s390x"); - DO_TEST("s390-panic", QEMU_CAPS_CCW); - DO_TEST("s390-panic-missing", QEMU_CAPS_CCW); - DO_TEST("s390-panic-no-address", QEMU_CAPS_CCW); - DO_TEST("s390-serial", QEMU_CAPS_CCW); - DO_TEST("s390-serial-2", QEMU_CAPS_CCW); - DO_TEST("s390-serial-console", QEMU_CAPS_CCW); + DO_TEST_NOCAPS("s390-panic"); + DO_TEST_NOCAPS("s390-panic-missing"); + DO_TEST_NOCAPS("s390-panic-no-address"); + DO_TEST_NOCAPS("s390-serial"); + DO_TEST_NOCAPS("s390-serial-2"); + DO_TEST_NOCAPS("s390-serial-console"); =20 DO_TEST_NOCAPS("pcihole64"); DO_TEST_NOCAPS("pcihole64-gib"); @@ -1122,12 +1116,10 @@ mymain(void) DO_TEST("video-qxl-resolution", QEMU_CAPS_DEVICE_QXL); DO_TEST("video-virtio-gpu-secondary", QEMU_CAPS_DEVICE_VIRTIO_GPU); DO_TEST("video-virtio-gpu-ccw", - QEMU_CAPS_CCW, QEMU_CAPS_DEVICE_VIRTIO_GPU, QEMU_CAPS_VNC, QEMU_CAPS_DEVICE_VIRTIO_GPU_CCW); DO_TEST("video-virtio-gpu-ccw-auto", - QEMU_CAPS_CCW, QEMU_CAPS_DEVICE_VIRTIO_GPU, QEMU_CAPS_VNC, QEMU_CAPS_DEVICE_VIRTIO_GPU_CCW); @@ -1170,7 +1162,6 @@ mymain(void) =20 DO_TEST_CAPS_LATEST("user-aliases"); DO_TEST("input-virtio-ccw", - QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_KEYBOARD, QEMU_CAPS_VIRTIO_MOUSE, QEMU_CAPS_VIRTIO_TABLET, @@ -1182,10 +1173,8 @@ mymain(void) =20 DO_TEST_CAPS_LATEST("vhost-vsock"); DO_TEST_CAPS_LATEST("vhost-vsock-auto"); - DO_TEST("vhost-vsock-ccw", QEMU_CAPS_DEVICE_VHOST_VSOCK, - QEMU_CAPS_CCW); - DO_TEST("vhost-vsock-ccw-auto", QEMU_CAPS_DEVICE_VHOST_VSOCK, - QEMU_CAPS_CCW); + DO_TEST("vhost-vsock-ccw", QEMU_CAPS_DEVICE_VHOST_VSOCK); + DO_TEST("vhost-vsock-ccw-auto", QEMU_CAPS_DEVICE_VHOST_VSOCK); DO_TEST_CAPS_ARCH_LATEST("vhost-vsock-ccw-iommu", "s390x"); =20 =20 --=20 2.37.3 From nobody Tue Apr 30 00:40:07 2024 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=1664548727; cv=none; d=zohomail.com; s=zohoarc; b=OTy/Xnti0ZNS+rztBev4Z2Wy/8B0kU7XrcnDl4TTBKIjNC6PZp+QdIMifY4WTDselv0sqRU/jpFRe2+nhA0BiE5UTh6YSdm54FapCtBbZJhYGng1ATaLQ/qETye+OYTcI9WjAmE5Rf9HUHbGIqbPA4P7EZYveGn8DUAXfHf6AFs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1664548727; 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=vfEDrhfTgEPW1lOf44ZgKkDPO67fY5MBeRKQLct2u9Y=; b=LxHxWKtTwD0iW0xhJ3CwOdkk+N11nPkeJyU76PcSDsNEcsUhhHJKGzkBWHt5BSzVESPBOPi5tz9bIkm49rRe96lEzcSjS0H7+tu8g6qTwC42DyD8ZcHYCoCTvuilxzVNt8osNh0fWvptH7o01AwbqylsNnS+2m7xq7Pa0g5C3+o= 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 1664548727045460.1871423176251; Fri, 30 Sep 2022 07:38:47 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-14-Mz3nYVN-OMagwD5okbNmEA-1; Fri, 30 Sep 2022 10:38:44 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 473F285CEB9; Fri, 30 Sep 2022 14:38:39 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 351C12166B2B; Fri, 30 Sep 2022 14:38:39 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 253031946A52; Fri, 30 Sep 2022 14:38:39 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 92A45194705F for ; Fri, 30 Sep 2022 14:38:36 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 79882207B34B; Fri, 30 Sep 2022 14:38:36 +0000 (UTC) Received: from hjs.redhat.com (unknown [10.43.2.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 21846207B34A for ; Fri, 30 Sep 2022 14:38:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1664548726; 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=vfEDrhfTgEPW1lOf44ZgKkDPO67fY5MBeRKQLct2u9Y=; b=at3A03VlFwUD/+/kLXbd/Gc3gfaUSHKEqnKmllPTVtrcjsAAHN1KXTdYH5h24Sx5qYcvhz oLArK3OHgVhYSlwvC0fY+9DudlLSLLKMaR9VMeEmrtqw5O2oJh0ElhWpldtK028jODsKIS 8SOQTkTdV3NustWua3vWV4NMF2THw40= X-MC-Unique: Mz3nYVN-OMagwD5okbNmEA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 5/6] qemu: retire QEMU_CAPS_CCW_CSSID_UNRESTRICTED Date: Fri, 30 Sep 2022 16:38:30 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1664548727763100003 Now that it is no longer used, stop probing for it. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- src/qemu/qemu_capabilities.c | 3 +-- src/qemu/qemu_capabilities.h | 2 +- tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml | 1 - 5 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index d254f38f92..699111a431 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -480,7 +480,7 @@ VIR_ENUM_IMPL(virQEMUCaps, =20 /* 295 */ "virtual-css-bridge", /* QEMU_CAPS_CCW */ - "virtual-css-bridge.cssid-unrestricted", /* QEMU_CAPS_CCW_CS= SID_UNRESTRICTED */ + "virtual-css-bridge.cssid-unrestricted", /* X_QEMU_CAPS_CCW_= CSSID_UNRESTRICTED */ "vfio-ccw", /* QEMU_CAPS_DEVICE_VFIO_CCW */ "sdl-gl", /* X_QEMU_CAPS_SDL_GL */ "screendump_device", /* QEMU_CAPS_SCREENDUMP_DEVICE */ @@ -1532,7 +1532,6 @@ static struct virQEMUCapsDevicePropsFlags virQEMUCaps= DevicePropsIntelIOMMU[] =3D { }; =20 static struct virQEMUCapsDevicePropsFlags virQEMUCapsObjectPropsVirtualCSS= Bridge[] =3D { - { "cssid-unrestricted", QEMU_CAPS_CCW_CSSID_UNRESTRICTED, NULL }, }; =20 static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsMCH[] =3D { diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 9cd00ba812..263ef850c7 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -459,7 +459,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for = syntax-check */ =20 /* 295 */ QEMU_CAPS_CCW, /* -device virtual-css-bridge */ - QEMU_CAPS_CCW_CSSID_UNRESTRICTED, /* virtual-css-bridge.cssid-unrestri= cted=3D */ + X_QEMU_CAPS_CCW_CSSID_UNRESTRICTED, /* virtual-css-bridge.cssid-unrest= ricted=3D */ QEMU_CAPS_DEVICE_VFIO_CCW, /* -device vfio-ccw */ X_QEMU_CAPS_SDL_GL, /* -sdl gl */ QEMU_CAPS_SCREENDUMP_DEVICE, /* screendump command accepts device & he= ad */ diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml b/tests/qemuca= pabilitiesdata/caps_4.2.0.s390x.xml index 7bf0427077..4bb6d1fc5e 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml @@ -63,7 +63,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml b/tests/qemuca= pabilitiesdata/caps_5.2.0.s390x.xml index 0523c8d22f..40eb1550af 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml @@ -61,7 +61,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml b/tests/qemuca= pabilitiesdata/caps_6.0.0.s390x.xml index 4f009def58..2628ab1409 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml @@ -61,7 +61,6 @@ - --=20 2.37.3 From nobody Tue Apr 30 00:40:07 2024 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=1664548730; cv=none; d=zohomail.com; s=zohoarc; b=Sj1JKkZWSDAfsyp0VmTG59GLMKmBSfqqw/w6IlyV09alHPBhOaj1/nTo8uWQnsHaOGqZ4DoAVe3yyyXLcMnoH4sxaii20KkGeQFpHLNosGLMdHnY7sdNAEW+kSRGUQTS1FJg2wkiKAiStf3RoLs8nr2tA9Mvkfj67kUN7Bb4ZYY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1664548730; 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=9ocJSqWdGaMkVw1FzaNFxGbudeSKV0BfWcJMrE+41so=; b=V5/BVE75xZGWu4bXdDQiM2YiK/HgOBDq4A7Jk7sFigo8D6QbkPi3DBb7wQKJHtcrnfrX7dmjgv3a3SlU62kAHknJYxDNwnr425iXy/WfCuGjI4upueJiZDedF2/01FtnYuKwBsij0oOp65JaYKCoWjZr8TV/A6AS2o3/9E8zCjc= 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 1664548730077980.4663388981577; Fri, 30 Sep 2022 07:38:50 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-578-fPWphHfvOC-H7zo8Vj8HcA-1; Fri, 30 Sep 2022 10:38:43 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 314E32823801; Fri, 30 Sep 2022 14:38:39 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1D9CB207B34B; Fri, 30 Sep 2022 14:38:39 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 144341946A54; Fri, 30 Sep 2022 14:38:39 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 369F81946A79 for ; Fri, 30 Sep 2022 14:38:37 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 15695207B34E; Fri, 30 Sep 2022 14:38:37 +0000 (UTC) Received: from hjs.redhat.com (unknown [10.43.2.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id B0A14207B34B for ; Fri, 30 Sep 2022 14:38:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1664548726; 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=9ocJSqWdGaMkVw1FzaNFxGbudeSKV0BfWcJMrE+41so=; b=jJi1ANm3W4TJBh6+UyWRDzLOczUXHnUXqxBVFSiV1CPvOt0bpubHmYng+zTHE8sXmk+Jfg 0VL7hQ0K+YdMTqgWLmVGHGPXlBOPjQ/pcWIcj+peaFtwE9FO/C3WvflyVUPlA7O8OH+JCI ZguSaY6go98CIN0npOivhtTkbP5a9e8= X-MC-Unique: fPWphHfvOC-H7zo8Vj8HcA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 6/6] qemu: retire QEMU_CAPS_CCW Date: Fri, 30 Sep 2022 16:38:31 +0200 Message-Id: <4e9ac4f8fa3a2e989ce9293a8ec7a04cd855af92.1664548661.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1664548731573100007 Now that we no longer use the capability, stop probing for existence of 'virtual-css-bridge' and its properties. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- src/qemu/qemu_capabilities.c | 9 +-- src/qemu/qemu_capabilities.h | 2 +- .../caps_4.2.0.s390x.replies | 71 ++++++----------- .../qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 - .../caps_5.2.0.s390x.replies | 76 +++++++------------ .../qemucapabilitiesdata/caps_5.2.0.s390x.xml | 1 - .../caps_6.0.0.s390x.replies | 76 +++++++------------ .../qemucapabilitiesdata/caps_6.0.0.s390x.xml | 1 - 8 files changed, 78 insertions(+), 159 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 699111a431..50bde370e8 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -479,7 +479,7 @@ VIR_ENUM_IMPL(virQEMUCaps, "memory-backend-file.discard-data", /* QEMU_CAPS_OBJECT_MEMO= RY_FILE_DISCARD */ =20 /* 295 */ - "virtual-css-bridge", /* QEMU_CAPS_CCW */ + "virtual-css-bridge", /* X_QEMU_CAPS_CCW */ "virtual-css-bridge.cssid-unrestricted", /* X_QEMU_CAPS_CCW_= CSSID_UNRESTRICTED */ "vfio-ccw", /* QEMU_CAPS_DEVICE_VFIO_CCW */ "sdl-gl", /* X_QEMU_CAPS_SDL_GL */ @@ -1328,7 +1328,6 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[= ] =3D { { "virtio-tablet-ccw", QEMU_CAPS_DEVICE_VIRTIO_TABLET_CCW }, { "pcie-pci-bridge", QEMU_CAPS_DEVICE_PCIE_PCI_BRIDGE }, { "pr-manager-helper", QEMU_CAPS_PR_MANAGER_HELPER }, - { "virtual-css-bridge", QEMU_CAPS_CCW }, { "vfio-ccw", QEMU_CAPS_DEVICE_VFIO_CCW }, { "hda-output", QEMU_CAPS_HDA_OUTPUT }, { "vmgenid", QEMU_CAPS_DEVICE_VMGENID }, @@ -1531,9 +1530,6 @@ static struct virQEMUCapsDevicePropsFlags virQEMUCaps= DevicePropsIntelIOMMU[] =3D { { "aw-bits", QEMU_CAPS_INTEL_IOMMU_AW_BITS, NULL }, }; =20 -static struct virQEMUCapsDevicePropsFlags virQEMUCapsObjectPropsVirtualCSS= Bridge[] =3D { -}; - static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsMCH[] =3D { { "extended-tseg-mbytes", QEMU_CAPS_MCH_EXTENDED_TSEG_MBYTES, NULL }, }; @@ -1680,9 +1676,6 @@ static virQEMUCapsDeviceTypeProps virQEMUCapsDevicePr= ops[] =3D { { "virtio-gpu-ccw", virQEMUCapsDevicePropsVirtioGpu, G_N_ELEMENTS(virQEMUCapsDevicePropsVirtioGpu), QEMU_CAPS_DEVICE_VIRTIO_GPU_CCW }, - { "virtual-css-bridge", virQEMUCapsObjectPropsVirtualCSSBridge, - G_N_ELEMENTS(virQEMUCapsObjectPropsVirtualCSSBridge), - QEMU_CAPS_CCW }, { "mch", virQEMUCapsDevicePropsMCH, G_N_ELEMENTS(virQEMUCapsDevicePropsMCH), QEMU_CAPS_DEVICE_MCH }, diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 263ef850c7..ca919ff368 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -458,7 +458,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for = syntax-check */ QEMU_CAPS_OBJECT_MEMORY_FILE_DISCARD, /* -object memory-backend-file,d= iscard-data */ =20 /* 295 */ - QEMU_CAPS_CCW, /* -device virtual-css-bridge */ + X_QEMU_CAPS_CCW, /* -device virtual-css-bridge */ X_QEMU_CAPS_CCW_CSSID_UNRESTRICTED, /* virtual-css-bridge.cssid-unrest= ricted=3D */ QEMU_CAPS_DEVICE_VFIO_CCW, /* -device vfio-ccw */ X_QEMU_CAPS_SDL_GL, /* -sdl gl */ diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.replies b/tests/qe= mucapabilitiesdata/caps_4.2.0.s390x.replies index b7e6abb749..8c7bbb85ec 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.replies @@ -16875,35 +16875,12 @@ "id": "libvirt-26" } =20 -{ - "execute": "device-list-properties", - "arguments": { - "typename": "virtual-css-bridge" - }, - "id": "libvirt-27" -} - -{ - "return": [ - { - "name": "cssid-unrestricted", - "description": "A css device can use any cssid, regardless whether v= irtual or not (read only, always true)", - "type": "bool" - }, - { - "name": "css_dev_path", - "type": "bool" - } - ], - "id": "libvirt-27" -} - { "execute": "device-list-properties", "arguments": { "typename": "usb-host" }, - "id": "libvirt-28" + "id": "libvirt-27" } =20 { @@ -16992,7 +16969,7 @@ "type": "bool" } ], - "id": "libvirt-28" + "id": "libvirt-27" } =20 { @@ -17000,7 +16977,7 @@ "arguments": { "typename": "vhost-user-fs-device" }, - "id": "libvirt-29" + "id": "libvirt-28" } =20 { @@ -17071,7 +17048,7 @@ "type": "uint16" } ], - "id": "libvirt-29" + "id": "libvirt-28" } =20 { @@ -17079,7 +17056,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-30" + "id": "libvirt-29" } =20 { @@ -17144,7 +17121,7 @@ "type": "bool" } ], - "id": "libvirt-30" + "id": "libvirt-29" } =20 { @@ -17152,7 +17129,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-31" + "id": "libvirt-30" } =20 { @@ -17216,12 +17193,12 @@ "type": "int" } ], - "id": "libvirt-31" + "id": "libvirt-30" } =20 { "execute": "query-machines", - "id": "libvirt-32" + "id": "libvirt-31" } =20 { @@ -17348,7 +17325,7 @@ "deprecated": false } ], - "id": "libvirt-32" + "id": "libvirt-31" } =20 { @@ -17356,7 +17333,7 @@ "arguments": { "typename": "none-machine" }, - "id": "libvirt-33" + "id": "libvirt-32" } =20 { @@ -17461,12 +17438,12 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-32" } =20 { "execute": "query-cpu-definitions", - "id": "libvirt-34" + "id": "libvirt-33" } =20 { @@ -18073,34 +18050,34 @@ "migration-safe": true } ], - "id": "libvirt-34" + "id": "libvirt-33" } =20 { "execute": "query-tpm-models", - "id": "libvirt-35" + "id": "libvirt-34" } =20 { "return": [ ], - "id": "libvirt-35" + "id": "libvirt-34" } =20 { "execute": "query-tpm-types", - "id": "libvirt-36" + "id": "libvirt-35" } =20 { "return": [ ], - "id": "libvirt-36" + "id": "libvirt-35" } =20 { "execute": "query-command-line-options", - "id": "libvirt-37" + "id": "libvirt-36" } =20 { @@ -19247,12 +19224,12 @@ "option": "drive" } ], - "id": "libvirt-37" + "id": "libvirt-36" } =20 { "execute": "query-migrate-capabilities", - "id": "libvirt-38" + "id": "libvirt-37" } =20 { @@ -19330,7 +19307,7 @@ "capability": "validate-uuid" } ], - "id": "libvirt-38" + "id": "libvirt-37" } =20 { @@ -19341,7 +19318,7 @@ "name": "host" } }, - "id": "libvirt-39" + "id": "libvirt-38" } =20 { @@ -19395,7 +19372,7 @@ } } }, - "id": "libvirt-39" + "id": "libvirt-38" } =20 { diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml b/tests/qemuca= pabilitiesdata/caps_4.2.0.s390x.xml index 4bb6d1fc5e..6cd7256b0d 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml @@ -62,7 +62,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.replies b/tests/qe= mucapabilitiesdata/caps_5.2.0.s390x.replies index 720bf54649..f89a42680a 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.replies @@ -19295,40 +19295,16 @@ "id": "libvirt-26" } =20 -{ - "execute": "device-list-properties", - "arguments": { - "typename": "virtual-css-bridge" - }, - "id": "libvirt-27" -} - -{ - "return": [ - { - "default-value": true, - "name": "css_dev_path", - "type": "bool" - }, - { - "name": "cssid-unrestricted", - "description": "A css device can use any cssid, regardless whether v= irtual or not (read only, always true)", - "type": "bool" - } - ], - "id": "libvirt-27" -} - { "execute": "device-list-properties", "arguments": { "typename": "usb-host" }, - "id": "libvirt-28" + "id": "libvirt-27" } =20 { - "id": "libvirt-28", + "id": "libvirt-27", "error": { "class": "DeviceNotFound", "desc": "Device 'usb-host' not found" @@ -19340,7 +19316,7 @@ "arguments": { "typename": "vhost-user-fs-device" }, - "id": "libvirt-29" + "id": "libvirt-28" } =20 { @@ -19416,7 +19392,7 @@ "type": "uint16" } ], - "id": "libvirt-29" + "id": "libvirt-28" } =20 { @@ -19424,7 +19400,7 @@ "arguments": { "typename": "virtio-iommu-pci" }, - "id": "libvirt-30" + "id": "libvirt-29" } =20 { @@ -19435,7 +19411,7 @@ "type": "str" } ], - "id": "libvirt-30" + "id": "libvirt-29" } =20 { @@ -19443,7 +19419,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-31" + "id": "libvirt-30" } =20 { @@ -19513,7 +19489,7 @@ "type": "bool" } ], - "id": "libvirt-31" + "id": "libvirt-30" } =20 { @@ -19521,7 +19497,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-32" + "id": "libvirt-31" } =20 { @@ -19590,12 +19566,12 @@ "type": "int" } ], - "id": "libvirt-32" + "id": "libvirt-31" } =20 { "execute": "query-machines", - "id": "libvirt-33" + "id": "libvirt-32" } =20 { @@ -19764,7 +19740,7 @@ "default-ram-id": "s390.ram" } ], - "id": "libvirt-33" + "id": "libvirt-32" } =20 { @@ -19772,7 +19748,7 @@ "arguments": { "typename": "none-machine" }, - "id": "libvirt-34" + "id": "libvirt-33" } =20 { @@ -19857,12 +19833,12 @@ "type": "string" } ], - "id": "libvirt-34" + "id": "libvirt-33" } =20 { "execute": "query-cpu-definitions", - "id": "libvirt-35" + "id": "libvirt-34" } =20 { @@ -20543,34 +20519,34 @@ "deprecated": false } ], - "id": "libvirt-35" + "id": "libvirt-34" } =20 { "execute": "query-tpm-models", - "id": "libvirt-36" + "id": "libvirt-35" } =20 { "return": [ ], - "id": "libvirt-36" + "id": "libvirt-35" } =20 { "execute": "query-tpm-types", - "id": "libvirt-37" + "id": "libvirt-36" } =20 { "return": [ ], - "id": "libvirt-37" + "id": "libvirt-36" } =20 { "execute": "query-command-line-options", - "id": "libvirt-38" + "id": "libvirt-37" } =20 { @@ -21726,12 +21702,12 @@ "option": "drive" } ], - "id": "libvirt-38" + "id": "libvirt-37" } =20 { "execute": "query-migrate-capabilities", - "id": "libvirt-39" + "id": "libvirt-38" } =20 { @@ -21809,7 +21785,7 @@ "capability": "validate-uuid" } ], - "id": "libvirt-39" + "id": "libvirt-38" } =20 { @@ -21820,7 +21796,7 @@ "name": "host" } }, - "id": "libvirt-40" + "id": "libvirt-39" } =20 { @@ -21876,7 +21852,7 @@ } } }, - "id": "libvirt-40" + "id": "libvirt-39" } =20 { diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml b/tests/qemuca= pabilitiesdata/caps_5.2.0.s390x.xml index 40eb1550af..40a4a8b19d 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml @@ -60,7 +60,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.replies b/tests/qe= mucapabilitiesdata/caps_6.0.0.s390x.replies index cb225eab00..83e75ca0fa 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.replies @@ -20929,40 +20929,16 @@ "id": "libvirt-26" } =20 -{ - "execute": "device-list-properties", - "arguments": { - "typename": "virtual-css-bridge" - }, - "id": "libvirt-27" -} - -{ - "return": [ - { - "default-value": true, - "name": "css_dev_path", - "type": "bool" - }, - { - "name": "cssid-unrestricted", - "description": "A css device can use any cssid, regardless whether v= irtual or not (read only, always true)", - "type": "bool" - } - ], - "id": "libvirt-27" -} - { "execute": "device-list-properties", "arguments": { "typename": "usb-host" }, - "id": "libvirt-28" + "id": "libvirt-27" } =20 { - "id": "libvirt-28", + "id": "libvirt-27", "error": { "class": "DeviceNotFound", "desc": "Device 'usb-host' not found" @@ -20974,7 +20950,7 @@ "arguments": { "typename": "vhost-user-fs-device" }, - "id": "libvirt-29" + "id": "libvirt-28" } =20 { @@ -21054,7 +21030,7 @@ "type": "int32" } ], - "id": "libvirt-29" + "id": "libvirt-28" } =20 { @@ -21062,7 +21038,7 @@ "arguments": { "typename": "virtio-iommu-pci" }, - "id": "libvirt-30" + "id": "libvirt-29" } =20 { @@ -21073,7 +21049,7 @@ "type": "str" } ], - "id": "libvirt-30" + "id": "libvirt-29" } =20 { @@ -21081,7 +21057,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-31" + "id": "libvirt-30" } =20 { @@ -21151,7 +21127,7 @@ "type": "bool" } ], - "id": "libvirt-31" + "id": "libvirt-30" } =20 { @@ -21159,7 +21135,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-32" + "id": "libvirt-31" } =20 { @@ -21228,12 +21204,12 @@ "type": "int" } ], - "id": "libvirt-32" + "id": "libvirt-31" } =20 { "execute": "query-machines", - "id": "libvirt-33" + "id": "libvirt-32" } =20 { @@ -21411,7 +21387,7 @@ "default-ram-id": "s390.ram" } ], - "id": "libvirt-33" + "id": "libvirt-32" } =20 { @@ -21419,7 +21395,7 @@ "arguments": { "typename": "none-machine" }, - "id": "libvirt-34" + "id": "libvirt-33" } =20 { @@ -21517,12 +21493,12 @@ "type": "child" } ], - "id": "libvirt-34" + "id": "libvirt-33" } =20 { "execute": "query-cpu-definitions", - "id": "libvirt-35" + "id": "libvirt-34" } =20 { @@ -22203,34 +22179,34 @@ "deprecated": false } ], - "id": "libvirt-35" + "id": "libvirt-34" } =20 { "execute": "query-tpm-models", - "id": "libvirt-36" + "id": "libvirt-35" } =20 { "return": [ ], - "id": "libvirt-36" + "id": "libvirt-35" } =20 { "execute": "query-tpm-types", - "id": "libvirt-37" + "id": "libvirt-36" } =20 { "return": [ ], - "id": "libvirt-37" + "id": "libvirt-36" } =20 { "execute": "query-command-line-options", - "id": "libvirt-38" + "id": "libvirt-37" } =20 { @@ -23406,12 +23382,12 @@ "option": "drive" } ], - "id": "libvirt-38" + "id": "libvirt-37" } =20 { "execute": "query-migrate-capabilities", - "id": "libvirt-39" + "id": "libvirt-38" } =20 { @@ -23493,7 +23469,7 @@ "capability": "background-snapshot" } ], - "id": "libvirt-39" + "id": "libvirt-38" } =20 { @@ -23504,7 +23480,7 @@ "name": "host" } }, - "id": "libvirt-40" + "id": "libvirt-39" } =20 { @@ -23561,7 +23537,7 @@ } } }, - "id": "libvirt-40" + "id": "libvirt-39" } =20 { diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml b/tests/qemuca= pabilitiesdata/caps_6.0.0.s390x.xml index 2628ab1409..3b6e8a0a47 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml @@ -60,7 +60,6 @@ - --=20 2.37.3