all lists on lists.proxmox.com
 help / color / mirror / Atom feed
* [pve-devel] [PATCH qemu-server] disk reassign: add unused disks directly to config
@ 2021-11-10 17:00 Aaron Lauterer
  2021-11-11  9:09 ` [pve-devel] applied: " Fabian Grünbichler
  0 siblings, 1 reply; 2+ messages in thread
From: Aaron Lauterer @ 2021-11-10 17:00 UTC (permalink / raw)
  To: pve-devel

Using $update_vm_api for unused disks will cause them to end up as a
pending change if the VM is running.

Signed-off-by: Aaron Lauterer <a.lauterer@proxmox.com>
---
That case is already handled for containers but was missed for VMs.

 PVE/API2/Qemu.pm | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm
index 4404da9..24b1d2f 100644
--- a/PVE/API2/Qemu.pm
+++ b/PVE/API2/Qemu.pm
@@ -3607,15 +3607,21 @@ __PACKAGE__->register_method({
 		    PVE::QemuConfig->write_config($vmid, $source_conf);
 
 		    my $drive_string = PVE::QemuServer::print_drive($drive);
-		    &$update_vm_api(
-			{
-			    node => $node,
-			    vmid => $target_vmid,
-			    digest => $target_digest,
-			    $target_disk => $drive_string,
-			},
-			1,
-		    );
+
+		    if ($target_disk =~ /^unused\d+$/) {
+			$target_conf->{$target_disk} = $drive_string;
+			PVE::QemuConfig->write_config($target_vmid, $target_conf);
+		    } else {
+			&$update_vm_api(
+			    {
+				node => $node,
+				vmid => $target_vmid,
+				digest => $target_digest,
+				$target_disk => $drive_string,
+			    },
+			    1,
+			);
+		    }
 
 		    # remove possible replication snapshots
 		    if (PVE::Storage::volume_has_feature(
-- 
2.30.2





^ permalink raw reply	[flat|nested] 2+ messages in thread

* [pve-devel] applied: [PATCH qemu-server] disk reassign: add unused disks directly to config
  2021-11-10 17:00 [pve-devel] [PATCH qemu-server] disk reassign: add unused disks directly to config Aaron Lauterer
@ 2021-11-11  9:09 ` Fabian Grünbichler
  0 siblings, 0 replies; 2+ messages in thread
From: Fabian Grünbichler @ 2021-11-11  9:09 UTC (permalink / raw)
  To: Proxmox VE development discussion

On November 10, 2021 6:00 pm, Aaron Lauterer wrote:
> Using $update_vm_api for unused disks will cause them to end up as a
> pending change if the VM is running.
> 
> Signed-off-by: Aaron Lauterer <a.lauterer@proxmox.com>
> ---
> That case is already handled for containers but was missed for VMs.
> 
>  PVE/API2/Qemu.pm | 24 +++++++++++++++---------
>  1 file changed, 15 insertions(+), 9 deletions(-)
> 
> diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm
> index 4404da9..24b1d2f 100644
> --- a/PVE/API2/Qemu.pm
> +++ b/PVE/API2/Qemu.pm
> @@ -3607,15 +3607,21 @@ __PACKAGE__->register_method({
>  		    PVE::QemuConfig->write_config($vmid, $source_conf);
>  
>  		    my $drive_string = PVE::QemuServer::print_drive($drive);
> -		    &$update_vm_api(
> -			{
> -			    node => $node,
> -			    vmid => $target_vmid,
> -			    digest => $target_digest,
> -			    $target_disk => $drive_string,
> -			},
> -			1,
> -		    );
> +
> +		    if ($target_disk =~ /^unused\d+$/) {
> +			$target_conf->{$target_disk} = $drive_string;
> +			PVE::QemuConfig->write_config($target_vmid, $target_conf);
> +		    } else {
> +			&$update_vm_api(
> +			    {
> +				node => $node,
> +				vmid => $target_vmid,
> +				digest => $target_digest,
> +				$target_disk => $drive_string,
> +			    },
> +			    1,
> +			);
> +		    }
>  
>  		    # remove possible replication snapshots
>  		    if (PVE::Storage::volume_has_feature(
> -- 
> 2.30.2
> 
> 
> 
> _______________________________________________
> pve-devel mailing list
> pve-devel@lists.proxmox.com
> https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
> 
> 
> 




^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2021-11-11  9:10 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-11-10 17:00 [pve-devel] [PATCH qemu-server] disk reassign: add unused disks directly to config Aaron Lauterer
2021-11-11  9:09 ` [pve-devel] applied: " Fabian Grünbichler

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal