| commit | e268078f55e5c3d0ffadded8e322bb45c785f403 | |
| author | Marcelo Tosatti <mtosatti@redhat.com> | |
| Fri, 27 Aug 2010 00:07:34 +0000 (26 21:07 -0300) | ||
| committer | Marcelo Tosatti <mtosatti@redhat.com> | |
| Fri, 27 Aug 2010 00:07:34 +0000 (26 21:07 -0300) | ||
| tree | ea105dcb5e9bc76236e98cf2a5be816eeec5c9f4 | treesnapshot (tar.gz zip) |
| parent | 0256dc7b64e4e0dd90c87437da627b7ecd0ddbe0 | commitdiff |
| parent | 2446333cd5b5c985f6517dee7004e542ecacd21c | commitdiff |
Merge commit '2446333cd5b5c985f6517dee7004e542ecacd21c' into upstream-merge
* commit '2446333cd5b5c985f6517dee7004e542ecacd21c':
Rearrange block headers
compile -fsdev and -virtfs cmd line options unconditionally.
kvm: remove guest triggerable abort()
kvm: Don't walk memory_size == 0 slots in kvm_client_migration_log
Conflicts:
hw/pc.c
hw/pci-hotplug.c
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
* commit '2446333cd5b5c985f6517dee7004e542ecacd21c':
Rearrange block headers
compile -fsdev and -virtfs cmd line options unconditionally.
kvm: remove guest triggerable abort()
kvm: Don't walk memory_size == 0 slots in kvm_client_migration_log
Conflicts:
hw/pc.c
hw/pci-hotplug.c
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>