From nobody Fri Mar 29 10:35:12 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=1592840559; cv=none; d=zohomail.com; s=zohoarc; b=mPzbAqNjDRE+jNmUvavNxh1lQ0E4Cegj2L9BcSIazgZCrfxOx+TaJB4AZoWeCMPIOivUlhu0pGc5gBocvphg8m+AI8Tm3eLL9MOGdzwA/L/6asybRndvgzl+O59WT90MLiz55bLGl9paKA3HjdWYjWUyziipxyubVLsUpckHWUo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592840559; 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=OF3tmMRjajjRjbzPYgsY6vf+qXg5s9fnTrMABu2XdH0=; b=XWFdt0DPnmA0Whl7WFTSNnsrhe2MJXwd3/WtoaBemzc5UErTGL4fxs5cvsKPtiPzifEtTTK/jd9gZbGTly9lnNPAeJLPxtvWCiPCEfUA6XWa2FrVXmYOY1dhm58ww2+fL7w7bWl4NKljcKl4Do+i5oEgPOlN7Tfyvooq+AjbWLc= 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 1592840559272868.0655492637186; Mon, 22 Jun 2020 08:42:39 -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-407-FoY_MP2VPRiwhpTYD7QhYw-1; Mon, 22 Jun 2020 11:42:35 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 90D5C10059A0; Mon, 22 Jun 2020 15:42: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 6520D10016DA; Mon, 22 Jun 2020 15:42: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 C04521809554; Mon, 22 Jun 2020 15:42:29 +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 05MFgRns020377 for ; Mon, 22 Jun 2020 11:42:27 -0400 Received: by smtp.corp.redhat.com (Postfix) id 2262F5C220; Mon, 22 Jun 2020 15:42:27 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.23]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8BF0B5C1BD for ; Mon, 22 Jun 2020 15:42:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1592840557; 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=OF3tmMRjajjRjbzPYgsY6vf+qXg5s9fnTrMABu2XdH0=; b=Jo5+S8GvKEc30CiIi9cwc+lnTO8gSqCT3iHIbTnM09gVifiwZYHw/g/NTAu5HVHOHjC/kK JHnfj4RTzOiGnNe3wYLHZV1oPKxHOZwG7Jyoltdomrk57jur2b6Of+1PDYBEllz2g30tSK oMyq8LvvrMKALflPrDPLmVoxk1McWVc= X-MC-Unique: FoY_MP2VPRiwhpTYD7QhYw-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 01/12] qemuxml2argvtest: hostdev-scsi-lsi: Modernize to qemu-4.1 Date: Mon, 22 Jun 2020 17:42:13 +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.84 on 10.5.11.22 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. Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik --- ...rgs =3D> hostdev-scsi-lsi.x86_64-4.1.0.args} | 21 ++++++++++++------- tests/qemuxml2argvtest.c | 5 ++--- 2 files changed, 15 insertions(+), 11 deletions(-) rename tests/qemuxml2argvdata/{hostdev-scsi-lsi.args =3D> hostdev-scsi-lsi= .x86_64-4.1.0.args} (59%) diff --git a/tests/qemuxml2argvdata/hostdev-scsi-lsi.args b/tests/qemuxml2a= rgvdata/hostdev-scsi-lsi.x86_64-4.1.0.args similarity index 59% rename from tests/qemuxml2argvdata/hostdev-scsi-lsi.args rename to tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-4.1.0.args index cf90224e9ad..54fbf3a8472 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-lsi.args +++ b/tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-4.1.0.args @@ -8,26 +8,31 @@ 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 lsi,id=3Dscsi0,bus=3Dpci.0,addr=3D0x3 \ --usb \ +-boot strict=3Don \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device lsi,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,scsi-id=3D7,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 d5b2a21b5a7..9c0fd27b8db 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -2656,9 +2656,8 @@ mymain(void) QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_DEVICE_PXB_PCIE); - DO_TEST("hostdev-scsi-lsi", - QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_SCSI_LSI); + DO_TEST_CAPS_VER("hostdev-scsi-lsi", "4.1.0"); + DO_TEST("hostdev-scsi-virtio-scsi", QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_SCSI_LSI); --=20 2.26.2 From nobody Fri Mar 29 10:35:12 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) client-ip=207.211.31.81; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 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=1592840643; cv=none; d=zohomail.com; s=zohoarc; b=lvBWQav6FKkTKxfC94UKYQsgYrj+Kji9WTvCvzTCIH1Rh6aAjg1/J4opdO4V48UPR7hgpN14H2k2HI7bjGV15Qxzlcuqy7sp3+tWDQQAflP01isMUHTTrjXcTjIqdJRl+A29UcSzyziCTj1lpqe3eGuMdZHU0YYSOc1tVtT6P2I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592840643; 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=Cy1YEvSsVEkByfXa31IFoCqbSsDE9xngxq+h4qkAqOg=; b=PHhG936La3NKJa6GhQ14+ey216F9R9GnL+494YqhKlfF7ToSIXm7GrfllpyG6M4e2eGyyCqNyMscjwR967whTP0DJHV/6kJHyxc2n4s7n8tYpS8mqWOXo4bITlZVK/sHNwn8k9wDMjl4K1ad081hgyvaMtgcW/I1g0taHgK+NlQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 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-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 1592840643495553.9233222328209; Mon, 22 Jun 2020 08:44:03 -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-107-GFFP3qDcMEWI1nB1-XGv0w-1; Mon, 22 Jun 2020 11:42:52 -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 97B72107ACF8; Mon, 22 Jun 2020 15:42:40 +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 7183727CCA; Mon, 22 Jun 2020 15:42:40 +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 3CEBA1809563; Mon, 22 Jun 2020 15:42:40 +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 05MFgSa8020386 for ; Mon, 22 Jun 2020 11:42:28 -0400 Received: by smtp.corp.redhat.com (Postfix) id 0861F5C220; Mon, 22 Jun 2020 15:42:28 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.23]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7724A5C1BD for ; Mon, 22 Jun 2020 15:42:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1592840642; 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=Cy1YEvSsVEkByfXa31IFoCqbSsDE9xngxq+h4qkAqOg=; b=eH77THhUU7QGuHRCNgDtWmSguKqRrLOAMUHGeWNQvK1GpEtHpJrlFTbmiwfQFhAzU3dTv7 CCr44TFJPt4hWwthO4QKkXMY8uuRWjDGlyfY6Swvuflqraaz1Vqpn6BMAqQdWhsChLsQ4t 0Wl15ujF1xDWXc/e5ORoN6nmQQfH9qE= X-MC-Unique: GFFP3qDcMEWI1nB1-XGv0w-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 02/12] qemuxml2argvtest: hostdev-scsi-lsi: Add qemu-2.8 variant Date: Mon, 22 Jun 2020 17:42:14 +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.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) Content-Type: text/plain; charset="utf-8" qemu-2.8 didn't yet support QEMU_CAPS_ISCSI_PASSWORD_SECRET. This version will allow integrating multiple test cases into one. Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik --- .../hostdev-scsi-lsi.x86_64-2.8.0.args | 37 +++++++++++++++++++ tests/qemuxml2argvtest.c | 1 + 2 files changed, 38 insertions(+) create mode 100644 tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-2.8.0.ar= gs diff --git a/tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-2.8.0.args b/te= sts/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-2.8.0.args new file mode 100644 index 00000000000..60467c44558 --- /dev/null +++ b/tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-2.8.0.args @@ -0,0 +1,37 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/tmp/lib/domain--1-QEMUGuest2 \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest2/.local/share \ +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 guest=3DQEMUGuest2,debug-threads=3Don \ +-S \ +-object secret,id=3DmasterKey0,format=3Draw,\ +file=3D/tmp/lib/domain--1-QEMUGuest2/master-key.aes \ +-machine pc-i440fx-2.8,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ +-m 214 \ +-realtime mlock=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 \ +-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 \ +-device lsi,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,scsi-id=3D7,drive=3Ddrive-hostdev0,id= =3Dhostdev0 \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 9c0fd27b8db..610cf6ccc85 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -2656,6 +2656,7 @@ mymain(void) QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_DEVICE_PXB_PCIE); + DO_TEST_CAPS_VER("hostdev-scsi-lsi", "2.8.0"); DO_TEST_CAPS_VER("hostdev-scsi-lsi", "4.1.0"); DO_TEST("hostdev-scsi-virtio-scsi", --=20 2.26.2 From nobody Fri Mar 29 10:35:12 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=1592840572; cv=none; d=zohomail.com; s=zohoarc; b=LzBuRiH4PnxTa+O5I8z2nT15Df8+U7OUhvPWl6Cn4guxAYkPxfyKnk/YTvP3EXPBsNTbXQ8HmVarxfiN+uZAg1dzUkvkqOYwAQWTOQwrON4+8rXvujGXsDQ7bkfb5+J0PFufsIXrc+NataIth9Lad65UESBlj6T8udSsURrxHcI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592840572; 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=UUCc0z3zCZA0LgMlm1OZbZledllpkUhXUZSo9FNwmOo=; b=m1hqksMcjy580/Il3Gd184Ed8ToWcCkWSz2xJ6cXv69QcNgiVlu0y1ZhDef8OX4QK+e1l2nQbkD3wR4MS0YALGUpiyCiQvS+bG5e9aKISbm9HG4lpjhCNorRZMoZppuIl6jUhE0fijFog3i5MVXd2z7e8A0ENoa5a3H2EyO9wME= 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 1592840572000893.7044350757909; Mon, 22 Jun 2020 08:42:52 -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-309-s38LBjsSOqijT5TwYjpJeg-1; Mon, 22 Jun 2020 11:42:48 -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 75E21188360A; Mon, 22 Jun 2020 15:42:40 +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 4EBB160C47; Mon, 22 Jun 2020 15:42:40 +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 1EA0A833CB; Mon, 22 Jun 2020 15:42:40 +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 05MFgSRg020393 for ; Mon, 22 Jun 2020 11:42:28 -0400 Received: by smtp.corp.redhat.com (Postfix) id EABAA5C220; Mon, 22 Jun 2020 15:42:28 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.23]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5FE295C1BD for ; Mon, 22 Jun 2020 15:42:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1592840570; 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=UUCc0z3zCZA0LgMlm1OZbZledllpkUhXUZSo9FNwmOo=; b=OMLJFNvSdFXGG1lV87xgqbcq94C5ZwZCXEKqF7wozENcGIxNRmccz9MRWU1YqvQl0C7ufr HXRr4YnNI8hc9dJ6C0mErm5V8OP9Y0C0Ng+4Y66z4rLXFLUsodZOllqoBIvTk0F78HN7X+ qIuvUyGtGID9N4mRQrR4yMFNO2LUYmg= X-MC-Unique: s38LBjsSOqijT5TwYjpJeg-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 03/12] qemuxml2argvtest: hostdev-scsi-lsi: Add "latest" caps version Date: Mon, 22 Jun 2020 17:42:15 +0200 Message-Id: <3f0bbf093ce34766cab6843a4bd60af6fc634226.1592840388.git.pkrempa@redhat.com> 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.12 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" Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik --- .../hostdev-scsi-lsi.x86_64-latest.args | 42 +++++++++++++++++++ tests/qemuxml2argvtest.c | 1 + 2 files changed, 43 insertions(+) create mode 100644 tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-latest.a= rgs diff --git a/tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-latest.args b/t= ests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-latest.args new file mode 100644 index 00000000000..23223d4cff1 --- /dev/null +++ b/tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-latest.args @@ -0,0 +1,42 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/tmp/lib/domain--1-QEMUGuest2 \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest2/.local/share \ +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 guest=3DQEMUGuest2,debug-threads=3Don \ +-S \ +-object secret,id=3DmasterKey0,format=3Draw,\ +file=3D/tmp/lib/domain--1-QEMUGuest2/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-9466-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 \ +-device lsi,id=3Dscsi0,bus=3Dpci.0,addr=3D0x2 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2",\ +"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 ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ +-drive file=3D/dev/sg0,if=3Dnone,format=3Draw,id=3Ddrive-hostdev0 \ +-device scsi-generic,bus=3Dscsi0.0,scsi-id=3D7,drive=3Ddrive-hostdev0,id= =3Dhostdev0 \ +-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 610cf6ccc85..2880be27271 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -2658,6 +2658,7 @@ 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("hostdev-scsi-virtio-scsi", QEMU_CAPS_VIRTIO_SCSI, --=20 2.26.2 From nobody Fri Mar 29 10:35:12 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=1592840563; cv=none; d=zohomail.com; s=zohoarc; b=VzbxEJEDNf6p4+1dphPZqAa667zHrr4fgm3f+szxU4RE0clZPMdjnRCCDicUjsbv+aSnwnSU4A0/0Rl5XpKwZaCN70Wq4hgRX6wtQdhZEvFYDmCTkEJz2oPZ0NHPjYyeCQ2HGsMrAPVHTW57L8FonFuEeknM5iEMEyy0wTjdKrU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592840563; 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=bii/BUNhiqDwV9VIxchwCFlDY5hRErB8Pc5PIeS84N0=; b=As4Gt1r7l2f1l1/NvhhO9bCUrzce2AvqzktyhBxzonPj9BkODX97Zap0S5QFFRuaHXB+xufd6TEOeXhy6Og9uyX6ZraKPkKkcu9jC7x8PRuajXe+WVK2+SXWVM/7kD1bYniO3VCiXWKZsq01GL0GtZvpuR/FsCTssAn2XNloy04= 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 1592840563200412.1740485665873; Mon, 22 Jun 2020 08:42:43 -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-50-3KAUm9i2OKWTXDa6Jeovxg-1; Mon, 22 Jun 2020 11:42:39 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6646F8C5362; Mon, 22 Jun 2020 15:42:34 +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 472CD709D7; Mon, 22 Jun 2020 15:42:34 +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 1ABAC833A4; Mon, 22 Jun 2020 15:42:34 +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 05MFgTHC020398 for ; Mon, 22 Jun 2020 11:42:29 -0400 Received: by smtp.corp.redhat.com (Postfix) id DF58B5C220; Mon, 22 Jun 2020 15:42:29 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.23]) by smtp.corp.redhat.com (Postfix) with ESMTP id 552015C1BD for ; Mon, 22 Jun 2020 15:42:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1592840562; 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=bii/BUNhiqDwV9VIxchwCFlDY5hRErB8Pc5PIeS84N0=; b=FR8DDRVvfofHM/qnaXdNj7RxJO8BPwtYqBE+ZtuSasSoDbuTxwTNaAE8S0SpPAooweUfDV 7qaiw+oUdxEG2uWagxgVgHrcGlUSzYh6GKoneqaoOef7iWzk2eeNozSXH34qfRhcVE2w64 flD8UR8Px/S6UPjlKfAFHfKMjHu8KSw= X-MC-Unique: 3KAUm9i2OKWTXDa6Jeovxg-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 04/12] qemuxml2argvtest: hostdev-scsi-lsi: Add test of readonly variant Date: Mon, 22 Jun 2020 17:42:16 +0200 Message-Id: <86e167651b76235d4a29831f49f4fc483ac5e45c.1592840388.git.pkrempa@redhat.com> 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.13 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" "hostdev-scsi-readonly" case tests the readonly disk with a virtio-scsi controller. Add it for the 'lsi' controller test as well. Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik --- tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-2.8.0.args | 2 ++ tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-4.1.0.args | 2 ++ .../qemuxml2argvdata/hostdev-scsi-lsi.x86_64-latest.args | 2 ++ tests/qemuxml2argvdata/hostdev-scsi-lsi.xml | 8 ++++++++ tests/qemuxml2xmloutdata/hostdev-scsi-lsi.xml | 8 ++++++++ 5 files changed, 22 insertions(+) diff --git a/tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-2.8.0.args b/te= sts/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-2.8.0.args index 60467c44558..1808e2a303b 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-2.8.0.args +++ b/tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-2.8.0.args @@ -33,5 +33,7 @@ server,nowait \ -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,scsi-id=3D7,drive=3Ddrive-hostdev0,id= =3Dhostdev0 \ +-drive file=3D/dev/sg0,if=3Dnone,format=3Draw,id=3Ddrive-hostdev1,readonly= =3Don \ +-device scsi-generic,bus=3Dscsi0.0,scsi-id=3D6,drive=3Ddrive-hostdev1,id= =3Dhostdev1 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-4.1.0.args b/te= sts/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-4.1.0.args index 54fbf3a8472..66764f87a1b 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-4.1.0.args +++ b/tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-4.1.0.args @@ -32,6 +32,8 @@ file=3D/tmp/lib/domain--1-QEMUGuest2/master-key.aes \ -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,scsi-id=3D7,drive=3Ddrive-hostdev0,id= =3Dhostdev0 \ +-drive file=3D/dev/sg0,if=3Dnone,format=3Draw,id=3Ddrive-hostdev1,readonly= =3Don \ +-device scsi-generic,bus=3Dscsi0.0,scsi-id=3D6,drive=3Ddrive-hostdev1,id= =3Dhostdev1 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ resourcecontrol=3Ddeny \ diff --git a/tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-latest.args b/t= ests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-latest.args index 23223d4cff1..4d42bf2cbf3 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-latest.args @@ -36,6 +36,8 @@ file=3D/tmp/lib/domain--1-QEMUGuest2/master-key.aes \ -device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -drive file=3D/dev/sg0,if=3Dnone,format=3Draw,id=3Ddrive-hostdev0 \ -device scsi-generic,bus=3Dscsi0.0,scsi-id=3D7,drive=3Ddrive-hostdev0,id= =3Dhostdev0 \ +-drive file=3D/dev/sg0,if=3Dnone,format=3Draw,id=3Ddrive-hostdev1,readonly= =3Don \ +-device scsi-generic,bus=3Dscsi0.0,scsi-id=3D6,drive=3Ddrive-hostdev1,id= =3Dhostdev1 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ resourcecontrol=3Ddeny \ diff --git a/tests/qemuxml2argvdata/hostdev-scsi-lsi.xml b/tests/qemuxml2ar= gvdata/hostdev-scsi-lsi.xml index 34c41e3fe61..cc0960e2216 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-lsi.xml +++ b/tests/qemuxml2argvdata/hostdev-scsi-lsi.xml @@ -32,6 +32,14 @@
+ + + +
+ + +
+ diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-lsi.xml b/tests/qemuxml2= xmloutdata/hostdev-scsi-lsi.xml index 6fb6979399c..10811844255 100644 --- a/tests/qemuxml2xmloutdata/hostdev-scsi-lsi.xml +++ b/tests/qemuxml2xmloutdata/hostdev-scsi-lsi.xml @@ -39,6 +39,14 @@
+ + + +
+ + +
+
--=20 2.26.2 From nobody Fri Mar 29 10:35:12 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=1592840581; cv=none; d=zohomail.com; s=zohoarc; b=CbX2Qp5pkKTMU7b6MMiLD05l7NnkzgJKNPwaiGkyKYz5uPsrw3mKET4NUpH3HlCJH6eXuwwdDAW/f/Q9uwZ4JSPQ6mNsXDVw1rFDA3Ew21zmySH4rK3ThpPNhun3CGv2DaTaBkaiEM/m1zuwIs3ni8O5Ldimza9WTTk+Ul4ApHs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592840581; 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=XJ0hy28v8t/iEIojBvUMt4BNAo6WhGfvrpFekqaui1o=; b=KkBKpYSZBU9N/F9cZevuyoicN+7LM4jZ/CMu9QeGA6tinc2JurzaRUeyEge/FaUYSQEfV1rp6qrx2nmILv4Rg1W+jzAP4IXvyQ4Afeu11lCAGU0/gkVO6Oe6GoXLdWTaoYoaT1L45EOIctkdlETMwGzfbLrrFcqZB1R5cQnjRy8= 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 1592840581017575.5107383295389; Mon, 22 Jun 2020 08:43:01 -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-306-QLjzKbPsP3WFuNHHE5CmXQ-1; Mon, 22 Jun 2020 11:42:54 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id BE7DC8730B2; Mon, 22 Jun 2020 15:42:42 +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 9ACB67C200; 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 68953180BACF; 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 05MFgUJM020410 for ; Mon, 22 Jun 2020 11:42:30 -0400 Received: by smtp.corp.redhat.com (Postfix) id D73DF5C240; Mon, 22 Jun 2020 15:42:30 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.23]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4A8985C1BD for ; Mon, 22 Jun 2020 15:42:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1592840578; 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=XJ0hy28v8t/iEIojBvUMt4BNAo6WhGfvrpFekqaui1o=; b=PieXxb8lJTRzEfcQzhAabNcfWrwGe7IILUMJdSQa/vDytx3Z9TeOjfnp00VF03bhiFVFLi 9uH05e2eWjA9udEIWDviQiXq3muQIuP0YzzBZf/H+g5R3FrsIaa5eVZATvRzZMetfSq/6g padg2Ah4H+PDPpgodPsRnCGC0qe3JnM= X-MC-Unique: QLjzKbPsP3WFuNHHE5CmXQ-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 05/12] qemuxml2argvtest: hostdev-scsi-lsi: Integrate 'hostdev-scsi-lsi-iscsi' case Date: Mon, 22 Jun 2020 17:42:17 +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.13 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 can add the iSCSI hostdevs to the same test file. Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik --- .../hostdev-scsi-lsi-iscsi.args | 37 -------------- .../hostdev-scsi-lsi-iscsi.xml | 42 --------------- .../hostdev-scsi-lsi.x86_64-2.8.0.args | 6 +++ .../hostdev-scsi-lsi.x86_64-4.1.0.args | 8 +++ .../hostdev-scsi-lsi.x86_64-latest.args | 8 +++ tests/qemuxml2argvdata/hostdev-scsi-lsi.xml | 12 +++++ tests/qemuxml2argvtest.c | 3 -- .../hostdev-scsi-lsi-iscsi.xml | 51 ------------------- tests/qemuxml2xmloutdata/hostdev-scsi-lsi.xml | 12 +++++ tests/qemuxml2xmltest.c | 3 -- 10 files changed, 46 insertions(+), 136 deletions(-) delete mode 100644 tests/qemuxml2argvdata/hostdev-scsi-lsi-iscsi.args delete mode 100644 tests/qemuxml2argvdata/hostdev-scsi-lsi-iscsi.xml delete mode 100644 tests/qemuxml2xmloutdata/hostdev-scsi-lsi-iscsi.xml diff --git a/tests/qemuxml2argvdata/hostdev-scsi-lsi-iscsi.args b/tests/qem= uxml2argvdata/hostdev-scsi-lsi-iscsi.args deleted file mode 100644 index f215fba0666..00000000000 --- a/tests/qemuxml2argvdata/hostdev-scsi-lsi-iscsi.args +++ /dev/null @@ -1,37 +0,0 @@ -LC_ALL=3DC \ -PATH=3D/bin \ -HOME=3D/tmp/lib/domain--1-QEMUGuest2 \ -USER=3Dtest \ -LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest2/.local/share \ -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 \ --S \ --machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ --m 214 \ --realtime mlock=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 \ --mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ --rtc base=3Dutc \ --no-shutdown \ --no-acpi \ --device lsi,id=3Dscsi0,bus=3Dpci.0,addr=3D0x3 \ --usb \ --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=3Discsi://example.org:3260/iqn.1992-01.com.example/0,if=3Dnone= ,\ -format=3Draw,id=3Ddrive-hostdev0 \ --device scsi-generic,bus=3Dscsi0.0,scsi-id=3D4,drive=3Ddrive-hostdev0,id= =3Dhostdev0 \ --drive file=3Discsi://example.org:3260/iqn.1992-01.com.example/1,if=3Dnone= ,\ -format=3Draw,id=3Ddrive-hostdev1 \ --device scsi-generic,bus=3Dscsi0.0,scsi-id=3D5,drive=3Ddrive-hostdev1,id= =3Dhostdev1 \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x4 diff --git a/tests/qemuxml2argvdata/hostdev-scsi-lsi-iscsi.xml b/tests/qemu= xml2argvdata/hostdev-scsi-lsi-iscsi.xml deleted file mode 100644 index 85885aad8da..00000000000 --- a/tests/qemuxml2argvdata/hostdev-scsi-lsi-iscsi.xml +++ /dev/null @@ -1,42 +0,0 @@ - - QEMUGuest2 - c7a5fdbd-edaf-9466-926a-d65c16db1809 - 219100 - 219100 - 1 - - hvm - - - - destroy - restart - destroy - - /usr/bin/qemu-system-i386 - - - -
- - - - - - - - - - - -
- - - - - -
- - - - diff --git a/tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-2.8.0.args b/te= sts/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-2.8.0.args index 1808e2a303b..fc02c613875 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-2.8.0.args +++ b/tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-2.8.0.args @@ -35,5 +35,11 @@ server,nowait \ -device scsi-generic,bus=3Dscsi0.0,scsi-id=3D7,drive=3Ddrive-hostdev0,id= =3Dhostdev0 \ -drive file=3D/dev/sg0,if=3Dnone,format=3Draw,id=3Ddrive-hostdev1,readonly= =3Don \ -device scsi-generic,bus=3Dscsi0.0,scsi-id=3D6,drive=3Ddrive-hostdev1,id= =3Dhostdev1 \ +-drive file=3Discsi://example.org:3260/iqn.1992-01.com.example/0,if=3Dnone= ,\ +format=3Draw,id=3Ddrive-hostdev2 \ +-device scsi-generic,bus=3Dscsi0.0,scsi-id=3D4,drive=3Ddrive-hostdev2,id= =3Dhostdev2 \ +-drive file=3Discsi://example.org:3260/iqn.1992-01.com.example/1,if=3Dnone= ,\ +format=3Draw,id=3Ddrive-hostdev3 \ +-device scsi-generic,bus=3Dscsi0.0,scsi-id=3D5,drive=3Ddrive-hostdev3,id= =3Dhostdev3 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-4.1.0.args b/te= sts/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-4.1.0.args index 66764f87a1b..af45fd8cb25 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-4.1.0.args +++ b/tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-4.1.0.args @@ -34,6 +34,14 @@ file=3D/tmp/lib/domain--1-QEMUGuest2/master-key.aes \ -device scsi-generic,bus=3Dscsi0.0,scsi-id=3D7,drive=3Ddrive-hostdev0,id= =3Dhostdev0 \ -drive file=3D/dev/sg0,if=3Dnone,format=3Draw,id=3Ddrive-hostdev1,readonly= =3Don \ -device scsi-generic,bus=3Dscsi0.0,scsi-id=3D6,drive=3Ddrive-hostdev1,id= =3Dhostdev1 \ +-drive file.driver=3Discsi,file.portal=3Dexample.org:3260,\ +file.target=3Diqn.1992-01.com.example,file.lun=3D0,file.transport=3Dtcp,if= =3Dnone,\ +format=3Draw,id=3Ddrive-hostdev2 \ +-device scsi-generic,bus=3Dscsi0.0,scsi-id=3D4,drive=3Ddrive-hostdev2,id= =3Dhostdev2 \ +-drive file.driver=3Discsi,file.portal=3Dexample.org:3260,\ +file.target=3Diqn.1992-01.com.example,file.lun=3D1,file.transport=3Dtcp,if= =3Dnone,\ +format=3Draw,id=3Ddrive-hostdev3 \ +-device scsi-generic,bus=3Dscsi0.0,scsi-id=3D5,drive=3Ddrive-hostdev3,id= =3Dhostdev3 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ resourcecontrol=3Ddeny \ diff --git a/tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-latest.args b/t= ests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-latest.args index 4d42bf2cbf3..32aacd6224e 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-latest.args @@ -38,6 +38,14 @@ file=3D/tmp/lib/domain--1-QEMUGuest2/master-key.aes \ -device scsi-generic,bus=3Dscsi0.0,scsi-id=3D7,drive=3Ddrive-hostdev0,id= =3Dhostdev0 \ -drive file=3D/dev/sg0,if=3Dnone,format=3Draw,id=3Ddrive-hostdev1,readonly= =3Don \ -device scsi-generic,bus=3Dscsi0.0,scsi-id=3D6,drive=3Ddrive-hostdev1,id= =3Dhostdev1 \ +-drive file.driver=3Discsi,file.portal=3Dexample.org:3260,\ +file.target=3Diqn.1992-01.com.example,file.lun=3D0,file.transport=3Dtcp,if= =3Dnone,\ +format=3Draw,id=3Ddrive-hostdev2 \ +-device scsi-generic,bus=3Dscsi0.0,scsi-id=3D4,drive=3Ddrive-hostdev2,id= =3Dhostdev2 \ +-drive file.driver=3Discsi,file.portal=3Dexample.org:3260,\ +file.target=3Diqn.1992-01.com.example,file.lun=3D1,file.transport=3Dtcp,if= =3Dnone,\ +format=3Draw,id=3Ddrive-hostdev3 \ +-device scsi-generic,bus=3Dscsi0.0,scsi-id=3D5,drive=3Ddrive-hostdev3,id= =3Dhostdev3 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ resourcecontrol=3Ddeny \ diff --git a/tests/qemuxml2argvdata/hostdev-scsi-lsi.xml b/tests/qemuxml2ar= gvdata/hostdev-scsi-lsi.xml index cc0960e2216..671bc20f262 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-lsi.xml +++ b/tests/qemuxml2argvdata/hostdev-scsi-lsi.xml @@ -40,6 +40,18 @@
+ + + + +
+ + + + + +
+ diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 2880be27271..c542a7534e8 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -2669,9 +2669,6 @@ mymain(void) DO_TEST("hostdev-scsi-virtio-scsi", QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_SCSI_LSI); - DO_TEST("hostdev-scsi-lsi-iscsi", - QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_SCSI_LSI); DO_TEST("hostdev-scsi-lsi-iscsi-auth", QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_SCSI_LSI); diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-lsi-iscsi.xml b/tests/qe= muxml2xmloutdata/hostdev-scsi-lsi-iscsi.xml deleted file mode 100644 index 463357a20c3..00000000000 --- a/tests/qemuxml2xmloutdata/hostdev-scsi-lsi-iscsi.xml +++ /dev/null @@ -1,51 +0,0 @@ - - QEMUGuest2 - c7a5fdbd-edaf-9466-926a-d65c16db1809 - 219100 - 219100 - 1 - - hvm - - - - destroy - restart - destroy - - /usr/bin/qemu-system-i386 - - - - -
- - -
- - -
- - -
- - - - - - - - -
- - - - - -
- - -
- - - diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-lsi.xml b/tests/qemuxml2= xmloutdata/hostdev-scsi-lsi.xml index 10811844255..b314856d8b7 100644 --- a/tests/qemuxml2xmloutdata/hostdev-scsi-lsi.xml +++ b/tests/qemuxml2xmloutdata/hostdev-scsi-lsi.xml @@ -47,6 +47,18 @@
+ + + + +
+ + + + + +
+
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 022f6786b98..ea9c919f27d 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -1042,9 +1042,6 @@ mymain(void) QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_SCSI_LSI); - DO_TEST("hostdev-scsi-lsi-iscsi", - QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_SCSI_LSI); DO_TEST("hostdev-scsi-lsi-iscsi-auth", QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_SCSI_LSI); --=20 2.26.2 From nobody Fri Mar 29 10:35:12 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=1592840570; cv=none; d=zohomail.com; s=zohoarc; b=KIOws8sTtC5iPToNAcYGI6LJ0b76foRtcBAszbiJYFDdgh8KtY5N/52WUyzXy8mX3epiJ+s9125TY4E9NC/JMDHjzbh4XOXI6qBLJFy9jhvMyFRXIpLxJqOruRxwV69jbnzXAzhxCEFmB89u1OpZtthDtVhUurprL3OnU5Zp0GA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592840570; 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=N5+yT0sEKdaRaFRNq6/dNSE/wQDrTpcWpqyV0T7SXcQ=; b=SD2nw+CuOIx2jixkZCUVvxN10Xm5+oA8d2uCIA51QqmJG570mEI0dA96c56+qNhg3Ufh3ewUgx2y6/VGjaOsPsxdBbiQalrrmt3med99fcKi1vWZa5rsC5Pv775jxKXVNpoCuTLQvBtf6LwU7HUxQpSWzFTnCvHMGnPd37Xjn4Y= 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 1592840570640446.93523277341217; Mon, 22 Jun 2020 08:42:50 -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-295-1sOvOQLAMF-kA7OtJ29cuQ-1; Mon, 22 Jun 2020 11:42:47 -0400 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 717388005AD; Mon, 22 Jun 2020 15:42:40 +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 5165F5BADE; Mon, 22 Jun 2020 15:42:40 +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 1FAAE1809561; Mon, 22 Jun 2020 15:42:40 +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 05MFgVKe020424 for ; Mon, 22 Jun 2020 11:42:31 -0400 Received: by smtp.corp.redhat.com (Postfix) id E9DFB5C1BD; Mon, 22 Jun 2020 15:42:31 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.23]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3F4BE5C583 for ; Mon, 22 Jun 2020 15:42:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1592840569; 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=N5+yT0sEKdaRaFRNq6/dNSE/wQDrTpcWpqyV0T7SXcQ=; b=BpTUWhKOZYJnnFgWPIbCuPZSATdG00CjL1njX5+NGHSOSXfyss7ZOvnRx1TNEfna/6ZMSX rkijKSWIoDqw8onITXu97Td0Szd5UAjInJ25RBjoNkVqBl1YTPD3Gu18X6msJ51KVRYk+2 hcSHgQXCRirrXoMKILhBUH/cQFleQmM= X-MC-Unique: 1sOvOQLAMF-kA7OtJ29cuQ-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 06/12] qemuxml2argvtest: hostdev-scsi-lsi: Integrate 'hostdev-scsi-lsi-iscsi-auth' case Date: Mon, 22 Jun 2020 17:42:18 +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.15 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 can add the authenticated iSCSI hostdevs to the same test file. Additionally this now covers passing secret via the 'secret' object rather than on the command line. Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik --- .../hostdev-scsi-lsi-iscsi-auth.args | 37 ------------ .../hostdev-scsi-lsi-iscsi-auth.xml | 48 ---------------- .../hostdev-scsi-lsi.x86_64-2.8.0.args | 6 ++ .../hostdev-scsi-lsi.x86_64-4.1.0.args | 16 ++++++ .../hostdev-scsi-lsi.x86_64-latest.args | 16 ++++++ tests/qemuxml2argvdata/hostdev-scsi-lsi.xml | 18 ++++++ tests/qemuxml2argvtest.c | 3 - .../hostdev-scsi-lsi-iscsi-auth.xml | 57 ------------------- tests/qemuxml2xmloutdata/hostdev-scsi-lsi.xml | 18 ++++++ tests/qemuxml2xmltest.c | 3 - 10 files changed, 74 insertions(+), 148 deletions(-) delete mode 100644 tests/qemuxml2argvdata/hostdev-scsi-lsi-iscsi-auth.args delete mode 100644 tests/qemuxml2argvdata/hostdev-scsi-lsi-iscsi-auth.xml delete mode 100644 tests/qemuxml2xmloutdata/hostdev-scsi-lsi-iscsi-auth.xml diff --git a/tests/qemuxml2argvdata/hostdev-scsi-lsi-iscsi-auth.args b/test= s/qemuxml2argvdata/hostdev-scsi-lsi-iscsi-auth.args deleted file mode 100644 index 03e77517b48..00000000000 --- a/tests/qemuxml2argvdata/hostdev-scsi-lsi-iscsi-auth.args +++ /dev/null @@ -1,37 +0,0 @@ -LC_ALL=3DC \ -PATH=3D/bin \ -HOME=3D/tmp/lib/domain--1-QEMUGuest2 \ -USER=3Dtest \ -LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest2/.local/share \ -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 \ --S \ --machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ --m 214 \ --realtime mlock=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 \ --mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ --rtc base=3Dutc \ --no-shutdown \ --no-acpi \ --device lsi,id=3Dscsi0,bus=3Dpci.0,addr=3D0x3 \ --usb \ --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=3Discsi://myname:AQCVn5hO6HzFAhAAq0NCv8jtJcIcE+HOBlMQ1A@exampl= e.org:\ -3260/iqn.1992-01.com.example%3Astorage/1,if=3Dnone,format=3Draw,id=3Ddrive= -hostdev0 \ --device scsi-generic,bus=3Dscsi0.0,scsi-id=3D4,drive=3Ddrive-hostdev0,id= =3Dhostdev0 \ --drive file=3Discsi://myname:AQCVn5hO6HzFAhAAq0NCv8jtJcIcE+HOBlMQ1A@exampl= e.org:\ -3260/iqn.1992-01.com.example%3Astorage/2,if=3Dnone,format=3Draw,id=3Ddrive= -hostdev1 \ --device scsi-generic,bus=3Dscsi0.0,scsi-id=3D5,drive=3Ddrive-hostdev1,id= =3Dhostdev1 \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x4 diff --git a/tests/qemuxml2argvdata/hostdev-scsi-lsi-iscsi-auth.xml b/tests= /qemuxml2argvdata/hostdev-scsi-lsi-iscsi-auth.xml deleted file mode 100644 index 439aa05db02..00000000000 --- a/tests/qemuxml2argvdata/hostdev-scsi-lsi-iscsi-auth.xml +++ /dev/null @@ -1,48 +0,0 @@ - - QEMUGuest2 - c7a5fdbd-edaf-9466-926a-d65c16db1809 - 219100 - 219100 - 1 - - hvm - - - - destroy - restart - destroy - - /usr/bin/qemu-system-i386 - - - -
- - - - - - - - - - - - - - -
- - - - - - - - -
- - - - diff --git a/tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-2.8.0.args b/te= sts/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-2.8.0.args index fc02c613875..51dd2da7de2 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-2.8.0.args +++ b/tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-2.8.0.args @@ -41,5 +41,11 @@ format=3Draw,id=3Ddrive-hostdev2 \ -drive file=3Discsi://example.org:3260/iqn.1992-01.com.example/1,if=3Dnone= ,\ format=3Draw,id=3Ddrive-hostdev3 \ -device scsi-generic,bus=3Dscsi0.0,scsi-id=3D5,drive=3Ddrive-hostdev3,id= =3Dhostdev3 \ +-drive file=3Discsi://myname:AQCVn5hO6HzFAhAAq0NCv8jtJcIcE+HOBlMQ1A@exampl= e.org:\ +3260/iqn.1992-01.com.example%3Astorage/1,if=3Dnone,format=3Draw,id=3Ddrive= -hostdev4 \ +-device scsi-generic,bus=3Dscsi0.0,scsi-id=3D3,drive=3Ddrive-hostdev4,id= =3Dhostdev4 \ +-drive file=3Discsi://myname:AQCVn5hO6HzFAhAAq0NCv8jtJcIcE+HOBlMQ1A@exampl= e.org:\ +3260/iqn.1992-01.com.example%3Astorage/2,if=3Dnone,format=3Draw,id=3Ddrive= -hostdev5 \ +-device scsi-generic,bus=3Dscsi0.0,scsi-id=3D2,drive=3Ddrive-hostdev5,id= =3Dhostdev5 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-4.1.0.args b/te= sts/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-4.1.0.args index af45fd8cb25..cee891199dd 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-4.1.0.args +++ b/tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-4.1.0.args @@ -42,6 +42,22 @@ format=3Draw,id=3Ddrive-hostdev2 \ file.target=3Diqn.1992-01.com.example,file.lun=3D1,file.transport=3Dtcp,if= =3Dnone,\ format=3Draw,id=3Ddrive-hostdev3 \ -device scsi-generic,bus=3Dscsi0.0,scsi-id=3D5,drive=3Ddrive-hostdev3,id= =3Dhostdev3 \ +-object secret,id=3Dhostdev4-secret0,\ +data=3D9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\ +keyid=3DmasterKey0,iv=3DAAECAwQFBgcICQoLDA0ODw=3D=3D,format=3Dbase64 \ +-drive file.driver=3Discsi,file.portal=3Dexample.org:3260,\ +file.target=3Diqn.1992-01.com.example:storage,file.lun=3D1,file.transport= =3Dtcp,\ +file.user=3Dmyname,file.password-secret=3Dhostdev4-secret0,if=3Dnone,forma= t=3Draw,\ +id=3Ddrive-hostdev4 \ +-device scsi-generic,bus=3Dscsi0.0,scsi-id=3D3,drive=3Ddrive-hostdev4,id= =3Dhostdev4 \ +-object secret,id=3Dhostdev5-secret0,\ +data=3D9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\ +keyid=3DmasterKey0,iv=3DAAECAwQFBgcICQoLDA0ODw=3D=3D,format=3Dbase64 \ +-drive file.driver=3Discsi,file.portal=3Dexample.org:3260,\ +file.target=3Diqn.1992-01.com.example:storage,file.lun=3D2,file.transport= =3Dtcp,\ +file.user=3Dmyname,file.password-secret=3Dhostdev5-secret0,if=3Dnone,forma= t=3Draw,\ +id=3Ddrive-hostdev5 \ +-device scsi-generic,bus=3Dscsi0.0,scsi-id=3D2,drive=3Ddrive-hostdev5,id= =3Dhostdev5 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ resourcecontrol=3Ddeny \ diff --git a/tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-latest.args b/t= ests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-latest.args index 32aacd6224e..76a0708336a 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-latest.args @@ -46,6 +46,22 @@ format=3Draw,id=3Ddrive-hostdev2 \ file.target=3Diqn.1992-01.com.example,file.lun=3D1,file.transport=3Dtcp,if= =3Dnone,\ format=3Draw,id=3Ddrive-hostdev3 \ -device scsi-generic,bus=3Dscsi0.0,scsi-id=3D5,drive=3Ddrive-hostdev3,id= =3Dhostdev3 \ +-object secret,id=3Dhostdev4-secret0,\ +data=3D9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\ +keyid=3DmasterKey0,iv=3DAAECAwQFBgcICQoLDA0ODw=3D=3D,format=3Dbase64 \ +-drive file.driver=3Discsi,file.portal=3Dexample.org:3260,\ +file.target=3Diqn.1992-01.com.example:storage,file.lun=3D1,file.transport= =3Dtcp,\ +file.user=3Dmyname,file.password-secret=3Dhostdev4-secret0,if=3Dnone,forma= t=3Draw,\ +id=3Ddrive-hostdev4 \ +-device scsi-generic,bus=3Dscsi0.0,scsi-id=3D3,drive=3Ddrive-hostdev4,id= =3Dhostdev4 \ +-object secret,id=3Dhostdev5-secret0,\ +data=3D9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\ +keyid=3DmasterKey0,iv=3DAAECAwQFBgcICQoLDA0ODw=3D=3D,format=3Dbase64 \ +-drive file.driver=3Discsi,file.portal=3Dexample.org:3260,\ +file.target=3Diqn.1992-01.com.example:storage,file.lun=3D2,file.transport= =3Dtcp,\ +file.user=3Dmyname,file.password-secret=3Dhostdev5-secret0,if=3Dnone,forma= t=3Draw,\ +id=3Ddrive-hostdev5 \ +-device scsi-generic,bus=3Dscsi0.0,scsi-id=3D2,drive=3Ddrive-hostdev5,id= =3Dhostdev5 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ resourcecontrol=3Ddeny \ diff --git a/tests/qemuxml2argvdata/hostdev-scsi-lsi.xml b/tests/qemuxml2ar= gvdata/hostdev-scsi-lsi.xml index 671bc20f262..9f45084f1cb 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-lsi.xml +++ b/tests/qemuxml2argvdata/hostdev-scsi-lsi.xml @@ -52,6 +52,24 @@
+ + + + + + + +
+ + + + + + + + +
+ diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index c542a7534e8..3cef0616a50 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -2669,9 +2669,6 @@ mymain(void) DO_TEST("hostdev-scsi-virtio-scsi", QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_SCSI_LSI); - DO_TEST("hostdev-scsi-lsi-iscsi-auth", - QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_SCSI_LSI); DO_TEST("hostdev-scsi-virtio-iscsi", QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_SCSI_LSI); diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-lsi-iscsi-auth.xml b/tes= ts/qemuxml2xmloutdata/hostdev-scsi-lsi-iscsi-auth.xml deleted file mode 100644 index d0e025d8151..00000000000 --- a/tests/qemuxml2xmloutdata/hostdev-scsi-lsi-iscsi-auth.xml +++ /dev/null @@ -1,57 +0,0 @@ - - QEMUGuest2 - c7a5fdbd-edaf-9466-926a-d65c16db1809 - 219100 - 219100 - 1 - - hvm - - - - destroy - restart - destroy - - /usr/bin/qemu-system-i386 - - - - -
- - -
- - -
- - -
- - - - - - - - - - - -
- - - - - - - - -
- - -
- - - diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-lsi.xml b/tests/qemuxml2= xmloutdata/hostdev-scsi-lsi.xml index b314856d8b7..9cefc3471ca 100644 --- a/tests/qemuxml2xmloutdata/hostdev-scsi-lsi.xml +++ b/tests/qemuxml2xmloutdata/hostdev-scsi-lsi.xml @@ -59,6 +59,24 @@
+ + + + + + + +
+ + + + + + + + +
+
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index ea9c919f27d..2857f4f30f9 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -1042,9 +1042,6 @@ mymain(void) QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_SCSI_LSI); - DO_TEST("hostdev-scsi-lsi-iscsi-auth", - 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 From nobody Fri Mar 29 10:35:12 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=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 Reviewed-by: Michal Privoznik --- ...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 From nobody Fri Mar 29 10:35:12 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) client-ip=207.211.31.81; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 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=1592840573; cv=none; d=zohomail.com; s=zohoarc; b=UsFBn25aGkm0aEXY6x90Nzhrxs4swBr5cbSr9LoMXsLSDwN76t9WenA31F9MF5Rqeg1tz3/+TZ+P30NhtKYnjjMMpxFNG3AM0pFcfqdHvBcfD/qejCFSIFbBz2qPV780/g/ocApbfjGLlsNKTrcBvBclpieKSPAy/oyhSoRXaZQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592840573; 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=VQdWSiRAjOjIgbnyBwRau3Iux+L/Kw4A+hW/c0xc8s4=; b=C+lHiGyrTgcrDr8bJjgME2um1I7Y7QM/kr+iIu6YxmHuEnoc4oYQFefbEh049VLVwxCn3GAq3rvtEcxAr1Q5o+v+g3gqJ4CWCBvTASnRuC4dazgiNM7f1DXnSMe4dbzE6G2UYReJFeuy5M0NaQMQrkC7Eszl+QLQrfzZo75W7Cs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 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-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 1592840573800804.0328438754335; Mon, 22 Jun 2020 08:42:53 -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-137-EtN0x4-8P4K1hjQXVX5zmA-1; Mon, 22 Jun 2020 11:42:49 -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 F235910A0300; 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 D1DAB71677; 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 A1246833CE; 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 05MFgXgf020441 for ; Mon, 22 Jun 2020 11:42:33 -0400 Received: by smtp.corp.redhat.com (Postfix) id C53605C220; Mon, 22 Jun 2020 15:42:33 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.23]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3CB8D5C1BD for ; Mon, 22 Jun 2020 15:42:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1592840572; 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=VQdWSiRAjOjIgbnyBwRau3Iux+L/Kw4A+hW/c0xc8s4=; b=BPgE+1Pj6ne7+VmaRytwqEXx+9UKTXvGWzUv/JPZYHxKdd2u6mBnwVaimUTVuzkwg4o4Ll LJIA+c/v8OF+vVYFVY/EpGfXklbu0Oehfi5veGQcMPvrM+t8W0YQyifZUGDLTRnDO0V8Gw 2nwaB4CWXO33i2MsMDQrnFya6MWAork= X-MC-Unique: EtN0x4-8P4K1hjQXVX5zmA-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 08/12] qemuxml2argvtest: hostdev-scsi-virtio-scsi: Add "latest" caps version Date: Mon, 22 Jun 2020 17:42:20 +0200 Message-Id: <6c669c4a043e36531e4f27afbaefac36c9665f08.1592840388.git.pkrempa@redhat.com> 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" Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik --- ...ostdev-scsi-virtio-scsi.x86_64-latest.args | 43 +++++++++++++++++++ tests/qemuxml2argvtest.c | 1 + 2 files changed, 44 insertions(+) create mode 100644 tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-= latest.args diff --git a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-latest.= args b/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-latest.args new file mode 100644 index 00000000000..9a70b6eeb0f --- /dev/null +++ b/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-latest.args @@ -0,0 +1,43 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/tmp/lib/domain--1-QEMUGuest2 \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest2/.local/share \ +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 guest=3DQEMUGuest2,debug-threads=3Don \ +-S \ +-object secret,id=3DmasterKey0,format=3Draw,\ +file=3D/tmp/lib/domain--1-QEMUGuest2/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-9466-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 \ +-device virtio-scsi-pci,id=3Dscsi0,bus=3Dpci.0,addr=3D0x2 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2",\ +"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 ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=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=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 9d877d7d2b4..1f3e836698a 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -2660,6 +2660,7 @@ mymain(void) 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_CAPS_LATEST("hostdev-scsi-virtio-scsi"); DO_TEST("hostdev-scsi-readonly", QEMU_CAPS_VIRTIO_SCSI, --=20 2.26.2 From nobody Fri Mar 29 10:35:12 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=1592840581; cv=none; d=zohomail.com; s=zohoarc; b=SbVRY1XRFCFs65t+O6WPmsmMLWv6lMwCAh7QGR3wdu0lR8ersRL8avXDtwJ2BPQxIfAVQgszjI10HisdZYdGSMxFxuepE2FEBhqrU7xYyjEOi+YORxSqaSBqoLsQ4SgqI5YKmqOs3NiGEyMtNg1mxWqijv6WQjZE/VFI2wTYR48= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592840581; 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=x9+cJu7K827vQX2R09XTeRKfTH9u7vRpoH/lZ9SHLbM=; b=kR++1bGqoRolkThPhfqY8IjNDz0lG8MM3unmIErfrlH1AY7WczEdYtp27W6uTdcB3FHZgm1fnFyfHmzTeYB+Jjb+ouJ0BQFkoPrLCMQOdrxmaAIfXT1H5u4N5/YLr+c7kgvQRDHfJcp0JGUctB9cwm2I0pNa87sSWZkLYNqnoAQ= 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 1592840581312507.39349433478935; Mon, 22 Jun 2020 08:43:01 -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-347-3CjLO5acM-Cw1ZmM0VpmFQ-1; Mon, 22 Jun 2020 11:42:58 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 25CC6107ACF3; Mon, 22 Jun 2020 15:42:45 +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 05A8C6FDD1; Mon, 22 Jun 2020 15:42:45 +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 C8FDD180CB27; Mon, 22 Jun 2020 15:42:44 +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 05MFgYop020451 for ; Mon, 22 Jun 2020 11:42:34 -0400 Received: by smtp.corp.redhat.com (Postfix) id B01385C220; Mon, 22 Jun 2020 15:42:34 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.23]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2F5525C1BD for ; Mon, 22 Jun 2020 15:42:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1592840580; 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=x9+cJu7K827vQX2R09XTeRKfTH9u7vRpoH/lZ9SHLbM=; b=fZepmQa0Hmn+Ft0wzEFKXSRi591VxjACQA6mIQOeDhqOQtNMWFikC67ppyZfmi911M35/v z7T7VJGG8jeItPF+b9qTHy1aQjAHN+7jstmoCebnneBTOthynaMj6/Jdt+Vr4ir11413iB i3U8BFsWbcvQZW2kcCZPqKBc2Ch0fvQ= X-MC-Unique: 3CjLO5acM-Cw1ZmM0VpmFQ-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 09/12] qemuxml2argvtest: hostdev-scsi-virtio-scsi: Add qemu-2.8 variant Date: Mon, 22 Jun 2020 17:42:21 +0200 Message-Id: <830eb33796350727ac39cfba051693a74f281a16.1592840388.git.pkrempa@redhat.com> 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.13 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" qemu-2.8 didn't yet support QEMU_CAPS_ISCSI_PASSWORD_SECRET. This version will allow integrating multiple test cases into one. Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik --- ...hostdev-scsi-virtio-scsi.x86_64-2.8.0.args | 38 +++++++++++++++++++ tests/qemuxml2argvtest.c | 1 + 2 files changed, 39 insertions(+) create mode 100644 tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-= 2.8.0.args diff --git a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-2.8.0.a= rgs b/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-2.8.0.args new file mode 100644 index 00000000000..810d02a408a --- /dev/null +++ b/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-2.8.0.args @@ -0,0 +1,38 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/tmp/lib/domain--1-QEMUGuest2 \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest2/.local/share \ +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 guest=3DQEMUGuest2,debug-threads=3Don \ +-S \ +-object secret,id=3DmasterKey0,format=3Draw,\ +file=3D/tmp/lib/domain--1-QEMUGuest2/master-key.aes \ +-machine pc-i440fx-2.8,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ +-m 214 \ +-realtime mlock=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 \ +-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 \ +-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=3D0x3 \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 1f3e836698a..d9544a511b7 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -2659,6 +2659,7 @@ 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", "2.8.0"); DO_TEST_CAPS_VER("hostdev-scsi-virtio-scsi", "4.1.0"); DO_TEST_CAPS_LATEST("hostdev-scsi-virtio-scsi"); --=20 2.26.2 From nobody Fri Mar 29 10:35:12 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=1592840578; cv=none; d=zohomail.com; s=zohoarc; b=Bl0RdBUbnWT5Ns6FCNuS0S/cU0C1TtYX2oCVNn/2xYp/fwak3BDPU989RKXkee8JFatWunDBdeC/Nc3g2EFfVuk75Fr2CE5V+uts536sojaipvHuPQsISkf+P9iejglunhM17oJL30N3U51xbtzc/wU9PC/ZRdY4HyU3nripGRg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592840578; 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=qUqZ5wMR7rg+UgR8rn0Iou9AsHnlqSoAGVoOo/nlhsk=; b=ZbYQYXmHoiqJY7KZtBB3DrEpsRo7ytJaN98J8V/9Nlq1y0NHMELLqWJO6WyTpnqsXMuwbOJPnZ7WdAPuSPuxMgL7UrFfZdWFFNCkvWMABwZqNfbEGirtlpmM0WfxUHh6hSwfyQ4QqdlRr8RfdRG1SN5oGvS7WD8Xc5AcDqbYpiI= 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 1592840578330739.685847914338; Mon, 22 Jun 2020 08:42:58 -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-281-N9b3Nh8zOJeyA3_ozyDaqQ-1; Mon, 22 Jun 2020 11:42:54 -0400 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 428631883612; Mon, 22 Jun 2020 15:42:45 +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 1ECCD5C1BD; Mon, 22 Jun 2020 15:42:45 +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 E1F92180597C; Mon, 22 Jun 2020 15:42:44 +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 05MFgZd8020470 for ; Mon, 22 Jun 2020 11:42:35 -0400 Received: by smtp.corp.redhat.com (Postfix) id 9D7395C220; Mon, 22 Jun 2020 15:42:35 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.23]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1125F5C1BD for ; Mon, 22 Jun 2020 15:42:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1592840577; 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=qUqZ5wMR7rg+UgR8rn0Iou9AsHnlqSoAGVoOo/nlhsk=; b=FVPA1EUdeUKdnoxVmiRb61H8M3JtNo/8eM0lQji81LvD25t44dTLq9S6gLKnJHV8vdX8Vp j/y1WAnaUoRFNm/gTQYwCQz+XtP+eJdLUlzHV7oOKEOTlqX9XjLVAX29+1coVWYmgagKZf mhhvmTN0/AVG8Anq3Yp9pOkTStlkIQo= X-MC-Unique: N9b3Nh8zOJeyA3_ozyDaqQ-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 10/12] qemuxml2argvtest: hostdev-scsi-virtio-scsi: Integrate 'hostdev-scsi-readonly' Date: Mon, 22 Jun 2020 17:42:22 +0200 Message-Id: <11d29688a34c148730f199f915e22621718b6a2b.1592840388.git.pkrempa@redhat.com> 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.16 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" This can be tested along with other stuff. Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik --- .../hostdev-scsi-readonly.args | 34 -------------- .../hostdev-scsi-readonly.xml | 38 --------------- ...hostdev-scsi-virtio-scsi.x86_64-2.8.0.args | 3 ++ ...hostdev-scsi-virtio-scsi.x86_64-4.1.0.args | 3 ++ ...ostdev-scsi-virtio-scsi.x86_64-latest.args | 3 ++ .../hostdev-scsi-virtio-scsi.xml | 8 ++++ tests/qemuxml2argvtest.c | 3 -- .../hostdev-scsi-readonly.xml | 47 ------------------- .../hostdev-scsi-virtio-scsi.xml | 8 ++++ tests/qemuxml2xmltest.c | 3 -- 10 files changed, 25 insertions(+), 125 deletions(-) delete mode 100644 tests/qemuxml2argvdata/hostdev-scsi-readonly.args delete mode 100644 tests/qemuxml2argvdata/hostdev-scsi-readonly.xml delete mode 100644 tests/qemuxml2xmloutdata/hostdev-scsi-readonly.xml diff --git a/tests/qemuxml2argvdata/hostdev-scsi-readonly.args b/tests/qemu= xml2argvdata/hostdev-scsi-readonly.args deleted file mode 100644 index 0e481e74647..00000000000 --- a/tests/qemuxml2argvdata/hostdev-scsi-readonly.args +++ /dev/null @@ -1,34 +0,0 @@ -LC_ALL=3DC \ -PATH=3D/bin \ -HOME=3D/tmp/lib/domain--1-QEMUGuest2 \ -USER=3Dtest \ -LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest2/.local/share \ -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 \ --S \ --machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ --m 214 \ --realtime mlock=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 \ --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 \ --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,readonly= =3Don \ --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 diff --git a/tests/qemuxml2argvdata/hostdev-scsi-readonly.xml b/tests/qemux= ml2argvdata/hostdev-scsi-readonly.xml deleted file mode 100644 index 2e70edd6400..00000000000 --- a/tests/qemuxml2argvdata/hostdev-scsi-readonly.xml +++ /dev/null @@ -1,38 +0,0 @@ - - QEMUGuest2 - c7a5fdbd-edaf-9466-926a-d65c16db1809 - 219100 - 219100 - 1 - - hvm - - - - destroy - restart - destroy - - /usr/bin/qemu-system-i386 - - - -
- - - - - - - - - - -
- - -
- - - - diff --git a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-2.8.0.a= rgs b/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-2.8.0.args index 810d02a408a..50353df478c 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-2.8.0.args +++ b/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-2.8.0.args @@ -34,5 +34,8 @@ server,nowait \ -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 \ +-drive file=3D/dev/sg0,if=3Dnone,format=3Draw,id=3Ddrive-hostdev1,readonly= =3Don \ +-device scsi-generic,bus=3Dscsi0.0,channel=3D0,scsi-id=3D4,lun=3D7,\ +drive=3Ddrive-hostdev1,id=3Dhostdev1 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-4.1.0.a= rgs b/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-4.1.0.args index e74fd1118ca..e0680fce4cf 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-4.1.0.args +++ b/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-4.1.0.args @@ -33,6 +33,9 @@ file=3D/tmp/lib/domain--1-QEMUGuest2/master-key.aes \ -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 \ +-drive file=3D/dev/sg0,if=3Dnone,format=3Draw,id=3Ddrive-hostdev1,readonly= =3Don \ +-device scsi-generic,bus=3Dscsi0.0,channel=3D0,scsi-id=3D4,lun=3D7,\ +drive=3Ddrive-hostdev1,id=3Dhostdev1 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ resourcecontrol=3Ddeny \ diff --git a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-latest.= args b/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-latest.args index 9a70b6eeb0f..0da84d08b30 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-latest.args @@ -37,6 +37,9 @@ file=3D/tmp/lib/domain--1-QEMUGuest2/master-key.aes \ -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 \ +-drive file=3D/dev/sg0,if=3Dnone,format=3Draw,id=3Ddrive-hostdev1,readonly= =3Don \ +-device scsi-generic,bus=3Dscsi0.0,channel=3D0,scsi-id=3D4,lun=3D7,\ +drive=3Ddrive-hostdev1,id=3Dhostdev1 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ resourcecontrol=3Ddeny \ diff --git a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.xml b/tests/qe= muxml2argvdata/hostdev-scsi-virtio-scsi.xml index 0fe01de1abd..013c8cd17f7 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.xml +++ b/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.xml @@ -32,6 +32,14 @@
+ + + +
+ + +
+ diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index d9544a511b7..e10d90fbf88 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -2663,9 +2663,6 @@ mymain(void) DO_TEST_CAPS_VER("hostdev-scsi-virtio-scsi", "4.1.0"); DO_TEST_CAPS_LATEST("hostdev-scsi-virtio-scsi"); - DO_TEST("hostdev-scsi-readonly", - QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_SCSI_LSI); DO_TEST("hostdev-scsi-virtio-iscsi", QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_SCSI_LSI); diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-readonly.xml b/tests/qem= uxml2xmloutdata/hostdev-scsi-readonly.xml deleted file mode 100644 index 17bb7e3904d..00000000000 --- a/tests/qemuxml2xmloutdata/hostdev-scsi-readonly.xml +++ /dev/null @@ -1,47 +0,0 @@ - - QEMUGuest2 - c7a5fdbd-edaf-9466-926a-d65c16db1809 - 219100 - 219100 - 1 - - hvm - - - - destroy - restart - destroy - - /usr/bin/qemu-system-i386 - - - - -
- - -
- - -
- - -
- - - - - - - -
- - -
- - -
- - - diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-virtio-scsi.xml b/tests/= qemuxml2xmloutdata/hostdev-scsi-virtio-scsi.xml index 81ae94318b5..a1fa36de386 100644 --- a/tests/qemuxml2xmloutdata/hostdev-scsi-virtio-scsi.xml +++ b/tests/qemuxml2xmloutdata/hostdev-scsi-virtio-scsi.xml @@ -39,6 +39,14 @@
+ + + +
+ + +
+
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 2857f4f30f9..d3da788979d 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -1021,9 +1021,6 @@ mymain(void) 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-shareable", QEMU_CAPS_VIRTIO_SCSI, --=20 2.26.2 From nobody Fri Mar 29 10:35:12 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) client-ip=207.211.31.81; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 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=1592840650; cv=none; d=zohomail.com; s=zohoarc; b=CWnTO49kgkZZQPCfIUeRBT6WvKiL72KFn4kVKm9DDwacJDKLPl3KpEyNl+TwQLOFERbeVCByFixqlZJxjFdcdTgQewj0nVKxgxEnn2NOPNv2qfP5OYN5wi0gWUSYV1AgE7SXu/5CJZlFnDikiTZ+TlkBHoSqKjYg4/MCEE0u+kU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592840650; 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=JOzR1mA2PnOqIL9m2wSB2zBwxam8ArbhhxY/bdAD6vI=; b=ludc3lDV65pDP6Sh1fg/nhWd8EZGU4Ge9NZSQ1sYqOuGLdBigFHhCLFL9CO4Lg49OmiEwBNBrnYHySpjnKH2QvuyXCU/h3LrmGCK6fXyHwZr4ik/S+DSj3DcR0efAfjundOJOjRTbZ8/sSH8OPTpf41UpUZvHTLXaxrVqwZJYgU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 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-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 1592840650083115.57988065339134; Mon, 22 Jun 2020 08:44:10 -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-203-akpRyAgTOVqKyiLU1smlgw-1; Mon, 22 Jun 2020 11:42:57 -0400 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 B89031883627; Mon, 22 Jun 2020 15:42:47 +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 72D3B5C220; Mon, 22 Jun 2020 15:42:47 +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 435A0180530F; Mon, 22 Jun 2020 15:42:47 +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 05MFga0V020478 for ; Mon, 22 Jun 2020 11:42:36 -0400 Received: by smtp.corp.redhat.com (Postfix) id 8912D5C1BD; Mon, 22 Jun 2020 15:42:36 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.23]) by smtp.corp.redhat.com (Postfix) with ESMTP id 07CA25C220 for ; Mon, 22 Jun 2020 15:42:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1592840648; 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=JOzR1mA2PnOqIL9m2wSB2zBwxam8ArbhhxY/bdAD6vI=; b=QwCmOae6BRJn/JCFI3rhbADysKPdnlEzth9JCUiaHG8q1GkXxAwz0AZUcDj9kZofI8mQXr idPuybWyEcnGwXROo0ip/qhQuohp91l3s0VTO/RxEarWSH7zw2NGznisHsBp2om76czf1m cOCkQUp4ZXi37kIfGswtwJR+Scpjfpo= X-MC-Unique: akpRyAgTOVqKyiLU1smlgw-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 11/12] qemuxml2argvtest: hostdev-scsi-virtio-scsi: Integrate 'hostdev-scsi-virtio-iscsi' case Date: Mon, 22 Jun 2020 17:42:23 +0200 Message-Id: <34e222b46a4182bdbb9a5d6455ca04960e53269f.1592840388.git.pkrempa@redhat.com> 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.16 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 can add the iSCSI hostdevs to the same test file. Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik --- .../hostdev-scsi-virtio-iscsi.args | 39 -------------- .../hostdev-scsi-virtio-iscsi.xml | 42 --------------- ...hostdev-scsi-virtio-scsi.x86_64-2.8.0.args | 8 +++ ...hostdev-scsi-virtio-scsi.x86_64-4.1.0.args | 10 ++++ ...ostdev-scsi-virtio-scsi.x86_64-latest.args | 10 ++++ .../hostdev-scsi-virtio-scsi.xml | 12 +++++ tests/qemuxml2argvtest.c | 3 -- .../hostdev-scsi-virtio-iscsi.xml | 51 ------------------- .../hostdev-scsi-virtio-scsi.xml | 12 +++++ tests/qemuxml2xmltest.c | 3 -- 10 files changed, 52 insertions(+), 138 deletions(-) delete mode 100644 tests/qemuxml2argvdata/hostdev-scsi-virtio-iscsi.args delete mode 100644 tests/qemuxml2argvdata/hostdev-scsi-virtio-iscsi.xml delete mode 100644 tests/qemuxml2xmloutdata/hostdev-scsi-virtio-iscsi.xml diff --git a/tests/qemuxml2argvdata/hostdev-scsi-virtio-iscsi.args b/tests/= qemuxml2argvdata/hostdev-scsi-virtio-iscsi.args deleted file mode 100644 index 050e74a449d..00000000000 --- a/tests/qemuxml2argvdata/hostdev-scsi-virtio-iscsi.args +++ /dev/null @@ -1,39 +0,0 @@ -LC_ALL=3DC \ -PATH=3D/bin \ -HOME=3D/tmp/lib/domain--1-QEMUGuest2 \ -USER=3Dtest \ -LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest2/.local/share \ -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 \ --S \ --machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ --m 214 \ --realtime mlock=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 \ --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 \ --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=3Discsi://example.org:3260/iqn.1992-01.com.example/0,if=3Dnone= ,\ -format=3Draw,id=3Ddrive-hostdev0 \ --device scsi-generic,bus=3Dscsi0.0,channel=3D0,scsi-id=3D2,lun=3D4,\ -drive=3Ddrive-hostdev0,id=3Dhostdev0 \ --drive file=3Discsi://example.org:3260/iqn.1992-01.com.example/1,if=3Dnone= ,\ -format=3Draw,id=3Ddrive-hostdev1 \ --device scsi-generic,bus=3Dscsi0.0,channel=3D0,scsi-id=3D2,lun=3D5,\ -drive=3Ddrive-hostdev1,id=3Dhostdev1 \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x4 diff --git a/tests/qemuxml2argvdata/hostdev-scsi-virtio-iscsi.xml b/tests/q= emuxml2argvdata/hostdev-scsi-virtio-iscsi.xml deleted file mode 100644 index 88684c94054..00000000000 --- a/tests/qemuxml2argvdata/hostdev-scsi-virtio-iscsi.xml +++ /dev/null @@ -1,42 +0,0 @@ - - QEMUGuest2 - c7a5fdbd-edaf-9466-926a-d65c16db1809 - 219100 - 219100 - 1 - - hvm - - - - destroy - restart - destroy - - /usr/bin/qemu-system-i386 - - - -
- - - - - - - - - - - -
- - - - - -
- - - - diff --git a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-2.8.0.a= rgs b/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-2.8.0.args index 50353df478c..c4b0b7ef7f6 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-2.8.0.args +++ b/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-2.8.0.args @@ -37,5 +37,13 @@ drive=3Ddrive-hostdev0,id=3Dhostdev0 \ -drive file=3D/dev/sg0,if=3Dnone,format=3Draw,id=3Ddrive-hostdev1,readonly= =3Don \ -device scsi-generic,bus=3Dscsi0.0,channel=3D0,scsi-id=3D4,lun=3D7,\ drive=3Ddrive-hostdev1,id=3Dhostdev1 \ +-drive file=3Discsi://example.org:3260/iqn.1992-01.com.example/0,if=3Dnone= ,\ +format=3Draw,id=3Ddrive-hostdev2 \ +-device scsi-generic,bus=3Dscsi0.0,channel=3D0,scsi-id=3D2,lun=3D4,\ +drive=3Ddrive-hostdev2,id=3Dhostdev2 \ +-drive file=3Discsi://example.org:3260/iqn.1992-01.com.example/1,if=3Dnone= ,\ +format=3Draw,id=3Ddrive-hostdev3 \ +-device scsi-generic,bus=3Dscsi0.0,channel=3D0,scsi-id=3D2,lun=3D5,\ +drive=3Ddrive-hostdev3,id=3Dhostdev3 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-4.1.0.a= rgs b/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-4.1.0.args index e0680fce4cf..c691b1dc050 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-4.1.0.args +++ b/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-4.1.0.args @@ -36,6 +36,16 @@ drive=3Ddrive-hostdev0,id=3Dhostdev0 \ -drive file=3D/dev/sg0,if=3Dnone,format=3Draw,id=3Ddrive-hostdev1,readonly= =3Don \ -device scsi-generic,bus=3Dscsi0.0,channel=3D0,scsi-id=3D4,lun=3D7,\ drive=3Ddrive-hostdev1,id=3Dhostdev1 \ +-drive file.driver=3Discsi,file.portal=3Dexample.org:3260,\ +file.target=3Diqn.1992-01.com.example,file.lun=3D0,file.transport=3Dtcp,if= =3Dnone,\ +format=3Draw,id=3Ddrive-hostdev2 \ +-device scsi-generic,bus=3Dscsi0.0,channel=3D0,scsi-id=3D2,lun=3D4,\ +drive=3Ddrive-hostdev2,id=3Dhostdev2 \ +-drive file.driver=3Discsi,file.portal=3Dexample.org:3260,\ +file.target=3Diqn.1992-01.com.example,file.lun=3D1,file.transport=3Dtcp,if= =3Dnone,\ +format=3Draw,id=3Ddrive-hostdev3 \ +-device scsi-generic,bus=3Dscsi0.0,channel=3D0,scsi-id=3D2,lun=3D5,\ +drive=3Ddrive-hostdev3,id=3Dhostdev3 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ resourcecontrol=3Ddeny \ diff --git a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-latest.= args b/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-latest.args index 0da84d08b30..6d00994e4d5 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-latest.args @@ -40,6 +40,16 @@ drive=3Ddrive-hostdev0,id=3Dhostdev0 \ -drive file=3D/dev/sg0,if=3Dnone,format=3Draw,id=3Ddrive-hostdev1,readonly= =3Don \ -device scsi-generic,bus=3Dscsi0.0,channel=3D0,scsi-id=3D4,lun=3D7,\ drive=3Ddrive-hostdev1,id=3Dhostdev1 \ +-drive file.driver=3Discsi,file.portal=3Dexample.org:3260,\ +file.target=3Diqn.1992-01.com.example,file.lun=3D0,file.transport=3Dtcp,if= =3Dnone,\ +format=3Draw,id=3Ddrive-hostdev2 \ +-device scsi-generic,bus=3Dscsi0.0,channel=3D0,scsi-id=3D2,lun=3D4,\ +drive=3Ddrive-hostdev2,id=3Dhostdev2 \ +-drive file.driver=3Discsi,file.portal=3Dexample.org:3260,\ +file.target=3Diqn.1992-01.com.example,file.lun=3D1,file.transport=3Dtcp,if= =3Dnone,\ +format=3Draw,id=3Ddrive-hostdev3 \ +-device scsi-generic,bus=3Dscsi0.0,channel=3D0,scsi-id=3D2,lun=3D5,\ +drive=3Ddrive-hostdev3,id=3Dhostdev3 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ resourcecontrol=3Ddeny \ diff --git a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.xml b/tests/qe= muxml2argvdata/hostdev-scsi-virtio-scsi.xml index 013c8cd17f7..eec78b1c736 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.xml +++ b/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.xml @@ -40,6 +40,18 @@
+ + + + +
+ + + + + +
+ diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index e10d90fbf88..7a001b797a7 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -2663,9 +2663,6 @@ mymain(void) DO_TEST_CAPS_VER("hostdev-scsi-virtio-scsi", "4.1.0"); DO_TEST_CAPS_LATEST("hostdev-scsi-virtio-scsi"); - DO_TEST("hostdev-scsi-virtio-iscsi", - QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_SCSI_LSI); DO_TEST("hostdev-scsi-virtio-iscsi-auth", QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_SCSI_LSI); diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-virtio-iscsi.xml b/tests= /qemuxml2xmloutdata/hostdev-scsi-virtio-iscsi.xml deleted file mode 100644 index 4addf5ebc87..00000000000 --- a/tests/qemuxml2xmloutdata/hostdev-scsi-virtio-iscsi.xml +++ /dev/null @@ -1,51 +0,0 @@ - - QEMUGuest2 - c7a5fdbd-edaf-9466-926a-d65c16db1809 - 219100 - 219100 - 1 - - hvm - - - - destroy - restart - destroy - - /usr/bin/qemu-system-i386 - - - - -
- - -
- - -
- - -
- - - - - - - - -
- - - - - -
- - -
- - - diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-virtio-scsi.xml b/tests/= qemuxml2xmloutdata/hostdev-scsi-virtio-scsi.xml index a1fa36de386..a8d70ef31be 100644 --- a/tests/qemuxml2xmloutdata/hostdev-scsi-virtio-scsi.xml +++ b/tests/qemuxml2xmloutdata/hostdev-scsi-virtio-scsi.xml @@ -47,6 +47,18 @@
+ + + + +
+ + + + + +
+
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index d3da788979d..edbd75039d3 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -1039,9 +1039,6 @@ mymain(void) QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_SCSI_LSI); - DO_TEST("hostdev-scsi-virtio-iscsi", - QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_SCSI_LSI); DO_TEST("hostdev-scsi-virtio-iscsi-auth", QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_SCSI_LSI); --=20 2.26.2 From nobody Fri Mar 29 10:35:12 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-delivery-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=1592840584; cv=none; d=zohomail.com; s=zohoarc; b=FYZz2aXJn8Z/a8NUJpDVKUU2YvmDIYSa4NxENZhrTd0+Ft42lNOKcNpJ3LWMDieryBp9Y+P8QRPkJdvlVwktlwlZxgIt4E3GIBuH4Rdm2b5OB8ArArUopgRG7k/T9mXY/O7RP5M0asApwqewiH/cmW+/G9rY/C3CF1WijuZcRHU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592840584; 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=rc5psmDzH6NGvYKpuHNQ8rn/yRbHI+gxdlnesW/xyuw=; b=IgPsrnJfvoC/jJ0ERx5TSmikkDySYZCNswzmRODOPJwk1r+l6qFFdtxKaxV9xQ3uVYEOQ+8Qugt3HsGwDYtSEv1ncMt5yksDvEwNyrH0rRFEdpACAyl6yjw+st9TlC211Tc4nJA6Io8sYRi+2P0GW/cydViEy95IeRNcN1IoSog= 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-delivery-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 1592840584059413.9591325645781; Mon, 22 Jun 2020 08:43:04 -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-462-cmOsSLvVPkWqOW74e3vPqQ-1; Mon, 22 Jun 2020 11:43:00 -0400 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 ED1AE1005512; Mon, 22 Jun 2020 15:42:49 +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 B25F45C298; Mon, 22 Jun 2020 15:42:49 +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 7CB39833CE; Mon, 22 Jun 2020 15:42:49 +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 05MFgbl9020486 for ; Mon, 22 Jun 2020 11:42:37 -0400 Received: by smtp.corp.redhat.com (Postfix) id 7565C5C220; Mon, 22 Jun 2020 15:42:37 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.23]) by smtp.corp.redhat.com (Postfix) with ESMTP id DE2695C1BD for ; Mon, 22 Jun 2020 15:42:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1592840582; 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=rc5psmDzH6NGvYKpuHNQ8rn/yRbHI+gxdlnesW/xyuw=; b=gFzuqG4aAfb+UDakJat85Nk4bhX75pEby/YgP+Q9GPKnxeuCgqVsGNUXJ/60Ye6jwWgBvJ /0tF4umRKE8SoZZ6nAAtdZZ8i7bSDpdqLcFt2yCmGE2BuLMTYbuZN8HDcYxZa5872uEyB3 aXNRSG7j+aSUZrcbzslHYikmOaKbEIA= X-MC-Unique: cmOsSLvVPkWqOW74e3vPqQ-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 12/12] qemuxml2argvtest: hostdev-scsi-virtio-scsi: Integrate iSCSI authentication cases Date: Mon, 22 Jun 2020 17:42:24 +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.16 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" Integrate both 'disk-hostdev-scsi-virtio-iscsi-auth-AES' and 'hostdev-scsi-virtio-iscsi-auth' as the new test infrastructure tests both legacy and 'secret' object cases. Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik --- ...sk-hostdev-scsi-virtio-iscsi-auth-AES.args | 49 ---------------- ...isk-hostdev-scsi-virtio-iscsi-auth-AES.xml | 43 -------------- .../hostdev-scsi-virtio-iscsi-auth.args | 39 ------------- .../hostdev-scsi-virtio-iscsi-auth.xml | 48 ---------------- ...hostdev-scsi-virtio-scsi.x86_64-2.8.0.args | 8 +++ ...hostdev-scsi-virtio-scsi.x86_64-4.1.0.args | 18 ++++++ ...ostdev-scsi-virtio-scsi.x86_64-latest.args | 18 ++++++ .../hostdev-scsi-virtio-scsi.xml | 18 ++++++ tests/qemuxml2argvtest.c | 8 --- .../hostdev-scsi-virtio-iscsi-auth.xml | 57 ------------------- .../hostdev-scsi-virtio-scsi.xml | 18 ++++++ tests/qemuxml2xmltest.c | 4 -- 12 files changed, 80 insertions(+), 248 deletions(-) delete mode 100644 tests/qemuxml2argvdata/disk-hostdev-scsi-virtio-iscsi-a= uth-AES.args delete mode 100644 tests/qemuxml2argvdata/disk-hostdev-scsi-virtio-iscsi-a= uth-AES.xml delete mode 100644 tests/qemuxml2argvdata/hostdev-scsi-virtio-iscsi-auth.a= rgs delete mode 100644 tests/qemuxml2argvdata/hostdev-scsi-virtio-iscsi-auth.x= ml delete mode 100644 tests/qemuxml2xmloutdata/hostdev-scsi-virtio-iscsi-auth= .xml diff --git a/tests/qemuxml2argvdata/disk-hostdev-scsi-virtio-iscsi-auth-AES= .args b/tests/qemuxml2argvdata/disk-hostdev-scsi-virtio-iscsi-auth-AES.args deleted file mode 100644 index 47b014aacc1..00000000000 --- a/tests/qemuxml2argvdata/disk-hostdev-scsi-virtio-iscsi-auth-AES.args +++ /dev/null @@ -1,49 +0,0 @@ -LC_ALL=3DC \ -PATH=3D/bin \ -HOME=3D/tmp/lib/domain--1-QEMUGuest2 \ -USER=3Dtest \ -LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest2/.local/share \ -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 \ --S \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest2/master-key.aes \ --machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ --m 214 \ --realtime mlock=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 \ --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 \ --object secret,id=3Dvirtio-disk0-auth-secret0,\ -data=3D9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\ -keyid=3DmasterKey0,iv=3DAAECAwQFBgcICQoLDA0ODw=3D=3D,format=3Dbase64 \ --drive file.driver=3Discsi,file.portal=3Dexample.org:6000,\ -file.target=3Diqn.1992-01.com.example:storage,file.lun=3D1,file.transport= =3Dtcp,\ -file.user=3Dmyname,file.password-secret=3Dvirtio-disk0-auth-secret0,format= =3Draw,\ -if=3Dnone,id=3Ddrive-virtio-disk0 \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x4,drive=3Ddrive-virtio-disk0,\ -id=3Dvirtio-disk0,bootindex=3D1 \ --object secret,id=3Dhostdev0-secret0,\ -data=3D9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\ -keyid=3DmasterKey0,iv=3DAAECAwQFBgcICQoLDA0ODw=3D=3D,format=3Dbase64 \ --drive file.driver=3Discsi,file.portal=3Dexample.org:6000,\ -file.target=3Diqn.1992-01.com.example:storage,file.lun=3D2,file.transport= =3Dtcp,\ -file.user=3Dmyname,file.password-secret=3Dhostdev0-secret0,if=3Dnone,forma= t=3Draw,\ -id=3Ddrive-hostdev0 \ --device scsi-generic,bus=3Dscsi0.0,channel=3D0,scsi-id=3D0,lun=3D0,\ -drive=3Ddrive-hostdev0,id=3Dhostdev0 \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x5 diff --git a/tests/qemuxml2argvdata/disk-hostdev-scsi-virtio-iscsi-auth-AES= .xml b/tests/qemuxml2argvdata/disk-hostdev-scsi-virtio-iscsi-auth-AES.xml deleted file mode 100644 index 3b13f9284c1..00000000000 --- a/tests/qemuxml2argvdata/disk-hostdev-scsi-virtio-iscsi-auth-AES.xml +++ /dev/null @@ -1,43 +0,0 @@ - - QEMUGuest2 - c7a5fdbd-edaf-9466-926a-d65c16db1809 - 219100 - 219100 - 1 - - hvm - - - - destroy - restart - destroy - - /usr/bin/qemu-system-i386 - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/qemuxml2argvdata/hostdev-scsi-virtio-iscsi-auth.args b/t= ests/qemuxml2argvdata/hostdev-scsi-virtio-iscsi-auth.args deleted file mode 100644 index 4ce2029adb7..00000000000 --- a/tests/qemuxml2argvdata/hostdev-scsi-virtio-iscsi-auth.args +++ /dev/null @@ -1,39 +0,0 @@ -LC_ALL=3DC \ -PATH=3D/bin \ -HOME=3D/tmp/lib/domain--1-QEMUGuest2 \ -USER=3Dtest \ -LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest2/.local/share \ -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 \ --S \ --machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ --m 214 \ --realtime mlock=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 \ --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 \ --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=3Discsi://myname:AQCVn5hO6HzFAhAAq0NCv8jtJcIcE+HOBlMQ1A@exampl= e.org:\ -3260/iqn.1992-01.com.example%3Astorage/1,if=3Dnone,format=3Draw,id=3Ddrive= -hostdev0 \ --device scsi-generic,bus=3Dscsi0.0,channel=3D0,scsi-id=3D2,lun=3D4,\ -drive=3Ddrive-hostdev0,id=3Dhostdev0 \ --drive file=3Discsi://myname:AQCVn5hO6HzFAhAAq0NCv8jtJcIcE+HOBlMQ1A@exampl= e.org:\ -3260/iqn.1992-01.com.example%3Astorage/2,if=3Dnone,format=3Draw,id=3Ddrive= -hostdev1 \ --device scsi-generic,bus=3Dscsi0.0,channel=3D0,scsi-id=3D2,lun=3D5,\ -drive=3Ddrive-hostdev1,id=3Dhostdev1 \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x4 diff --git a/tests/qemuxml2argvdata/hostdev-scsi-virtio-iscsi-auth.xml b/te= sts/qemuxml2argvdata/hostdev-scsi-virtio-iscsi-auth.xml deleted file mode 100644 index 388cd63314f..00000000000 --- a/tests/qemuxml2argvdata/hostdev-scsi-virtio-iscsi-auth.xml +++ /dev/null @@ -1,48 +0,0 @@ - - QEMUGuest2 - c7a5fdbd-edaf-9466-926a-d65c16db1809 - 219100 - 219100 - 1 - - hvm - - - - destroy - restart - destroy - - /usr/bin/qemu-system-i386 - - - -
- - - - - - - - - - - - - - -
- - - - - - - - -
- - - - diff --git a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-2.8.0.a= rgs b/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-2.8.0.args index c4b0b7ef7f6..c5a3c0ce61d 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-2.8.0.args +++ b/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-2.8.0.args @@ -45,5 +45,13 @@ drive=3Ddrive-hostdev2,id=3Dhostdev2 \ format=3Draw,id=3Ddrive-hostdev3 \ -device scsi-generic,bus=3Dscsi0.0,channel=3D0,scsi-id=3D2,lun=3D5,\ drive=3Ddrive-hostdev3,id=3Dhostdev3 \ +-drive file=3Discsi://myname:AQCVn5hO6HzFAhAAq0NCv8jtJcIcE+HOBlMQ1A@exampl= e.org:\ +3260/iqn.1992-01.com.example%3Astorage/1,if=3Dnone,format=3Draw,id=3Ddrive= -hostdev4 \ +-device scsi-generic,bus=3Dscsi0.0,channel=3D0,scsi-id=3D3,lun=3D4,\ +drive=3Ddrive-hostdev4,id=3Dhostdev4 \ +-drive file=3Discsi://myname:AQCVn5hO6HzFAhAAq0NCv8jtJcIcE+HOBlMQ1A@exampl= e.org:\ +3260/iqn.1992-01.com.example%3Astorage/2,if=3Dnone,format=3Draw,id=3Ddrive= -hostdev5 \ +-device scsi-generic,bus=3Dscsi0.0,channel=3D0,scsi-id=3D3,lun=3D5,\ +drive=3Ddrive-hostdev5,id=3Dhostdev5 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-4.1.0.a= rgs b/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-4.1.0.args index c691b1dc050..de4047000ea 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-4.1.0.args +++ b/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-4.1.0.args @@ -46,6 +46,24 @@ file.target=3Diqn.1992-01.com.example,file.lun=3D1,file.= transport=3Dtcp,if=3Dnone,\ format=3Draw,id=3Ddrive-hostdev3 \ -device scsi-generic,bus=3Dscsi0.0,channel=3D0,scsi-id=3D2,lun=3D5,\ drive=3Ddrive-hostdev3,id=3Dhostdev3 \ +-object secret,id=3Dhostdev4-secret0,\ +data=3D9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\ +keyid=3DmasterKey0,iv=3DAAECAwQFBgcICQoLDA0ODw=3D=3D,format=3Dbase64 \ +-drive file.driver=3Discsi,file.portal=3Dexample.org:3260,\ +file.target=3Diqn.1992-01.com.example:storage,file.lun=3D1,file.transport= =3Dtcp,\ +file.user=3Dmyname,file.password-secret=3Dhostdev4-secret0,if=3Dnone,forma= t=3Draw,\ +id=3Ddrive-hostdev4 \ +-device scsi-generic,bus=3Dscsi0.0,channel=3D0,scsi-id=3D3,lun=3D4,\ +drive=3Ddrive-hostdev4,id=3Dhostdev4 \ +-object secret,id=3Dhostdev5-secret0,\ +data=3D9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\ +keyid=3DmasterKey0,iv=3DAAECAwQFBgcICQoLDA0ODw=3D=3D,format=3Dbase64 \ +-drive file.driver=3Discsi,file.portal=3Dexample.org:3260,\ +file.target=3Diqn.1992-01.com.example:storage,file.lun=3D2,file.transport= =3Dtcp,\ +file.user=3Dmyname,file.password-secret=3Dhostdev5-secret0,if=3Dnone,forma= t=3Draw,\ +id=3Ddrive-hostdev5 \ +-device scsi-generic,bus=3Dscsi0.0,channel=3D0,scsi-id=3D3,lun=3D5,\ +drive=3Ddrive-hostdev5,id=3Dhostdev5 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ resourcecontrol=3Ddeny \ diff --git a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-latest.= args b/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-latest.args index 6d00994e4d5..99b0117447a 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-latest.args @@ -50,6 +50,24 @@ file.target=3Diqn.1992-01.com.example,file.lun=3D1,file.= transport=3Dtcp,if=3Dnone,\ format=3Draw,id=3Ddrive-hostdev3 \ -device scsi-generic,bus=3Dscsi0.0,channel=3D0,scsi-id=3D2,lun=3D5,\ drive=3Ddrive-hostdev3,id=3Dhostdev3 \ +-object secret,id=3Dhostdev4-secret0,\ +data=3D9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\ +keyid=3DmasterKey0,iv=3DAAECAwQFBgcICQoLDA0ODw=3D=3D,format=3Dbase64 \ +-drive file.driver=3Discsi,file.portal=3Dexample.org:3260,\ +file.target=3Diqn.1992-01.com.example:storage,file.lun=3D1,file.transport= =3Dtcp,\ +file.user=3Dmyname,file.password-secret=3Dhostdev4-secret0,if=3Dnone,forma= t=3Draw,\ +id=3Ddrive-hostdev4 \ +-device scsi-generic,bus=3Dscsi0.0,channel=3D0,scsi-id=3D3,lun=3D4,\ +drive=3Ddrive-hostdev4,id=3Dhostdev4 \ +-object secret,id=3Dhostdev5-secret0,\ +data=3D9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\ +keyid=3DmasterKey0,iv=3DAAECAwQFBgcICQoLDA0ODw=3D=3D,format=3Dbase64 \ +-drive file.driver=3Discsi,file.portal=3Dexample.org:3260,\ +file.target=3Diqn.1992-01.com.example:storage,file.lun=3D2,file.transport= =3Dtcp,\ +file.user=3Dmyname,file.password-secret=3Dhostdev5-secret0,if=3Dnone,forma= t=3Draw,\ +id=3Ddrive-hostdev5 \ +-device scsi-generic,bus=3Dscsi0.0,channel=3D0,scsi-id=3D3,lun=3D5,\ +drive=3Ddrive-hostdev5,id=3Dhostdev5 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ resourcecontrol=3Ddeny \ diff --git a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.xml b/tests/qe= muxml2argvdata/hostdev-scsi-virtio-scsi.xml index eec78b1c736..775b678b368 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.xml +++ b/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.xml @@ -52,6 +52,24 @@
+ + + + + + + +
+ + + + + + + + +
+ diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 7a001b797a7..337fe1acdab 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -2663,14 +2663,6 @@ mymain(void) DO_TEST_CAPS_VER("hostdev-scsi-virtio-scsi", "4.1.0"); DO_TEST_CAPS_LATEST("hostdev-scsi-virtio-scsi"); - DO_TEST("hostdev-scsi-virtio-iscsi-auth", - QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_SCSI_LSI); - DO_TEST("disk-hostdev-scsi-virtio-iscsi-auth-AES", - QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_SCSI_LSI, - QEMU_CAPS_OBJECT_SECRET, - QEMU_CAPS_ISCSI_PASSWORD_SECRET); DO_TEST("hostdev-scsi-vhost-scsi-ccw", QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_DEVICE_VHOST_SCSI, QEMU_CAPS_CCW); diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-virtio-iscsi-auth.xml b/= tests/qemuxml2xmloutdata/hostdev-scsi-virtio-iscsi-auth.xml deleted file mode 100644 index b6dc1dbb8fe..00000000000 --- a/tests/qemuxml2xmloutdata/hostdev-scsi-virtio-iscsi-auth.xml +++ /dev/null @@ -1,57 +0,0 @@ - - QEMUGuest2 - c7a5fdbd-edaf-9466-926a-d65c16db1809 - 219100 - 219100 - 1 - - hvm - - - - destroy - restart - destroy - - /usr/bin/qemu-system-i386 - - - - -
- - -
- - -
- - -
- - - - - - - - - - - -
- - - - - - - - -
- - -
- - - diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-virtio-scsi.xml b/tests/= qemuxml2xmloutdata/hostdev-scsi-virtio-scsi.xml index a8d70ef31be..9c823809abf 100644 --- a/tests/qemuxml2xmloutdata/hostdev-scsi-virtio-scsi.xml +++ b/tests/qemuxml2xmloutdata/hostdev-scsi-virtio-scsi.xml @@ -59,6 +59,24 @@
+ + + + + + + +
+ + + + + + + + +
+
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index edbd75039d3..2b61a6459e2 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -1039,10 +1039,6 @@ mymain(void) QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_SCSI_LSI); - DO_TEST("hostdev-scsi-virtio-iscsi-auth", - QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_SCSI_LSI); - DO_TEST("hostdev-subsys-mdev-vfio-ccw", QEMU_CAPS_CCW, QEMU_CAPS_CCW_CSSID_UNRESTRICTED, --=20 2.26.2