drive schema: allow 'none' again

[qemu-server.git] / PVE / QemuServer.pm

diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
index 39c97883d356ecedf6dcf4d606050ccdcc9078f5..bb9624b1b5dea2961e1bffe81e2918d9a589764b 100644 (file)
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -516,13 +516,26 @@ for (my $i = 0; $i < $MAX_NETS; $i++)  {
     $confdesc->{"net$i"} = $netdesc;
 }
 
+PVE::JSONSchema::register_format('pve-volume-id-or-none', \&verify_volume_id_or_none);
+sub verify_volume_id_or_none {
+    my ($volid, $noerr) = @_;
+
+    return $volid if $volid eq 'none';
+    $volid = eval { PVE::JSONSchema::check_format('pve-volume-id', $volid, '') };
+    if ($@) {
+       return undef if $noerr;
+       die $@;
+    }
+    return $volid;
+}
+
 my $drivename_hash;
 
 my %drivedesc_base = (
     volume => { alias => 'file' },
     file => {
        type => 'string',
-       format => 'pve-volume-id',
+       format => 'pve-volume-id-or-none',
        default_key => 1,
        format_description => 'volume',
        description => "The drive's backing volume.",