| commit | 0836b77f0f65d56d08bdeffbac25cd6d78267dc9 | |
| author | Marcelo Tosatti <mtosatti@redhat.com> | |
| Tue, 15 Mar 2011 01:36:27 +0000 (14 22:36 -0300) | ||
| committer | Marcelo Tosatti <mtosatti@redhat.com> | |
| Tue, 15 Mar 2011 01:36:27 +0000 (14 22:36 -0300) | ||
| tree | b35c31880ffe80da4c1e8235f66fca996e895a59 | treesnapshot (tar.gz zip) |
| parent | ac166344df588a0fa455eb18ff4d083f709a8685 | commitdiff |
| parent | 64d7e9a421fea0ac50b44541f5521de455e7cd5d | commitdiff |
Merge commit '64d7e9a421fea0ac50b44541f5521de455e7cd5d' into upstream-merge
* commit '64d7e9a421fea0ac50b44541f5521de455e7cd5d':
i8254: convert to qdev
vga-isa: make optional
vga-isa: convert to qdev
applesmc: make optional
fdc: make optional
fdc: refactor device creation
fdc: use FDriveType for floppy drive type
fdc: move floppy geometry guessing to block.c
serial: make optional
serial: refactor device creation
ne2000_isa: make optional
ne2000_isa: refactor device creation
parallel: make optional
parallel: refactor device creation
Conflicts:
hw/i8254.c
hw/pc.c
* commit '64d7e9a421fea0ac50b44541f5521de455e7cd5d':
i8254: convert to qdev
vga-isa: make optional
vga-isa: convert to qdev
applesmc: make optional
fdc: make optional
fdc: refactor device creation
fdc: use FDriveType for floppy drive type
fdc: move floppy geometry guessing to block.c
serial: make optional
serial: refactor device creation
ne2000_isa: make optional
ne2000_isa: refactor device creation
parallel: make optional
parallel: refactor device creation
Conflicts:
hw/i8254.c
hw/pc.c