From nobody Thu Apr 25 19:23:18 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 ARC-Seal: i=1; a=rsa-sha256; t=1589334982; cv=none; d=zohomail.com; s=zohoarc; b=PCnlujfSR6a3ews80DttVA5gf6s/lUZ0UR+3vCsWkJA/Ua0u6/toZcFjkbM8zvkWUqBmyWIScu6XgsMIOukBLUwpyIITKO8Spk85hB6wfQ864pt+E6+L//Vw7mbj50EP2aWGBO1tRuNDcdmMzbspSE6QgaROHpJHTjt9OkU7DGA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589334982; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=vElnvXSa/1qYY1H0qFJpH17Tz/IrGc0BxS7W9m+UhdU=; b=Q1dhdEADlrlusai3rpLQlXWbMO1ID7/BH3Wlv1jwdHEht+VfbVYXPxgjc8EFBbr6/qW9oQI2MB5hXT7oPKqM1pCwdmUfdDRyDB0Ovowij5AZFeeHG72geFXp3alVp49fUyLVt8YK7PW9SIkXJjabmoH8N+9A3ZYncI4whU20XUE= 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 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 1589334982830851.2856356963546; Tue, 12 May 2020 18:56:22 -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-444-kQr2dDloNyyO2yuFPE_u1A-1; Tue, 12 May 2020 21:56:18 -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 C22BC800688; Wed, 13 May 2020 01:56:13 +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 A011F99D1; Wed, 13 May 2020 01:56:13 +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 DFDD01809543; Wed, 13 May 2020 01:56:12 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 04D1uB9e007230 for ; Tue, 12 May 2020 21:56:11 -0400 Received: by smtp.corp.redhat.com (Postfix) id 0E319101044A; Wed, 13 May 2020 01:56:11 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast05.extmail.prod.ext.rdu2.redhat.com [10.11.55.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 07FF21010440 for ; Wed, 13 May 2020 01:56:09 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id F295780CDB3 for ; Wed, 13 May 2020 01:56:08 +0000 (UTC) Received: from pb-smtp21.pobox.com (pb-smtp21.pobox.com [173.228.157.53]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-456-r94d4B-rMjydMuNghf841w-1; Tue, 12 May 2020 21:56:03 -0400 Received: from pb-smtp21.pobox.com (unknown [127.0.0.1]) by pb-smtp21.pobox.com (Postfix) with ESMTP id 8F86EBEE5B; Tue, 12 May 2020 21:56:02 -0400 (EDT) (envelope-from cky@cky.nz) Received: from pb-smtp21.sea.icgroup.com (unknown [127.0.0.1]) by pb-smtp21.pobox.com (Postfix) with ESMTP id 8866DBEE5A; Tue, 12 May 2020 21:56:02 -0400 (EDT) (envelope-from cky@cky.nz) Received: from obsidius.destinee.acro.gen.nz (unknown [68.20.14.190]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pb-smtp21.pobox.com (Postfix) with ESMTPSA id D48F9BEE51; Tue, 12 May 2020 21:55:58 -0400 (EDT) (envelope-from cky@cky.nz) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1589334981; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=vElnvXSa/1qYY1H0qFJpH17Tz/IrGc0BxS7W9m+UhdU=; b=TuHB/3LbVdI0ZZSiI9ruFBshCuhRhcg3LbJVK0PrRC2cGP4JEPH9EmgNm0pDyTSGY7pFZ6 QOKCLUoZ3uJqahHG5O0BJunKKFL0SfO/Hxq6V0IK7AJ4w88OvCtHh1eLwKgVS7iq2tOzyF z0ALQ2ouExS1fGPkUmSJe7cXnX4DSH8= X-MC-Unique: kQr2dDloNyyO2yuFPE_u1A-1 X-MC-Unique: r94d4B-rMjydMuNghf841w-1 From: Chris Jester-Young To: libvir-list@redhat.com Subject: [libvirt PATCH v2 1/4] qemu: pvscsi: Add capability Date: Tue, 12 May 2020 21:55:45 -0400 Message-Id: <20200513015548.295386-2-cky@cky.nz> In-Reply-To: <20200513015548.295386-1-cky@cky.nz> References: <20200513015548.295386-1-cky@cky.nz> MIME-Version: 1.0 Mail-Followup-To: libvir-list@redhat.com X-Pobox-Relay-ID: E4BCC27C-94BC-11EA-99BB-8D86F504CC47-57607449!pb-smtp21.pobox.com X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id 04D1uB9e007230 X-loop: libvir-list@redhat.com Cc: Chris Jester-Young 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 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 capability flags support for `-device pvscsi`, which provides the VMware paravirtual SCSI controller. Signed-off-by: Chris Jester-Young Reviewed-by: Peter Krempa --- src/qemu/qemu_capabilities.c | 2 ++ src/qemu/qemu_capabilities.h | 1 + tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml | 1 + tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml | 1 + tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml | 1 + tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml | 1 + 40 files changed, 41 insertions(+) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 0e7db2643a..7e711f22f8 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -581,6 +581,7 @@ VIR_ENUM_IMPL(virQEMUCaps, "machine.pseries.cap-ibs", "tcg", "virtio-blk-pci.scsi.default.disabled", + "pvscsi", ); =20 =20 @@ -1302,6 +1303,7 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[= ] =3D { { "tpm-spapr", QEMU_CAPS_DEVICE_TPM_SPAPR }, { "vhost-user-fs-device", QEMU_CAPS_DEVICE_VHOST_USER_FS }, { "tcg-accel", QEMU_CAPS_TCG }, + { "pvscsi", QEMU_CAPS_SCSI_PVSCSI }, }; =20 =20 diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index db8bebe3df..6bfc7386e3 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -562,6 +562,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for = syntax-check */ QEMU_CAPS_MACHINE_PSERIES_CAP_IBS, /* -machine pseries.cap-ibs */ QEMU_CAPS_TCG, /* QEMU does support TCG */ QEMU_CAPS_VIRTIO_BLK_SCSI_DEFAULT_DISABLED, /* virtio-blk-pci.scsi dis= abled by default */ + QEMU_CAPS_SCSI_PVSCSI, /* -device pvscsi */ =20 QEMU_CAPS_LAST /* this must always be the last item */ } virQEMUCapsFlags; diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_1.5.3.x86_64.xml index 2ba184cdda..a4f6c3aa09 100644 --- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml @@ -86,6 +86,7 @@ + 1005003 0 43100245 diff --git a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_1.6.0.x86_64.xml index fb160dfd4c..9e5501bed9 100644 --- a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml @@ -91,6 +91,7 @@ + 1006000 0 43100243 diff --git a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_1.7.0.x86_64.xml index 732af17233..28eb61b38c 100644 --- a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml @@ -93,6 +93,7 @@ + 1007000 0 43100244 diff --git a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_2.1.1.x86_64.xml index 22b4817e4e..cfe79fef46 100644 --- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml @@ -109,6 +109,7 @@ + 2001001 0 43100240 diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml b/tests/qem= ucapabilitiesdata/caps_2.10.0.aarch64.xml index 8c2f8be55d..cfa1962e98 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml @@ -141,6 +141,7 @@ + 2010000 0 61700287 diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml b/tests/qemuc= apabilitiesdata/caps_2.10.0.ppc64.xml index cec361b60c..0eee26c3ac 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml @@ -141,6 +141,7 @@ + 2010000 0 42900287 diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml b/tests/qemu= capabilitiesdata/caps_2.10.0.x86_64.xml index 4a8bc42778..205a0675db 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml @@ -184,6 +184,7 @@ + 2010000 0 43100287 diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml b/tests/qemu= capabilitiesdata/caps_2.11.0.x86_64.xml index 03ba191bc2..15f59774f3 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml @@ -190,6 +190,7 @@ + 2011000 0 43100288 diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml b/tests/qem= ucapabilitiesdata/caps_2.12.0.aarch64.xml index 025130c378..94a0344b1a 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml @@ -157,6 +157,7 @@ + 2012000 0 61700289 diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml b/tests/qemuc= apabilitiesdata/caps_2.12.0.ppc64.xml index 06ee1f4ec4..3bf0e20c9b 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml @@ -158,6 +158,7 @@ + 2011090 0 42900289 diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemu= capabilitiesdata/caps_2.12.0.x86_64.xml index 3e86df890b..c249525547 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml @@ -199,6 +199,7 @@ + 2011090 0 43100289 diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_2.4.0.x86_64.xml index a11659d617..6eebad8b03 100644 --- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml @@ -135,6 +135,7 @@ + 2004000 0 43100242 diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_2.5.0.x86_64.xml index 432e3a5af4..662140e657 100644 --- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml @@ -141,6 +141,7 @@ + 2005000 0 43100243 diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_2.6.0.aarch64.xml index 389f7af1d6..f8f57a7eaa 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml @@ -124,6 +124,7 @@ + 2006000 0 61700244 diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_2.6.0.ppc64.xml index cdf9450f4a..52592ad138 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml @@ -120,6 +120,7 @@ + 2006000 0 42900244 diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_2.6.0.x86_64.xml index 4b6b840496..77297fff36 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml @@ -153,6 +153,7 @@ + 2006000 0 43100244 diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_2.7.0.x86_64.xml index 1fa9a37102..e7d9808e28 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml @@ -158,6 +158,7 @@ + 2007000 0 43100245 diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_2.8.0.x86_64.xml index 2847ad711f..bfeb9c9b40 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml @@ -161,6 +161,7 @@ + 2008000 0 43100246 diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_2.9.0.ppc64.xml index 539b5e042d..f32e233549 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml @@ -133,6 +133,7 @@ + 2009000 0 42900247 diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_2.9.0.x86_64.xml index 765e469205..75e9905df7 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml @@ -178,6 +178,7 @@ + 2009000 0 43100247 diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_3.0.0.ppc64.xml index c9c2ac4a0b..a66008b0de 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml @@ -160,6 +160,7 @@ + 2012050 0 42900239 diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_3.0.0.x86_64.xml index 2f318640d8..f5f1d5b466 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml @@ -205,6 +205,7 @@ + 3000000 0 43100239 diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_3.1.0.ppc64.xml index 18fba375fb..ca9ff82e28 100644 --- a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml @@ -165,6 +165,7 @@ + 3000091 0 42900240 diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_3.1.0.x86_64.xml index 6a05b3e719..11009a2f80 100644 --- a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml @@ -208,6 +208,7 @@ + 3000092 0 43100240 diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_4.0.0.aarch64.xml index 2e8460f829..c9199df261 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml @@ -171,6 +171,7 @@ + 4000000 0 61700240 diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_4.0.0.ppc64.xml index 978fad0ba6..f4294436a8 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml @@ -179,6 +179,7 @@ + 4000000 0 42900240 diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml b/tests/qemu= capabilitiesdata/caps_4.0.0.riscv32.xml index 4322ca3593..f5c9d7f83e 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml @@ -172,6 +172,7 @@ + 4000000 0 0 diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml b/tests/qemu= capabilitiesdata/caps_4.0.0.riscv64.xml index 8df0e1eb79..538ce225f8 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml @@ -172,6 +172,7 @@ + 4000000 0 0 diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_4.0.0.x86_64.xml index 4285bec2bf..9f45fe6359 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml @@ -213,6 +213,7 @@ + 4000000 0 43100240 diff --git a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_4.1.0.x86_64.xml index 1c960faa6c..9ad50bc2b5 100644 --- a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml @@ -219,6 +219,7 @@ + 4001000 0 43100241 diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_4.2.0.aarch64.xml index 418b5937a0..7aca4fe022 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml @@ -183,6 +183,7 @@ + 4001050 0 61700242 diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_4.2.0.ppc64.xml index 796ed0a2bc..a68786ddc8 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml @@ -184,6 +184,7 @@ + 4001050 0 42900242 diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_4.2.0.x86_64.xml index 0d4d6e71d5..3935be4813 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml @@ -227,6 +227,7 @@ + 4002000 0 43100242 diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_5.0.0.aarch64.xml index 618ad8ee14..7649153cfd 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml @@ -192,6 +192,7 @@ + 5000000 0 61700241 diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_5.0.0.ppc64.xml index 0f5dce9264..c8cc07d954 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml @@ -200,6 +200,7 @@ + 5000000 0 42900241 diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml b/tests/qemu= capabilitiesdata/caps_5.0.0.riscv64.xml index bc6a27e87e..7a091d27db 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml @@ -188,6 +188,7 @@ + 5000000 0 0 diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_5.0.0.x86_64.xml index ed4c08e99e..e28e87fd23 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml @@ -233,6 +233,7 @@ + 5000000 0 43100241 diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_5.1.0.x86_64.xml index f7018daa84..8c20b5fe5c 100644 --- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml @@ -233,6 +233,7 @@ + 5000050 0 43100242 --=20 2.25.1 From nobody Thu Apr 25 19:23:18 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 ARC-Seal: i=1; a=rsa-sha256; t=1589334989; cv=none; d=zohomail.com; s=zohoarc; b=BtN0jedVOCvVUQ1QcZAnJm0abKja3oEZgvbzPaD3SOqEb1aZXuxjARNxs5YKTITBRJKHQjw56bILC8oq8A2MbB05A7fex+IygGPm4zcxZBvFhgaRB71L5bfNcQAaCoio0tGa5JeRpWhUu5I7ZWOQbAikaxHBXlD8+lcGfIFYZdA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589334989; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=+W9XsaQu8H9VEpme2Qc/ay70fpQ/ceXF3gYwSwuA2SY=; b=ddSBfIilr8ApNlK5twHQKuQZhkSHYzszo0DvjuU0osMBmQ7h/5qYxbjY9uYDAEjsZWgbdGhCANbyHePJ0+mvgkV7clrwd7CyUsPlOzL3bDUMkBm/O9iY/LPtMD03qP5qc3EYg+cq45v2kwuBzt1+Gc0aKudcskGr148s11iwhUo= 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 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 1589334989496553.496150214946; Tue, 12 May 2020 18:56:29 -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-225-jTA6511aP6iDs0ijtvwuFw-1; Tue, 12 May 2020 21:56:25 -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 0071F473; Wed, 13 May 2020 01:56:20 +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 D664276E61; Wed, 13 May 2020 01:56:19 +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 A50E9180954D; Wed, 13 May 2020 01:56:19 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 04D1uCWU007239 for ; Tue, 12 May 2020 21:56:12 -0400 Received: by smtp.corp.redhat.com (Postfix) id 50F30202683E; Wed, 13 May 2020 01:56:12 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast04.extmail.prod.ext.rdu2.redhat.com [10.11.55.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4CE2A2026FFE for ; Wed, 13 May 2020 01:56:09 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 3ED4C101A526 for ; Wed, 13 May 2020 01:56:09 +0000 (UTC) Received: from pb-smtp21.pobox.com (pb-smtp21.pobox.com [173.228.157.53]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-361-FT3_KMfdPVGmGwH5zj11IQ-1; Tue, 12 May 2020 21:56:06 -0400 Received: from pb-smtp21.pobox.com (unknown [127.0.0.1]) by pb-smtp21.pobox.com (Postfix) with ESMTP id A47D8BEE65; Tue, 12 May 2020 21:56:05 -0400 (EDT) (envelope-from cky@cky.nz) Received: from pb-smtp21.sea.icgroup.com (unknown [127.0.0.1]) by pb-smtp21.pobox.com (Postfix) with ESMTP id 9D14ABEE62; Tue, 12 May 2020 21:56:05 -0400 (EDT) (envelope-from cky@cky.nz) Received: from obsidius.destinee.acro.gen.nz (unknown [68.20.14.190]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pb-smtp21.pobox.com (Postfix) with ESMTPSA id 06B1DBEE57; Tue, 12 May 2020 21:56:01 -0400 (EDT) (envelope-from cky@cky.nz) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1589334987; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=+W9XsaQu8H9VEpme2Qc/ay70fpQ/ceXF3gYwSwuA2SY=; b=QL2SJNQVjhsnHNU0mv+JcJNKM7PIILvGM2p+THlxBVyUvv7wH9wlRnVyDhcSXXWcHmq2Lx amQJXX+IbDupqSoMMPmeZKm66QyeBaBzVYpbIZazmhkuRjcEe4imi9Y/OVsESnI35ODM9D CyPzTYfHt8aMPUy2q1FcXWO8nIwX5Vo= X-MC-Unique: jTA6511aP6iDs0ijtvwuFw-1 X-MC-Unique: FT3_KMfdPVGmGwH5zj11IQ-1 From: Chris Jester-Young To: libvir-list@redhat.com Subject: [libvirt PATCH v2 2/4] qemu: pvscsi: Add support for vmpvscsi controller model Date: Tue, 12 May 2020 21:55:46 -0400 Message-Id: <20200513015548.295386-3-cky@cky.nz> In-Reply-To: <20200513015548.295386-1-cky@cky.nz> References: <20200513015548.295386-1-cky@cky.nz> MIME-Version: 1.0 Mail-Followup-To: libvir-list@redhat.com X-Pobox-Relay-ID: E69D2DDE-94BC-11EA-9156-8D86F504CC47-57607449!pb-smtp21.pobox.com X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id 04D1uCWU007239 X-loop: libvir-list@redhat.com Cc: Chris Jester-Young 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" Availability of the vmpvscsi controller model is gated by the pvscsi capability. Signed-off-by: Chris Jester-Young Reviewed-by: Peter Krempa --- src/qemu/qemu_command.c | 4 +++- src/qemu/qemu_validate.c | 9 ++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 2d8a6fb0dd..bfe70ed228 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -2573,9 +2573,11 @@ qemuBuildControllerDevStr(const virDomainDef *domain= Def, case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LSISAS1078: virBufferAddLit(&buf, "megasas"); break; + case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_VMPVSCSI: + virBufferAddLit(&buf, "pvscsi"); + break; case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_AUTO: case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_BUSLOGIC: - case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_VMPVSCSI: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Unsupported controller model: %s"), virDomainControllerModelSCSITypeToString(def->m= odel)); diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index d34151050f..fde1892d42 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -2362,9 +2362,16 @@ qemuValidateCheckSCSIControllerModel(virQEMUCapsPtr = qemuCaps, return false; } break; + case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_VMPVSCSI: + if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_SCSI_PVSCSI)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("This QEMU doesn't support " + "the pvscsi (VMware paravirtual SCSI) control= ler")); + return false; + } + break; case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_AUTO: case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_BUSLOGIC: - case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_VMPVSCSI: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Unsupported controller model: %s"), virDomainControllerModelSCSITypeToString(model)); --=20 2.25.1 From nobody Thu Apr 25 19:23:18 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 ARC-Seal: i=1; a=rsa-sha256; t=1589334991; cv=none; d=zohomail.com; s=zohoarc; b=J8ANRrTUl/t0gZLkTr+8UtnBzqV330T1Us3jAW3rVtvwVvAznirlG7qsOprqSt3Ng+DgNcdSlUjJuCBOmT9FbWNzD4L6e892jTuFKBGt9qg62axQBDvKjvAoF9rJC3XTJq9BA67gF05gxnkTy+YiDbpJnRzB9K0A8c4HsCIdSXE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589334991; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=0+XF7leqROQYktxU34JhN2kz7KBJfPtwqkzKdaJ/d0k=; b=GvKtpkFaxg2o2UDgJKheL9gaR4jzUfnjL9YgqF6GW/YxLx72WGnRYRPW7eptFnAXrsqpqgMcQEpFfn2g87EFNyBvMeuQR9m4vDr7yecwsLGKgGWItesTFnKCDvBf3pP9BLLftrnakqWNUq8IBkmb9+U8bAWCNXZ1gqCagyI+Myo= 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 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 15893349919108.36942194299968; Tue, 12 May 2020 18:56:31 -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-180-4tqcz_WbOfKJIPEC8z5yhg-1; Tue, 12 May 2020 21:56:28 -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 411E9835B48; Wed, 13 May 2020 01:56:23 +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 1D32D99D6; Wed, 13 May 2020 01:56:23 +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 DC9DC1809557; Wed, 13 May 2020 01:56:22 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 04D1uLNP007274 for ; Tue, 12 May 2020 21:56:21 -0400 Received: by smtp.corp.redhat.com (Postfix) id 40C5A1010440; Wed, 13 May 2020 01:56:21 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast05.extmail.prod.ext.rdu2.redhat.com [10.11.55.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3C7041004049 for ; Wed, 13 May 2020 01:56:21 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 1B3F380CDAE for ; Wed, 13 May 2020 01:56:21 +0000 (UTC) Received: from pb-smtp21.pobox.com (pb-smtp21.pobox.com [173.228.157.53]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-135-MKtkE33bNfC2wjnvWARdKw-1; Tue, 12 May 2020 21:56:09 -0400 Received: from pb-smtp21.pobox.com (unknown [127.0.0.1]) by pb-smtp21.pobox.com (Postfix) with ESMTP id D99D4BEE6B; Tue, 12 May 2020 21:56:08 -0400 (EDT) (envelope-from cky@cky.nz) Received: from pb-smtp21.sea.icgroup.com (unknown [127.0.0.1]) by pb-smtp21.pobox.com (Postfix) with ESMTP id D0EA4BEE6A; Tue, 12 May 2020 21:56:08 -0400 (EDT) (envelope-from cky@cky.nz) Received: from obsidius.destinee.acro.gen.nz (unknown [68.20.14.190]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pb-smtp21.pobox.com (Postfix) with ESMTPSA id 213FCBEE5F; Tue, 12 May 2020 21:56:05 -0400 (EDT) (envelope-from cky@cky.nz) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1589334990; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=0+XF7leqROQYktxU34JhN2kz7KBJfPtwqkzKdaJ/d0k=; b=CCUL5N/j4KBKyMLuuP8wD2C4F9k0lvT/9O7u/a0S+wk1Dxbcs7ursV2p7FONeuI56rLG8h Cxko8dKdDpDCK+V1X03hEetK8AbKy2hAPpP0q34QGwdoVTdZZ3YqeC+0jGVPrCep5FCEs9 7sHSoIGXzOkRq4orafIcQWy03SrPDDc= X-MC-Unique: 4tqcz_WbOfKJIPEC8z5yhg-1 X-MC-Unique: MKtkE33bNfC2wjnvWARdKw-1 From: Chris Jester-Young To: libvir-list@redhat.com Subject: [libvirt PATCH v2 3/4] tests: qemuxml2xmltest: Convert disk-scsi to DO_TEST_CAPS_LATEST Date: Tue, 12 May 2020 21:55:47 -0400 Message-Id: <20200513015548.295386-4-cky@cky.nz> In-Reply-To: <20200513015548.295386-1-cky@cky.nz> References: <20200513015548.295386-1-cky@cky.nz> MIME-Version: 1.0 Mail-Followup-To: libvir-list@redhat.com X-Pobox-Relay-ID: E877A436-94BC-11EA-981F-8D86F504CC47-57607449!pb-smtp21.pobox.com X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id 04D1uLNP007274 X-loop: libvir-list@redhat.com Cc: Chris Jester-Young 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 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: Chris Jester-Young Reviewed-by: Peter Krempa --- .../{disk-scsi.xml =3D> disk-scsi.x86_64-latest.xml} | 13 ++++++++----- tests/qemuxml2xmltest.c | 3 +-- 2 files changed, 9 insertions(+), 7 deletions(-) rename tests/qemuxml2xmloutdata/{disk-scsi.xml =3D> disk-scsi.x86_64-lates= t.xml} (92%) diff --git a/tests/qemuxml2xmloutdata/disk-scsi.xml b/tests/qemuxml2xmloutd= ata/disk-scsi.x86_64-latest.xml similarity index 92% rename from tests/qemuxml2xmloutdata/disk-scsi.xml rename to tests/qemuxml2xmloutdata/disk-scsi.x86_64-latest.xml index 062a907303..c5fd3c0657 100644 --- a/tests/qemuxml2xmloutdata/disk-scsi.xml +++ b/tests/qemuxml2xmloutdata/disk-scsi.x86_64-latest.xml @@ -8,6 +8,9 @@ hvm + + qemu64 + destroy restart @@ -46,20 +49,20 @@
- +
-
+
-
+
-
+
@@ -68,7 +71,7 @@ -
+
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index e7480fcf9d..033f81013e 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -339,8 +339,7 @@ mymain(void) DO_TEST("disk-network-vxhs", NONE); DO_TEST("disk-network-tlsx509", NONE); DO_TEST("disk-nvme", QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_QCOW2_LUKS); - DO_TEST("disk-scsi", QEMU_CAPS_SCSI_LSI, QEMU_CAPS_SCSI_MEGASAS, - QEMU_CAPS_SCSI_MPTSAS1068, QEMU_CAPS_SCSI_DISK_WWN); + DO_TEST_CAPS_LATEST("disk-scsi"); DO_TEST("disk-virtio-scsi-reservations", QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_PR_MANAGER_HELPER); DO_TEST("controller-virtio-scsi", QEMU_CAPS_VIRTIO_SCSI); --=20 2.25.1 From nobody Thu Apr 25 19:23:18 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 ARC-Seal: i=1; a=rsa-sha256; t=1589334991; cv=none; d=zohomail.com; s=zohoarc; b=dCP6zOCLz8Yk2vXRQMhQFoTJX2KSOOCUCNT1Ey+zP5Cd8YCHfnhk9BHFc969yjZ+bRixbXPBqYaImfoQ4Rzttplqo9R1xDlJY62X4kgCzgj6KOZaCRUdVRGXcdUYN723nV+rLIRM+fUdk2TrHnLhulTZtrlZYzGlNPCAtph5quo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589334991; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=l2kyNHPMGvzdfl6lVUo+7HNk3XH8pKY9rNZP9LymYV0=; b=Dl9ZqYFFXsp4unPwC0E31/+2w7Vn5TUUg7C42rhGb8M1DWVJnRqyriy/dMi93r+s6+k72XXuJpCEEQdFDzKz4ZMuBCSasd2+uRULMf7wNMYNtoMmIxf842hc8DFqAPeLme1wK2AOvRKvHIW2ye2tYs54sf856cKM0Ej9FNflxcU= 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 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 1589334991012245.73233254317074; Tue, 12 May 2020 18:56:31 -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-373-3ktyXBf3Mdu5vA6DZvn9Ow-1; Tue, 12 May 2020 21:56:27 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4B54A91165; Wed, 13 May 2020 01:56:22 +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 2D4F35D9DD; Wed, 13 May 2020 01:56:22 +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 014C44CAA8; Wed, 13 May 2020 01:56:22 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 04D1uFgt007258 for ; Tue, 12 May 2020 21:56:15 -0400 Received: by smtp.corp.redhat.com (Postfix) id 7A51C202683E; Wed, 13 May 2020 01:56:15 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast02.extmail.prod.ext.rdu2.redhat.com [10.11.55.18]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 764C3202696C for ; Wed, 13 May 2020 01:56:15 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 5C8448007DB for ; Wed, 13 May 2020 01:56:15 +0000 (UTC) Received: from pb-smtp21.pobox.com (pb-smtp21.pobox.com [173.228.157.53]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-330-cPLOTz4wMVGpGiA4rWOXtg-1; Tue, 12 May 2020 21:56:13 -0400 Received: from pb-smtp21.pobox.com (unknown [127.0.0.1]) by pb-smtp21.pobox.com (Postfix) with ESMTP id 04141BEE6E; Tue, 12 May 2020 21:56:12 -0400 (EDT) (envelope-from cky@cky.nz) Received: from pb-smtp21.sea.icgroup.com (unknown [127.0.0.1]) by pb-smtp21.pobox.com (Postfix) with ESMTP id F01DABEE6C; Tue, 12 May 2020 21:56:11 -0400 (EDT) (envelope-from cky@cky.nz) Received: from obsidius.destinee.acro.gen.nz (unknown [68.20.14.190]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pb-smtp21.pobox.com (Postfix) with ESMTPSA id 55AD0BEE66; Tue, 12 May 2020 21:56:08 -0400 (EDT) (envelope-from cky@cky.nz) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1589334989; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=l2kyNHPMGvzdfl6lVUo+7HNk3XH8pKY9rNZP9LymYV0=; b=KEqF0jKu9/MYU2vMj/aLVDkkw4oVK6dYiHxqaN+IFEYdqER0B5U43qhciKZrKrlbkj61FZ NepjEhFEDLdareumsG6lMUW6Tvyyzmw9vJYRDdRBFkaMtqSehQhnpJep39/Te0PZPuC9Wu ZnlsMZ0cFo7uO+FzLoxeQOTbWAqUFLg= X-MC-Unique: 3ktyXBf3Mdu5vA6DZvn9Ow-1 X-MC-Unique: cPLOTz4wMVGpGiA4rWOXtg-1 From: Chris Jester-Young To: libvir-list@redhat.com Subject: [libvirt PATCH v2 4/4] tests: qemuxml2argvtest: Add vmpvscsi to disk-scsi test Date: Tue, 12 May 2020 21:55:48 -0400 Message-Id: <20200513015548.295386-5-cky@cky.nz> In-Reply-To: <20200513015548.295386-1-cky@cky.nz> References: <20200513015548.295386-1-cky@cky.nz> MIME-Version: 1.0 Mail-Followup-To: libvir-list@redhat.com X-Pobox-Relay-ID: EA6266A0-94BC-11EA-8368-8D86F504CC47-57607449!pb-smtp21.pobox.com X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id 04D1uFgt007258 X-loop: libvir-list@redhat.com Cc: Chris Jester-Young 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.14 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: Chris Jester-Young Reviewed-by: Peter Krempa --- .../disk-scsi.x86_64-latest.args | 37 +++++++++++-------- tests/qemuxml2argvdata/disk-scsi.xml | 6 +++ .../disk-scsi.x86_64-latest.xml | 11 +++++- 3 files changed, 38 insertions(+), 16 deletions(-) diff --git a/tests/qemuxml2argvdata/disk-scsi.x86_64-latest.args b/tests/qe= muxml2argvdata/disk-scsi.x86_64-latest.args index 06c71cbab6..489f53d80e 100644 --- a/tests/qemuxml2argvdata/disk-scsi.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-scsi.x86_64-latest.args @@ -32,37 +32,44 @@ file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ -device megasas,id=3Dscsi1,bus=3Dpci.0,addr=3D0x3 \ -device mptsas1068,id=3Dscsi2,bus=3Dpci.0,addr=3D0x4 \ -device spapr-vscsi,id=3Dscsi3,reg=3D0x00002000 \ +-device pvscsi,id=3Dscsi4,bus=3Dpci.0,addr=3D0x5 \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1",\ +"node-name":"libvirt-6-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-6-format","read-only":false,"driver":"raw= ",\ +"file":"libvirt-6-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-6-format,id=3Dide0-0-0= ,bootindex=3D1 \ +-blockdev '{"driver":"file","filename":"/tmp/scsidisk.img",\ "node-name":"libvirt-5-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-5-format","read-only":false,"driver":"raw= ",\ "file":"libvirt-5-storage"}' \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-5-format,id=3Dide0-0-0= ,bootindex=3D1 \ --blockdev '{"driver":"file","filename":"/tmp/scsidisk.img",\ +-device scsi-hd,bus=3Dscsi0.0,scsi-id=3D0,device_id=3Ddrive-scsi0-0-0,\ +drive=3Dlibvirt-5-format,id=3Dscsi0-0-0 \ +-blockdev '{"driver":"file","filename":"/tmp/scsidisk2.img",\ "node-name":"libvirt-4-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-4-format","read-only":false,"driver":"raw= ",\ "file":"libvirt-4-storage"}' \ --device scsi-hd,bus=3Dscsi0.0,scsi-id=3D0,device_id=3Ddrive-scsi0-0-0,\ -drive=3Dlibvirt-4-format,id=3Dscsi0-0-0 \ --blockdev '{"driver":"file","filename":"/tmp/scsidisk2.img",\ +-device scsi-hd,bus=3Dscsi1.0,channel=3D0,scsi-id=3D0,lun=3D0,device_id=3D= abcdefghijklmn,\ +drive=3Dlibvirt-4-format,id=3Dscsi1-0-0-0,serial=3Dabcdefghijklmn \ +-blockdev '{"driver":"file","filename":"/tmp/scsidisk3.img",\ "node-name":"libvirt-3-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-3-format","read-only":false,"driver":"raw= ",\ "file":"libvirt-3-storage"}' \ --device scsi-hd,bus=3Dscsi1.0,channel=3D0,scsi-id=3D0,lun=3D0,device_id=3D= abcdefghijklmn,\ -drive=3Dlibvirt-3-format,id=3Dscsi1-0-0-0,serial=3Dabcdefghijklmn \ --blockdev '{"driver":"file","filename":"/tmp/scsidisk3.img",\ -"node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw= ",\ -"file":"libvirt-2-storage"}' \ -device scsi-hd,bus=3Dscsi2.0,channel=3D0,scsi-id=3D0,lun=3D0,\ -device_id=3Ddrive-scsi2-0-0-0,drive=3Dlibvirt-2-format,id=3Dscsi2-0-0-0,\ +device_id=3Ddrive-scsi2-0-0-0,drive=3Dlibvirt-3-format,id=3Dscsi2-0-0-0,\ wwn=3D0x5000c50015ea71ac \ -blockdev '{"driver":"file","filename":"/tmp/scsidisk4.img",\ +"node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw= ",\ +"file":"libvirt-2-storage"}' \ +-device scsi-hd,bus=3Dscsi3.0,channel=3D0,scsi-id=3D0,lun=3D0,\ +device_id=3Ddrive-scsi3-0-0-0,drive=3Dlibvirt-2-format,id=3Dscsi3-0-0-0 \ +-blockdev '{"driver":"file","filename":"/tmp/scsidisk5.img",\ "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 scsi-hd,bus=3Dscsi3.0,channel=3D0,scsi-id=3D0,lun=3D0,\ -device_id=3Ddrive-scsi3-0-0-0,drive=3Dlibvirt-1-format,id=3Dscsi3-0-0-0 \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x5 \ +-device scsi-hd,bus=3Dscsi4.0,channel=3D0,scsi-id=3D0,lun=3D0,\ +device_id=3Ddrive-scsi4-0-0-0,drive=3Dlibvirt-1-format,id=3Dscsi4-0-0-0 \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x6 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ resourcecontrol=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-scsi.xml b/tests/qemuxml2argvdata/= disk-scsi.xml index 7fbb785a37..4468a182db 100644 --- a/tests/qemuxml2argvdata/disk-scsi.xml +++ b/tests/qemuxml2argvdata/disk-scsi.xml @@ -41,12 +41,18 @@
+ + + +
+ + diff --git a/tests/qemuxml2xmloutdata/disk-scsi.x86_64-latest.xml b/tests/q= emuxml2xmloutdata/disk-scsi.x86_64-latest.xml index c5fd3c0657..ff93277835 100644 --- a/tests/qemuxml2xmloutdata/disk-scsi.x86_64-latest.xml +++ b/tests/qemuxml2xmloutdata/disk-scsi.x86_64-latest.xml @@ -49,6 +49,12 @@
+ + + + +
+
@@ -67,11 +73,14 @@
+ +
+ -
+
--=20 2.25.1