From nobody Thu Apr 25 04:09:41 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=1589514474; cv=none; d=zohomail.com; s=zohoarc; b=I31wUcpOX9FJlmdPqH+wWFZ1GSxNkEjvHy64GkHVnonwP9nppODkjW+O+s+sKLQuo+zwqfC24TqfB7M0WNpQPG1C58DNqupyJ5Znn1SKKk3RmWqgujyaKqccvGDdVK1ombLn7Vh1ErlWiZ2DWuXJXe/Q2phz4zDYdM3mNyuhuUc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589514474; 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=JiFI441wSHKzOMT+cS83ay47kSMBDy+yNf2HEoFn07U=; b=m6EWoEfW13KF+I0n3UgaP+HfiGxh3l7pk0L1S7Jo7decK63tsrUXIcsu6bPbfoiBfzgAdAap9jVSVXfJr3TWQJ5guZqxr85IO2u00XfFURJFjLxSofZ6neXyrB/nWrM5IMw7mxCpkuudBadSB0D+LZsQQF4j8bFWGWDlq8IcfHc= 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 1589514474101574.9331958089133; Thu, 14 May 2020 20:47:54 -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-2zulYrX2N-eD2wzW0AdcsQ-1; Thu, 14 May 2020 23:47:49 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 13277474; Fri, 15 May 2020 03:47:44 +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 D6E925C1D3; Fri, 15 May 2020 03:47:43 +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 AB1774E995; Fri, 15 May 2020 03:47:42 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 04F3kO4G012955 for ; Thu, 14 May 2020 23:46:24 -0400 Received: by smtp.corp.redhat.com (Postfix) id B17922B6DE; Fri, 15 May 2020 03:46:24 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-13-111.pek2.redhat.com [10.72.13.111]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8FFDC1C92D; Fri, 15 May 2020 03:46:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1589514472; 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=JiFI441wSHKzOMT+cS83ay47kSMBDy+yNf2HEoFn07U=; b=CzStuD+sIyHmu1biFHb+/zPW/i96yncjkD0ffW+D73GSfwL3FL0nVsEQvOQSRqq4GTVFn5 w+rHZJee+yrJqbXoAmt05oF4kcOFqwCQ+74J3/SOLWUjTCiE8PFaFq9xyXELQWbOk6Qf7/ CrKjun6QmcaNu0CVZVBw7GYNgFfo9Tc= X-MC-Unique: 2zulYrX2N-eD2wzW0AdcsQ-1 From: Han Han To: libvir-list@redhat.com Subject: [PATCH v2 1/6] qemu_capabilities: Introduce iSCSI iSER flag Date: Fri, 15 May 2020 11:46:00 +0800 Message-Id: <20200515034606.5810-2-hhan@redhat.com> In-Reply-To: <20200515034606.5810-1-hhan@redhat.com> References: <20200515034606.5810-1-hhan@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com Cc: pkrempa@redhat.com, Han Han , david.schweizer@davischw.ch X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Introduce QEMU_CAPS_ISCSI_ISER for iSER(iSCSI Extensions for RDMA) of iscsi backend. Signed-off-by: Han Han --- src/qemu/qemu_capabilities.c | 4 ++++ src/qemu/qemu_capabilities.h | 3 +++ 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.riscv64.xml | 1 + tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml | 1 + 38 files changed, 43 insertions(+) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 7e711f22..c8e0169a 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -582,6 +582,9 @@ VIR_ENUM_IMPL(virQEMUCaps, "tcg", "virtio-blk-pci.scsi.default.disabled", "pvscsi", + + /* 370 */ + "iscsi.iser", ); =20 =20 @@ -1501,6 +1504,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_ISER= }, }; =20 typedef struct _virQEMUCapsObjectTypeProps virQEMUCapsObjectTypeProps; diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 6bfc7386..c5ef3a26 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -564,6 +564,9 @@ typedef enum { /* virQEMUCapsFlags grouping marker for = syntax-check */ QEMU_CAPS_VIRTIO_BLK_SCSI_DEFAULT_DISABLED, /* virtio-blk-pci.scsi dis= abled by default */ QEMU_CAPS_SCSI_PVSCSI, /* -device pvscsi */ =20 + /* 370 */ + QEMU_CAPS_ISCSI_ISER, /* -blockdev {"driver":"iscsi","transport":"iser= ",...} */ + QEMU_CAPS_LAST /* this must always be the last item */ } virQEMUCapsFlags; =20 diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml b/tests/qem= ucapabilitiesdata/caps_2.10.0.aarch64.xml index cfa1962e..5172dd56 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml @@ -142,6 +142,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 0eee26c3..29822be8 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml @@ -142,6 +142,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 7b14f7c2..38ceaaf3 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml @@ -108,6 +108,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 205a0675..a85145f5 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml @@ -185,6 +185,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 ec8723f0..38393025 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml @@ -115,6 +115,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 15f59774..dc31c72a 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml @@ -191,6 +191,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 94a0344b..823de1f7 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml @@ -158,6 +158,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 3bf0e20c..a7e8ad99 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml @@ -159,6 +159,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 8be663c9..55e90554 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml @@ -127,6 +127,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 c2495255..4a3d2c8e 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml @@ -200,6 +200,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 f32e2335..94389cba 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml @@ -134,6 +134,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 4e791931..70cf4a64 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml @@ -102,6 +102,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 75e9905d..a2fc38fa 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml @@ -179,6 +179,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 a66008b0..0db3b4c0 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml @@ -161,6 +161,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 690c964f..1fbad5c7 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml @@ -97,6 +97,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 ad2a5fe1..0d359ddc 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml @@ -97,6 +97,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 cdd89c8c..32d86c96 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml @@ -130,6 +130,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 f5f1d5b4..bd36b7ff 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml @@ -206,6 +206,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 ca9ff82e..d1d10e2c 100644 --- a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml @@ -166,6 +166,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 11009a2f..9a581284 100644 --- a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml @@ -209,6 +209,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 c9199df2..84b23446 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml @@ -172,6 +172,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 f4294436..c96a03f0 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml @@ -180,6 +180,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 f5c9d7f8..d3d63ac7 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml @@ -173,6 +173,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 538ce225..84a401c7 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml @@ -173,6 +173,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 60d3a942..112474ce 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml @@ -138,6 +138,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 9f45fe63..c56f6518 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml @@ -214,6 +214,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 9ad50bc2..393b8b12 100644 --- a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml @@ -220,6 +220,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 7aca4fe0..cec19657 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml @@ -184,6 +184,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 a68786dd..f73d761a 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml @@ -185,6 +185,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 4c090829..4aface3d 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml @@ -148,6 +148,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 3935be48..37610972 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml @@ -228,6 +228,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 7649153c..9b6eb906 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml @@ -193,6 +193,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 c8cc07d9..082e5867 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml @@ -201,6 +201,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 7a091d27..3622cb75 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml @@ -189,6 +189,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 e28e87fd..977fd7d0 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml @@ -234,6 +234,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 8c20b5fe..720dc73f 100644 --- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml @@ -234,6 +234,7 @@ + 5000050 0 43100242 --=20 2.25.0 From nobody Thu Apr 25 04:09:41 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=1589514476; cv=none; d=zohomail.com; s=zohoarc; b=MqnmyCjFmKzI6TvjcmS1M5OwIn1eWAfG3u7U9BEGDpigUVODdCGjC4CI5bcDrfR+IS4uHRyIQ/20bekH1q+yAH7XX+9CGULLHsUk8FvojzoUSPQQRubHkd/zo/3V6+KG9R30XxODhQTHP8x+h9/INNh0+vlKrzDdxK96o2AuShs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589514476; 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=pT/QkMEsBZTWvrf7ZGrjeqn2fAEPMolZ3Eqyddlp1qg=; b=d+8TLJ+WPoUNSykoWWPsAmgwiQiCUwy4fyt79r+m+KkIGUHuhKFX2z2h9FER/iJCLShxvz9vy7fmRIgVabnJJGsgiAs/k6SWxO0ZqXcOMuJ2XxHkgUZnmuaXdJZqBTPWXwe0bNqQa5DUKOaTRzT7lTtpV5QjeGEdhjzwnPwpbSE= 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 1589514476853547.9364444228071; Thu, 14 May 2020 20:47:56 -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-477-uwOx8TImMwGKagCgDLet5w-1; Thu, 14 May 2020 23:47:53 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 619DD835B40; Fri, 15 May 2020 03:47:48 +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 43EE961547; Fri, 15 May 2020 03:47:48 +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 1508A1809543; Fri, 15 May 2020 03:47:48 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 04F3kRFC012967 for ; Thu, 14 May 2020 23:46:27 -0400 Received: by smtp.corp.redhat.com (Postfix) id 2D2D0261D7; Fri, 15 May 2020 03:46:27 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-13-111.pek2.redhat.com [10.72.13.111]) by smtp.corp.redhat.com (Postfix) with ESMTP id 515432B6DE; Fri, 15 May 2020 03:46:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1589514475; 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=pT/QkMEsBZTWvrf7ZGrjeqn2fAEPMolZ3Eqyddlp1qg=; b=dV8U1LU8j0RaViV+DaHLeFXGVdKxCfyPU/6gYrPxln/NXjS8wuLk5jB8Jt+XvrBN7Tmc+S lBiSKpeH2GOCVzrYL3riXW29xG6DbHD6YEbY38uKPW4LPgi4vY+0dpMfPpWRkdBTLMHKj9 E/6AbDFSYmciziHah/Nvirkn+vTiaNI= X-MC-Unique: uwOx8TImMwGKagCgDLet5w-1 From: Han Han To: libvir-list@redhat.com Subject: [PATCH v2 2/6] conf: Parse the iser element Date: Fri, 15 May 2020 11:46:01 +0800 Message-Id: <20200515034606.5810-3-hhan@redhat.com> In-Reply-To: <20200515034606.5810-1-hhan@redhat.com> References: <20200515034606.5810-1-hhan@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com Cc: pkrempa@redhat.com, Han Han , david.schweizer@davischw.ch X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Now libvirt supports to parse the iser element in source. It will be used to enable the iSCSI iSER. Signed-off-by: Han Han --- src/conf/domain_conf.c | 10 ++++++++++ src/util/virstoragefile.c | 17 ++++++++++++++--- src/util/virstoragefile.h | 2 ++ 3 files changed, 26 insertions(+), 3 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index c201fc90..9008eead 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -9488,6 +9488,7 @@ virDomainDiskSourceNetworkParse(xmlNodePtr node, g_autofree char *haveTLS =3D NULL; g_autofree char *tlsCfg =3D NULL; g_autofree char *sslverifystr =3D NULL; + int iscsiIser =3D 0; xmlNodePtr tmpnode; =20 if (!(protocol =3D virXMLPropString(node, "protocol"))) { @@ -9598,6 +9599,12 @@ virDomainDiskSourceNetworkParse(xmlNodePtr node, } } =20 + if (src->protocol =3D=3D VIR_STORAGE_NET_PROTOCOL_ISCSI) { + if ((iscsiIser =3D virXPathBoolean("boolean(./iser)", ctxt)) =3D= =3D -1) + return -1; + src->iscsiIser =3D (bool)iscsiIser; + } + return 0; } =20 @@ -24944,6 +24951,9 @@ virDomainDiskSourceFormatNetwork(virBufferPtr attrB= uf, =20 virStorageSourceInitiatorFormatXML(&src->initiator, childBuf); =20 + if (src->iscsiIser) + virBufferAddLit(childBuf, "\n"); + if (src->sslverify !=3D VIR_TRISTATE_BOOL_ABSENT) { virBufferAsprintf(childBuf, "\n", virTristateBoolTypeToString(src->sslverify)); diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index 535a94e2..fd687e62 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -2805,8 +2805,15 @@ virStorageSourceParseBackingURI(virStorageSourcePtr = src, if (!(scheme =3D virStringSplit(uri->scheme, "+", 2))) return -1; =20 + src->protocol =3D virStorageNetProtocolTypeFromString(scheme[0]); + + if (STREQ(scheme[0], "iser")) { + src->protocol =3D VIR_STORAGE_NET_PROTOCOL_ISCSI; + src->iscsiIser =3D true; + } + if (!scheme[0] || - (src->protocol =3D virStorageNetProtocolTypeFromString(scheme[0]))= < 0) { + src->protocol < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("invalid backing protocol '%s'"), NULLSTR(scheme[0])); @@ -3509,12 +3516,16 @@ virStorageSourceParseBackingJSONiSCSI(virStorageSou= rcePtr src, =20 src->nhosts =3D 1; =20 - if (STRNEQ_NULLABLE(transport, "tcp")) { + if (STRNEQ_NULLABLE(transport, "tcp") && + STRNEQ_NULLABLE(transport, "iser")) { 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 + if (STREQ(transport, "iser")) + src->iscsiIser =3D true; + src->hosts->transport =3D VIR_STORAGE_NET_HOST_TRANS_TCP; =20 if (!portal) { diff --git a/src/util/virstoragefile.h b/src/util/virstoragefile.h index c68bdc96..e1773ba0 100644 --- a/src/util/virstoragefile.h +++ b/src/util/virstoragefile.h @@ -383,6 +383,8 @@ struct _virStorageSource { /* these must not be used apart from formatting the output JSON in the= qemu driver */ char *ssh_user; bool ssh_host_key_check_disabled; + + bool iscsiIser; /* An optional setting for iSCSI iSER transport*/ }; =20 G_DEFINE_AUTOPTR_CLEANUP_FUNC(virStorageSource, virObjectUnref); --=20 2.25.0 From nobody Thu Apr 25 04:09:41 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=1589514501; cv=none; d=zohomail.com; s=zohoarc; b=IPDXCWJ+ZsLhc5/Xh2OZbGfHGN8ShSm3vorINuAftiUkv1eTKkLJMmuPXwcK6XSwZpfssJfq1InZ2JlbVuJMm2kSNJqqO7dIrMAlsd3gMc43X/9SLz+s94hZf0bLIA79TOpSuq2O9AwXekn9KR47B5w5NWb8mNBgqb9luFaY1k0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589514501; 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=xz1bQEJrTH/dFYfcYALFDP/Sr7IY5vx6ghVusOkvTjY=; b=ByLp3lRxgltq99JeF5YhrFnvADcAlqufmvLL2CUe8gSTBb2b23P7ilA/T3CswgCoWlmO8/SotWtBT1lthIggP5ugyXKbxeBEIKOop6GUXr6ek7N4ZqbOAN9YPant7RdtvN/jdRjS0sOnfMiZX8d4xQb4Lgv6wJoCC6E8AGM7U/U= 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 1589514501187510.0604101457277; Thu, 14 May 2020 20:48:21 -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-94-XP22rGeROpe2CiYaLH9qCw-1; Thu, 14 May 2020 23:48:17 -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 6B2EC107ACCD; Fri, 15 May 2020 03:48:12 +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 47787261D7; Fri, 15 May 2020 03:48:12 +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 1A4271809563; Fri, 15 May 2020 03:48:12 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 04F3kT4s012975 for ; Thu, 14 May 2020 23:46:29 -0400 Received: by smtp.corp.redhat.com (Postfix) id 9CC28261D7; Fri, 15 May 2020 03:46:29 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-13-111.pek2.redhat.com [10.72.13.111]) by smtp.corp.redhat.com (Postfix) with ESMTP id B7D372B6DE; Fri, 15 May 2020 03:46:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1589514499; 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=xz1bQEJrTH/dFYfcYALFDP/Sr7IY5vx6ghVusOkvTjY=; b=Y241MOF6RYSI1cGOeWaLbVmcMiQPHOHlH1NowtpqxBJhtWhWmqYMHuLM+01xdoc0XFAcfW nLXKo9w+mDD6wUJNZ68Nav3fSx9TyeWwqoiYAHTeX7YCSimikOrZzp623Bpk19rIggQWNE T2iKSjgxBdYqwlmLL3Ba6MEk46HAasA= X-MC-Unique: XP22rGeROpe2CiYaLH9qCw-1 From: Han Han To: libvir-list@redhat.com Subject: [PATCH v2 3/6] qemu: Implement the iSCSI iSER Date: Fri, 15 May 2020 11:46:02 +0800 Message-Id: <20200515034606.5810-4-hhan@redhat.com> In-Reply-To: <20200515034606.5810-1-hhan@redhat.com> References: <20200515034606.5810-1-hhan@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com Cc: pkrempa@redhat.com, Han Han , david.schweizer@davischw.ch 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" The iSCSI iSER transport is introdcued since QEMU 2.9. For blockdev json, it will appear at 'transport' field: 'json:{...,{"driver": "iscsi","transport":"iser",...}}' For legacy drive filename as iscsi uri, it will start with 'iser' scheme: iser://[[username][%]@][:]// Signed-off-by: Han Han --- src/qemu/qemu_block.c | 11 +++++++++-- src/qemu/qemu_command.c | 3 +++ src/qemu/qemu_domain.c | 9 +++++++++ 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c index 6f9c7071..4261e110 100644 --- a/src/qemu/qemu_block.c +++ b/src/qemu/qemu_block.c @@ -421,7 +421,10 @@ qemuBlockStorageSourceGetURI(virStorageSourcePtr src) if (src->hosts->transport =3D=3D VIR_STORAGE_NET_HOST_TRANS_TCP) { uri->port =3D src->hosts->port; =20 - uri->scheme =3D g_strdup(virStorageNetProtocolTypeToString(src->pr= otocol)); + if (src->iscsiIser) + uri->scheme =3D g_strdup("iser"); + else + uri->scheme =3D g_strdup(virStorageNetProtocolTypeToString(src= ->protocol)); } else { uri->scheme =3D g_strdup_printf("%s+%s", virStorageNetProtocolTypeToString(sr= c->protocol), @@ -746,6 +749,7 @@ qemuBlockStorageSourceGetISCSIProps(virStorageSourcePtr= src, char *lunStr =3D NULL; char *username =3D NULL; char *objalias =3D NULL; + const char *transport =3D "tcp"; g_autofree char *portal =3D NULL; unsigned int lun =3D 0; virJSONValuePtr ret =3D NULL; @@ -761,6 +765,9 @@ qemuBlockStorageSourceGetISCSIProps(virStorageSourcePtr= src, * } */ =20 + if (src->iscsiIser) + transport =3D "iser"; + target =3D g_strdup(src->path); =20 /* Separate the target and lun */ @@ -791,7 +798,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, diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index bfe70ed2..1d5a302a 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -5087,6 +5087,9 @@ qemuBuildHostdevCommandLine(virCommandPtr cmd, qemuDomainStorageSourcePrivatePtr srcPriv =3D QEMU_DOMAIN_STORAGE_SOURCE_PRIVATE(iscsisrc->src); =20 + if (qemuDomainValidateStorageSource(iscsisrc->src, qemuCap= s, true) < 0) + return -1; + if (qemuBuildDiskSecinfoCommandLine(cmd, srcPriv ? srcPriv->secinfo : NULL) < 0) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index a1b250fd..41e97bf7 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -5318,6 +5318,15 @@ qemuDomainValidateStorageSource(virStorageSourcePtr = src, return -1; } =20 + if (qemuCaps) { + if (src->iscsiIser && + !virQEMUCapsGet(qemuCaps, QEMU_CAPS_ISCSI_ISER)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("iSCSI iSER is not supported with this QEMU binary")); + return -1; + } + } + return 0; } =20 --=20 2.25.0 From nobody Thu Apr 25 04:09:41 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=1589514547; cv=none; d=zohomail.com; s=zohoarc; b=elBa2OY3CUhi0H62rhL00edf14iT+0qqC52aNPTZOCqnri676GkGGwUbYqQq/cUvKxLOlPMHpP0QTv0c2FrbnS29SBghAIcF+1BIMGMPUnXiENm9aCHT5ZG/JQnYEYSsCyDpf0lhEnqfbUNbZNMvO8hZRS9S/wOY21XCJmFCseY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589514547; 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=6TUWwiJQAZmV0ErO3liqrH1ZWBNWlQ4eH/I+n3XNfkk=; b=LuF+Dq3lcOBWpxzo+n/zpfiDj8n9dwzz0kJUTyfCvbI8GpIVilNWpmiabQzBwRA8uvAtUg+Z75gg9ZQDFvWwGSTj0/W+gb7ReGQEGm0EeohtsHgvOhAsfFXQZVJLOCt6J1pVMfRNzM6CjIcNedrax4Yq2Bjkns3rvj5suzGfNaE= 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 1589514547546144.18049414574182; Thu, 14 May 2020 20:49:07 -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-511-BvOJmJCgOdSxn-SyohuDJw-1; Thu, 14 May 2020 23:48:20 -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 B4BA6100CCC3; Fri, 15 May 2020 03:48: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 968EA5D9D7; Fri, 15 May 2020 03:48: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 6644D1800431; Fri, 15 May 2020 03:48:14 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 04F3kWNX012990 for ; Thu, 14 May 2020 23:46:32 -0400 Received: by smtp.corp.redhat.com (Postfix) id 046E32B6D6; Fri, 15 May 2020 03:46:32 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-13-111.pek2.redhat.com [10.72.13.111]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3DA231C92D; Fri, 15 May 2020 03:46:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1589514545; 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=6TUWwiJQAZmV0ErO3liqrH1ZWBNWlQ4eH/I+n3XNfkk=; b=EYOI5Q4ZdQt24Q8F5n1ze80qs8i+kzFST+yy/128etEnkg9Nm6oOInxzY5gXlJKsYjWuf3 q++m24TXKEDEKWJgijhnxD+VLDI9t787obUCBGiex9TBblhJus3iwylopS8a9Y8M5CIi1r NZpeRUoPgh32slO17JJm/QGFjuDZkak= X-MC-Unique: BvOJmJCgOdSxn-SyohuDJw-1 From: Han Han To: libvir-list@redhat.com Subject: [PATCH v2 4/6] docs: Support iSCSI iser Date: Fri, 15 May 2020 11:46:03 +0800 Message-Id: <20200515034606.5810-5-hhan@redhat.com> In-Reply-To: <20200515034606.5810-1-hhan@redhat.com> References: <20200515034606.5810-1-hhan@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com Cc: pkrempa@redhat.com, Han Han , david.schweizer@davischw.ch 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: Han Han --- docs/formatdomain.html.in | 5 +++++ docs/schemas/domaincommon.rng | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 23eb0292..78fd8546 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -3448,6 +3448,11 @@ initiator IQN needed to access the source via mandatory attribute name. +
iser
+
Since libvirt 6.4.0 and QEMU 2.9, + For iscsi, the element iser is used = to + enable the iSER(iSCSI Extensions for RDMA). +
address
For disk of type nvme this element specifies the PCI address of the host NVMe diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 9d60b090..e722069c 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -1810,6 +1810,11 @@ + + + + + --=20 2.25.0 From nobody Thu Apr 25 04:09:41 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=1589514559; cv=none; d=zohomail.com; s=zohoarc; b=NK8FJgSd8Vnf0AVY+WMaT2J/ItkPAnZe/o0UU6RWFuuikWvLBibmpMRQ2TkS3SpS/X5h7g4yUkdZxCmiI7nSiUllHtymgEyKkgACgoRzfXMj4BuSo3cTGzEpaOen/AVFKDIUjJMtNjpIO66wDK1A0yX2aTVLpExS7QgnRnaHOHA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589514559; 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=7AOiRovttMZvdUZh1p9LTauY/GTtWOse0pi6O8yfcvY=; b=jTt0Ab91kmQktyZjN8FxXbFpY4oCkBY9wrNVSSgPtvPd0k5L02rBiM2bPqpD/ISt5gL0N0HStmnHnI5bswxOw/KOha2zyY9x+8F6ZGOl7m0sznbkO58P7jRNzLAnzlryj0YN6M6cUEr88Z0mxx/b1LDFOhIHO7diY2gSU3YltFg= 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 1589514559790997.2541454090341; Thu, 14 May 2020 20:49:19 -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-117-ibKOcDqcMFOtIZzRf8_OyA-1; Thu, 14 May 2020 23:48:22 -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 31AD3100CCC6; Fri, 15 May 2020 03:48:17 +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 0C7712E16C; Fri, 15 May 2020 03:48:17 +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 D4D7A4E9B9; Fri, 15 May 2020 03:48:16 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 04F3kdNI013030 for ; Thu, 14 May 2020 23:46:39 -0400 Received: by smtp.corp.redhat.com (Postfix) id 8C077261D7; Fri, 15 May 2020 03:46:39 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-13-111.pek2.redhat.com [10.72.13.111]) by smtp.corp.redhat.com (Postfix) with ESMTP id BF6EB2E16C; Fri, 15 May 2020 03:46:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1589514558; 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=7AOiRovttMZvdUZh1p9LTauY/GTtWOse0pi6O8yfcvY=; b=BFitOB/mNXFWwSR9nDtapL1SvNlCe0jlv4lTjYA70D7P08DuWAmK60mhkAmzeq/kDD3gqN dYF5qNx7ILYVG3SP7I3EFQ2IFn7SW3F7nU/pGBPniS5Oz+im2cL26Aom+SbZjrFs8kalaE fXy7FZTENg57TjLIHxZ6tjiA7/tAwBE= X-MC-Unique: ibKOcDqcMFOtIZzRf8_OyA-1 From: Han Han To: libvir-list@redhat.com Subject: [PATCH v2 5/6] tests: unit tests for iSCSI iSER Date: Fri, 15 May 2020 11:46:04 +0800 Message-Id: <20200515034606.5810-6-hhan@redhat.com> In-Reply-To: <20200515034606.5810-1-hhan@redhat.com> References: <20200515034606.5810-1-hhan@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com Cc: pkrempa@redhat.com, Han Han , david.schweizer@davischw.ch 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: 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 | 16 +++++++ 8 files changed, 80 insertions(+), 24 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 98481280..716646d5 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,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,bus=3Dpci.0,addr=3D0x3,drive=3Dlibvirt-5-format,\ -id=3Dvirtio-disk0,bootindex=3D1 \ +-device virtio-blk-pci,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,bus=3Dpci.0,addr=3D0x4,drive=3Dlibvirt-4-format,\ -id=3Dvirtio-disk1 \ +-device virtio-blk-pci,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,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,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,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..9812b4b1 100644 --- a/tests/qemuxml2argvdata/disk-network-iscsi.xml +++ b/tests/qemuxml2argvdata/disk-network-iscsi.xml @@ -25,6 +25,7 @@ + @@ -55,6 +56,14 @@ + + + + + + + + diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 4ab664a8..f5419701 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1060,7 +1060,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_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..0c8722a2 100644 --- a/tests/qemuxml2xmloutdata/disk-network-iscsi.xml +++ b/tests/qemuxml2xmloutdata/disk-network-iscsi.xml @@ -26,6 +26,7 @@ +
@@ -60,6 +61,15 @@
+ + + + + + + +
+
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 033f8101..e7d881fa 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_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 98f47f0e..7f72e76a 100644 --- a/tests/virstoragetest.c +++ b/tests/virstoragetest.c @@ -1314,6 +1314,11 @@ mymain(void) "\n" " \= n" "\n"); + TEST_BACKING_PARSE("iser://example.org:1234/exportname", + "\n" + " \n" + " \n" + "\n"); TEST_BACKING_PARSE_FULL("iscsi://testuser:testpass@example.org:1234/ex= portname", "\n" " \= n" @@ -1550,6 +1555,17 @@ 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" + "\n"); TEST_BACKING_PARSE_FULL("json:{\"file\":{\"driver\":\"iscsi\"," "\"transport\":\"tcp\"," "\"portal\":\"test.org\"," --=20 2.25.0 From nobody Thu Apr 25 04:09:41 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=1589514509; cv=none; d=zohomail.com; s=zohoarc; b=ei4doNUx2QDmRrIW6CnC5qsHHr7c3Ggqi7MhxNjmKWtcGfbZCDKSs/GKAFXJSdPRnrwQe9XHqAXGvFOQaeuUTjasPzHEmctCIgOwXwfneNBOTI05kU0FDB/SUqctL8+vQf/cC9rxaqEG1PQLemMOhspaK9byrrw7UUg7W0iCLv8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589514509; 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=qcpWtK8R9d80CJM2PMvydCTRHsjBa/KxV63SAAvLLpc=; b=ay6pTxyAYl2oBC7rjPsWfNTXXUlNKsLSlY9/4Khwaey/DH0nuWbSJ5UyylP1k0aiLoSJ7Jw33+/WxdgsDC/6Dt6XHjJXX5zORh5UN4+Kl0FzbbQO8bwE4OOROxLBVMo/V/8XNW2VPv/ekBt7nRxpD5zMLv9HRMe9Ac3SCfqg9tk= 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 1589514509359945.6407975657315; Thu, 14 May 2020 20:48: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-294-NPbSCwwFPQmozJMHTij5IA-1; Thu, 14 May 2020 23:48:25 -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 62FA7805726; Fri, 15 May 2020 03:48:19 +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 42D021C8; Fri, 15 May 2020 03:48: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 146C54E9BD; Fri, 15 May 2020 03:48:19 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 04F3kgmu013047 for ; Thu, 14 May 2020 23:46:42 -0400 Received: by smtp.corp.redhat.com (Postfix) id F17752B6D6; Fri, 15 May 2020 03:46:41 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-13-111.pek2.redhat.com [10.72.13.111]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2C1321C92D; Fri, 15 May 2020 03:46:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1589514507; 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=qcpWtK8R9d80CJM2PMvydCTRHsjBa/KxV63SAAvLLpc=; b=ZtJVWh2qCCSJFuaUXmZNAoQgB3LuMJZTKOOQ5fTqZlICb7+9NdJFCShpb+EgWaAWki0wE+ e4zij4ePweMwM+ewItcJeDLle0Fd80V6JZyAXSyWHF+N9/pCSBE65ABogqJddo5nUnMV1b ghRFGRzKvmdi146c9bnOWPySeI0WbkI= X-MC-Unique: NPbSCwwFPQmozJMHTij5IA-1 From: Han Han To: libvir-list@redhat.com Subject: [PATCH v2 6/6] news: Support iSCSI iSER Date: Fri, 15 May 2020 11:46:05 +0800 Message-Id: <20200515034606.5810-7-hhan@redhat.com> In-Reply-To: <20200515034606.5810-1-hhan@redhat.com> References: <20200515034606.5810-1-hhan@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com Cc: pkrempa@redhat.com, Han Han , david.schweizer@davischw.ch 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" 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 4cef804a..73e58a8f 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -44,6 +44,16 @@
+ + + qemu: support iSCSI iSER + + + The iSCSI Extensions for RDMA, also named iSER, is introduce to = QEMU + since 2.9. In libvirt, it can be used by + <iser/> in the iscsi source. + +
--=20 2.25.0