| commit | 3ee86eb70cf2bbbf8cbc74597e48c012dec2457c | |
| author | Avi Kivity <avi@redhat.com> | |
| Thu, 26 Jan 2012 13:06:32 +0000 (26 15:06 +0200) | ||
| committer | Avi Kivity <avi@redhat.com> | |
| Thu, 26 Jan 2012 13:06:32 +0000 (26 15:06 +0200) | ||
| tree | 509cd3a0a6eb0eca37562d972fa637c23f07e1d6 | treesnapshot (tar.gz zip) |
| parent | ecf11ed37ad5e63d2dc5565d5c20313445752c4f | commitdiff |
| parent | 60ba3cc231d6bc7b802ad4fe6b6fc159ecb112e2 | commitdiff |
Merge commit '60ba3cc231d6bc7b802ad4fe6b6fc159ecb112e2' into upstream-merge
* commit '60ba3cc231d6bc7b802ad4fe6b6fc159ecb112e2':
msi: Generalize msix_supported to msi_supported
hyper-v: initialize Hyper-V CPUID leaves.
hyper-v: introduce Hyper-V support infrastructure.
Conflicts:
hw/msix.c
hw/msix.h
Signed-off-by: Avi Kivity <avi@redhat.com>
* commit '60ba3cc231d6bc7b802ad4fe6b6fc159ecb112e2':
msi: Generalize msix_supported to msi_supported
hyper-v: initialize Hyper-V CPUID leaves.
hyper-v: introduce Hyper-V support infrastructure.
Conflicts:
hw/msix.c
hw/msix.h
Signed-off-by: Avi Kivity <avi@redhat.com>