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

Make agent a property string, add fstrim_cloned_disks

Browse Source 
Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
This commit is contained in:
Stoiko Ivanov 2018-08-01 20:29:04 +02:00 committed by Thomas Lamprecht
parent b1a70cab3d
commit 9d66b39769
3 changed files with 35 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
PVE/API2/Qemu.pm
View File

@ -1894,8 +1894,7 @@ __PACKAGE__->register_method({
$status->{ha} = PVE::HA::Config::get_service_status("vm:$param->{vmid}");
$status->{spice} = 1 if PVE::QemuServer::vga_conf_has_spice($conf->{vga});
$status->{agent} = 1 if $conf->{agent};
$status->{agent} = 1 if (PVE::QemuServer::parse_guest_agent($conf)->{enabled});
return $status;
}});

2
PVE/QemuConfig.pm
View File

@ -161,7 +161,7 @@ sub __snapshot_check_freeze_needed {
my $running = $class->__snapshot_check_running($vmid);
if (!$save_vmstate) {
return ($running, $running && $config->{agent} && PVE::QemuServer::qga_check_running($vmid));
return ($running, $running && PVE::QemuServer::parse_guest_agent($config)->{enabled} && PVE::QemuServer::qga_check_running($vmid));
} else {
return ($running, 0);
}

38
PVE/QemuServer.pm
View File

@ -200,6 +200,21 @@ my $watchdog_fmt = {
};
PVE::JSONSchema::register_format('pve-qm-watchdog', $watchdog_fmt);
my $agent_fmt = {
enabled => {
description => "Enable/disable Qemu GuestAgent.",
type => 'boolean',
default => 0,
default_key => 1,
},
fstrim_cloned_disks => {
description => "Run fstrim after cloning/moving a disk.",
type => 'boolean',
optional => 1,
default => 0
},
};
my $confdesc = {
onboot => {
optional => 1,
@ -380,9 +395,9 @@ EODESC
},
agent => {
optional => 1,
type => 'boolean',
description => "Enable/disable Qemu GuestAgent.",
default => 0,
description => "Enable/disable Qemu GuestAgent and its properties.",
type => 'string',
format => $agent_fmt,
},
kvm => {
optional => 1,
@ -2211,6 +2226,19 @@ sub parse_watchdog {
return $res;
}
sub parse_guest_agent {
my ($value) = @_;
return {} if !defined($value->{agent});
my $res = eval { PVE::JSONSchema::parse_property_string($agent_fmt, $value->{agent}) };
warn $@ if $@;
# if the agent is disabled ignore the other potentially set properties
return {} if !$res->{enabled};
return $res;
}
PVE::JSONSchema::register_format('pve-qm-usb-device', \&verify_usb_device);
sub verify_usb_device {
my ($value, $noerr) = @_;
@ -3442,7 +3470,7 @@ sub config_to_command {
#push @$cmd, '-soundhw', 'es1370';
#push @$cmd, '-soundhw', $soundhw if $soundhw;
if($conf->{agent}) {
if (parse_guest_agent($conf)->{enabled}) {
my $qgasocket = qmp_socket($vmid, 1);
my $pciaddr = print_pci_addr("qga0", $bridges);
push @$devices, '-chardev', "socket,path=$qgasocket,server,nowait,id=qga0";
@ -5152,7 +5180,7 @@ sub vm_stop {
eval {
if ($shutdown) {
if (defined($conf) && $conf->{agent}) {
if (defined($conf) && parse_guest_agent($conf)->{enabled}) {
vm_qmp_command($vmid, { execute => "guest-shutdown" }, $nocheck);
} else {
vm_qmp_command($vmid, { execute => "system_powerdown" }, $nocheck);