diff options
| author | Max Reitz <mreitz@redhat.com> | 2017-11-10 23:43:00 +0100 |
|---|---|---|
| committer | Max Reitz <mreitz@redhat.com> | 2018-01-23 12:34:42 +0100 |
| commit | f6c3dc136fe2b215cb2c6c5ff4a2c1faa1871640 (patch) | |
| tree | 93d8970b4241d4d16dd358963f5c3407af35582b | |
| parent | 1d701e0e7e3cdae803481216f572b8e4263d2b42 (diff) | |
| download | qemu-f6c3dc136fe2b215cb2c6c5ff4a2c1faa1871640.zip qemu-f6c3dc136fe2b215cb2c6c5ff4a2c1faa1871640.tar.gz qemu-f6c3dc136fe2b215cb2c6c5ff4a2c1faa1871640.tar.bz2 | |
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: Max Reitz <mreitz@redhat.com>
Message-id: 20171110224302.14424-3-mreitz@redhat.com
Reviewed-by: Alberto Garcia <berto@igalia.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
| -rw-r--r-- | tests/ahci-test.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/ahci-test.c b/tests/ahci-test.c index cb84edc..3635ea6 100644 --- a/tests/ahci-test.c +++ b/tests/ahci-test.c @@ -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); |