[COMMIT master] Merge branch 'upstream-merge'

From: Avi Kivity a...@redhat.com * upstream-merge: (229 commits) Initialize apic before vcpu main loop Add S390 maintainer information Set default console to virtio on S390x S390 GDB stub Add S390x virtio machine bus Add S390x virtio machine description Add support for S390x system

[COMMIT master] vapic: fix alignment

From: Avi Kivity a...@redhat.com Align the bios descriptor to 16 bytes (cosmetic) and the vptr to 128 bytes (worst case cache line). Signed-off-by: Avi Kivity a...@redhat.com diff --git a/pc-bios/optionrom/vapic.S b/pc-bios/optionrom/vapic.S index 1924eeb..afe98a9 100644 ---

[COMMIT master] tpr patching: defer post-migration load to vcpu context

From: Avi Kivity a...@redhat.com This makes sure the cpu state is properly loaded. Signed-off-by: Avi Kivity a...@redhat.com diff --git a/kvm-tpr-opt.c b/kvm-tpr-opt.c index 89256d4..bf9c9a0 100644 --- a/kvm-tpr-opt.c +++ b/kvm-tpr-opt.c @@ -233,7 +233,7 @@ static int get_pcr_cpu(CPUState *env)

[COMMIT master] Merge branch 'upstream-merge'

From: Avi Kivity a...@redhat.com * upstream-merge: (134 commits) target-alpha: Fix double log_cpu_state. target-alpha: Fix FMOV. target-alpha: Expand ins*h inline. target-alpha: Expand msk*h inline. target-alpha: Expand msk*l inline. target-alpha: Expand ins*l inline. target-alpha:

[COMMIT master] Revert Temporarily avoid loading pxe option roms

From: Avi Kivity a...@redhat.com This reverts commit b496fe34317ead61cf5ae019506fadc8f9ad6556. Seabios fixes/workarounds now allow gpxe to work. Signed-off-by: Avi Kivity a...@redhat.com diff --git a/hw/loader.c b/hw/loader.c index b1827a7..2d7a2c4 100644 --- a/hw/loader.c +++ b/hw/loader.c @@

[COMMIT master] Fix mismerge in cpu_post_load

From: Jan Kiszka jan.kis...@siemens.com Merge 8e2c5ec2f6 forgot to restore some qemu-kvm-specific hooks in cpu_post_load. mp_state was readded later on, but tsc was missing, breaking the guest timing after resume. Also, reset of halt was dropped which is obviously required for in-kernel irqchip.

[COMMIT master] KVM: MMU: remove prefault from invlpg handler

From: Marcelo Tosatti mtosa...@redhat.com The invlpg prefault optimization breaks Windows 2008 R2 occasionally. The visible effect is that the invlpg handler instantiates a pte which is, microseconds later, written with a different gfn by another vcpu. The OS could have other mechanisms to