From nobody Tue Apr 30 09:28:02 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=1587952926; cv=none; d=zohomail.com; s=zohoarc; b=nMjfId8Jdsj0QKNT8dZ5TSp9ktxbrWu1JS0svVsi6rQEciV9+WNLVZ9S+NCAacCZyb4uqCOmWyGHNrPFav84DyZ41YAXzstj4/JOIappBxG09+iks+K9zD35wc/4PL5o0RP0ECWFTqdJoqn2ZzK6c4/WGUhH4gVGcyDu5R0XIxs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1587952926; 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=4wlR1rJNIL2m1sLXYOLSVxMPzgLtJZSLxIia0YwBIgY=; b=MISUv7e4T2emxSqzkovBCjZHMjZA80salQPg7m+1spKIJADyimCG8JPljxpOKHU7nF1gzIkLJFtiCibSjIHeo9eTeWxBubQOBBaVYDNxKok2ZEkPu3q2VGcFFM04EEkKDSz0xR9iu+YBjI4SOFB7jZF1Z2XAvWNeZGE4j+bbi5Y= 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-1.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 1587952926056152.8732344679538; Sun, 26 Apr 2020 19:02:06 -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-418-zl5ezuLaOt-zcBlJMAHyqg-1; Sun, 26 Apr 2020 22:02:02 -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 C4580835B41; Mon, 27 Apr 2020 02:01:56 +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 8EDA760CD3; Mon, 27 Apr 2020 02:01:56 +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 3CEBD1809557; Mon, 27 Apr 2020 02:01:56 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 03R21OVN021255 for ; Sun, 26 Apr 2020 22:01:24 -0400 Received: by smtp.corp.redhat.com (Postfix) id C486E605D8; Mon, 27 Apr 2020 02:01:24 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-13-109.pek2.redhat.com [10.72.13.109]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5EA15605D1; Mon, 27 Apr 2020 02:01:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1587952924; 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=4wlR1rJNIL2m1sLXYOLSVxMPzgLtJZSLxIia0YwBIgY=; b=DoNwDvU/cdOdqX6qs9m4TyxdPhKjQFU5XRaWl1TYKhMgtU8fiUEbcCDc7BXF2N08drABti moxlYfHVsAAXOG4+7cyVNstu2NvCzdOeg3wRsmQYiSLtAN/Xz1HKo6eisxJ5XF/MNcwaV3 YfpZcB4/Jza7i9Tx/SyssQqvMbA06Oo= X-MC-Unique: zl5ezuLaOt-zcBlJMAHyqg-1 From: Han Han To: libvir-list@redhat.com Subject: [PATCH v1 1/5] qemu_capabilities: Introduce iSER transport flag Date: Mon, 27 Apr 2020 10:01:06 +0800 Message-Id: <20200427020110.174406-2-hhan@redhat.com> In-Reply-To: <20200427020110.174406-1-hhan@redhat.com> References: <20200427020110.174406-1-hhan@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Cc: pkrempa@redhat.com, Han Han 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" Introduce the flag QEMU_CAPS_ISCSI_TRANSPORT_ISER for iSER(iSCSI Extensions for RDMA) transport of iscsi backend. Signed-off-by: Han Han --- src/qemu/qemu_capabilities.c | 2 ++ src/qemu/qemu_capabilities.h | 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.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.11.0.s390x.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.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_2.9.0.s390x.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.riscv32.xml | 1 + tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml | 1 + tests/qemucapabilitiesdata/caps_3.0.0.s390x.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.s390x.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.s390x.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.x86_64.xml | 1 + 36 files changed, 37 insertions(+) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index f6b3c96a..37dcf7cd 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -574,6 +574,7 @@ VIR_ENUM_IMPL(virQEMUCaps, "virtio.packed", "pcie-root-port.hotplug", "aio.io_uring", + "iscsi.transport.iser", ); =20 =20 @@ -1463,6 +1464,7 @@ static struct virQEMUCapsStringFlags virQEMUCapsQMPSc= hemaQueries[] =3D { { "query-named-block-nodes/arg-type/flat", QEMU_CAPS_QMP_QUERY_NAMED_B= LOCK_NODES_FLAT }, { "blockdev-snapshot/$allow-write-only-overlay", QEMU_CAPS_BLOCKDEV_SN= APSHOT_ALLOW_WRITE_ONLY }, { "blockdev-add/arg-type/+file/aio/^io_uring", QEMU_CAPS_AIO_IO_URING = }, + { "blockdev-add/arg-type/+iscsi/transport/^iser", QEMU_CAPS_ISCSI_TRAN= SPORT_ISER }, }; =20 typedef struct _virQEMUCapsObjectTypeProps virQEMUCapsObjectTypeProps; diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 0e9a161f..fc2fad02 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -555,6 +555,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for = syntax-check */ QEMU_CAPS_VIRTIO_PACKED_QUEUES, /* virtio.packed */ QEMU_CAPS_PCIE_ROOT_PORT_HOTPLUG, /* pcie-root-port.hotplug */ QEMU_CAPS_AIO_IO_URING, /* -blockdev {...,"aio":"io_uring",...} */ + QEMU_CAPS_ISCSI_TRANSPORT_ISER, /* -blockdev {"driver":"iscsi","transp= ort":"iser",...} */ =20 QEMU_CAPS_LAST /* this must always be the last item */ } virQEMUCapsFlags; diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml b/tests/qem= ucapabilitiesdata/caps_2.10.0.aarch64.xml index f598b467..f7b67ff5 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml @@ -140,6 +140,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 b95a9d42..7b4f2c0d 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml @@ -140,6 +140,7 @@ + 2010000 0 42900287 diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml b/tests/qemuc= apabilitiesdata/caps_2.10.0.s390x.xml index 04ac8729..6c9a4279 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml @@ -107,6 +107,7 @@ + 2010000 0 39100287 diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml b/tests/qemu= capabilitiesdata/caps_2.10.0.x86_64.xml index 7ebe97b6..63581f29 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml @@ -183,6 +183,7 @@ + 2010000 0 43100287 diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml b/tests/qemuc= apabilitiesdata/caps_2.11.0.s390x.xml index 6d36a6e4..af4cc294 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml @@ -114,6 +114,7 @@ + 2011000 0 39100288 diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml b/tests/qemu= capabilitiesdata/caps_2.11.0.x86_64.xml index b8eb3abd..55228919 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml @@ -189,6 +189,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 64d8d495..ce6d8e04 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml @@ -156,6 +156,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 38a3103c..5e508de6 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml @@ -154,6 +154,7 @@ + 2011090 0 42900289 diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml b/tests/qemuc= apabilitiesdata/caps_2.12.0.s390x.xml index 21a168dd..b3a1dad1 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml @@ -126,6 +126,7 @@ + 2012000 0 39100289 diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemu= capabilitiesdata/caps_2.12.0.x86_64.xml index 0c30cc75..e6526ccf 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml @@ -198,6 +198,7 @@ + 2011090 0 43100289 diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_2.9.0.ppc64.xml index 3bc6ec8d..49bfe565 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml @@ -132,6 +132,7 @@ + 2009000 0 42900247 diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml b/tests/qemuca= pabilitiesdata/caps_2.9.0.s390x.xml index 9a6d94d3..9603a5e8 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml @@ -101,6 +101,7 @@ + 2009000 0 39100247 diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_2.9.0.x86_64.xml index 83fc6cde..2d6246f8 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml @@ -177,6 +177,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 9a0b9c05..85b51c5f 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml @@ -156,6 +156,7 @@ + 2012050 0 42900239 diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml b/tests/qemu= capabilitiesdata/caps_3.0.0.riscv32.xml index 6814a2f9..9ac4a147 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml @@ -96,6 +96,7 @@ + 3000000 0 0 diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml b/tests/qemu= capabilitiesdata/caps_3.0.0.riscv64.xml index b81f5825..071d6bde 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml @@ -96,6 +96,7 @@ + 3000000 0 0 diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml b/tests/qemuca= pabilitiesdata/caps_3.0.0.s390x.xml index 85cda120..e0e2f0a1 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml @@ -129,6 +129,7 @@ + 3000000 0 39100239 diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_3.0.0.x86_64.xml index 517e27d8..264931bc 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml @@ -204,6 +204,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 68010232..9fdbe3be 100644 --- a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml @@ -161,6 +161,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 d901715f..10ceac33 100644 --- a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml @@ -207,6 +207,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 6fd1880a..004fca41 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml @@ -170,6 +170,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 f7e69fcc..95972054 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml @@ -175,6 +175,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 6a567239..d90ade53 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml @@ -171,6 +171,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 d6686b7c..a1c087eb 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml @@ -171,6 +171,7 @@ + 4000000 0 0 diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml b/tests/qemuca= pabilitiesdata/caps_4.0.0.s390x.xml index 9dc29832..a7739055 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml @@ -137,6 +137,7 @@ + 4000000 0 39100240 diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_4.0.0.x86_64.xml index ae4004ad..4dc62a1a 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml @@ -212,6 +212,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 d9bdeb25..e597c1af 100644 --- a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml @@ -218,6 +218,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 e994aa79..d92b7fa0 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml @@ -182,6 +182,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 99ec98e8..c4416079 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml @@ -180,6 +180,7 @@ + 4001050 0 42900242 diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml b/tests/qemuca= pabilitiesdata/caps_4.2.0.s390x.xml index 058326ba..b44d771f 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml @@ -147,6 +147,7 @@ + 4002000 0 39100242 diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_4.2.0.x86_64.xml index a1994603..c7b58f6f 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml @@ -226,6 +226,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 3876d08c..23a12971 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml @@ -184,6 +184,7 @@ + 4002050 0 61700241 diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_5.0.0.ppc64.xml index b0891613..7e4fc28a 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml @@ -192,6 +192,7 @@ + 4002050 0 42900241 diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_5.0.0.x86_64.xml index 4058efdf..1da44474 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml @@ -231,6 +231,7 @@ + 4002093 0 43100241 --=20 2.25.0 From nobody Tue Apr 30 09:28:02 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=1587952936; cv=none; d=zohomail.com; s=zohoarc; b=PNk568vLgIWCMe5Y5irm2HO/aUeyjMZWAy2pNU3cN7ynVFEcQtLggj0EHHI457lH2AmZBgLp73pqBz5CUtiEqLg63r/ww56yrhK20fHo0xWjNGuQBqyGeLT0s1y1PfaZDyUv98RfdcLfFylgX9yKvNat9JeT6V+JHCtIlqFt6z4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1587952936; 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=LVnKW7TSjKL8uR6K5VLSLDBqxIr2iE/yyYKMXhFQSXY=; b=DaQ1KsrQ03P3znPAyEixGXANBHasSzPSUBjC1loUiZQYycOO9SY8DToB0jT1b4+WKV2wEoZgnniDJCcd16NkLDj1A5Xgmk9BM2aZOIZEQMSu4rSVZJZCJlVffkny2PoVSXeZegPD6t2ngUv6/62QpR9bg9q2yGJxJsvsO1+Gr7U= 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 1587952936120913.2435309908768; Sun, 26 Apr 2020 19:02:16 -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-43-qu35MPoNPFGy0ZQyEZx0HQ-1; Sun, 26 Apr 2020 22:02:09 -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 2C31D1800D42; Mon, 27 Apr 2020 02:02:04 +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 DEF016062B; Mon, 27 Apr 2020 02:02:03 +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 50B864CAA0; Mon, 27 Apr 2020 02:02:03 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 03R21QdV021267 for ; Sun, 26 Apr 2020 22:01:26 -0400 Received: by smtp.corp.redhat.com (Postfix) id E72263818D; Mon, 27 Apr 2020 02:01:26 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-13-109.pek2.redhat.com [10.72.13.109]) by smtp.corp.redhat.com (Postfix) with ESMTP id 56987605D1; Mon, 27 Apr 2020 02:01:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1587952934; 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=LVnKW7TSjKL8uR6K5VLSLDBqxIr2iE/yyYKMXhFQSXY=; b=jOqHNx+sK+cPqyq06qmq2i7MleLhzKkxAq/yIReF1Gj3uqDfQ5uNq9OWZ3Kl3zcGRjWmP6 95CQYnKfi8TRAe7zvOFncRjR9atfsojfDMRzAk+a/j+OGYpXSykY84N1pZVxYFpBP+3KhQ xEFCxFM7CqB7U8gD3edtNpm0v6Lg/xI= X-MC-Unique: qu35MPoNPFGy0ZQyEZx0HQ-1 From: Han Han To: libvir-list@redhat.com Subject: [PATCH v1 2/5] qemu: Support iser transport in iscsi Date: Mon, 27 Apr 2020 10:01:07 +0800 Message-Id: <20200427020110.174406-3-hhan@redhat.com> In-Reply-To: <20200427020110.174406-1-hhan@redhat.com> References: <20200427020110.174406-1-hhan@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Cc: pkrempa@redhat.com, Han Han 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" The iscsi iser transport is introdcued since QEMU 2.9. For iscsi blockdev json, it will be shown at 'transport' field: 'json:{...,{"driver": "iscsi","transport":"iser",...}}' For legacy drive filename as iscsi uri, it will start with 'iser' scheme: iser://[[username][%]@][:]// By default, the iscsi transport is still tcp. Signed-off-by: Han Han --- src/qemu/qemu_backup.c | 1 + src/qemu/qemu_block.c | 16 +++++++++++++--- src/qemu/qemu_command.c | 17 +++++++++++++++++ src/qemu/qemu_monitor_json.c | 1 + src/storage/storage_file_gluster.c | 7 +++++++ src/util/virstoragefile.c | 26 ++++++++++++++++++-------- src/util/virstoragefile.h | 1 + 7 files changed, 58 insertions(+), 11 deletions(-) diff --git a/src/qemu/qemu_backup.c b/src/qemu/qemu_backup.c index 80fc5d77..caf0b4ce 100644 --- a/src/qemu/qemu_backup.c +++ b/src/qemu/qemu_backup.c @@ -88,6 +88,7 @@ qemuBackupPrepare(virDomainBackupDefPtr def) /* TODO: Do we need to mess with selinux? */ break; =20 + case VIR_STORAGE_NET_HOST_TRANS_ISER: case VIR_STORAGE_NET_HOST_TRANS_RDMA: case VIR_STORAGE_NET_HOST_TRANS_LAST: virReportError(VIR_ERR_INTERNAL_ERROR, "%s", diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c index d32277d7..003c18f1 100644 --- a/src/qemu/qemu_block.c +++ b/src/qemu/qemu_block.c @@ -418,10 +418,16 @@ qemuBlockStorageSourceGetURI(virStorageSourcePtr src) if (VIR_ALLOC(uri) < 0) return NULL; =20 - if (src->hosts->transport =3D=3D VIR_STORAGE_NET_HOST_TRANS_TCP) { + if (src->hosts->transport =3D=3D VIR_STORAGE_NET_HOST_TRANS_TCP || + src->hosts->transport =3D=3D VIR_STORAGE_NET_HOST_TRANS_RDMA || + src->hosts->transport =3D=3D VIR_STORAGE_NET_HOST_TRANS_ISER) uri->port =3D src->hosts->port; =20 + if (src->hosts->transport =3D=3D VIR_STORAGE_NET_HOST_TRANS_TCP) { uri->scheme =3D g_strdup(virStorageNetProtocolTypeToString(src->pr= otocol)); + } else if (src->protocol =3D=3D VIR_STORAGE_NET_PROTOCOL_ISCSI && + src->hosts->transport =3D=3D VIR_STORAGE_NET_HOST_TRANS_ISE= R) { + uri->scheme =3D g_strdup("iser"); } else { uri->scheme =3D g_strdup_printf("%s+%s", virStorageNetProtocolTypeToString(sr= c->protocol), @@ -497,6 +503,7 @@ qemuBlockStorageSourceBuildJSONSocketAddress(virStorage= NetHostDefPtr host, return NULL; break; =20 + case VIR_STORAGE_NET_HOST_TRANS_ISER: case VIR_STORAGE_NET_HOST_TRANS_RDMA: case VIR_STORAGE_NET_HOST_TRANS_LAST: virReportError(VIR_ERR_INTERNAL_ERROR, @@ -743,6 +750,7 @@ qemuBlockStorageSourceGetISCSIProps(virStorageSourcePtr= src, { qemuDomainStorageSourcePrivatePtr srcPriv =3D QEMU_DOMAIN_STORAGE_SOUR= CE_PRIVATE(src); g_autofree char *target =3D NULL; + const char *transport =3D NULL; char *lunStr =3D NULL; char *username =3D NULL; char *objalias =3D NULL; @@ -762,6 +770,7 @@ qemuBlockStorageSourceGetISCSIProps(virStorageSourcePtr= src, */ =20 target =3D g_strdup(src->path); + transport =3D virStorageNetHostTransportTypeToString(src->hosts->trans= port); =20 /* Separate the target and lun */ if ((lunStr =3D strchr(target, '/'))) { @@ -791,7 +800,7 @@ qemuBlockStorageSourceGetISCSIProps(virStorageSourcePtr= src, "s:portal", portal, "s:target", target, "u:lun", lun, - "s:transport", "tcp", + "s:transport", transport, "S:user", username, "S:password-secret", objalias, "S:initiator-name", src->initiat= or.iqn, @@ -2063,7 +2072,8 @@ qemuBlockGetBackingStoreString(virStorageSourcePtr sr= c, /* generate simplified URIs for the easy cases */ if (actualType =3D=3D VIR_STORAGE_TYPE_NETWORK && src->nhosts =3D=3D 1 && - src->hosts->transport =3D=3D VIR_STORAGE_NET_HOST_TRANS_TCP && + (src->hosts->transport =3D=3D VIR_STORAGE_NET_HOST_TRANS_TCP || + src->hosts->transport =3D=3D VIR_STORAGE_NET_HOST_TRANS_ISER)= && src->timeout =3D=3D 0 && src->ncookies =3D=3D 0 && src->sslverify =3D=3D VIR_TRISTATE_BOOL_ABSENT && diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 45dd8307..c5cf9401 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1443,6 +1443,16 @@ qemuCheckDiskConfig(virDomainDiskDefPtr disk, return -1; } } + + if (disk->src && + disk->src->hosts && + disk->src->hosts->transport =3D=3D VIR_STORAGE_NET_HOST_TRANS_= ISER && + !virQEMUCapsGet(qemuCaps, QEMU_CAPS_ISCSI_TRANSPORT_ISER)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("iSCSI iser transport is not supported by this " + "QEMU binary")); + return -1; + } } =20 if (disk->serial && @@ -4888,6 +4898,13 @@ qemuBuildSCSIiSCSIHostdevDrvStr(virDomainHostdevDefP= tr dev, qemuDomainStorageSourcePrivatePtr srcPriv =3D QEMU_DOMAIN_STORAGE_SOURCE_PRIVATE(iscsisrc->src); =20 + if (iscsisrc->src->hosts->transport =3D=3D VIR_STORAGE_NET_HOST_TRANS_= ISER && + !virQEMUCapsGet(qemuCaps, QEMU_CAPS_ISCSI_TRANSPORT_ISER)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("This QEMU doesn't support iSCSI iser transport")= ); + return NULL; + } + if (qemuDiskSourceNeedsProps(iscsisrc->src, qemuCaps)) { if (!(srcprops =3D qemuDiskSourceGetProps(iscsisrc->src))) return NULL; diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 619717ea..338f66ef 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -7199,6 +7199,7 @@ qemuMonitorJSONNBDServerStart(qemuMonitorPtr mon, case VIR_STORAGE_NET_HOST_TRANS_UNIX: addr =3D qemuMonitorJSONBuildUnixSocketAddress(server->socket); break; + case VIR_STORAGE_NET_HOST_TRANS_ISER: case VIR_STORAGE_NET_HOST_TRANS_RDMA: case VIR_STORAGE_NET_HOST_TRANS_LAST: virReportError(VIR_ERR_INTERNAL_ERROR, "%s", diff --git a/src/storage/storage_file_gluster.c b/src/storage/storage_file_= gluster.c index f389a944..73dfef0c 100644 --- a/src/storage/storage_file_gluster.c +++ b/src/storage/storage_file_gluster.c @@ -78,6 +78,13 @@ virStorageFileBackendGlusterInitServer(virStorageFileBac= kendGlusterPrivPtr priv, hoststr =3D host->socket; break; =20 + case VIR_STORAGE_NET_HOST_TRANS_ISER: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("invalid transport '%s' for gluster host"), + transport); + return -1; + break; + case VIR_STORAGE_NET_HOST_TRANS_LAST: break; } diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index ffc8bdb3..4f162f10 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -97,6 +97,7 @@ VIR_ENUM_IMPL(virStorageNetHostTransport, "tcp", "unix", "rdma", + "iser", ); =20 VIR_ENUM_IMPL(virStorageSourcePoolMode, @@ -2839,10 +2840,15 @@ virStorageSourceParseBackingURI(virStorageSourcePtr= src, =20 if (!scheme[0] || (src->protocol =3D virStorageNetProtocolTypeFromString(scheme[0]))= < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("invalid backing protocol '%s'"), - NULLSTR(scheme[0])); - return -1; + if (STRNEQ(scheme[0], "iser")) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("invalid backing protocol '%s'"), + NULLSTR(scheme[0])); + return -1; + } + + src->protocol =3D VIR_STORAGE_NET_PROTOCOL_ISCSI; + src->hosts->transport =3D VIR_STORAGE_NET_HOST_TRANS_ISER; } =20 if (scheme[1] && @@ -3523,14 +3529,17 @@ virStorageSourceParseBackingJSONiSCSI(virStorageSou= rcePtr src, return -1; =20 src->nhosts =3D 1; + src->hosts->transport =3D VIR_STORAGE_NET_HOST_TRANS_TCP; =20 - if (STRNEQ_NULLABLE(transport, "tcp")) { + if (STRNEQ(transport, "tcp") && STRNEQ(transport, "iser") && transport= ) { virReportError(VIR_ERR_INVALID_ARG, "%s", - _("only TCP transport is supported for iSCSI volume= s")); + _("only TCP or iSER transport is supported for iSCS= I " + "volumes")); return -1; } =20 - src->hosts->transport =3D VIR_STORAGE_NET_HOST_TRANS_TCP; + if (transport) + src->hosts->transport =3D virStorageNetHostTransportTypeFromString= (transport); =20 if (!portal) { virReportError(VIR_ERR_INVALID_ARG, "%s", @@ -4710,7 +4719,8 @@ virStorageSourceNetworkAssignDefaultPorts(virStorageS= ourcePtr src) size_t i; =20 for (i =3D 0; i < src->nhosts; i++) { - if (src->hosts[i].transport =3D=3D VIR_STORAGE_NET_HOST_TRANS_TCP = && + if ((src->hosts[i].transport =3D=3D VIR_STORAGE_NET_HOST_TRANS_TCP= || + src->hosts[i].transport =3D=3D VIR_STORAGE_NET_HOST_TRANS_ISE= R) && src->hosts[i].port =3D=3D 0) src->hosts[i].port =3D virStorageSourceNetworkDefaultPort(src-= >protocol); } diff --git a/src/util/virstoragefile.h b/src/util/virstoragefile.h index 7939c09c..120d6190 100644 --- a/src/util/virstoragefile.h +++ b/src/util/virstoragefile.h @@ -146,6 +146,7 @@ typedef enum { VIR_STORAGE_NET_HOST_TRANS_TCP, VIR_STORAGE_NET_HOST_TRANS_UNIX, VIR_STORAGE_NET_HOST_TRANS_RDMA, + VIR_STORAGE_NET_HOST_TRANS_ISER, =20 VIR_STORAGE_NET_HOST_TRANS_LAST } virStorageNetHostTransport; --=20 2.25.0 From nobody Tue Apr 30 09:28:02 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=1587952903; cv=none; d=zohomail.com; s=zohoarc; b=nGggmREpev+tRJHH9VEvDaYj0OZW0orqXnGHMwG6VF7au2iPx4/8fX+keHjib0dnAKZsZehZEsnK8hW10nm8ND7AVomofhtADBc5GGVxiilDPlKULkRlLUJVafBaknA4AZ0Oym1QVocDO6yqaomNQzUzdF39hw2BRinibRz/U+0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1587952903; 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=Tsg4vLv5sPShDJSKZw0czXomTwjRHL9f715FcJQGNPo=; b=ODf6JfMvMaR/eKtaHVgYosRdeazunZRXrMtt2VxhesA702DK01hC5AmnUI37wT0OlnHd4xLeoLXIFRSjTB6y6zkiG/+zJZy1oXj43/lAmEoPCzHGunoAWHPxM8YXdwsKg+6RyVOQ/FsAaCGnzpRnBv9Hjg2VbPvBzPg3287YEqE= 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 1587952903886424.7975127642243; Sun, 26 Apr 2020 19:01: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-472-fVto3_TPNCKRazTWJDc4xQ-1; Sun, 26 Apr 2020 22:01:40 -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 C1098EC1A0; Mon, 27 Apr 2020 02:01: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 D5D20605D6; Mon, 27 Apr 2020 02:01:32 +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 2C2114CAA0; Mon, 27 Apr 2020 02:01:30 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 03R21SOX021278 for ; Sun, 26 Apr 2020 22:01:28 -0400 Received: by smtp.corp.redhat.com (Postfix) id DC082605D6; Mon, 27 Apr 2020 02:01:28 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-13-109.pek2.redhat.com [10.72.13.109]) by smtp.corp.redhat.com (Postfix) with ESMTP id 78C5A605D1; Mon, 27 Apr 2020 02:01:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1587952902; 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=Tsg4vLv5sPShDJSKZw0czXomTwjRHL9f715FcJQGNPo=; b=HBzAT2S8WMuUO+ZM8PV9QupqxkfhDFKrMS+oGEzBk/oOc/uXD82WCsxiyXfx5GMYdE7doY YVvi8Ni4XESW5Lo+CHKSjP9kymgtU0qH8zW8eDev0JonQptP+hhW52fKybQAWkYBstYUGD NYxWOt+0fFrqkL2ok/h19+ssxgpqMJk= X-MC-Unique: fVto3_TPNCKRazTWJDc4xQ-1 From: Han Han To: libvir-list@redhat.com Subject: [PATCH v1 3/5] docs: Support iser transport of iscsi Date: Mon, 27 Apr 2020 10:01:08 +0800 Message-Id: <20200427020110.174406-4-hhan@redhat.com> In-Reply-To: <20200427020110.174406-1-hhan@redhat.com> References: <20200427020110.174406-1-hhan@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Cc: pkrempa@redhat.com, Han Han 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: Han Han --- docs/formatdomain.html.in | 10 ++++++---- docs/schemas/domaincommon.rng | 1 + 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index c5305739..ae3fcc8d 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -3327,10 +3327,12 @@

