| commit | 8f4c2c6545580ce96ef0c51d61a8df6c0e96ee18 | |
| author | Avi Kivity <avi@redhat.com> | |
| Sun, 16 May 2010 12:58:18 +0000 (16 15:58 +0300) | ||
| committer | Avi Kivity <avi@redhat.com> | |
| Sun, 16 May 2010 12:58:18 +0000 (16 15:58 +0300) | ||
| tree | d9a9647b2eb40163040a41629a924a4ed161fdfa | treesnapshot (tar.gz zip) |
| parent | 0c81e6b5b6b7395306c7d2e5400ce9b3780291fb | commitdiff |
| parent | 6f09e686f807611aa03a91e37e9fb5cfc5283703 | commitdiff |
Merge commit '6f09e686f807611aa03a91e37e9fb5cfc5283703' into upstream-merge
* commit '6f09e686f807611aa03a91e37e9fb5cfc5283703':
pc: introduce a function to allocate cpu irq.
Conflicts:
hw/pc.c
Signed-off-by: Avi Kivity <avi@redhat.com>
* commit '6f09e686f807611aa03a91e37e9fb5cfc5283703':
pc: introduce a function to allocate cpu irq.
Conflicts:
hw/pc.c
Signed-off-by: Avi Kivity <avi@redhat.com>
| hw/pc.c | diff1 | diff2 | blobhistory |