From nobody Sun Apr 28 19:07:10 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 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=1579788316; cv=none; d=zohomail.com; s=zohoarc; b=SX6LqO0dJBi1dcYY1NqFYptgDeqr9vEuyNWKYLviJ/NHN8eU7JacGDKL590IUZeJByfdfc+y0FS/EmIWdHzAkWt28Ex+JMzCUGNaY5KGkfTUd/Ow02IVsqR46IZh98AieeMdumiHR/s9KtHIWz4sgPg+qLZjPQgt9SJVLZh1y6I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1579788316; 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=MZLNHAzEReuHj7oUMDWiUQT9kxQvZpxlNTjKkCX7bY4=; b=Hvxn4as+/axmjFKtsA5fD0IM/xRFNTobdnCKWXPNroKNSQfio6k/SLSvLgJDymJUruT9qfobONYN5fl3ncQAcMBU9nVUMRiruu+80t5HDS0Xj4ulwv0rnj4Pta9rUkUc7ifULJx6VIjmo19urCZnBZ4AXCJcgnNvgTwgqYibfbY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 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-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 1579788316513987.2678685334821; Thu, 23 Jan 2020 06:05:16 -0800 (PST) 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-386-Y5EL4EiePrmvWydemrNR_A-1; Thu, 23 Jan 2020 09:04:35 -0500 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 0CE15DB92; Thu, 23 Jan 2020 14:04:27 +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 D3F9560FC5; Thu, 23 Jan 2020 14:04:26 +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 866ED1832DEE; Thu, 23 Jan 2020 14:04:26 +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 00NE471M003297 for ; Thu, 23 Jan 2020 09:04:07 -0500 Received: by smtp.corp.redhat.com (Postfix) id F3D4560C85; Thu, 23 Jan 2020 14:04:06 +0000 (UTC) Received: from angien.redhat.com (unknown [10.43.2.48]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7E07D60BE1 for ; Thu, 23 Jan 2020 14:04:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1579788315; 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=MZLNHAzEReuHj7oUMDWiUQT9kxQvZpxlNTjKkCX7bY4=; b=fSnoKYsDNaUED9cpNnM/AEuvrJy2UiE3rXrGxMf0XmmoP5OrQVF+Du2G4nEvloGSidu3no GpJuhODlhF42H/PI7C4qlwDkp/lKxP4TPWNVLgy3O4P3nhUJ6gLiKka3DoyKkSKkmrW8JN 1rxKHxEwx8pD+/vuewRCc3SCXdr9COE= From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 01/21] tests: qemuxml2argv: Use 64 bit qemu binary and 1.5 machine type in 'disk-cache' case Date: Thu, 23 Jan 2020 15:03:41 +0100 Message-Id: <674711d4302ced2fb09d5686fadc98bf140e290e.1579787834.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: Y5EL4EiePrmvWydemrNR_A-1 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" The data is tested against the latest qemu binaries so we should use the proper architecture. Also the test is used against data from qemu 1.5.3 and thus we should use a machine type that qemu supported. Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik --- tests/qemuxml2argvdata/disk-cache.x86_64-1.5.3.args | 4 ++-- tests/qemuxml2argvdata/disk-cache.x86_64-2.12.0.args | 4 ++-- tests/qemuxml2argvdata/disk-cache.x86_64-2.6.0.args | 4 ++-- tests/qemuxml2argvdata/disk-cache.x86_64-2.7.0.args | 4 ++-- tests/qemuxml2argvdata/disk-cache.x86_64-latest.args | 4 ++-- tests/qemuxml2argvdata/disk-cache.xml | 4 ++-- tests/qemuxml2xmloutdata/disk-cache.xml | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/tests/qemuxml2argvdata/disk-cache.x86_64-1.5.3.args b/tests/qe= muxml2argvdata/disk-cache.x86_64-1.5.3.args index b598bacb94..25360071e3 100644 --- a/tests/qemuxml2argvdata/disk-cache.x86_64-1.5.3.args +++ b/tests/qemuxml2argvdata/disk-cache.x86_64-1.5.3.args @@ -7,10 +7,10 @@ XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/shar= e \ 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 \ +/usr/bin/qemu-system-x86_64 \ -name QEMUGuest1 \ -S \ --machine pc-i440fx-2.6,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ +-machine pc-i440fx-1.5,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ -m 214 \ -realtime mlock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/disk-cache.x86_64-2.12.0.args b/tests/q= emuxml2argvdata/disk-cache.x86_64-2.12.0.args index 7279921ae6..aa7a230583 100644 --- a/tests/qemuxml2argvdata/disk-cache.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-cache.x86_64-2.12.0.args @@ -7,12 +7,12 @@ XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/shar= e \ 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 \ +/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-QEMUGuest1/master-key.aes \ --machine pc-i440fx-2.6,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ +-machine pc-i440fx-1.5,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ -m 214 \ -realtime mlock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/disk-cache.x86_64-2.6.0.args b/tests/qe= muxml2argvdata/disk-cache.x86_64-2.6.0.args index 82e45effba..64fd4308e4 100644 --- a/tests/qemuxml2argvdata/disk-cache.x86_64-2.6.0.args +++ b/tests/qemuxml2argvdata/disk-cache.x86_64-2.6.0.args @@ -7,12 +7,12 @@ XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/shar= e \ 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 \ +/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-QEMUGuest1/master-key.aes \ --machine pc-i440fx-2.6,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ +-machine pc-i440fx-1.5,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ -m 214 \ -realtime mlock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/disk-cache.x86_64-2.7.0.args b/tests/qe= muxml2argvdata/disk-cache.x86_64-2.7.0.args index 8d0904260a..a6a448999b 100644 --- a/tests/qemuxml2argvdata/disk-cache.x86_64-2.7.0.args +++ b/tests/qemuxml2argvdata/disk-cache.x86_64-2.7.0.args @@ -7,12 +7,12 @@ XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/shar= e \ 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 \ +/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-QEMUGuest1/master-key.aes \ --machine pc-i440fx-2.6,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ +-machine pc-i440fx-1.5,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ -m 214 \ -realtime mlock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/disk-cache.x86_64-latest.args b/tests/q= emuxml2argvdata/disk-cache.x86_64-latest.args index 3dca80dacd..4b70cb634c 100644 --- a/tests/qemuxml2argvdata/disk-cache.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-cache.x86_64-latest.args @@ -7,12 +7,12 @@ XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/shar= e \ 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 \ +/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-QEMUGuest1/master-key.aes \ --machine pc-i440fx-2.6,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ +-machine pc-i440fx-1.5,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ -cpu qemu64 \ -m 214 \ -overcommit mem-lock=3Doff \ diff --git a/tests/qemuxml2argvdata/disk-cache.xml b/tests/qemuxml2argvdata= /disk-cache.xml index 5104c8469f..5cbbd2f3bc 100644 --- a/tests/qemuxml2argvdata/disk-cache.xml +++ b/tests/qemuxml2argvdata/disk-cache.xml @@ -5,7 +5,7 @@ 219136 1 - hvm + hvm @@ -13,7 +13,7 @@ restart destroy - /usr/bin/qemu-system-i386 + /usr/bin/qemu-system-x86_64 diff --git a/tests/qemuxml2xmloutdata/disk-cache.xml b/tests/qemuxml2xmlout= data/disk-cache.xml index b81c9c2368..a622db347e 100644 --- a/tests/qemuxml2xmloutdata/disk-cache.xml +++ b/tests/qemuxml2xmloutdata/disk-cache.xml @@ -5,7 +5,7 @@ 219136 1 - hvm + hvm @@ -13,7 +13,7 @@ restart destroy - /usr/bin/qemu-system-i386 + /usr/bin/qemu-system-x86_64 --=20 2.24.1 From nobody Sun Apr 28 19:07:10 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 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=1579788282; cv=none; d=zohomail.com; s=zohoarc; b=WbLzxtfo+ix9+XF7MC3/3c7RhJSbZl8y5CKpLBXYAawpS6IelXapx4W1BrDbeXTy2l4Snh91Q1RV2nmIdr/cbJbgpqTuWVPus979u11itgrUGxDLSghZx9yHgKX8nZ6YtTWLd3q/U6K8vL8MHy45gAqaOhmGH2oM1gHFhHJ99TE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1579788282; 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=ySnAmSGnBitJia2xem1/CTDAQALd5s/FBuHtf91XkrY=; b=O7JSYNmm/x20ZYemXUIrgVgut2DGXKpz0gwfFz1MmzbAnx6lA/7vfwsfNBmvYHc/SbXO3/gJHTNwmsHEJsQJPDqr34eIeroEqFpzXa3bc4b1C+5DxR6RHKVCYIYvdQ//y1d6InkNXyy4NXmqAHCeHWhOyleyP3LJhZ8ryDfgVdo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 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-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by mx.zohomail.com with SMTPS id 1579788282662928.8068611515963; Thu, 23 Jan 2020 06:04:42 -0800 (PST) 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-183-J-cR-YKSMCy6oRdXy4dWRQ-1; Thu, 23 Jan 2020 09:04:39 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E9B851882CD4; Thu, 23 Jan 2020 14:04:30 +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 9BE5F85788; Thu, 23 Jan 2020 14:04:30 +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 4F0F91832DF5; Thu, 23 Jan 2020 14:04:30 +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 00NE47hh003305 for ; Thu, 23 Jan 2020 09:04:07 -0500 Received: by smtp.corp.redhat.com (Postfix) id C265260C85; Thu, 23 Jan 2020 14:04:07 +0000 (UTC) Received: from angien.redhat.com (unknown [10.43.2.48]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4CA1160BE1 for ; Thu, 23 Jan 2020 14:04:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1579788281; 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=ySnAmSGnBitJia2xem1/CTDAQALd5s/FBuHtf91XkrY=; b=h+M0WdssXKvwX0iVHFBk9u3zfrBgZwis/Gbbvr38ZDqWQ+bMUkp4lg+N1fMkQC3O4kQnga KBbRN2FrS4VuaUFdlppFn6T3gxKIiKBJjcZN+0rTefBFYwVkK1b922QGmNxa65OmO0IcOy Cp1Qi8eI5UbhPw6Yh4knJCRLCp6qLK4= From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 02/21] tests: qemuxml2xml: Modernize 'disk-cache' test Date: Thu, 23 Jan 2020 15:03:42 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-MC-Unique: J-cR-YKSMCy6oRdXy4dWRQ-1 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" Mirror what's done in the xml2argv test and use recent capabilities. Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik --- ...-cache.xml =3D> disk-cache.x86_64-1.5.3.xml} | 2 +- .../disk-cache.x86_64-2.12.0.xml | 60 ++++++++++++++++++ .../disk-cache.x86_64-2.6.0.xml | 60 ++++++++++++++++++ .../disk-cache.x86_64-2.7.0.xml | 60 ++++++++++++++++++ .../disk-cache.x86_64-latest.xml | 63 +++++++++++++++++++ tests/qemuxml2xmltest.c | 6 +- 6 files changed, 249 insertions(+), 2 deletions(-) rename tests/qemuxml2xmloutdata/{disk-cache.xml =3D> disk-cache.x86_64-1.5= .3.xml} (97%) create mode 100644 tests/qemuxml2xmloutdata/disk-cache.x86_64-2.12.0.xml create mode 100644 tests/qemuxml2xmloutdata/disk-cache.x86_64-2.6.0.xml create mode 100644 tests/qemuxml2xmloutdata/disk-cache.x86_64-2.7.0.xml create mode 100644 tests/qemuxml2xmloutdata/disk-cache.x86_64-latest.xml diff --git a/tests/qemuxml2xmloutdata/disk-cache.xml b/tests/qemuxml2xmlout= data/disk-cache.x86_64-1.5.3.xml similarity index 97% rename from tests/qemuxml2xmloutdata/disk-cache.xml rename to tests/qemuxml2xmloutdata/disk-cache.x86_64-1.5.3.xml index a622db347e..749b931e42 100644 --- a/tests/qemuxml2xmloutdata/disk-cache.xml +++ b/tests/qemuxml2xmloutdata/disk-cache.x86_64-1.5.3.xml @@ -43,7 +43,7 @@ - +
diff --git a/tests/qemuxml2xmloutdata/disk-cache.x86_64-2.12.0.xml b/tests/= qemuxml2xmloutdata/disk-cache.x86_64-2.12.0.xml new file mode 100644 index 0000000000..880eb71d04 --- /dev/null +++ b/tests/qemuxml2xmloutdata/disk-cache.x86_64-2.12.0.xml @@ -0,0 +1,60 @@ + + QEMUGuest1 + c7a5fdbd-edaf-9455-926a-d65c16db1809 + 219136 + 219136 + 1 + + hvm + + + + destroy + restart + destroy + + /usr/bin/qemu-system-x86_64 + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + + + +
+ + +
+ + + +
+ + + + + + diff --git a/tests/qemuxml2xmloutdata/disk-cache.x86_64-2.6.0.xml b/tests/q= emuxml2xmloutdata/disk-cache.x86_64-2.6.0.xml new file mode 100644 index 0000000000..880eb71d04 --- /dev/null +++ b/tests/qemuxml2xmloutdata/disk-cache.x86_64-2.6.0.xml @@ -0,0 +1,60 @@ + + QEMUGuest1 + c7a5fdbd-edaf-9455-926a-d65c16db1809 + 219136 + 219136 + 1 + + hvm + + + + destroy + restart + destroy + + /usr/bin/qemu-system-x86_64 + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + + + +
+ + +
+ + + +
+ + + + + + diff --git a/tests/qemuxml2xmloutdata/disk-cache.x86_64-2.7.0.xml b/tests/q= emuxml2xmloutdata/disk-cache.x86_64-2.7.0.xml new file mode 100644 index 0000000000..880eb71d04 --- /dev/null +++ b/tests/qemuxml2xmloutdata/disk-cache.x86_64-2.7.0.xml @@ -0,0 +1,60 @@ + + QEMUGuest1 + c7a5fdbd-edaf-9455-926a-d65c16db1809 + 219136 + 219136 + 1 + + hvm + + + + destroy + restart + destroy + + /usr/bin/qemu-system-x86_64 + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + + + +
+ + +
+ + + +
+ + + + + + diff --git a/tests/qemuxml2xmloutdata/disk-cache.x86_64-latest.xml b/tests/= qemuxml2xmloutdata/disk-cache.x86_64-latest.xml new file mode 100644 index 0000000000..e992d9db1c --- /dev/null +++ b/tests/qemuxml2xmloutdata/disk-cache.x86_64-latest.xml @@ -0,0 +1,63 @@ + + QEMUGuest1 + c7a5fdbd-edaf-9455-926a-d65c16db1809 + 219136 + 219136 + 1 + + hvm + + + + qemu64 + + + destroy + restart + destroy + + /usr/bin/qemu-system-x86_64 + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + + + +
+ + +
+ + + +
+ + + + + + diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 3cefc64833..a29a3533d4 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -321,7 +321,11 @@ mymain(void) DO_TEST("disk-boot-cdrom", NONE); DO_TEST("disk-error-policy", NONE); DO_TEST("disk-fmt-qcow", NONE); - DO_TEST("disk-cache", QEMU_CAPS_SCSI_LSI); + DO_TEST_CAPS_VER("disk-cache", "1.5.3"); + DO_TEST_CAPS_VER("disk-cache", "2.6.0"); + 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("disk-network-nbd", NONE); DO_TEST("disk-network-iscsi", QEMU_CAPS_VIRTIO_SCSI); DO_TEST("disk-network-gluster", NONE); --=20 2.24.1 From nobody Sun Apr 28 19:07:10 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 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=1579788262; cv=none; d=zohomail.com; s=zohoarc; b=jgc+/ZwwAq6lzrB9gZgPGKhR3bZL4/pdTny97o7uwCkrrzx6mFD4kJX+sLFTnHyNPntK1O4CcN80ucUHtu8rJYLMuaUK1rmtglA83LZeH6aN22jJBOQWIr5s8W2jhYBZAx7x6Odho+kiaUDsGLXlJ4lhJzWmXdSl3i7AraWJKqk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1579788262; 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=2sD7TUqzsFHw6BjSCDvKcgPFScCeRmKSD7RLGo3K4jU=; b=fRaxwb6m7ER4O8TNM9huMalKW/7XAWI4LKf4uviLxvEwVHyRWtsLvoCDcQBdvDz4HrqKPHu9GAaeRxiQ+K09h1BG6EiUPNj4nyCOvGSc9aYSXfng8Ywm19nvYl5sSV7d/7yn/s7Wc0cYlgAbd2/8pkxXFimUWc+/tSSZKNpDXr8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 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-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by mx.zohomail.com with SMTPS id 1579788262785939.9634543177986; Thu, 23 Jan 2020 06:04:22 -0800 (PST) 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-213-lgkfb_jdO9u01rli9H5zqQ-1; Thu, 23 Jan 2020 09:04:19 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 25C49107ACC5; Thu, 23 Jan 2020 14:04:13 +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 964E05C1BB; Thu, 23 Jan 2020 14:04:11 +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 508D585948; Thu, 23 Jan 2020 14:04:09 +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 00NE48wi003314 for ; Thu, 23 Jan 2020 09:04:08 -0500 Received: by smtp.corp.redhat.com (Postfix) id 911F060C85; Thu, 23 Jan 2020 14:04:08 +0000 (UTC) Received: from angien.redhat.com (unknown [10.43.2.48]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1ABC260BE1 for ; Thu, 23 Jan 2020 14:04:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1579788261; 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=2sD7TUqzsFHw6BjSCDvKcgPFScCeRmKSD7RLGo3K4jU=; b=JsVKdEXtY8w2prSEmoesqKVJC5UW9xhpXN9WxVu9wqpDVpCShgLRt7muLRojHlBc4DR+zN 7VfhLheCTm+p/bsuKAHEZE6zg6UiGD9X4icPgj+r3NghVJoAjJn8bRL3Lvm27xZ6pCMKPu kMVDVpa98IwY1QMRe4AL7Mt4gJuAnXs= From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 03/21] tests: qemuxml2argv: Modernize tpm-passthrough tests Date: Thu, 23 Jan 2020 15:03:43 +0100 Message-Id: <09128c26553d305b4543dc1bb80ab9c115ee7f65.1579787834.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-MC-Unique: lgkfb_jdO9u01rli9H5zqQ-1 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" XML->XML testing uses DO_TEST_CAPS_LATEST so use it also for the XML->argv testing. Additionally use the same more modern machine type in both tests. Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik --- ...=3D> tpm-passthrough-crb.x86_64-latest.args} | 19 ++++++++++------- ...rgs =3D> tpm-passthrough.x86_64-latest.args} | 21 ++++++++++++------- tests/qemuxml2argvdata/tpm-passthrough.xml | 2 +- tests/qemuxml2argvtest.c | 6 ++---- .../tpm-passthrough.x86_64-latest.xml | 2 +- 5 files changed, 29 insertions(+), 21 deletions(-) rename tests/qemuxml2argvdata/{tpm-passthrough-crb.args =3D> tpm-passthrou= gh-crb.x86_64-latest.args} (61%) rename tests/qemuxml2argvdata/{tpm-passthrough.args =3D> tpm-passthrough.x= 86_64-latest.args} (56%) diff --git a/tests/qemuxml2argvdata/tpm-passthrough-crb.args b/tests/qemuxm= l2argvdata/tpm-passthrough-crb.x86_64-latest.args similarity index 61% rename from tests/qemuxml2argvdata/tpm-passthrough-crb.args rename to tests/qemuxml2argvdata/tpm-passthrough-crb.x86_64-latest.args index 1a2531d5b8..5508e4defb 100644 --- a/tests/qemuxml2argvdata/tpm-passthrough-crb.args +++ b/tests/qemuxml2argvdata/tpm-passthrough-crb.x86_64-latest.args @@ -8,25 +8,30 @@ XDG_CACHE_HOME=3D/tmp/lib/domain--1-TPM-VM/.cache \ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-TPM-VM/.config \ QEMU_AUDIO_DRV=3Dnone \ /usr/bin/qemu-system-x86_64 \ --name TPM-VM \ +-name guest=3DTPM-VM,debug-threads=3Don \ -S \ +-object secret,id=3DmasterKey0,format=3Draw,\ +file=3D/tmp/lib/domain--1-TPM-VM/master-key.aes \ -machine pc-i440fx-2.12,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ +-cpu qemu64 \ -m 2048 \ --realtime mlock=3Doff \ +-overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid 11d7cd22-da89-3094-6212-079a48a309a1 \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-TPM-VM/monitor.= sock,\ -server,nowait \ +-chardev socket,id=3Dcharmonitor,fd=3D1729,server,nowait \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --boot menu=3Don \ --usb \ +-boot menu=3Don,strict=3Don \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -tpmdev passthrough,id=3Dtpm-tpm0,path=3D/dev/fdset/0,cancel-path=3D/dev/f= dset/1 \ -add-fd set=3D0,fd=3D1730 \ -add-fd set=3D1,fd=3D1731 \ -device tpm-crb,tpmdev=3Dtpm-tpm0,id=3Dtpm0 \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 +-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/tpm-passthrough.args b/tests/qemuxml2ar= gvdata/tpm-passthrough.x86_64-latest.args similarity index 56% rename from tests/qemuxml2argvdata/tpm-passthrough.args rename to tests/qemuxml2argvdata/tpm-passthrough.x86_64-latest.args index 644363b352..60edf86dbd 100644 --- a/tests/qemuxml2argvdata/tpm-passthrough.args +++ b/tests/qemuxml2argvdata/tpm-passthrough.x86_64-latest.args @@ -8,25 +8,30 @@ XDG_CACHE_HOME=3D/tmp/lib/domain--1-TPM-VM/.cache \ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-TPM-VM/.config \ QEMU_AUDIO_DRV=3Dnone \ /usr/bin/qemu-system-x86_64 \ --name TPM-VM \ +-name guest=3DTPM-VM,debug-threads=3Don \ -S \ --machine pc-0.12,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ +-object secret,id=3DmasterKey0,format=3Draw,\ +file=3D/tmp/lib/domain--1-TPM-VM/master-key.aes \ +-machine pc-i440fx-2.12,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ +-cpu qemu64 \ -m 2048 \ --realtime mlock=3Doff \ +-overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid 11d7cd22-da89-3094-6212-079a48a309a1 \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-TPM-VM/monitor.= sock,\ -server,nowait \ +-chardev socket,id=3Dcharmonitor,fd=3D1729,server,nowait \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --boot menu=3Don \ --usb \ +-boot menu=3Don,strict=3Don \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -tpmdev passthrough,id=3Dtpm-tpm0,path=3D/dev/fdset/0,cancel-path=3D/dev/f= dset/1 \ -add-fd set=3D0,fd=3D1730 \ -add-fd set=3D1,fd=3D1731 \ -device tpm-tis,tpmdev=3Dtpm-tpm0,id=3Dtpm0 \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 +-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/tpm-passthrough.xml b/tests/qemuxml2arg= vdata/tpm-passthrough.xml index 4198f30340..036091d44f 100644 --- a/tests/qemuxml2argvdata/tpm-passthrough.xml +++ b/tests/qemuxml2argvdata/tpm-passthrough.xml @@ -5,7 +5,7 @@ 512288 1 - hvm + hvm diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index b923590930..700f3878e4 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -2176,10 +2176,8 @@ mymain(void) DO_TEST("ppce500-serial", QEMU_CAPS_KVM); - DO_TEST("tpm-passthrough", - QEMU_CAPS_DEVICE_TPM_PASSTHROUGH, QEMU_CAPS_DEVICE_TPM_TIS); - DO_TEST("tpm-passthrough-crb", - QEMU_CAPS_DEVICE_TPM_PASSTHROUGH, QEMU_CAPS_DEVICE_TPM_CRB); + DO_TEST_CAPS_LATEST("tpm-passthrough"); + DO_TEST_CAPS_LATEST("tpm-passthrough-crb"); DO_TEST_PARSE_ERROR("tpm-no-backend-invalid", QEMU_CAPS_DEVICE_TPM_PASSTHROUGH, QEMU_CAPS_DEVICE= _TPM_TIS); DO_TEST_CAPS_LATEST("tpm-emulator"); diff --git a/tests/qemuxml2xmloutdata/tpm-passthrough.x86_64-latest.xml b/t= ests/qemuxml2xmloutdata/tpm-passthrough.x86_64-latest.xml index 669992bcf6..030ab3e605 100644 --- a/tests/qemuxml2xmloutdata/tpm-passthrough.x86_64-latest.xml +++ b/tests/qemuxml2xmloutdata/tpm-passthrough.x86_64-latest.xml @@ -5,7 +5,7 @@ 512288 1 - hvm + hvm --=20 2.24.1 From nobody Sun Apr 28 19:07:10 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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=1579788388; cv=none; d=zohomail.com; s=zohoarc; b=SZQ3c6nSsj8kbbu4EyI7yyGC6w+AaAgaX4tlICyR/t9KtvH0ZbHrOzqJhVCmC5hPrXmRR/TQvJhlqsGP5V4AQGvLJiMY9fBiTBQTM0fBTXQKoqLkQb2UTR0UOkrcCWsSWecjxIn/wqS3dIGesUZ7R9ahn/h5IfUau7spq13xbfQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1579788388; 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=yyHY/z7C6nkjD9Wv4TGYgpgw/2NwsQcOog+ldXLEnTI=; b=BiGspytqGFX2lUA9+jU9XrV0KTw7FdyoXMgZ2xtJyhNTK4c3NrytYeG1jorEVglQsGgTEZmtywSioBpyynijwKMUgrdYVuHKUvqvHc/vjQ1GrM0xkwizRn63lcBilAfuDhbrHevov7AfT3su546PNDZe/KEAHWRnWDGmHsB0QrE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 1579788388407119.22376026366669; Thu, 23 Jan 2020 06:06:28 -0800 (PST) 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-257-JIo60uMFNsWbDZQiKNctPQ-1; Thu, 23 Jan 2020 09:04:36 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 338BC100E12D; Thu, 23 Jan 2020 14:04:28 +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 020B28644E; Thu, 23 Jan 2020 14:04:28 +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 A9D741832DF1; Thu, 23 Jan 2020 14:04:27 +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 00NE49O1003323 for ; Thu, 23 Jan 2020 09:04:09 -0500 Received: by smtp.corp.redhat.com (Postfix) id 862BA60C85; Thu, 23 Jan 2020 14:04:09 +0000 (UTC) Received: from angien.redhat.com (unknown [10.43.2.48]) by smtp.corp.redhat.com (Postfix) with ESMTP id DF03360BE1 for ; Thu, 23 Jan 2020 14:04:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1579788387; 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=yyHY/z7C6nkjD9Wv4TGYgpgw/2NwsQcOog+ldXLEnTI=; b=MeaMtwAESRpgQOW7Sa7zNYkFzLmTu4bb0Jh4PdwZ/Uhc0UZ583qF+8jIZXENfcOyeB66Rn DcOVxO3i2u15ApyyJi+O4LtG9NQ16NHSzriiBrnTFJIPxNA2yQ+PoG/aWQblTi1Tf96TQw Ec1WvwbopbLZafxuMpejv8gBwCa9l+Y= From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 04/21] tests: qemuxml: Fix and enable default-video-type* tests Date: Thu, 23 Jan 2020 15:03:44 +0100 Message-Id: <30a4182dc3f203beba9df2160971d10d417404f4.1579787834.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-MC-Unique: JIo60uMFNsWbDZQiKNctPQ-1 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" The tests prefixed default-video* were enabled only for the xml2xml testing and used impossible configurations. Enable them for xml2argv testing fix them: 1) aarch64: remove pointless cpu mode 2) s390x: remove pointless cpu and use existing machine type 3) riscv: remove pointless cpu 4) x86: remove pointless cpu and use existing machine type 5) ppc65: use correct machine type and enable USB Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik --- ...ult-video-type-aarch64.aarch64-latest.args | 35 +++++++++++++++++++ .../default-video-type-aarch64.xml | 1 - ...default-video-type-ppc64.ppc64-latest.args | 35 +++++++++++++++++++ .../default-video-type-ppc64.xml | 3 +- ...ult-video-type-riscv64.riscv64-latest.args | 34 ++++++++++++++++++ .../default-video-type-riscv64.xml | 1 - ...default-video-type-s390x.s390x-latest.args | 31 ++++++++++++++++ .../default-video-type-s390x.xml | 3 +- .../default-video-type-x86_64-caps-test-0.xml | 3 +- .../default-video-type-x86_64-caps-test-1.xml | 3 +- tests/qemuxml2argvtest.c | 5 +++ ...ault-video-type-aarch64.aarch64-latest.xml | 1 - .../default-video-type-ppc64.ppc64-latest.xml | 14 +++++--- ...ault-video-type-riscv64.riscv64-latest.xml | 1 - .../default-video-type-s390x.s390x-latest.xml | 7 ++-- .../default-video-type-x86_64-caps-test-0.xml | 5 ++- .../default-video-type-x86_64-caps-test-1.xml | 5 ++- 17 files changed, 160 insertions(+), 27 deletions(-) create mode 100644 tests/qemuxml2argvdata/default-video-type-aarch64.aarch= 64-latest.args create mode 100644 tests/qemuxml2argvdata/default-video-type-ppc64.ppc64-l= atest.args create mode 100644 tests/qemuxml2argvdata/default-video-type-riscv64.riscv= 64-latest.args create mode 100644 tests/qemuxml2argvdata/default-video-type-s390x.s390x-l= atest.args diff --git a/tests/qemuxml2argvdata/default-video-type-aarch64.aarch64-late= st.args b/tests/qemuxml2argvdata/default-video-type-aarch64.aarch64-latest.= args new file mode 100644 index 0000000000..4eaeaa5436 --- /dev/null +++ b/tests/qemuxml2argvdata/default-video-type-aarch64.aarch64-latest.args @@ -0,0 +1,35 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/tmp/lib/domain--1-default-video-type-a \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/tmp/lib/domain--1-default-video-type-a/.local/share \ +XDG_CACHE_HOME=3D/tmp/lib/domain--1-default-video-type-a/.cache \ +XDG_CONFIG_HOME=3D/tmp/lib/domain--1-default-video-type-a/.config \ +QEMU_AUDIO_DRV=3Dnone \ +/usr/bin/qemu-system-aarch64 \ +-name guest=3Ddefault-video-type-aarch64-test,debug-threads=3Don \ +-S \ +-object secret,id=3DmasterKey0,format=3Draw,\ +file=3D/tmp/lib/domain--1-default-video-type-a/master-key.aes \ +-machine virt,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff,gic-version=3D3 \ +-m 1024 \ +-overcommit mem-lock=3Doff \ +-smp 1,sockets=3D1,cores=3D1,threads=3D1 \ +-uuid 6ba410c5-1e5c-4d57-bee7-2228e7ffa32f \ +-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 pcie-root-port,port=3D0x8,chassis=3D1,id=3Dpci.1,bus=3Dpcie.0,mult= ifunction=3Don,\ +addr=3D0x1 \ +-device pcie-root-port,port=3D0x9,chassis=3D2,id=3Dpci.2,bus=3Dpcie.0,addr= =3D0x1.0x1 \ +-vnc 127.0.0.1:0 \ +-device virtio-gpu-pci,id=3Dvideo0,max_outputs=3D1,bus=3Dpci.1,addr=3D0x0 \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ +resourcecontrol=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/default-video-type-aarch64.xml b/tests/= qemuxml2argvdata/default-video-type-aarch64.xml index f7d2d5d94a..5c008813cc 100644 --- a/tests/qemuxml2argvdata/default-video-type-aarch64.xml +++ b/tests/qemuxml2argvdata/default-video-type-aarch64.xml @@ -6,7 +6,6 @@ hvm - /usr/bin/qemu-system-aarch64 diff --git a/tests/qemuxml2argvdata/default-video-type-ppc64.ppc64-latest.a= rgs b/tests/qemuxml2argvdata/default-video-type-ppc64.ppc64-latest.args new file mode 100644 index 0000000000..795c5a5c58 --- /dev/null +++ b/tests/qemuxml2argvdata/default-video-type-ppc64.ppc64-latest.args @@ -0,0 +1,35 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/tmp/lib/domain--1-default-video-type-p \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/tmp/lib/domain--1-default-video-type-p/.local/share \ +XDG_CACHE_HOME=3D/tmp/lib/domain--1-default-video-type-p/.cache \ +XDG_CONFIG_HOME=3D/tmp/lib/domain--1-default-video-type-p/.config \ +QEMU_AUDIO_DRV=3Dnone \ +/usr/bin/qemu-system-ppc64 \ +-name guest=3Ddefault-video-type-ppc64-test,debug-threads=3Don \ +-S \ +-object secret,id=3DmasterKey0,format=3Draw,\ +file=3D/tmp/lib/domain--1-default-video-type-p/master-key.aes \ +-machine pseries,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff \ +-cpu host \ +-m 1024 \ +-overcommit mem-lock=3Doff \ +-smp 1,sockets=3D1,cores=3D1,threads=3D1 \ +-uuid 6ba410c5-1e5c-4d57-bee7-2228e7ffa32f \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=3Dcharmonitor,fd=3D1729,server,nowait \ +-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ +-rtc base=3Dutc \ +-no-shutdown \ +-boot strict=3Don \ +-device pci-ohci,id=3Dusb,bus=3Dpci.0,addr=3D0x1 \ +-device usb-kbd,id=3Dinput0,bus=3Dusb.0,port=3D1 \ +-device usb-mouse,id=3Dinput1,bus=3Dusb.0,port=3D2 \ +-vnc 127.0.0.1:0 \ +-device VGA,id=3Dvideo0,vgamem_mb=3D16,bus=3Dpci.0,addr=3D0x2 \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ +resourcecontrol=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/default-video-type-ppc64.xml b/tests/qe= muxml2argvdata/default-video-type-ppc64.xml index ea5b966cfd..6f9ccdbaf1 100644 --- a/tests/qemuxml2argvdata/default-video-type-ppc64.xml +++ b/tests/qemuxml2argvdata/default-video-type-ppc64.xml @@ -4,12 +4,11 @@ 1048576 1 - hvm + hvm /usr/bin/qemu-system-ppc64 - diff --git a/tests/qemuxml2argvdata/default-video-type-riscv64.riscv64-late= st.args b/tests/qemuxml2argvdata/default-video-type-riscv64.riscv64-latest.= args new file mode 100644 index 0000000000..c4acaaff0f --- /dev/null +++ b/tests/qemuxml2argvdata/default-video-type-riscv64.riscv64-latest.args @@ -0,0 +1,34 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/tmp/lib/domain--1-default-video-type-r \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/tmp/lib/domain--1-default-video-type-r/.local/share \ +XDG_CACHE_HOME=3D/tmp/lib/domain--1-default-video-type-r/.cache \ +XDG_CONFIG_HOME=3D/tmp/lib/domain--1-default-video-type-r/.config \ +QEMU_AUDIO_DRV=3Dspice \ +/usr/bin/qemu-system-riscv64 \ +-name guest=3Ddefault-video-type-riscv64-test,debug-threads=3Don \ +-S \ +-object secret,id=3DmasterKey0,format=3Draw,\ +file=3D/tmp/lib/domain--1-default-video-type-r/master-key.aes \ +-machine virt,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ +-m 1024 \ +-overcommit mem-lock=3Doff \ +-smp 1,sockets=3D1,cores=3D1,threads=3D1 \ +-uuid 6ba410c5-1e5c-4d57-bee7-2228e7ffa32f \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=3Dcharmonitor,fd=3D1729,server,nowait \ +-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ +-rtc base=3Dutc \ +-no-shutdown \ +-boot strict=3Don \ +-device pcie-root-port,port=3D0x8,chassis=3D1,id=3Dpci.1,bus=3Dpcie.0,mult= ifunction=3Don,\ +addr=3D0x1 \ +-device pcie-root-port,port=3D0x9,chassis=3D2,id=3Dpci.2,bus=3Dpcie.0,addr= =3D0x1.0x1 \ +-spice port=3D0,seamless-migration=3Don \ +-device virtio-gpu-pci,id=3Dvideo0,max_outputs=3D1,bus=3Dpci.1,addr=3D0x0 \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ +resourcecontrol=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/default-video-type-riscv64.xml b/tests/= qemuxml2argvdata/default-video-type-riscv64.xml index 55f6fa9391..97e239f5ea 100644 --- a/tests/qemuxml2argvdata/default-video-type-riscv64.xml +++ b/tests/qemuxml2argvdata/default-video-type-riscv64.xml @@ -6,7 +6,6 @@ hvm - /usr/bin/qemu-system-riscv64 diff --git a/tests/qemuxml2argvdata/default-video-type-s390x.s390x-latest.a= rgs b/tests/qemuxml2argvdata/default-video-type-s390x.s390x-latest.args new file mode 100644 index 0000000000..441270d3d9 --- /dev/null +++ b/tests/qemuxml2argvdata/default-video-type-s390x.s390x-latest.args @@ -0,0 +1,31 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/tmp/lib/domain--1-default-video-type-s \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/tmp/lib/domain--1-default-video-type-s/.local/share \ +XDG_CACHE_HOME=3D/tmp/lib/domain--1-default-video-type-s/.cache \ +XDG_CONFIG_HOME=3D/tmp/lib/domain--1-default-video-type-s/.config \ +QEMU_AUDIO_DRV=3Dnone \ +/usr/bin/qemu-system-s390x \ +-name guest=3Ddefault-video-type-s390x-test,debug-threads=3Don \ +-S \ +-object secret,id=3DmasterKey0,format=3Draw,\ +file=3D/tmp/lib/domain--1-default-video-type-s/master-key.aes \ +-machine s390-ccw-virtio,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff \ +-m 1024 \ +-overcommit mem-lock=3Doff \ +-smp 1,sockets=3D1,cores=3D1,threads=3D1 \ +-uuid 6ba410c5-1e5c-4d57-bee7-2228e7ffa32f \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=3Dcharmonitor,fd=3D1729,server,nowait \ +-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ +-rtc base=3Dutc \ +-no-shutdown \ +-boot strict=3Don \ +-vnc 127.0.0.1:0 \ +-device virtio-gpu-ccw,id=3Dvideo0,max_outputs=3D1,devno=3Dfe.0.0000 \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ +resourcecontrol=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/default-video-type-s390x.xml b/tests/qe= muxml2argvdata/default-video-type-s390x.xml index fe402d2c7f..275b4c21a3 100644 --- a/tests/qemuxml2argvdata/default-video-type-s390x.xml +++ b/tests/qemuxml2argvdata/default-video-type-s390x.xml @@ -4,9 +4,8 @@ 1048576 1 - hvm + hvm - /usr/bin/qemu-system-s390x diff --git a/tests/qemuxml2argvdata/default-video-type-x86_64-caps-test-0.x= ml b/tests/qemuxml2argvdata/default-video-type-x86_64-caps-test-0.xml index 2c753fe227..2142db8d1f 100644 --- a/tests/qemuxml2argvdata/default-video-type-x86_64-caps-test-0.xml +++ b/tests/qemuxml2argvdata/default-video-type-x86_64-caps-test-0.xml @@ -4,9 +4,8 @@ 1048576 1 - hvm + hvm - /usr/bin/qemu-system-x86_64 diff --git a/tests/qemuxml2argvdata/default-video-type-x86_64-caps-test-1.x= ml b/tests/qemuxml2argvdata/default-video-type-x86_64-caps-test-1.xml index 2c753fe227..2142db8d1f 100644 --- a/tests/qemuxml2argvdata/default-video-type-x86_64-caps-test-1.xml +++ b/tests/qemuxml2argvdata/default-video-type-x86_64-caps-test-1.xml @@ -4,9 +4,8 @@ 1048576 1 - hvm + hvm - /usr/bin/qemu-system-x86_64 diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 700f3878e4..4e57a834fc 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -2112,6 +2112,11 @@ mymain(void) DO_TEST_PARSE_ERROR("video-invalid-multiple-devices", NONE); DO_TEST_PARSE_ERROR("default-video-type-x86_64-caps-test-0", NONE); + DO_TEST_CAPS_ARCH_LATEST("default-video-type-aarch64", "aarch64"); + DO_TEST_CAPS_ARCH_LATEST("default-video-type-ppc64", "ppc64"); + DO_TEST_CAPS_ARCH_LATEST("default-video-type-riscv64", "riscv64"); + DO_TEST_CAPS_ARCH_LATEST("default-video-type-s390x", "s390x"); + DO_TEST("virtio-rng-default", QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM); diff --git a/tests/qemuxml2xmloutdata/default-video-type-aarch64.aarch64-la= test.xml b/tests/qemuxml2xmloutdata/default-video-type-aarch64.aarch64-late= st.xml index 1efea62f6f..a47435163f 100644 --- a/tests/qemuxml2xmloutdata/default-video-type-aarch64.aarch64-latest.xml +++ b/tests/qemuxml2xmloutdata/default-video-type-aarch64.aarch64-latest.xml @@ -11,7 +11,6 @@ - destroy restart diff --git a/tests/qemuxml2xmloutdata/default-video-type-ppc64.ppc64-latest= .xml b/tests/qemuxml2xmloutdata/default-video-type-ppc64.ppc64-latest.xml index 6c4bd5ef8b..52bf8a1590 100644 --- a/tests/qemuxml2xmloutdata/default-video-type-ppc64.ppc64-latest.xml +++ b/tests/qemuxml2xmloutdata/default-video-type-ppc64.ppc64-latest.xml @@ -5,7 +5,7 @@ 1048576 1 - hvm + hvm @@ -15,8 +15,13 @@ destroy /usr/bin/qemu-system-ppc64 - - + +
+ + + + + @@ -24,8 +29,9 @@