Commit 7d60133f authored by John Snow's avatar John Snow
Browse files

IDE: deprecate ide-drive 



It's an old compatibility shim that just delegates to ide-cd or ide-hd.
I'd like to refactor these some day, and getting rid of the super-object
will make that easier.

Either way, we don't need this.

Signed-off-by: default avatarJohn Snow <jsnow@redhat.com>
Reviewed-by: default avatarThomas Huth <thuth@redhat.com>
Reviewed-by: default avatarMarkus Armbruster <armbru@redhat.com>
ACKed-by: default avatarPeter Krempa <pkrempa@redhat.com>
Message-id: 20191009224303.10232-2-jsnow@redhat.com
Signed-off-by: default avatarJohn Snow <jsnow@redhat.com>
parent 68d8ef4e

hw/ide/qdev.c

+3 −0
Original line number Diff line number Diff line
@@ -279,6 +279,9 @@ static void ide_drive_realize(IDEDevice *dev, Error **errp) 
{

    DriveInfo *dinfo = NULL;



    warn_report("'ide-drive' is deprecated, "

                "please use 'ide-hd' or 'ide-cd' instead");



    if (dev->conf.blk) {

        dinfo = blk_legacy_dinfo(dev->conf.blk);

    }

qemu-deprecated.texi

+5 −0
Original line number Diff line number Diff line
@@ -254,6 +254,11 @@ quite a bit. It will be removed without replacement unless some users speaks 
up at the @email{qemu-devel@@nongnu.org} mailing list with information about

their usecases.



@subsection ide-drive (since 4.2)



The 'ide-drive' device is deprecated. Users should use 'ide-hd' or

'ide-cd' as appropriate to get an IDE hard disk or CD-ROM as needed.



@section System emulator machines



@subsection pc-0.12, pc-0.13, pc-0.14 and pc-0.15 (since 4.0)

tests/qemu-iotests/051.pc.out

+4 −2
Original line number Diff line number Diff line
@@ -158,7 +158,8 @@ QEMU X.Y.Z monitor - type 'help' for more information 


Testing: -drive if=none,id=disk -device ide-drive,drive=disk

QEMU X.Y.Z monitor - type 'help' for more information

(qemu) QEMU_PROG: -device ide-drive,drive=disk: Device needs media, but drive is empty

(qemu) QEMU_PROG: -device ide-drive,drive=disk: warning: 'ide-drive' is deprecated, please use 'ide-hd' or 'ide-cd' instead

QEMU_PROG: -device ide-drive,drive=disk: Device needs media, but drive is empty



Testing: -drive if=none,id=disk -device ide-hd,drive=disk

QEMU X.Y.Z monitor - type 'help' for more information
@@ -228,7 +229,8 @@ QEMU X.Y.Z monitor - type 'help' for more information 


Testing: -drive file=TEST_DIR/t.qcow2,if=none,id=disk,readonly=on -device ide-drive,drive=disk

QEMU X.Y.Z monitor - type 'help' for more information

(qemu) QEMU_PROG: -device ide-drive,drive=disk: Block node is read-only

(qemu) QEMU_PROG: -device ide-drive,drive=disk: warning: 'ide-drive' is deprecated, please use 'ide-hd' or 'ide-cd' instead

QEMU_PROG: -device ide-drive,drive=disk: Block node is read-only



Testing: -drive file=TEST_DIR/t.qcow2,if=none,id=disk,readonly=on -device ide-hd,drive=disk

QEMU X.Y.Z monitor - type 'help' for more information