From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 7C8261FF15D for ; Thu, 17 Oct 2024 13:51:47 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id DBF9FEA7A; Thu, 17 Oct 2024 13:52:09 +0200 (CEST) From: Daniel Kral To: pve-devel@lists.proxmox.com Date: Thu, 17 Oct 2024 13:51:21 +0200 Message-Id: <20241017115124.75539-1-d.kral@proxmox.com> X-Mailer: git-send-email 2.39.5 MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.002 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH qemu-server 1/4] importdisk: add 'target-disk' option to add imported volume to disk 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: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" Implements the "target-disk" option for the importdisk command, which allows a disk to be imported and directly used instead of marking it as an unused disk (e.g. unused0), which is the default behavior. Signed-off-by: Daniel Kral --- PVE/CLI/qm.pm | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/PVE/CLI/qm.pm b/PVE/CLI/qm.pm index d3dbf7b4..30282f6f 100755 --- a/PVE/CLI/qm.pm +++ b/PVE/CLI/qm.pm @@ -29,7 +29,7 @@ use PVE::Tools qw(extract_param file_get_contents); use PVE::API2::Qemu::Agent; use PVE::API2::Qemu; use PVE::QemuConfig; -use PVE::QemuServer::Drive; +use PVE::QemuServer::Drive qw(is_valid_drivename); use PVE::QemuServer::Helpers; use PVE::QemuServer::Agent qw(agent_available); use PVE::QemuServer::ImportDisk; @@ -579,6 +579,12 @@ __PACKAGE__->register_method ({ enum => [ 'raw', 'qcow2', 'vmdk' ], optional => 1, }, + 'target-disk' => { + type => 'string', + description => 'The disk name where the volume will be imported to (e.g. scsi1).', + enum => [PVE::QemuServer::Drive::valid_drive_names_with_unused()], + optional => 1, + }, }, }, returns => { type => 'null'}, @@ -589,6 +595,10 @@ __PACKAGE__->register_method ({ my $source = extract_param($param, 'source'); my $storeid = extract_param($param, 'storage'); my $format = extract_param($param, 'format'); + my $target_disk = extract_param($param, 'target-disk'); + + # do_import does not allow invalid drive names (e.g. unused0) + $target_disk = undef if !is_valid_drivename($target_disk); my $vm_conf = PVE::QemuConfig->load_config($vmid); PVE::QemuConfig->check_lock($vm_conf); @@ -602,7 +612,16 @@ __PACKAGE__->register_method ({ if !$target_storage_config->{content}->{images}; print "importing disk '$source' to VM $vmid ...\n"; - my ($drive_id, $volid) = PVE::QemuServer::ImportDisk::do_import($source, $vmid, $storeid, { format => $format }); + + my ($drive_id, $volid) = PVE::QemuServer::ImportDisk::do_import( + $source, + $vmid, + $storeid, + { + drive_name => $target_disk, + format => $format, + }); + print "Successfully imported disk as '$drive_id:$volid'\n"; return; -- 2.39.5 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel