From nobody Mon Feb 9 00:07:34 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1632315882; cv=none; d=zohomail.com; s=zohoarc; b=NFRVPxTjQkLZYmSZsvzvfxpyNrCLO92vu973qSICAJpNxj3Jt4uP1Oa+2/A0jk337MWAV6xZmNRV22kDNRip2NMNkfXTRAyk0umaf3TPn8mTUOY1VUcFUPQBtW09tTocgTiyW0KD31kxBru06UBue0u9591MAZacehHFZ6qSasw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632315882; 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=39glfGme6hIMBzwoQiX8bwSk+clsDYU67oK/+z0XMtA=; b=aarnHQa+6S3Bg3R66h5iyecx5P9qv9lNkR2Zcrb/0UFTCI2X9OiNh0kIq5L9viKJ3wjM4Ybjyv2asbLjLxG0iX9TOz2ffYX6fd5KZ5BHE+6y9pLGhIC8K2THlBmzgj5oSUa5v74Kg/bWgE8stRF5FQzyiqEp/qzbEAFPvAeN3Ac= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1632315882324228.88521126592263; Wed, 22 Sep 2021 06:04:42 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-219-pSzcmIQfNRuc6K3I-c-Jog-1; Wed, 22 Sep 2021 09:04:39 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D596910247A9; Wed, 22 Sep 2021 13:04:33 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B1EC919C79; Wed, 22 Sep 2021 13:04:33 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 84DC61806D02; Wed, 22 Sep 2021 13:04:33 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 18MD4Vgu020968 for ; Wed, 22 Sep 2021 09:04:31 -0400 Received: by smtp.corp.redhat.com (Postfix) id 71A3A17B4F; Wed, 22 Sep 2021 13:04:31 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.16]) by smtp.corp.redhat.com (Postfix) with ESMTP id D51A45D9F4 for ; Wed, 22 Sep 2021 13:04:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1632315881; 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=39glfGme6hIMBzwoQiX8bwSk+clsDYU67oK/+z0XMtA=; b=VS3WrSHX1M/Jq3cPtXOSKQwLAlAlcYdruEPVqrgtewcCEGpDl1c0p4nTkWFu4Vm+lGdmcd W5x7TZdfJ0IAI6uYdPsvO0zZ4TeHPGA4kibUTcWb8AkXCf4XtpUqGWMp9YpUi8ocJOReDJ wI7I57ObInpGGF3AFH3VQcAlgPWPX6Q= X-MC-Unique: pSzcmIQfNRuc6K3I-c-Jog-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 13/20] qemuxml2argvtest: Modernize 'disk-network-rbd-no-colon' case Date: Wed, 22 Sep 2021 15:02:22 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1632315888371100001 Content-Type: text/plain; charset="utf-8" The test case fails in pre-blockdev scenarios as it would pass RBD parameters behind our back but succeeds after as we pass it in JSON form which doesn't have that defect. Cover both cases instead of the fake-caps version. Signed-off-by: Peter Krempa --- ...isk-network-rbd-no-colon.x86_64-4.1.0.err} | 0 ...sk-network-rbd-no-colon.x86_64-latest.args | 39 +++++++++++++++++++ tests/qemuxml2argvtest.c | 3 +- 3 files changed, 41 insertions(+), 1 deletion(-) rename tests/qemuxml2argvdata/{disk-network-rbd-no-colon.err =3D> disk-net= work-rbd-no-colon.x86_64-4.1.0.err} (100%) create mode 100644 tests/qemuxml2argvdata/disk-network-rbd-no-colon.x86_64= -latest.args diff --git a/tests/qemuxml2argvdata/disk-network-rbd-no-colon.err b/tests/q= emuxml2argvdata/disk-network-rbd-no-colon.x86_64-4.1.0.err similarity index 100% rename from tests/qemuxml2argvdata/disk-network-rbd-no-colon.err rename to tests/qemuxml2argvdata/disk-network-rbd-no-colon.x86_64-4.1.0.err diff --git a/tests/qemuxml2argvdata/disk-network-rbd-no-colon.x86_64-latest= .args b/tests/qemuxml2argvdata/disk-network-rbd-no-colon.x86_64-latest.args new file mode 100644 index 0000000000..9a35dbcf7f --- /dev/null +++ b/tests/qemuxml2argvdata/disk-network-rbd-no-colon.x86_64-latest.args @@ -0,0 +1,39 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/tmp/lib/domain--1-QEMUGuest1 \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-i386 \ +-name guest=3DQEMUGuest1,debug-threads=3Don \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ +-cpu qemu64 \ +-m 214 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ +-overcommit mem-lock=3Doff \ +-smp 1,sockets=3D1,cores=3D1,threads=3D1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ +-rtc base=3Dutc \ +-no-shutdown \ +-no-acpi \ +-boot strict=3Don \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-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 ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-2-format,id=3Dide0-0-0= ,bootindex=3D1 \ +-blockdev '{"driver":"rbd","pool":"poolname","image":"imagename:rbd_cache= =3D1:rbd_cache_size=3D67108864:rbd_cache_max_dirty=3D0","server":[{"host":"= mon1.example.org","port":"6321"},{"host":"mon2.example.org","port":"6322"},= {"host":"mon3.example.org","port":"6322"}],"node-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-pci,bus=3Dpci.0,addr=3D0x2,drive=3Dlibvirt-1-format,id= =3Dvirtio-disk0 \ +-audiodev id=3Daudio1,driver=3Dnone \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ +-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 1f633e3f07..bfa41a2f81 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1349,7 +1349,8 @@ mymain(void) DO_TEST_CAPS_LATEST("disk-network-gluster"); DO_TEST_CAPS_VER("disk-network-rbd", "2.12.0"); DO_TEST_CAPS_LATEST("disk-network-rbd"); - DO_TEST_FAILURE_NOCAPS("disk-network-rbd-no-colon"); + DO_TEST_CAPS_VER_FAILURE("disk-network-rbd-no-colon", "4.1.0"); + DO_TEST_CAPS_LATEST("disk-network-rbd-no-colon"); DO_TEST_CAPS_VER("disk-network-sheepdog", "2.12.0"); DO_TEST_CAPS_VER("disk-network-sheepdog", "6.0.0"); DO_TEST_CAPS_VER("disk-network-source-auth", "2.12.0"); --=20 2.31.1