Merge remote-tracking branch 'agraf/xen-next' into staging

diff --cc configure
Simple merge

diff --cc cpu-common.h
Simple merge

diff --cc exec.c
Simple merge

diff --cc hw/pc_piix.c
Simple merge

diff --cc vl.c
Simple merge