proxmox-mirrors/qemu-server
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu-server synced 2025-08-03 02:45:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

save description as comment

Browse Source
This commit is contained in:
Dietmar Maurer 2012-03-01 08:13:14 +01:00
parent 3f05af61ff
commit 0581fe4fd6
3 changed files with 27 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -2,7 +2,7 @@ RELEASE=2.0
VERSION=2.0
PACKAGE=qemu-server
PKGREL=23
PKGREL=24
DESTDIR=
PREFIX=/usr

31
PVE/QemuServer.pm
View File

@ -214,7 +214,7 @@ my $confdesc = {
description => {
optional => 1,
type => 'string',
description => "Description for the VM. Only used on the configuration web interface.",
description => "Description for the VM. Only used on the configuration web interface. This is saved as comment inside the configuration file.",
},
ostype => {
optional => 1,
@ -1435,17 +1435,20 @@ sub parse_vm_config {
my $vmid = $1;
my $descr = '';
while ($raw && $raw =~ s/^(.*?)(\n|$)//) {
my $line = $1;
next if $line =~ m/^\#/;
next if $line =~ m/^\s*$/;
if ($line =~ m/^\#(.*)\s*$/) {
$descr .= PVE::Tools::decode_text($1) . "\n";
next;
}
if ($line =~ m/^(description):\s*(.*\S)\s*$/) {
my $key = $1;
my $value = PVE::Tools::decode_text($2);
$res->{$key} = $value;
$descr .= PVE::Tools::decode_text($2);
} elsif ($line =~ m/^(args):\s*(.*\S)\s*$/) {
my $key = $1;
my $value = $2;
@ -1478,6 +1481,8 @@ sub parse_vm_config {
}
}
$res->{description} = $descr if $descr;
# convert old smp to sockets
if ($res->{smp} && !$res->{sockets}) {
$res->{sockets} = $res->{smp};
@ -1507,11 +1512,8 @@ sub write_vm_config {
my $new_volids = {};
foreach my $key (keys %$conf) {
next if $key eq 'digest';
next if $key eq 'digest' || $key eq 'description';
my $value = $conf->{$key};
if ($key eq 'description') {
$value = PVE::Tools::encode_text($value);
}
eval { $value = check_type($key, $value); };
die "unable to parse value of '$key' - $@" if $@;
@ -1533,8 +1535,15 @@ sub write_vm_config {
# gererate RAW data
my $raw = '';
# add description as comment to top of file
my $descr = $conf->{description} || '';
foreach my $cl (split(/\n/, $descr)) {
$raw .= '#' . PVE::Tools::encode_text($cl) . "\n";
}
foreach my $key (sort keys %$conf) {
next if $key eq 'digest';
next if $key eq 'digest' || $key eq 'description';
$raw .= "$key: $conf->{$key}\n";
}

6
changelog.Debian
View File

@ -1,3 +1,9 @@
qemu-server (2.0-24) unstable; urgency=low
* save description as comment.
-- Proxmox Support Team <support@proxmox.com> Thu, 01 Mar 2012 08:12:29 +0100
qemu-server (2.0-23) unstable; urgency=low
* fix lvremove call: avoid 'Not a CODE reference' warning