From nobody Mon Feb 9 05:00:03 2026 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=1657199519; cv=none; d=zohomail.com; s=zohoarc; b=MlD3Pg44A3GpaYnfQzubYeN3Gtehk3H3b+4kyXYAPiVeG/3TYwLbp/0CUQkUtAStfFJWeYBXSYEsbRswSOZY5yjFtxhoSqPBfVFN9Sv5cgi9YQ1pXF8Kf0nbSohekU8oatcpjdkD9Hju113ITi06w7koxwpNb67CChUYkZnpPdo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1657199519; 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=j1A96HkbMec32lVFX1itxwPFrw/SFliSm2PDJaet3VM=; b=YOiZO9RTNJWtRsb+nrJ/ND++nfeVhaZJFs9QmA25ZcqZHW6JJMs/ee01Bv2JdHuXURjGnW7vA9Jv2Czqn/osNACtclyM1Z2z0OjFBxBVhbiDxk9XHvxO6sSmvOG6jen3zjGh1ris6OkDF12jbSQK6671OJhYI7PIYDLj+RiITl0= 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 1657199519519418.4068692535353; Thu, 7 Jul 2022 06:11:59 -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-313-OCbEv2KgOwiQp8chwUfRnQ-1; Thu, 07 Jul 2022 09:11:55 -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 7A1F129DD9BC; Thu, 7 Jul 2022 13:11:14 +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 6799540D2962; Thu, 7 Jul 2022 13:11:14 +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 BFBF8194706E; Thu, 7 Jul 2022 13:11:10 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 2DA2C194706E for ; Thu, 7 Jul 2022 13:10:55 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 213B0403160; Thu, 7 Jul 2022 13:10:55 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.32]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9093B492C3B for ; Thu, 7 Jul 2022 13:10:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1657199517; 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=j1A96HkbMec32lVFX1itxwPFrw/SFliSm2PDJaet3VM=; b=hQVcBRPSfYnLoTZJYZzulbR+uoMD7mzXCiJowu+JzmvU6c9t+QnsgEv+872EVVnrL3zUxi pLuwof6mZEs2BJt8kS5To6Q71i/I/2KsBozJ5VzuZJFiwSVpQNVIrfP5zuNslfaVrOaxU0 jIV9iCEnP+esGqMkkJnXjJPaJUOExZk= X-MC-Unique: OCbEv2KgOwiQp8chwUfRnQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 07/11] qemuxml2argvtest: Make 'qemu-ns' test case more stable Date: Thu, 7 Jul 2022 15:10:41 +0200 Message-Id: <57aecf11e5f6a518abfe66a508a2b361b69dda58.1657199364.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.85 on 10.11.54.10 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 2.84 on 10.11.54.2 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: 1657199519781100006 Content-Type: text/plain; charset="utf-8" The test was showing that the 'blockdev' capability is properly added despite although we didn't detect it yet. Unfortunately this test can't be carried over once we bump minimum qemu version to qemu-4.2. Make the test case future-proof by removing the qemu-4.0.0 version which would become pointless and use only already deprecated capability flags so that the test output does not change. Signed-off-by: Peter Krempa --- .../qemu-ns.x86_64-4.0.0.args | 38 ------------------- tests/qemuxml2argvdata/qemu-ns.xml | 1 - tests/qemuxml2argvtest.c | 1 - .../qemu-ns.x86_64-latest.xml | 1 - 4 files changed, 41 deletions(-) delete mode 100644 tests/qemuxml2argvdata/qemu-ns.x86_64-4.0.0.args diff --git a/tests/qemuxml2argvdata/qemu-ns.x86_64-4.0.0.args b/tests/qemux= ml2argvdata/qemu-ns.x86_64-4.0.0.args deleted file mode 100644 index 284f32d6a1..0000000000 --- a/tests/qemuxml2argvdata/qemu-ns.x86_64-4.0.0.args +++ /dev/null @@ -1,38 +0,0 @@ -LC_ALL=3DC \ -PATH=3D/bin \ -HOME=3D/tmp/lib/domain--1-QEMUGuest1 \ -USER=3Dtest \ -LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \ -XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \ -XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -QEMU_AUDIO_DRV=3Dnone \ -NS=3Dns \ -BAR=3D'' \ -/usr/bin/qemu-system-x86_64 \ --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 pc-i440fx-4.0,usb=3Doff,dump-guest-core=3Doff \ --accel tcg \ --m 214 \ --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-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dua-disk,= bootindex=3D1,prop1=3Dpropval1,prop2=3D-321,prop3=3D123,prop4=3Don,prop5=3D= off \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ --unknown parameter \ --sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ --msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/qemu-ns.xml b/tests/qemuxml2argvdata/qe= mu-ns.xml index 36bf582dec..dc98421226 100644 --- a/tests/qemuxml2argvdata/qemu-ns.xml +++ b/tests/qemuxml2argvdata/qemu-ns.xml @@ -30,7 +30,6 @@ - diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 324475475e..e14ed8b882 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -2036,7 +2036,6 @@ mymain(void) QEMU_CAPS_LAST, ARG_END); - DO_TEST_CAPS_VER("qemu-ns", "4.0.0"); DO_TEST_CAPS_LATEST("qemu-ns"); DO_TEST_NOCAPS("qemu-ns-no-env"); DO_TEST_NOCAPS("qemu-ns-alt"); diff --git a/tests/qemuxml2xmloutdata/qemu-ns.x86_64-latest.xml b/tests/qem= uxml2xmloutdata/qemu-ns.x86_64-latest.xml index a8998ae582..b788038f29 100644 --- a/tests/qemuxml2xmloutdata/qemu-ns.x86_64-latest.xml +++ b/tests/qemuxml2xmloutdata/qemu-ns.x86_64-latest.xml @@ -46,7 +46,6 @@ - --=20 2.36.1