From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 7EFFC695E9 for ; Tue, 2 Mar 2021 13:02:10 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 7561F2BFED for ; Tue, 2 Mar 2021 13:02:10 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 489552BFDA for ; Tue, 2 Mar 2021 13:02:09 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 168D7446A1 for ; Tue, 2 Mar 2021 13:02:09 +0100 (CET) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Tue, 2 Mar 2021 13:02:04 +0100 Message-Id: <20210302120205.24323-1-f.ebner@proxmox.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.000 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [drive.pm] Subject: [pve-devel] [PATCH qemu-server 1/2] schema: mention special syntax for allocating a new volume X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Mar 2021 12:02:10 -0000 Signed-off-by: Fabian Ebner --- PVE/QemuServer/Drive.pm | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/PVE/QemuServer/Drive.pm b/PVE/QemuServer/Drive.pm index d560937..01ea8d7 100644 --- a/PVE/QemuServer/Drive.pm +++ b/PVE/QemuServer/Drive.pm @@ -253,10 +253,14 @@ my $ide_fmt = { }; PVE::JSONSchema::register_format("pve-qm-ide", $ide_fmt); +my $ALLOCATION_SYNTAX_DESC = + "Use the special syntax STORAGE_ID:SIZE_IN_GiB to allocate a new volume."; + my $idedesc = { optional => 1, type => 'string', format => $ide_fmt, - description => "Use volume as IDE hard disk or CD-ROM (n is 0 to " .($MAX_IDE_DISKS -1) . ").", + description => "Use volume as IDE hard disk or CD-ROM (n is 0 to " .($MAX_IDE_DISKS -1) . "). " . + $ALLOCATION_SYNTAX_DESC, }; PVE::JSONSchema::register_standard_option("pve-qm-ide", $idedesc); @@ -271,7 +275,8 @@ my $scsi_fmt = { my $scsidesc = { optional => 1, type => 'string', format => $scsi_fmt, - description => "Use volume as SCSI hard disk or CD-ROM (n is 0 to " . ($MAX_SCSI_DISKS - 1) . ").", + description => "Use volume as SCSI hard disk or CD-ROM (n is 0 to " . ($MAX_SCSI_DISKS - 1) . "). " . + $ALLOCATION_SYNTAX_DESC, }; PVE::JSONSchema::register_standard_option("pve-qm-scsi", $scsidesc); @@ -283,7 +288,8 @@ my $sata_fmt = { my $satadesc = { optional => 1, type => 'string', format => $sata_fmt, - description => "Use volume as SATA hard disk or CD-ROM (n is 0 to " . ($MAX_SATA_DISKS - 1). ").", + description => "Use volume as SATA hard disk or CD-ROM (n is 0 to " . ($MAX_SATA_DISKS - 1). "). " . + $ALLOCATION_SYNTAX_DESC, }; PVE::JSONSchema::register_standard_option("pve-qm-sata", $satadesc); @@ -294,7 +300,8 @@ my $virtio_fmt = { my $virtiodesc = { optional => 1, type => 'string', format => $virtio_fmt, - description => "Use volume as VIRTIO hard disk (n is 0 to " . ($MAX_VIRTIO_DISKS - 1) . ").", + description => "Use volume as VIRTIO hard disk (n is 0 to " . ($MAX_VIRTIO_DISKS - 1) . "). " . + $ALLOCATION_SYNTAX_DESC, }; PVE::JSONSchema::register_standard_option("pve-qm-virtio", $virtiodesc); @@ -330,7 +337,9 @@ my $efidisk_fmt = { my $efidisk_desc = { optional => 1, type => 'string', format => $efidisk_fmt, - description => "Configure a Disk for storing EFI vars", + description => "Configure a Disk for storing EFI vars. " . + $ALLOCATION_SYNTAX_DESC . " Note that SIZE_IN_GiB is ignored here " . + "and that the default EFI vars are copied to the volume instead.", }; PVE::JSONSchema::register_standard_option("pve-qm-efidisk", $efidisk_desc); -- 2.20.1