• M
    hw: Drop superfluous special checks for orphaned -drive · 8f2d75e8
    Markus Armbruster 提交于
    We've traditionally rejected orphans here and there, but not
    systematically.  For instance, the sun4m machines have an onboard SCSI
    HBA (bus=0), and have always rejected bus>0.  Other machines with an
    onboard SCSI HBA don't.
    
    Commit a66c9dc7 made all orphans trigger a warning, and the previous
    commit turned this into an error.  The checks "here and there" are now
    redundant.  Drop them.
    
    Note that the one in mips_jazz.c was wrong: it rejected bus > MAX_FD,
    but MAX_FD is the number of floppy drives per bus.
    
    Error messages change from
    
        $ qemu-system-x86_64 -drive if=ide,bus=2
        qemu-system-x86_64: Too many IDE buses defined (3 > 2)
        $ qemu-system-mips64 -M magnum,accel=qtest -drive if=floppy,bus=2,id=fd1
        qemu: too many floppy drives
        $ qemu-system-sparc -M LX -drive if=scsi,bus=1
        qemu: too many SCSI bus
    
    to
    
        $ qemu-system-x86_64 -drive if=ide,bus=2
        qemu-system-x86_64: -drive if=ide,bus=2: machine type does not support if=ide,bus=2,unit=0
        $ qemu-system-mips64 -M magnum,accel=qtest -drive if=floppy,bus=2,id=fd1
        qemu-system-mips64: -drive if=floppy,bus=2,id=fd1: machine type does not support if=floppy,bus=2,unit=0
        $ qemu-system-sparc -M LX -drive if=scsi,bus=1
        qemu-system-sparc: -drive if=scsi,bus=1: machine type does not support if=scsi,bus=1,unit=0
    
    Cc: John Snow <jsnow@redhat.com>
    Cc: "Hervé Poussineau" <hpoussin@reactos.org>
    Cc: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
    Signed-off-by: NMarkus Armbruster <armbru@redhat.com>
    Message-Id: <1487153147-11530-9-git-send-email-armbru@redhat.com>
    Reviewed-by: NJohn Snow <jsnow@redhat.com>
    8f2d75e8
mips_jazz.c 12.8 KB