On Tue, Jul 10, 2012 at 04:04:12PM +0200, Michal Privoznik wrote:
Cool, so now we don't overwrite PAE feature set just a few lines above (not visible in this diff though).
ACK with this squashed in:
I have now pushed this patch with the testcase update. Before pushing I have tested that without my patch the test fails, and after applying it the test succeeds. Christophe
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-kvmclock.xml b/tests/qemuxml2argvdata/qemuxml2argv-kvmclock.xml index e07c1f6..8abcb51 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-kvmclock.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-kvmclock.xml @@ -8,6 +8,9 @@ <type arch='i686' machine='pc'>hvm</type> <boot dev='network'/> </os> + <features> + <pae/> + </features> <clock offset='utc'> <timer name='kvmclock' present='no'/> </clock>
Michal