Public Git Hosting - qemu-kvm.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: b0e4c5d 3d4b264)

commit	0e2d893331ef3875cfe89f3caa68d17b0b51104b
author	Avi Kivity <avi@redhat.com>
	Thu, 16 Feb 2012 17:04:10 +0000 (16 19:04 +0200)
committer	Avi Kivity <avi@redhat.com>
	Thu, 16 Feb 2012 17:04:10 +0000 (16 19:04 +0200)
tree	2e4602e7bf48beace04ff992340c577c0848f078	tree \| snapshot (tar.gz zip)
parent	b0e4c5d0361ab72933e8bebfa54e014713ee5f57	commit \| diff
parent	3d4b26494fdce89354dac49ef909356ccda77914	commit \| diff

Merge commit '3d4b26494fdce89354dac49ef909356ccda77914' into upstream-merge

* commit '3d4b26494fdce89354dac49ef909356ccda77914':
kvm: Implement kvm_irqchip_in_kernel like kvm_enabled

Conflicts:
hw/pc.c
hw/pc_piix.c

Adjust:
kvm.h
qemu-kvm.c

Signed-off-by: Avi Kivity <avi@redhat.com>

hw/pc.c	diff1 \|	diff2 \|	blob \| history
hw/pc_piix.c	diff1 \|	diff2 \|	blob \| history
kvm-all.c	diff1 \|	diff2 \|	blob \| history
kvm-stub.c	diff1 \|	diff2 \|	blob \| history
kvm.h	diff1 \|	diff2 \|	blob \| history
qemu-kvm.c	diff1 \|	\|	blob \| history
target-i386/kvm.c	diff1 \|	diff2 \|	blob \| history

QEMU modified to work with kvm