From nobody Sun Feb 8 10:43:24 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.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 63.128.21.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=1600947960; cv=none; d=zohomail.com; s=zohoarc; b=OZr6+I6ds2NU1VYEtlIaBLGXQqM7EJDgsYxo43j4tYViliKvINKrs0Y6QlfaERYwm5aYQkTxOqu+wXdvAisDhrC5TxYmhhM1sRRS8ocF5/1+fWrDS8H0djE8DDXZ0hXBbC+mm0H7EpcYZFeAwI1yAf2MBVQq0mo3et/YsI8wTUQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600947960; h=Content-Type:Content-Transfer-Encoding:Cc: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=vHw+56dhewK2+099QpiFgke3H5hcKH89ug5PzLUIa+Y=; b=jKWg8ugtcZ3HDDRdVSrv0cefniVjnNcj/zDmPOIqSuQO35aPAqUGKl2zCNlTvGpG8L93KbQysDleVBWl/VvkBOC7o4qrpWAHsIu/CbEV57o8aTJSmo7CrriGSpYGRUhyIh7kwhqZhb8M4DVB/n5qiYqS/VPAk4CTOtOyxuyaf1M= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1600947960420360.9983404186661; Thu, 24 Sep 2020 04:46:00 -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-466-WB7a7ULbOkWbrA7K-3GfrQ-1; Thu, 24 Sep 2020 07:45:57 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2284A1009457; Thu, 24 Sep 2020 11:45:52 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 014B16716C; Thu, 24 Sep 2020 11:45:52 +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 C5E918C7AB; Thu, 24 Sep 2020 11:45:51 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 08OBiI73009133 for ; Thu, 24 Sep 2020 07:44:18 -0400 Received: by smtp.corp.redhat.com (Postfix) id 1236D60C04; Thu, 24 Sep 2020 11:44:18 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2CAB060C15; Thu, 24 Sep 2020 11:44:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1600947959; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc: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=vHw+56dhewK2+099QpiFgke3H5hcKH89ug5PzLUIa+Y=; b=YeHNg6KtTUn3hszS3d/p/pr31V6Pv6rzsu3QDuAZEG28g8DMWU+zzIO/x+OZn6PfQo7LQS RGJgxiw4QkDo/P3LeoM8QWXnaz4nfmc7IHpJzQnzYpPJhEbrmH1JWTf7Crr6b3G8p7k0wQ Nt2AoteAyKJ9cHA5SmhKl6ITieCZ6Ls= X-MC-Unique: WB7a7ULbOkWbrA7K-3GfrQ-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH v4 10/11] tests: qemuxml2argv: Fix and enable 'disk-transient' case Date: Thu, 24 Sep 2020 13:43:57 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com Cc: Masayoshi Mizuma X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" We didn't actually use this file. Change the disk type to 'file' so that it works in qemu and add pre and post-blockdev invocations. Signed-off-by: Peter Krempa --- .../disk-transient.x86_64-4.1.0.err | 1 + .../disk-transient.x86_64-latest.args | 42 +++++++++++++++++++ tests/qemuxml2argvdata/disk-transient.xml | 4 +- tests/qemuxml2argvtest.c | 2 + 4 files changed, 47 insertions(+), 2 deletions(-) create mode 100644 tests/qemuxml2argvdata/disk-transient.x86_64-4.1.0.err create mode 100644 tests/qemuxml2argvdata/disk-transient.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/disk-transient.x86_64-4.1.0.err b/tests= /qemuxml2argvdata/disk-transient.x86_64-4.1.0.err new file mode 100644 index 0000000000..341902e144 --- /dev/null +++ b/tests/qemuxml2argvdata/disk-transient.x86_64-4.1.0.err @@ -0,0 +1 @@ +unsupported configuration: transient disk not supported by this qemu binar= y (hda) diff --git a/tests/qemuxml2argvdata/disk-transient.x86_64-latest.args b/tes= ts/qemuxml2argvdata/disk-transient.x86_64-latest.args new file mode 100644 index 0000000000..1b9c64c96a --- /dev/null +++ b/tests/qemuxml2argvdata/disk-transient.x86_64-latest.args @@ -0,0 +1,42 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/tmp/lib/domain--1-QEMUGuest1 \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ +QEMU_AUDIO_DRV=3Dnone \ +/usr/bin/qemu-system-i386 \ +-name guest=3DQEMUGuest1,debug-threads=3Don \ +-S \ +-object secret,id=3DmasterKey0,format=3Draw,\ +file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ +-cpu qemu64 \ +-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,nowait \ +-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":"file","filename":"/tmp/QEMUGuest1.img",\ +"node-name":"libvirt-1-storage","cache":{"direct":true,"no-flush":false},\ +"auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,\ +"cache":{"direct":true,"no-flush":false},"driver":"qcow2",\ +"file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1,\ +write-cache=3Don \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ +resourcecontrol=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-transient.xml b/tests/qemuxml2argv= data/disk-transient.xml index 00ddb6487a..cffb325336 100644 --- a/tests/qemuxml2argvdata/disk-transient.xml +++ b/tests/qemuxml2argvdata/disk-transient.xml @@ -14,9 +14,9 @@ destroy /usr/bin/qemu-system-i386 - + - +
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index a3c91fd5de..9da74adb60 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1171,6 +1171,8 @@ mymain(void) DO_TEST_CAPS_VER("disk-cache", "2.7.0"); DO_TEST_CAPS_VER("disk-cache", "2.12.0"); DO_TEST_CAPS_LATEST("disk-cache"); + DO_TEST_CAPS_ARCH_VER_PARSE_ERROR("disk-transient", "x86_64", "4.1.0"); + DO_TEST_CAPS_LATEST("disk-transient"); DO_TEST("disk-network-nbd", NONE); DO_TEST_CAPS_VER("disk-network-nbd", "2.12.0"); DO_TEST_CAPS_LATEST("disk-network-nbd"); --=20 2.26.2