proxmox-mirrors/qemu-server
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu-server synced 2025-05-29 16:38:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

importdisk: add 'target-disk' option to add imported volume to disk

Browse Source 
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 <d.kral@proxmox.com>
 [ TL: squash in style-nit with parameter wrapping multiple lines ]
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Daniel Kral 2024-10-17 13:51:21 +02:00 committed by Thomas Lamprecht
parent fca0ba5d77
commit 585ec70a2b
1 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
PVE/CLI/qm.pm
View File

@ -29,7 +29,7 @@ use PVE::Tools qw(extract_param file_get_contents);
use PVE::API2::Qemu::Agent; use PVE::API2::Qemu::Agent;
use PVE::API2::Qemu; use PVE::API2::Qemu;
use PVE::QemuConfig; use PVE::QemuConfig;
use PVE::QemuServer::Drive; use PVE::QemuServer::Drive qw(is_valid_drivename);
use PVE::QemuServer::Helpers; use PVE::QemuServer::Helpers;
use PVE::QemuServer::Agent qw(agent_available); use PVE::QemuServer::Agent qw(agent_available);
use PVE::QemuServer::ImportDisk; use PVE::QemuServer::ImportDisk;
@ -580,6 +580,12 @@ __PACKAGE__->register_method ({
enum => [ 'raw', 'qcow2', 'vmdk' ], enum => [ 'raw', 'qcow2', 'vmdk' ],
optional => 1, 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'}, returns => { type => 'null'},
@ -590,6 +596,10 @@ __PACKAGE__->register_method ({
my $source = extract_param($param, 'source'); my $source = extract_param($param, 'source');
my $storeid = extract_param($param, 'storage'); my $storeid = extract_param($param, 'storage');
my $format = extract_param($param, 'format'); 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); my $vm_conf = PVE::QemuConfig->load_config($vmid);
PVE::QemuConfig->check_lock($vm_conf); PVE::QemuConfig->check_lock($vm_conf);
@ -603,7 +613,17 @@ __PACKAGE__->register_method ({
if !$target_storage_config->{content}->{images}; if !$target_storage_config->{content}->{images};
print "importing disk '$source' to VM $vmid ...\n"; 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"; print "Successfully imported disk as '$drive_id:$volid'\n";
return; return;