From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id CA9626D2E8 for ; Thu, 1 Apr 2021 02:22:11 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 8DE84152A0 for ; Thu, 1 Apr 2021 02:21:41 +0200 (CEST) Received: from kvmformation3.odiso.net (globalOdiso.M6Lille.odiso.net [89.248.211.242]) by firstgate.proxmox.com (Proxmox) with ESMTP id 11FC215276 for ; Thu, 1 Apr 2021 02:21:39 +0200 (CEST) Received: by kvmformation3.odiso.net (Postfix, from userid 0) id C496F77781; Thu, 1 Apr 2021 02:21:30 +0200 (CEST) From: Alexandre Derumier To: pve-devel@lists.proxmox.com Date: Thu, 1 Apr 2021 02:21:24 +0200 Message-Id: <20210401002127.4139144-4-aderumier@odiso.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210401002127.4139144-1-aderumier@odiso.com> References: <20210401002127.4139144-1-aderumier@odiso.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 1 AWL -0.169 Adjusted score from AWL reputation of From: address HEADER_FROM_DIFFERENT_DOMAINS 0.249 From and EnvelopeFrom 2nd level mail domains are different KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods KHOP_HELO_FCRDNS 0.399 Relay HELO differs from its IP's reverse DNS NO_DNS_FOR_FROM 0.379 Envelope sender has no MX or A DNS records SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an SPF Record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [qemuserver.pm] Subject: [pve-devel] [PATCH v2 qemu-server 3/6] cloudinit: make cloudnit options fastplug X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Apr 2021 00:22:11 -0000 --- PVE/QemuServer.pm | 30 +++--------------------------- 1 file changed, 3 insertions(+), 27 deletions(-) diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm index 5092b49..900e227 100644 --- a/PVE/QemuServer.pm +++ b/PVE/QemuServer.pm @@ -4456,9 +4456,10 @@ sub vmconfig_hotplug_pending { $errors->{$opt} = "hotplug problem - $msg"; }; + my @cloudinit_opts = keys %$confdesc_cloudinit; my $changes = 0; foreach my $opt (keys %{$conf->{pending}}) { # add/change - if ($fast_plug_option->{$opt}) { + if ($fast_plug_option->{$opt} || grep { $_ eq $opt } @cloudinit_opts) { $conf->{$opt} = $conf->{pending}->{$opt}; delete $conf->{pending}->{$opt}; $changes = 1; @@ -4531,31 +4532,6 @@ sub vmconfig_hotplug_pending { } } - my ($apply_pending_cloudinit, $apply_pending_cloudinit_done); - $apply_pending_cloudinit = sub { - return if $apply_pending_cloudinit_done; # once is enough - $apply_pending_cloudinit_done = 1; # once is enough - - my ($key, $value) = @_; - - my @cloudinit_opts = keys %$confdesc_cloudinit; - foreach my $opt (keys %{$conf->{pending}}) { - next if !grep { $_ eq $opt } @cloudinit_opts; - $conf->{$opt} = delete $conf->{pending}->{$opt}; - } - - my $pending_delete_hash = PVE::QemuConfig->parse_pending_delete($conf->{pending}->{delete}); - foreach my $opt (sort keys %$pending_delete_hash) { - next if !grep { $_ eq $opt } @cloudinit_opts; - PVE::QemuConfig->remove_from_pending_delete($conf, $opt); - delete $conf->{$opt}; - } - - my $new_conf = { %$conf }; - $new_conf->{$key} = $value; - PVE::QemuServer::Cloudinit::generate_cloudinitconfig($new_conf, $vmid); - }; - foreach my $opt (keys %{$conf->{pending}}) { next if $selection && !$selection->{$opt}; my $value = $conf->{pending}->{$opt}; @@ -4602,7 +4578,7 @@ sub vmconfig_hotplug_pending { # some changes can be done without hotplug my $drive = parse_drive($opt, $value); if (drive_is_cloudinit($drive)) { - &$apply_pending_cloudinit($opt, $value); + PVE::QemuServer::Cloudinit::generate_cloudinitconfig($conf, $vmid); } vmconfig_update_disk($storecfg, $conf, $hotplug_features->{disk}, $vmid, $opt, $value, $arch, $machine_type); -- 2.20.1