qemu-kvm: Merge kvm_context into KVMState
commitcd0a5c9cd577ec5b0436fbf9372c571e4a2ceac9
authorJan Kiszka <jan.kiszka@siemens.com>
Fri, 13 May 2011 12:14:08 +0000 (13 14:14 +0200)
committerMarcelo Tosatti <mtosatti@redhat.com>
Mon, 16 May 2011 18:20:34 +0000 (16 15:20 -0300)
treed086c7da1bb1e1442e3422ba5719b06db49e35c0
parentb41c7a12010620a64395414be61e711dc7751f56
qemu-kvm: Merge kvm_context into KVMState

Append the few additional fields needed for qemu-kvm to upstream's
KVMState and drop all related duplications.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
kvm-all.c
qemu-kvm.c
qemu-kvm.h