[pve-devel] [PATCH qemu-server 3/8] meta info: also add current pve-machine version

[Dominik Csapak <d.csapak@proxmox.com>]

when we bump the pve machine version, we also want to include that info
in the meta creation info. With that we can pin guests to the specific
version they were created on.

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
we could also give the kvm_version as parameter directly here, since
we already need it...

 PVE/API2/Qemu.pm           |  4 +++-
 PVE/QemuServer/MetaInfo.pm | 28 +++++++++++++++++++---------
 2 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm
index dc8915a7..0249c0d0 100644
--- a/PVE/API2/Qemu.pm
+++ b/PVE/API2/Qemu.pm
@@ -1207,7 +1207,9 @@ __PACKAGE__->register_method({
 		    assert_scsi_feature_compatibility($opt, $conf, $storecfg, $param->{$opt});
 		}
 
-		$conf->{meta} = PVE::QemuServer::MetaInfo::new_meta_info_string();
+		my $kvm_version = PVE::QemuServer::Helpers::kvm_user_version();
+		my $pve_machine = PVE::QemuServer::Machine::get_pve_version($kvm_version);
+		$conf->{meta} = PVE::QemuServer::MetaInfo::new_meta_info_string($pve_machine);
 
 		my $vollist = [];
 		eval {
diff --git a/PVE/QemuServer/MetaInfo.pm b/PVE/QemuServer/MetaInfo.pm
index a8cb6c5e..78526eb2 100644
--- a/PVE/QemuServer/MetaInfo.pm
+++ b/PVE/QemuServer/MetaInfo.pm
@@ -20,6 +20,13 @@ our $meta_info_fmt = {
 	pattern => '\d+(\.\d+)+',
 	optional => 1,
     },
+    'creation-pve-machine' => {
+	type => 'integer',
+	description => "The PVE machine version current at the time this VM was created.",
+	default => 0,
+	minimum => 1,
+	optional => 1,
+    },
 };
 
 sub parse_meta_info {
@@ -33,15 +40,18 @@ sub parse_meta_info {
 }
 
 sub new_meta_info_string {
-    my () = @_; # for now do not allow to override any value
-
-    return PVE::JSONSchema::print_property_string(
-	{
-	    'creation-qemu' => PVE::QemuServer::Helpers::kvm_user_version(),
-	    ctime => "". int(time()),
-	},
-	$meta_info_fmt,
-    );
+    my ($pve_machine) = @_;
+
+    my $data = {
+	'creation-qemu' => PVE::QemuServer::Helpers::kvm_user_version(),
+	ctime => "". int(time()),
+    };
+
+    if (defined($pve_machine) && $pve_machine > 0) {
+	$data->{'creation-pve-machine'} = $pve_machine;
+    }
+
+    return PVE::JSONSchema::print_property_string($data, $meta_info_fmt);
 }
 
 1;
-- 
2.39.5



_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel