Applied all relevant upstream patches.
Cleaned up the CD-ROM stuff a bit more, merging the drive and the image parts. Updated disk, cdrom and zip structures to use the same bus_id union.
This commit is contained in:
Cleaned up the CD-ROM stuff a bit more, merging the drive and the image parts. Updated disk, cdrom and zip structures to use the same bus_id union.