diff options
author | Anthony Liguori <aliguori@us.ibm.com> | 2013-01-30 10:48:23 -0600 |
---|---|---|
committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-01-30 10:48:23 -0600 |
commit | 7cc2a8b14a363777e7d5b7d102176fba0cf27667 (patch) | |
tree | 5d0d5684ddd1c8a715bbfb38b9bf865a1e3b9d95 /block/vmdk.c | |
parent | 6ac5107dc7045f2edc43ada2cb3f18d372b9be0b (diff) | |
parent | 75610155562bd480356a7a5018e5de4c44ec7884 (diff) | |
download | qemu-7cc2a8b14a363777e7d5b7d102176fba0cf27667.zip qemu-7cc2a8b14a363777e7d5b7d102176fba0cf27667.tar.gz qemu-7cc2a8b14a363777e7d5b7d102176fba0cf27667.tar.bz2 |
Merge remote-tracking branch 'afaerber-or/prep-up' into staging
# By Andreas Färber
# Via Andreas Färber
* afaerber-or/prep-up:
prep: Move PReP machine to hw/ppc/
prep_pci: Convert to QOM realizefn
prep_pci: Create PCIBus and PCIDevice in-place
Diffstat (limited to 'block/vmdk.c')
0 files changed, 0 insertions, 0 deletions