proxmox-mirrors/qemu-server
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu-server synced 2025-05-30 09:35:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

parse config: factor out finishing reading the description comment

Browse Source 
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht 2022-11-16 11:23:01 +01:00
parent 05eae0f21f
commit cbfc9d753f
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
PVE/QemuServer.pm
View File

@ -2425,6 +2425,13 @@ sub parse_vm_config {
my $conf = $res; my $conf = $res;
my $descr; my $descr;
my $finish_description = sub {
if (defined($descr)) {
$descr =~ s/\s+$//;
$conf->{description} = $descr;
}
$descr = undef;
};
my $section = ''; my $section = '';
my @lines = split(/\n/, $raw); my @lines = split(/\n/, $raw);
@ -2433,11 +2440,7 @@ sub parse_vm_config {
if ($line =~ m/^\[PENDING\]\s*$/i) { if ($line =~ m/^\[PENDING\]\s*$/i) {
$section = 'pending'; $section = 'pending';
if (defined($descr)) { $finish_description->();
$descr =~ s/\s+$//;
$conf->{description} = $descr;
}
$descr = undef;
$conf = $res->{$section} = {}; $conf = $res->{$section} = {};
next; next;
} elsif ($line =~ m/^\[special:cloudinit\]\s*$/i) { } elsif ($line =~ m/^\[special:cloudinit\]\s*$/i) {
@ -2448,11 +2451,7 @@ sub parse_vm_config {
} elsif ($line =~ m/^\[([a-z][a-z0-9_\-]+)\]\s*$/i) { } elsif ($line =~ m/^\[([a-z][a-z0-9_\-]+)\]\s*$/i) {
$section = $1; $section = $1;
if (defined($descr)) { $finish_description->();
$descr =~ s/\s+$//;
$conf->{description} = $descr;
}
$descr = undef;
$conf = $res->{snapshots}->{$section} = {}; $conf = $res->{snapshots}->{$section} = {};
next; next;
} }
@ -2506,10 +2505,7 @@ sub parse_vm_config {
} }
} }
if (defined($descr)) { $finish_description->();
$descr =~ s/\s+$//;
$conf->{description} = $descr;
}
delete $res->{snapstate}; # just to be sure delete $res->{snapstate}; # just to be sure
return $res; return $res;