X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=PVE%2FQemuServer.pm;h=fac4dfe7bfecf6bb3177660265fc116f5d812b9a;hb=90041ba890f5626f114ae227b9bdeb24f81f1224;hp=9d560ec3a91031d95fe6fd056e3f2c8298514a7c;hpb=ca6abacf6b12bb20f23576bcb829f1d934768075;p=qemu-server.git

diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
index 9d560ec3..fac4dfe7 100644
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -54,7 +54,7 @@ my $OVMF = {
     ],
 };
 
-my $qemu_snap_storage = {rbd => 1, sheepdog => 1};
+my $qemu_snap_storage = { rbd => 1 };
 
 my $cpuinfo = PVE::ProcFSTools::read_cpuinfo();
 
@@ -5766,8 +5766,8 @@ sub vm_resume {
     my ($vmid, $skiplock, $nocheck) = @_;
 
     PVE::QemuConfig->lock_config($vmid, sub {
-
-	my $res = vm_mon_cmd($vmid, 'query-status');
+	my $vm_mon_cmd = $nocheck ? \&vm_mon_cmd_nocheck : \&vm_mon_cmd;
+	my $res = $vm_mon_cmd->($vmid, 'query-status');
 	my $resume_cmd = 'cont';
 
 	if ($res->{status} && $res->{status} eq 'suspended') {
@@ -5780,12 +5780,9 @@ sub vm_resume {
 
 	    PVE::QemuConfig->check_lock($conf)
 		if !($skiplock || PVE::QemuConfig->has_lock($conf, 'backup'));
-
-	    vm_mon_cmd($vmid, $resume_cmd);
-
-	} else {
-	    vm_mon_cmd_nocheck($vmid, $resume_cmd);
 	}
+
+	$vm_mon_cmd->($vmid, $resume_cmd);
     });
 }
 
@@ -6264,6 +6261,24 @@ sub restore_vma_archive {
 		$storage_limits{$storeid} = $bwlimit;
 
 		$virtdev_hash->{$virtdev} = $devinfo->{$devname};
+	    } elsif ($line =~ m/^((?:ide|sata|scsi)\d+):\s*(.*)\s*$/) {
+		my $virtdev = $1;
+		my $drive = parse_drive($virtdev, $2);
+		if (drive_is_cloudinit($drive)) {
+		    my ($storeid, $volname) = PVE::Storage::parse_volume_id($drive->{file});
+		    my $scfg = PVE::Storage::storage_config($cfg, $storeid);
+		    my $format = qemu_img_format($scfg, $volname); # has 'raw' fallback
+
+		    my $d = {
+			format => $format,
+			storeid => $opts->{storage} // $storeid,
+			size => PVE::QemuServer::Cloudinit::CLOUDINIT_DISK_SIZE,
+			file => $drive->{file}, # to make drive_is_cloudinit check possible
+			name => "vm-$vmid-cloudinit",
+			is_cloudinit => 1,
+		    };
+		    $virtdev_hash->{$virtdev} = $d;
+		}
 	    }
 	}
 
@@ -6285,10 +6300,9 @@ sub restore_vma_archive {
 	    foreach_drive($oldconf, sub {
 		my ($ds, $drive) = @_;
 
-		return if drive_is_cdrom($drive);
+		return if !$drive->{is_cloudinit} && drive_is_cdrom($drive);
 
 		my $volid = $drive->{file};
-
 		return if !$volid || $volid =~ m|^/|;
 
 		my ($path, $owner) = PVE::Storage::path($cfg, $volid);
@@ -6304,8 +6318,7 @@ sub restore_vma_archive {
 		}
 	    });
 
-	    # delete vmstate files
-	    # since after the restore we have no snapshots anymore
+	    # delete vmstate files, after the restore we have no snapshots anymore
 	    foreach my $snapname (keys %{$oldconf->{snapshots}}) {
 		my $snap = $oldconf->{snapshots}->{$snapname};
 		if ($snap->{vmstate}) {
@@ -6334,22 +6347,30 @@ sub restore_vma_archive {
 	    my $supported = grep { $_ eq $d->{format} } @$validFormats;
 	    $d->{format} = $defFormat if !$supported;
 
-	    my $volid = PVE::Storage::vdisk_alloc($cfg, $storeid, $vmid,
-						  $d->{format}, undef, $alloc_size);
+	    my $name;
+	    if ($d->{is_cloudinit}) {
+		$name = $d->{name};
+		$name .= ".$d->{format}" if $d->{format} ne 'raw';
+	    }
+
+	    my $volid = PVE::Storage::vdisk_alloc($cfg, $storeid, $vmid, $d->{format}, $name, $alloc_size);
 	    print STDERR "new volume ID is '$volid'\n";
 	    $d->{volid} = $volid;
-	    my $path = PVE::Storage::path($cfg, $volid);
 
-	    PVE::Storage::activate_volumes($cfg,[$volid]);
+	    PVE::Storage::activate_volumes($cfg, [$volid]);
 
 	    my $write_zeros = 1;
 	    if (PVE::Storage::volume_has_feature($cfg, 'sparseinit', $volid)) {
 		$write_zeros = 0;
 	    }
 
-	    print $fifofh "${map_opts}format=$d->{format}:${write_zeros}:$d->{devname}=$path\n";
+	    if (!$d->{is_cloudinit}) {
+		my $path = PVE::Storage::path($cfg, $volid);
+
+		print $fifofh "${map_opts}format=$d->{format}:${write_zeros}:$d->{devname}=$path\n";
 
-	    print "map '$d->{devname}' to '$path' (write zeros = ${write_zeros})\n";
+		print "map '$d->{devname}' to '$path' (write zeros = ${write_zeros})\n";
+	    }
 	    $map->{$virtdev} = $volid;
 	}
 
@@ -6585,9 +6606,9 @@ sub do_snapshots_with_qemu {
     my ($storecfg, $volid) = @_;
 
     my $storage_name = PVE::Storage::parse_volume_id($volid);
+    my $scfg = $storecfg->{ids}->{$storage_name};
 
-    if ($qemu_snap_storage->{$storecfg->{ids}->{$storage_name}->{type}}
-	&& !$storecfg->{ids}->{$storage_name}->{krbd}){
+    if ($qemu_snap_storage->{$scfg->{type}} && !$scfg->{krbd}){
 	return 1;
     }
 
@@ -6925,11 +6946,9 @@ sub clone_disk {
 	if (drive_is_cloudinit($drive)) {
 	    $name = "vm-$newvmid-cloudinit";
 	    $snapname = undef;
-	    # cloudinit only supports raw and qcow2 atm:
-	    if ($dst_format eq 'qcow2') {
-		$name .= '.qcow2';
-	    } elsif ($dst_format ne 'raw') {
-		die "clone: unhandled format for cloudinit image\n";
+	    # we only get here if it's supported by QEMU_FORMAT_RE, so just accept
+	    if ($dst_format ne 'raw') {
+		$name .= ".$dst_format";
 	    }
 	}
 	$newvolid = PVE::Storage::vdisk_alloc($storecfg, $storeid, $newvmid, $dst_format, $name, ($size/1024));