mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
24,064 Commits 50 Branches 394 Tags 404 MiB
2c13ec50e7
Commit Graph

2 Commits

Author SHA1 Message Date
Andreas Färber
63e3555e80 Merge branch 'master' of git://git.qemu.org/qemu into prep-up 
Conflicts:
	hw/Makefile.objs
	hw/ppc_prep.c

Signed-off-by: Andreas Färber <andreas.faerber@web.de>
 2013-01-10 21:52:28 +01:00
Hervé Poussineau
1ae41f447d prep: Add pc87312 Super I/O emulation 
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>
 2012-08-15 22:10:58 +02:00