gluster supports "tcp", "rdma", "unix" as valid values for the - transport attribute. nbd supports "tcp" and "unix". Others o= nly - support "tcp". If nothing is specified, "tcp" is assumed. If = the - transport is "unix", the socket attribute specifies the path t= o an - AF_UNIX socket. + transport attribute. nbd supports "tcp" and "unix". iscsi sup= ports + "tcp" and "iser" + Since libvirt 6.3.0(QEMU 2.9). Ot= hers + only support "tcp". If nothing is specified, "tcp" is assumed. + If the transport is "unix", the socket attribute specifies + the path to an AF_UNIX socket.

snapshot
diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 7f18e5b6..7ae9522e 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -1725,6 +1725,7 @@ tcp rdma + iser --=20 2.25.0 From nobody Tue Apr 30 09:28:02 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=1587952904; cv=none; d=zohomail.com; s=zohoarc; b=JLSFigA0pHhk6dIxE6+dsOUvPRBykR/AO80Eg0hvx6QBq6mpo1lb54gBjIUdAut5z9vLCyRBMDGqLzTJOYPfDxkXQ7M19IE9NZO2nCOfOivOO02n8SEFjJz7a+AYF4SoM62WOitgbacZzTabCZbxm0cDmfnIfOVtuAsXyoZ4nBM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1587952904; 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=iBOn1Dk1HcE990xSJAlwf53qXFYkgVh7AvvLYn2wjqQ=; b=etNRnaJqtR9ofG4rr4vy1YeQGJi8qr7aumU7V0mS5gR4k2Bxp0W4qG9Od+LU+hpnAlyUABDQgZQacy0flq8CW3fp/Vw1chDCfBfDEDyDC/Ncoa5yHdAyZYiZeSkJzJJGAG8muWoYNdJ+jiLCvmTPREG8p0wEFI4l+VOp8eIPUng= 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-1.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 1587952904732767.8918036878265; Sun, 26 Apr 2020 19:01:44 -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-88-oQdGcdXdPECeNSsD9qD3QA-1; Sun, 26 Apr 2020 22:01:40 -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 066FE1800D42; Mon, 27 Apr 2020 02:01:35 +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 1CC8518A54; Mon, 27 Apr 2020 02:01: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 102481809543; Mon, 27 Apr 2020 02:01:32 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 03R21VMJ021292 for ; Sun, 26 Apr 2020 22:01:31 -0400 Received: by smtp.corp.redhat.com (Postfix) id 0331F605D8; Mon, 27 Apr 2020 02:01:31 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-13-109.pek2.redhat.com [10.72.13.109]) by smtp.corp.redhat.com (Postfix) with ESMTP id 725D5605D1; Mon, 27 Apr 2020 02:01:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1587952903; 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=iBOn1Dk1HcE990xSJAlwf53qXFYkgVh7AvvLYn2wjqQ=; b=NHO5H5Ulj8dyIjOMzjqaZ5a+HL08i9XJDX08o+RGOJx3ceLd5oe/fK1H3FfiEZ6nGr6h34 nCcISbs1yysgYpOBqgrX9oH7B/If5Hg9w/UNajqQ5J9SMv9XbcARTtjuG2udI0z9h0E/jB Se4CzfjO1iIZm6qTZRTxrr/fU8Ey3Jc= X-MC-Unique: oQdGcdXdPECeNSsD9qD3QA-1 From: Han Han To: libvir-list@redhat.com Subject: [PATCH v1 4/5] tests: unit tests for iser transport Date: Mon, 27 Apr 2020 10:01:09 +0800 Message-Id: <20200427020110.174406-5-hhan@redhat.com> In-Reply-To: <20200427020110.174406-1-hhan@redhat.com> References: <20200427020110.174406-1-hhan@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Cc: pkrempa@redhat.com, Han Han 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" Add xml2argv, xml2xml, backing metadata to xml tests for iscsi transport iser. Signed-off-by: Han Han --- .../qemuxml2argvdata/disk-network-iscsi.args | 8 +++- .../disk-network-iscsi.x86_64-2.12.0.args | 7 ++- .../disk-network-iscsi.x86_64-latest.args | 45 +++++++++++-------- tests/qemuxml2argvdata/disk-network-iscsi.xml | 9 +++- tests/qemuxml2argvtest.c | 5 ++- .../qemuxml2xmloutdata/disk-network-iscsi.xml | 10 ++++- tests/qemuxml2xmltest.c | 4 +- tests/virstoragetest.c | 14 ++++++ 8 files changed, 76 insertions(+), 26 deletions(-) diff --git a/tests/qemuxml2argvdata/disk-network-iscsi.args b/tests/qemuxml= 2argvdata/disk-network-iscsi.args index 53b3821e..23ef32f2 100644 --- a/tests/qemuxml2argvdata/disk-network-iscsi.args +++ b/tests/qemuxml2argvdata/disk-network-iscsi.args @@ -30,7 +30,7 @@ server,nowait \ if=3Dnone,id=3Ddrive-virtio-disk0 \ -device virtio-blk-pci,bus=3Dpci.0,addr=3D0x4,drive=3Ddrive-virtio-disk0,\ id=3Dvirtio-disk0,bootindex=3D1 \ --drive file=3Discsi://example.org:6000/iqn.1992-01.com.example/1,format=3D= raw,\ +-drive file=3Diser://example.org:6000/iqn.1992-01.com.example/1,format=3Dr= aw,\ if=3Dnone,id=3Ddrive-virtio-disk1 \ -device virtio-blk-pci,bus=3Dpci.0,addr=3D0x5,drive=3Ddrive-virtio-disk1,\ id=3Dvirtio-disk1 \ @@ -47,4 +47,8 @@ id=3Dvirtio-disk3 \ -drive file=3Discsi://example.org:3260/iqn.1992-01.com.example/0,format=3D= raw,\ if=3Dnone,id=3Ddrive-scsi0-0-0-0 \ -device scsi-block,bus=3Dscsi0.0,channel=3D0,scsi-id=3D0,lun=3D0,\ -drive=3Ddrive-scsi0-0-0-0,id=3Dscsi0-0-0-0 +drive=3Ddrive-scsi0-0-0-0,id=3Dscsi0-0-0-0 \ +-drive file=3Diser://example.org:3260/iqn.1992-01.com.example/1,format=3Dr= aw,\ +if=3Dnone,id=3Ddrive-scsi0-0-0-1 \ +-device scsi-block,bus=3Dscsi0.0,channel=3D0,scsi-id=3D0,lun=3D1,\ +drive=3Ddrive-scsi0-0-0-1,id=3Dscsi0-0-0-1 diff --git a/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-2.12.0.args b= /tests/qemuxml2argvdata/disk-network-iscsi.x86_64-2.12.0.args index 930d8d5d..b6b89912 100644 --- a/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-2.12.0.args @@ -34,7 +34,7 @@ if=3Dnone,id=3Ddrive-virtio-disk0 \ -device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x3,drive=3Ddrive-vir= tio-disk0,\ id=3Dvirtio-disk0,bootindex=3D1 \ -drive file.driver=3Discsi,file.portal=3Dexample.org:6000,\ -file.target=3Diqn.1992-01.com.example,file.lun=3D1,file.transport=3Dtcp,fo= rmat=3Draw,\ +file.target=3Diqn.1992-01.com.example,file.lun=3D1,file.transport=3Diser,f= ormat=3Draw,\ if=3Dnone,id=3Ddrive-virtio-disk1 \ -device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x4,drive=3Ddrive-vir= tio-disk1,\ id=3Dvirtio-disk1 \ @@ -61,6 +61,11 @@ file.target=3Diqn.1992-01.com.example,file.lun=3D0,file.= transport=3Dtcp,format=3Draw,\ if=3Dnone,id=3Ddrive-scsi0-0-0-0 \ -device scsi-block,bus=3Dscsi0.0,channel=3D0,scsi-id=3D0,lun=3D0,\ drive=3Ddrive-scsi0-0-0-0,id=3Dscsi0-0-0-0 \ +-drive file.driver=3Discsi,file.portal=3Dexample.org:3260,\ +file.target=3Diqn.1992-01.com.example,file.lun=3D1,file.transport=3Diser,f= ormat=3Draw,\ +if=3Dnone,id=3Ddrive-scsi0-0-0-1 \ +-device scsi-block,bus=3Dscsi0.0,channel=3D0,scsi-id=3D0,lun=3D1,\ +drive=3Ddrive-scsi0-0-0-1,id=3Dscsi0-0-0-1 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ resourcecontrol=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-latest.args b= /tests/qemuxml2argvdata/disk-network-iscsi.x86_64-latest.args index 3f61f6dc..984b34dc 100644 --- a/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-latest.args @@ -31,47 +31,54 @@ file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ -device virtio-scsi-pci,id=3Dscsi0,bus=3Dpci.0,addr=3D0x2 \ -blockdev '{"driver":"iscsi","portal":"example.org:6000",\ "target":"iqn.1992-01.com.example","lun":0,"transport":"tcp",\ +"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 virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x3,drive=3Dlibvirt-6= -format,\ +id=3Dvirtio-disk0,bootindex=3D1 \ +-blockdev '{"driver":"iscsi","portal":"example.org:6000",\ +"target":"iqn.1992-01.com.example","lun":1,"transport":"iser",\ "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 virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x3,drive=3Dlibvirt-5= -format,\ -id=3Dvirtio-disk0,bootindex=3D1 \ +-device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x4,drive=3Dlibvirt-5= -format,\ +id=3Dvirtio-disk1 \ +-object secret,id=3Dlibvirt-4-storage-auth-secret0,\ +data=3D9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\ +keyid=3DmasterKey0,iv=3DAAECAwQFBgcICQoLDA0ODw=3D=3D,format=3Dbase64 \ -blockdev '{"driver":"iscsi","portal":"example.org:6000",\ -"target":"iqn.1992-01.com.example","lun":1,"transport":"tcp",\ +"target":"iqn.1992-01.com.example:storage","lun":1,"transport":"tcp",\ +"user":"myname","password-secret":"libvirt-4-storage-auth-secret0",\ "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 virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x4,drive=3Dlibvirt-4= -format,\ -id=3Dvirtio-disk1 \ +-device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x5,drive=3Dlibvirt-4= -format,\ +id=3Dvirtio-disk2 \ -object secret,id=3Dlibvirt-3-storage-auth-secret0,\ data=3D9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\ keyid=3DmasterKey0,iv=3DAAECAwQFBgcICQoLDA0ODw=3D=3D,format=3Dbase64 \ -blockdev '{"driver":"iscsi","portal":"example.org:6000",\ -"target":"iqn.1992-01.com.example:storage","lun":1,"transport":"tcp",\ +"target":"iqn.1992-01.com.example:storage","lun":2,"transport":"tcp",\ "user":"myname","password-secret":"libvirt-3-storage-auth-secret0",\ "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 virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x5,drive=3Dlibvirt-3= -format,\ -id=3Dvirtio-disk2 \ --object secret,id=3Dlibvirt-2-storage-auth-secret0,\ -data=3D9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\ -keyid=3DmasterKey0,iv=3DAAECAwQFBgcICQoLDA0ODw=3D=3D,format=3Dbase64 \ --blockdev '{"driver":"iscsi","portal":"example.org:6000",\ -"target":"iqn.1992-01.com.example:storage","lun":2,"transport":"tcp",\ -"user":"myname","password-secret":"libvirt-2-storage-auth-secret0",\ +-device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x6,drive=3Dlibvirt-3= -format,\ +id=3Dvirtio-disk3 \ +-blockdev '{"driver":"iscsi","portal":"example.org:3260",\ +"target":"iqn.1992-01.com.example","lun":0,"transport":"tcp",\ "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 virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x6,drive=3Dlibvirt-2= -format,\ -id=3Dvirtio-disk3 \ +-device scsi-block,bus=3Dscsi0.0,channel=3D0,scsi-id=3D0,lun=3D0,\ +drive=3Dlibvirt-2-format,id=3Dscsi0-0-0-0 \ -blockdev '{"driver":"iscsi","portal":"example.org:3260",\ -"target":"iqn.1992-01.com.example","lun":0,"transport":"tcp",\ +"target":"iqn.1992-01.com.example","lun":1,"transport":"iser",\ "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-block,bus=3Dscsi0.0,channel=3D0,scsi-id=3D0,lun=3D0,\ -drive=3Dlibvirt-1-format,id=3Dscsi0-0-0-0 \ +-device scsi-block,bus=3Dscsi0.0,channel=3D0,scsi-id=3D0,lun=3D1,\ +drive=3Dlibvirt-1-format,id=3Dscsi0-0-0-1 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ resourcecontrol=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-network-iscsi.xml b/tests/qemuxml2= argvdata/disk-network-iscsi.xml index 8a55f1b2..6a5d3b61 100644 --- a/tests/qemuxml2argvdata/disk-network-iscsi.xml +++ b/tests/qemuxml2argvdata/disk-network-iscsi.xml @@ -24,7 +24,7 @@ - + @@ -55,6 +55,13 @@ + + + + + + + diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 1a1b9026..76185f79 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1064,7 +1064,10 @@ mymain(void) DO_TEST("disk-network-nbd", NONE); DO_TEST_CAPS_VER("disk-network-nbd", "2.12.0"); DO_TEST_CAPS_LATEST("disk-network-nbd"); - DO_TEST("disk-network-iscsi", QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_SCSI_BL= OCK); + DO_TEST("disk-network-iscsi", + QEMU_CAPS_VIRTIO_SCSI, + QEMU_CAPS_SCSI_BLOCK, + QEMU_CAPS_ISCSI_TRANSPORT_ISER); DO_TEST("disk-network-iscsi-modern", QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_SCSI_BLOCK, diff --git a/tests/qemuxml2xmloutdata/disk-network-iscsi.xml b/tests/qemuxm= l2xmloutdata/disk-network-iscsi.xml index 757b9b7b..2ff00891 100644 --- a/tests/qemuxml2xmloutdata/disk-network-iscsi.xml +++ b/tests/qemuxml2xmloutdata/disk-network-iscsi.xml @@ -25,7 +25,7 @@ - +
@@ -60,6 +60,14 @@
+ + + + + + +
+
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 4e43fa6f..70176df4 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -331,7 +331,9 @@ mymain(void) DO_TEST_CAPS_VER("disk-cache", "2.12.0"); DO_TEST_CAPS_LATEST("disk-cache"); DO_TEST("disk-network-nbd", NONE); - DO_TEST("disk-network-iscsi", QEMU_CAPS_VIRTIO_SCSI); + DO_TEST("disk-network-iscsi", + QEMU_CAPS_VIRTIO_SCSI, + QEMU_CAPS_ISCSI_TRANSPORT_ISER); DO_TEST("disk-network-gluster", NONE); DO_TEST("disk-network-rbd", NONE); DO_TEST("disk-network-source-auth", NONE); diff --git a/tests/virstoragetest.c b/tests/virstoragetest.c index 6d2b21c2..b5ae86c3 100644 --- a/tests/virstoragetest.c +++ b/tests/virstoragetest.c @@ -1297,6 +1297,10 @@ mymain(void) "\n" " \= n" "\n"); + TEST_BACKING_PARSE("iser://example.org:1234/exportname", + "\n" + " \n" + "\n"); TEST_BACKING_PARSE_FULL("iscsi://testuser:testpass@example.org:1234/ex= portname", "\n" " \= n" @@ -1533,6 +1537,16 @@ mymain(void) "\n" " \n" "\n"); + TEST_BACKING_PARSE("json:{\"file\":{\"driver\":\"iscsi\"," + "\"transport\":\"iser\"," + "\"portal\":\"test.org\"," + "\"target\":\"iqn.2016-12.com.virtt= est:emulated-iscsi-noauth.target\"," + "\"lun\":\"1\"" + "}" + "}", + "\n" + " \n" + "\n"); TEST_BACKING_PARSE_FULL("json:{\"file\":{\"driver\":\"iscsi\"," "\"transport\":\"tcp\"," "\"portal\":\"test.org\"," --=20 2.25.0 From nobody Tue Apr 30 09:28:02 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=1587952944; cv=none; d=zohomail.com; s=zohoarc; b=EIGEhYYj8J8q304n56gt3tWZvRD+FDsjcR0xapFHRBZBsq9PaT7AUj6sCB31EEX4+GccJgf/IxL4cNcZUA/t4zwAdaYNeIFH0IsR1FkuP2VY2Os3dYV/clx8ApEOngkAbPzUhhBSqZPe1pfAUeR7zrUfvW0gvo4M/1+HETaEX7k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1587952944; 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=pTjte3NT8pQD4tKWOH5k6u8EtEQNkvcOjdtiL9QFTyI=; b=kWAhXI9tA+AdyBquEfG8CGkQ++Ex1w1mmiQfI+nqD3Kt/pI03TRbsOJMsoAcj3bW9MYVVYy0ARlrg/QtKqBT4T33O72zbel1LWTGUNs8jgHZDgbAxTMoL77ClDXbCq3mjBpx23qdVPEfvY59hMrFsXF5fPUHVQ6bxyo1XCMtttY= 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 1587952944035333.2794537359815; Sun, 26 Apr 2020 19:02:24 -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-121-kV_LWkbYPJS940Spx08nKw-1; Sun, 26 Apr 2020 22:02:20 -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 C0322835B41; Mon, 27 Apr 2020 02:02:14 +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 882681001B30; Mon, 27 Apr 2020 02:02:14 +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 32B0F1809561; Mon, 27 Apr 2020 02:02:14 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 03R21XOt021307 for ; Sun, 26 Apr 2020 22:01:33 -0400 Received: by smtp.corp.redhat.com (Postfix) id 18E15605D8; Mon, 27 Apr 2020 02:01:33 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-13-109.pek2.redhat.com [10.72.13.109]) by smtp.corp.redhat.com (Postfix) with ESMTP id 89B92605D1; Mon, 27 Apr 2020 02:01:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1587952942; 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=pTjte3NT8pQD4tKWOH5k6u8EtEQNkvcOjdtiL9QFTyI=; b=K9uim8GsnAFV3L7O5HkSNd2hx+h+qFEJSC+QxUVtMNMFSvzRxb4m1Ekncs5kUEaYz67laF UPPyraunrYfiJ7raz4R0HJiPNBRcvNlo62PdPeTjb18msrC8DiWuyHE1jSav7z/iXyar4o uxCuKsFrxe1xsTxlHiN/n9WnSPkz2Vw= X-MC-Unique: kV_LWkbYPJS940Spx08nKw-1 From: Han Han To: libvir-list@redhat.com Subject: [PATCH v1 5/5] news: qemu: Support iSER transport of iscsi Date: Mon, 27 Apr 2020 10:01:10 +0800 Message-Id: <20200427020110.174406-6-hhan@redhat.com> In-Reply-To: <20200427020110.174406-1-hhan@redhat.com> References: <20200427020110.174406-1-hhan@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Cc: pkrempa@redhat.com, Han Han 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" Signed-off-by: Han Han --- docs/news.xml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/docs/news.xml b/docs/news.xml index 5835013c..60c1247f 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -44,6 +44,16 @@
+ + + qemu: support iSER transport of iscsi + + + The iSCSI Extensions for RDMA, also named iSER, is introduce to = QEMU + since 2.9. In libvirt, it can be used by + transport=3D'iser' in the host element of iscsi sou= rce. + + qemu: support disabling hotplug/unplug of PCIe devices --=20 2.25.0