| commit | a4203fbdb891324f4bf91016af8d4bbb144a92e5 | |
| author | Marcelo Tosatti <mtosatti@redhat.com> | |
| Wed, 22 Jun 2011 22:07:52 +0000 (22 19:07 -0300) | ||
| committer | Marcelo Tosatti <mtosatti@redhat.com> | |
| Wed, 22 Jun 2011 22:07:52 +0000 (22 19:07 -0300) | ||
| tree | c63fb4930f8aa46fbdc7ba425215ac2d310bb027 | treesnapshot (tar.gz zip) |
| parent | ab3e49ce127de4cf3b7d701ed3546bf1dded6f22 | commitdiff |
| parent | 4dad7f1ec51e13b40d2554d666cc122ed898d8e6 | commitdiff |
Merge commit '4dad7f1ec51e13b40d2554d666cc122ed898d8e6' into upstream-merge
* commit '4dad7f1ec51e13b40d2554d666cc122ed898d8e6':
msi: Fix copy&paste mistake in msi_uninit
virtio: correctly initialize vm_running
virtio: guard against negative vq notifies
Conflicts:
hw/msi.c
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
* commit '4dad7f1ec51e13b40d2554d666cc122ed898d8e6':
msi: Fix copy&paste mistake in msi_uninit
virtio: correctly initialize vm_running
virtio: guard against negative vq notifies
Conflicts:
hw/msi.c
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
| hw/msi.c | diff1 | diff2 | blobhistory |
| hw/virtio-pci.c | diff1 | diff2 | blobhistory |