5
0
mirror of git://git.proxmox.com/git/qemu-server.git synced 2024-12-27 03:21:43 +03:00

Add watchdog support

This commit is contained in:
Dietmar Maurer 2011-09-08 11:39:56 +02:00
parent abb39b66d7
commit 0ea9541da0

View File

@ -281,6 +281,12 @@ EODESC
description => "Select VGA type. If you want to use high resolution modes (>= 1280x1024x16) then you should use option 'std' or 'vmware'. Default is 'std' for win7/w2k8, and 'cirrur' for other OS types", description => "Select VGA type. If you want to use high resolution modes (>= 1280x1024x16) then you should use option 'std' or 'vmware'. Default is 'std' for win7/w2k8, and 'cirrur' for other OS types",
enum => [qw(std cirrus vmware)], enum => [qw(std cirrus vmware)],
}, },
watchdog => {
optional => 1,
type => 'string', format => 'pve-qm-watchdog',
typetext => '[[model=]i6300esb|ib700] [,[action=]reset|shutdown|poweroff|pause|debug|none]',
description => "Create a virtual hardware watchdog device. Once enabled (by a guest action), the watchdog must be periodically polled by an agent inside the guest or else the guest will be restarted (or execute the action specified)",
},
hostpci => { hostpci => {
optional => 1, optional => 1,
type => 'string', format => 'pve-qm-hostpci', type => 'string', format => 'pve-qm-hostpci',
@ -1032,6 +1038,39 @@ sub verify_hostpci {
return $value; return $value;
} }
PVE::JSONSchema::register_format('pve-qm-watchdog', \&verify_watchdog);
sub verify_watchdog {
my ($value, $noerr) = @_;
return $value if parse_watchdog($value);
return undef if $noerr;
die "unable to parse watchdog options\n";
}
sub parse_watchdog {
my ($value) = @_;
return undef if !$value;
my $res = {};
foreach my $p (split (/,/, $value)) {
next if $p =~ m/^\s*$/;
if ($p =~ m/^(model=)?(i6300esb|ib700)$/) {
$res->{model} = $2;
} elsif ($p =~ m/^(action=)?(reset|shutdown|poweroff|pause|debug|none)$/) {
$res->{action} = $2;
} else {
return undef;
}
}
return $res;
}
sub parse_usb_device { sub parse_usb_device {
my ($value) = @_; my ($value) = @_;
@ -2028,6 +2067,12 @@ sub config_to_command {
#push @$cmd, '-soundhw', 'es1370'; #push @$cmd, '-soundhw', 'es1370';
#push @$cmd, '-soundhw', $soundhw if $soundhw; #push @$cmd, '-soundhw', $soundhw if $soundhw;
if ($conf->{watchdog}) {
my $wdopts = parse_watchdog($conf->{watchdog});
push @$cmd, '-watchdog', $wdopts->{model} || 'i6300esb';
push @$cmd, '-watchdog-action', $wdopts->{action} if $wdopts->{action};
}
my $vollist = []; my $vollist = [];
foreach_drive($conf, sub { foreach_drive($conf, sub {