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

Revert "schema: add fleecing-images config property"

Browse Source 
This reverts commit fca0ba5d77, quoting
Fiona in verbatim:

> Regarding the patch "schema: add fleecing-images config property",
> Fabian off-list suggested using a config section "special:fleecing"
> instead of a property, so that it is truly internal-only. If we go for
> that, the commit should be reverted. Which approach do you prefer?
-- https://lore.proxmox.com/pve-devel/5126c251-64fd-44fe-b1a6-fda9074eb9a1@proxmox.com/

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht 2024-11-18 21:28:54 +01:00
parent 5fc635cc6d
commit 9304dc09e5
3 changed files with 0 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
PVE/API2/Qemu.pm
View File

@ -1041,9 +1041,6 @@ __PACKAGE__->register_method({
$param->{cpuunits} = PVE::CGroup::clamp_cpu_shares($param->{cpuunits}) $param->{cpuunits} = PVE::CGroup::clamp_cpu_shares($param->{cpuunits})
if defined($param->{cpuunits}); # clamp value depending on cgroup version if defined($param->{cpuunits}); # clamp value depending on cgroup version
raise_param_exc({ 'fleecing-images' => "Cannot set option - for internal use only." })
if $param->{'fleecing-images'};
PVE::Cluster::check_cfs_quorum(); PVE::Cluster::check_cfs_quorum();
my $filename = PVE::QemuConfig->config_file($vmid); my $filename = PVE::QemuConfig->config_file($vmid);
@ -1761,9 +1758,6 @@ my $update_vm_api = sub {
push @paramarr, "-$key", $value; push @paramarr, "-$key", $value;
} }
raise_param_exc({ 'fleecing-images' => "Cannot set option - for internal use only." })
if $param->{'fleecing-images'};
my $skiplock = extract_param($param, 'skiplock'); my $skiplock = extract_param($param, 'skiplock');
raise_param_exc({ skiplock => "Only root may use this option." }) raise_param_exc({ skiplock => "Only root may use this option." })
if $skiplock && $authuser ne 'root@pam'; if $skiplock && $authuser ne 'root@pam';
@ -3886,9 +3880,6 @@ __PACKAGE__->register_method({
next if $opt eq 'snapshots' || $opt eq 'parent' || $opt eq 'snaptime' || next if $opt eq 'snapshots' || $opt eq 'parent' || $opt eq 'snaptime' ||
$opt eq 'vmstate' || $opt eq 'snapstate'; $opt eq 'vmstate' || $opt eq 'snapstate';
# left-overs, not cloned
next if $opt eq 'fleecing-images';
# no need to copy unused images, because VMID(owner) changes anyways # no need to copy unused images, because VMID(owner) changes anyways
next if $opt =~ m/^unused\d+$/; next if $opt =~ m/^unused\d+$/;

7
PVE/QemuServer.pm
View File

@ -739,13 +739,6 @@ EODESCR
description => "List of host cores used to execute guest processes, for example: 0,5,8-11", description => "List of host cores used to execute guest processes, for example: 0,5,8-11",
optional => 1, optional => 1,
}, },
'fleecing-images' => {
type => 'string',
format => 'pve-volume-id-list',
description => "For internal use only. List of fleecing images allocated during backup."
." If no backup is running, these are left-overs that failed to be removed.",
optional => 1,
},
}; };
my $cicustom_fmt = { my $cicustom_fmt = {

1
PVE/VZDump/QemuServer.pm
View File

@ -252,7 +252,6 @@ sub assemble {
next; next;
} }
next if $line =~ m/^lock:/ || $line =~ m/^parent:/; next if $line =~ m/^lock:/ || $line =~ m/^parent:/;
next if $line =~ m/^fleecing-images:/;
print $outfd $line; print $outfd $line;
} }