From nobody Mon Feb 9 13:07:25 2026 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=1592840577; cv=none; d=zohomail.com; s=zohoarc; b=fu/hauJ/4oAmZ1BOMipL4bO0/av882P4hW6b2eHBtK/NGIJCmLfm4NEMpwiA5/fSDNhz+iUC4U03ZE8rfYY1Hs8ecaArMf72+UHncaFfwx8wAkEsRZS6Yv/Ar5fsO/nctdUyczLH/kALSJG5ztkZmxH2IyTRqZs6sYTxK5mjhkI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592840577; 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=tHA2iCMA2glakggzl5xtIxlAebBiHawVmuIL6oI9spM=; b=CVgr0CQa/GrU/+/vhJHcjxRyBMwTuyIOIFegzFdBUBWKxnlX3Jifuhux5mZwiP68KJBaApyT2+WNww9IIGDbzqLMTUTZuUbRpcQQ79zeKpfemNoh8tGZyWkuA8CXitDQkRZrlug4EUsbh7FhINxSK5nAYX30v9sPOZMKkK1gGAc= 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 1592840577804670.1292664050268; Mon, 22 Jun 2020 08:42:57 -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-464-4lmqrjTLMSmxDvbWWe3LBg-1; Mon, 22 Jun 2020 11:42:52 -0400 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 D028610059B2; Mon, 22 Jun 2020 15:42:42 +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 B1DAC1DC; Mon, 22 Jun 2020 15:42:42 +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 80752833CB; Mon, 22 Jun 2020 15:42:42 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 05MFgWJV020433 for ; Mon, 22 Jun 2020 11:42:32 -0400 Received: by smtp.corp.redhat.com (Postfix) id DC8395C220; Mon, 22 Jun 2020 15:42:32 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.23]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4A43B5C1BD for ; Mon, 22 Jun 2020 15:42:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1592840576; 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=tHA2iCMA2glakggzl5xtIxlAebBiHawVmuIL6oI9spM=; b=QjH0Mf6s0DgUrUamp3n0vg+/0EvnsdXMRzZpxdlB9z+O8B1mOZQjPEq4nK2m5l6pKceNmK bSstT4Og73y2y2SudGaDuhQtgzawMp+RqBRznAjg3vOfoUNiupsG1o/ubG9TwUyRdV5JA7 GNvrIiduooLrjP2XtFk6QWIEMQlXnls= X-MC-Unique: 4lmqrjTLMSmxDvbWWe3LBg-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 07/12] qemuxml2argvtest: hostdev-scsi-virtio-scsi: Modernize to qemu-4.1 Date: Mon, 22 Jun 2020 17:42:19 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 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-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" Modernize the current state to the pre-blockdev version of qemu to minimize changes. Later patch will add a 'latest' case too. Additionally this removes duplicated call of the same test. Signed-off-by: Peter Krempa --- ...ostdev-scsi-virtio-scsi.x86_64-4.1.0.args} | 21 ++++++++++++------- tests/qemuxml2argvtest.c | 7 +------ 2 files changed, 14 insertions(+), 14 deletions(-) rename tests/qemuxml2argvdata/{hostdev-scsi-virtio-scsi.args =3D> hostdev-= scsi-virtio-scsi.x86_64-4.1.0.args} (59%) diff --git a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.args b/tests/q= emuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-4.1.0.args similarity index 59% rename from tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.args rename to tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-4.1.0.args index 364c4a10a58..e74fd1118ca 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.args +++ b/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-4.1.0.args @@ -8,27 +8,32 @@ XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest2/.cache \ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest2/.config \ QEMU_AUDIO_DRV=3Dnone \ /usr/bin/qemu-system-i386 \ --name QEMUGuest2 \ +-name guest=3DQEMUGuest2,debug-threads=3Don \ -S \ --machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ +-object secret,id=3DmasterKey0,format=3Draw,\ +file=3D/tmp/lib/domain--1-QEMUGuest2/master-key.aes \ +-machine pc-i440fx-4.1,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ -m 214 \ --realtime mlock=3Doff \ +-overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9466-926a-d65c16db1809 \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-QEMUGuest2/moni= tor.sock,\ -server,nowait \ +-chardev socket,id=3Dcharmonitor,fd=3D1729,server,nowait \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ -no-acpi \ --device virtio-scsi-pci,id=3Dscsi0,bus=3Dpci.0,addr=3D0x3 \ --usb \ +-boot strict=3Don \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device virtio-scsi-pci,id=3Dscsi0,bus=3Dpci.0,addr=3D0x2 \ -drive file=3D/dev/HostVG/QEMUGuest2,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ -device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ -drive file=3D/dev/sg0,if=3Dnone,format=3Draw,id=3Ddrive-hostdev0 \ -device scsi-generic,bus=3Dscsi0.0,channel=3D0,scsi-id=3D4,lun=3D8,\ drive=3Ddrive-hostdev0,id=3Dhostdev0 \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x4 +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ +resourcecontrol=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 3cef0616a50..9d877d7d2b4 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -2659,16 +2659,11 @@ mymain(void) DO_TEST_CAPS_VER("hostdev-scsi-lsi", "2.8.0"); DO_TEST_CAPS_VER("hostdev-scsi-lsi", "4.1.0"); DO_TEST_CAPS_LATEST("hostdev-scsi-lsi"); + DO_TEST_CAPS_VER("hostdev-scsi-virtio-scsi", "4.1.0"); - DO_TEST("hostdev-scsi-virtio-scsi", - QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_SCSI_LSI); DO_TEST("hostdev-scsi-readonly", QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_SCSI_LSI); - DO_TEST("hostdev-scsi-virtio-scsi", - QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_SCSI_LSI); DO_TEST("hostdev-scsi-virtio-iscsi", QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_SCSI_LSI); --=20 2.26.2