On 01/29/2015 06:46 AM, Jan Beulich wrote:
On 28.01.15 at 20:56, <boris.ostrov...@oracle.com> wrote:
@@ -59,6 +60,12 @@ static void __init parse_vpmu_param(char *s)
}
/* fall through */
case 1:
+ if ( opt_watchdog )
+ {
+ printk("NMI watchdog is enabled. Disabling VPMU\n");
+ opt_vpmu_enabled = 0;
+ break;
+ }
opt_vpmu_enabled |= VPMU_BOOT_ENABLED;
break;
}
Not only to address Andrew's concerns this needs to be changed:
Logging messages from cmdline argument parsing functions is only
marginally useful - they won't appear on the serial console. But
afaict that'll go away anyway by consolidating the patch into simply
checking opt_watchdog from vPMU code.
Not on the console, but the do show up in the log:
root@haswell> xl dmesg|grep -i vpmu
(XEN) NMI watchdog is enabled. Disabling VPMU
(XEN) Command line: placeholder conring_size=512k loglvl=all
sync_console=true flask_enforcing=1 com1=38400,8n1,pci console=com1
watchdog vpmu
root@haswell>
But regardless, I am going to do the opt_watchdog check in VPMU init code.
-boris
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
