Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of git://git.qemu.org/qemu into prep-up | Andreas Färber | 2013-01-10 | 1 | -2/+3 |
| | | | | | | | | Conflicts: hw/Makefile.objs hw/ppc_prep.c Signed-off-by: Andreas Färber <andreas.faerber@web.de> | ||||
* | prep: Add pc87312 Super I/O emulation | Hervé Poussineau | 2012-08-15 | 1 | -0/+386 |
This provides floppy and IDE controllers as well as serial and parallel ports. However, dynamic configuration of devices is not yet supported. Signed-off-by: Hervé Poussineau <hpoussin@reactos.org> [AF: QOM'ify, split out header, create CharDriverState if absent] Signed-off-by: Andreas Färber <andreas.faerber@web.de> |