[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PULL 07/29] tests/ahci: Switch tray and medium commands to
From: |
Kevin Wolf |
Subject: |
[Qemu-block] [PULL 07/29] tests/ahci: Switch tray and medium commands to @id |
Date: |
Tue, 23 Jan 2018 15:01:39 +0100 |
From: Max Reitz <address@hidden>
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 <address@hidden>
Message-id: address@hidden
Reviewed-by: Alberto Garcia <address@hidden>
Signed-off-by: Max Reitz <address@hidden>
---
tests/ahci-test.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/tests/ahci-test.c b/tests/ahci-test.c
index cb84edc8fb..3635ea6d41 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);
--
2.13.6
- [Qemu-block] [PULL 00/29] Block layer patches, Kevin Wolf, 2018/01/23
- [Qemu-block] [PULL 02/29] hw/block: Fix pin-based interrupt behaviour of NVMe, Kevin Wolf, 2018/01/23
- [Qemu-block] [PULL 05/29] qcow2: Repair unaligned preallocated zero clusters, Kevin Wolf, 2018/01/23
- [Qemu-block] [PULL 01/29] osdep: Retry SETLK upon EINTR, Kevin Wolf, 2018/01/23
- [Qemu-block] [PULL 03/29] tests/.gitignore: Add test-bdrv-drain, Kevin Wolf, 2018/01/23
- [Qemu-block] [PULL 08/29] blockdev: Drop BD-{remove, insert}-medium's @device, Kevin Wolf, 2018/01/23
- [Qemu-block] [PULL 04/29] tests/qemu-iotests: adding savevm/loadvm with postcopy flag test, Kevin Wolf, 2018/01/23
- [Qemu-block] [PULL 07/29] tests/ahci: Switch tray and medium commands to @id,
Kevin Wolf <=
- [Qemu-block] [PULL 06/29] iotests: Make BD-{remove, insert}-medium use @id, Kevin Wolf, 2018/01/23
- [Qemu-block] [PULL 12/29] qcow2: No persistent dirty bitmaps for compat=0.10, Kevin Wolf, 2018/01/23
- [Qemu-block] [PULL 10/29] qemu-iotests: Fix locking issue in 102, Kevin Wolf, 2018/01/23
- [Qemu-block] [PULL 15/29] iotests: Fix _img_info for backslashes, Kevin Wolf, 2018/01/23
- [Qemu-block] [PULL 13/29] block/qcow: Add blkdebug events, Kevin Wolf, 2018/01/23
- [Qemu-block] [PULL 09/29] blockdev: Mark BD-{remove, insert}-medium stable, Kevin Wolf, 2018/01/23
- [Qemu-block] [PULL 11/29] block/vmdk: Fix , instead of ; at end of line, Kevin Wolf, 2018/01/23
- [Qemu-block] [PULL 16/29] iotests: Drop format-specific in _filter_img_info, Kevin Wolf, 2018/01/23
- [Qemu-block] [PULL 14/29] block/vmdk: Add blkdebug events, Kevin Wolf, 2018/01/23
- [Qemu-block] [PULL 21/29] iotests: Fix 059's reference output, Kevin Wolf, 2018/01/23