Commit f6c3dc13 authored by Max Reitz's avatar Max Reitz
Browse files

tests/ahci: Switch tray and medium commands to @id 



Currently, the tray and medium commands in the AHCI test use the
deprecated @device parameter.  This patch switches all invocations over
to use @id.

Signed-off-by: default avatarMax Reitz <mreitz@redhat.com>
Message-id: 20171110224302.14424-3-mreitz@redhat.com
Reviewed-by: default avatarAlberto Garcia <berto@igalia.com>
Signed-off-by: default avatarMax Reitz <mreitz@redhat.com>
parent 1d701e0e

tests/ahci-test.c

+6 −6
Original line number Diff line number Diff line
@@ -1578,9 +1578,9 @@ static void test_atapi_tray(void) 
    QDict *rsp;



    fd = prepare_iso(iso_size, &tx, &iso);

    ahci = ahci_boot_and_enable("-drive if=none,id=drive0,file=%s,format=raw "

    ahci = ahci_boot_and_enable("-blockdev node-name=drive0,driver=file,filename=%s "

                                "-M q35 "

                                "-device ide-cd,drive=drive0 ", iso);

                                "-device ide-cd,id=cd0,drive=drive0 ", iso);

    port = ahci_port_select(ahci);



    ahci_atapi_eject(ahci, port);
@@ -1591,13 +1591,13 @@ static void test_atapi_tray(void) 


    /* Remove media */

    qmp_async("{'execute': 'blockdev-open-tray', "

               "'arguments': {'device': 'drive0'}}");

               "'arguments': {'id': 'cd0'}}");

    atapi_wait_tray(true);

    rsp = qmp_receive();

    QDECREF(rsp);



    qmp_discard_response("{'execute': 'x-blockdev-remove-medium', "

                         "'arguments': {'device': 'drive0'}}");

                         "'arguments': {'id': 'cd0'}}");



    /* Test the tray without a medium */

    ahci_atapi_load(ahci, port);
@@ -1613,12 +1613,12 @@ static void test_atapi_tray(void) 
                                        "'file': { 'driver': 'file', "

                                                  "'filename': %s }}}", iso);

    qmp_discard_response("{'execute': 'x-blockdev-insert-medium',"

                          "'arguments': { 'device': 'drive0', "

                          "'arguments': { 'id': 'cd0', "

                                         "'node-name': 'node0' }}");



    /* Again, the event shows up first */

    qmp_async("{'execute': 'blockdev-close-tray', "

               "'arguments': {'device': 'drive0'}}");

               "'arguments': {'id': 'cd0'}}");

    atapi_wait_tray(false);

    rsp = qmp_receive();

    QDECREF(rsp);