proxmox-mirrors/qemu-server
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu-server synced 2025-08-06 15:06:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Move NEW_DISK_RE to QemuServer/Drive.pm

Browse Source 
Prepare for introduction of new helper

Signed-off-by: Hannes Duerr <h.duerr@proxmox.com>
This commit is contained in:
Hannes Duerr 2023-12-06 08:47:43 +01:00 committed by Fiona Ebner
parent ad464e0b87
commit 028aee4554
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
PVE/API2/Qemu.pm
View File

@ -86,8 +86,6 @@ my $foreach_volume_with_alloc = sub {
} }
}; };
my $NEW_DISK_RE = qr!^(([^/:\s]+):)?(\d+(\.\d+)?)$!;
my $check_drive_param = sub { my $check_drive_param = sub {
my ($param, $storecfg, $extra_checks) = @_; my ($param, $storecfg, $extra_checks) = @_;
@ -98,7 +96,7 @@ my $check_drive_param = sub {
raise_param_exc({ $opt => "unable to parse drive options" }) if !$drive; raise_param_exc({ $opt => "unable to parse drive options" }) if !$drive;
if ($drive->{'import-from'}) { if ($drive->{'import-from'}) {
if ($drive->{file} !~ $NEW_DISK_RE || $3 != 0) { if ($drive->{file} !~ $PVE::QemuServer::Drive::NEW_DISK_RE || $3 != 0) {
raise_param_exc({ raise_param_exc({
$opt => "'import-from' requires special syntax - ". $opt => "'import-from' requires special syntax - ".
"use <storage ID>:0,import-from=<source>", "use <storage ID>:0,import-from=<source>",
@ -142,7 +140,7 @@ my $check_storage_access = sub {
# nothing to check # nothing to check
} elsif ($isCDROM && ($volid eq 'cdrom')) { } elsif ($isCDROM && ($volid eq 'cdrom')) {
$rpcenv->check($authuser, "/", ['Sys.Console']); $rpcenv->check($authuser, "/", ['Sys.Console']);
} elsif (!$isCDROM && ($volid =~ $NEW_DISK_RE)) { } elsif (!$isCDROM && ($volid =~ $PVE::QemuServer::Drive::NEW_DISK_RE)) {
my ($storeid, $size) = ($2 || $default_storage, $3); my ($storeid, $size) = ($2 || $default_storage, $3);
die "no storage ID specified (and no default storage)\n" if !$storeid; die "no storage ID specified (and no default storage)\n" if !$storeid;
$rpcenv->check($authuser, "/storage/$storeid", ['Datastore.AllocateSpace']); $rpcenv->check($authuser, "/storage/$storeid", ['Datastore.AllocateSpace']);
@ -365,7 +363,7 @@ my $create_disks = sub {
delete $disk->{format}; # no longer needed delete $disk->{format}; # no longer needed
$res->{$ds} = PVE::QemuServer::print_drive($disk); $res->{$ds} = PVE::QemuServer::print_drive($disk);
print "$ds: successfully created disk '$res->{$ds}'\n"; print "$ds: successfully created disk '$res->{$ds}'\n";
} elsif ($volid =~ $NEW_DISK_RE) { } elsif ($volid =~ $PVE::QemuServer::Drive::NEW_DISK_RE) {
my ($storeid, $size) = ($2 || $default_storage, $3); my ($storeid, $size) = ($2 || $default_storage, $3);
die "no storage ID specified (and no default storage)\n" if !$storeid; die "no storage ID specified (and no default storage)\n" if !$storeid;
@ -1633,7 +1631,7 @@ my $update_vm_api = sub {
return if defined($volname) && $volname eq 'cloudinit'; return if defined($volname) && $volname eq 'cloudinit';
my $format; my $format;
if ($volid =~ $NEW_DISK_RE) { if ($volid =~ $PVE::QemuServer::Drive::NEW_DISK_RE) {
$storeid = $2; $storeid = $2;
$format = $drive->{format} || PVE::Storage::storage_default_format($storecfg, $storeid); $format = $drive->{format} || PVE::Storage::storage_default_format($storecfg, $storeid);
} else { } else {

1
PVE/QemuServer/Drive.pm
View File

@ -36,6 +36,7 @@ my $MAX_SCSI_DISKS = 31;
my $MAX_VIRTIO_DISKS = 16; my $MAX_VIRTIO_DISKS = 16;
our $MAX_SATA_DISKS = 6; our $MAX_SATA_DISKS = 6;
our $MAX_UNUSED_DISKS = 256; our $MAX_UNUSED_DISKS = 256;
our $NEW_DISK_RE = qr!^(([^/:\s]+):)?(\d+(\.\d+)?)$!;
our $drivedesc_hash; our $drivedesc_hash;
# Schema when disk allocation is possible. # Schema when disk allocation is possible.