| commit | c5913dd83d4a24f0304fd46ce265dc4b292788d4 | |
| author | Marcelo Tosatti <mtosatti@redhat.com> | |
| Wed, 16 Feb 2011 20:18:03 +0000 (16 18:18 -0200) | ||
| committer | Marcelo Tosatti <mtosatti@redhat.com> | |
| Wed, 16 Feb 2011 20:18:03 +0000 (16 18:18 -0200) | ||
| tree | 5a0da2eb83ee8f28809c8d0bfe975d0a4e66c459 | treesnapshot (tar.gz zip) |
| parent | 901ec66b7c935e70893b9d15bdb923fe92132e41 | commitdiff |
| parent | e5896b12e20b86ba9d16582888d60cf5cb286517 | commitdiff |
Merge commit 'e5896b12e20b86ba9d16582888d60cf5cb286517' into upstream-merge
* commit 'e5896b12e20b86ba9d16582888d60cf5cb286517':
Introduce log_start/log_stop in CPUPhysMemoryClient
kvm: Remove unneeded memory slot reservation
kvm: x86: Catch and report failing IRQ and NMI injections
Conflicts:
kvm.h
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
* commit 'e5896b12e20b86ba9d16582888d60cf5cb286517':
Introduce log_start/log_stop in CPUPhysMemoryClient
kvm: Remove unneeded memory slot reservation
kvm: x86: Catch and report failing IRQ and NMI injections
Conflicts:
kvm.h
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>