diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-10-23 18:14:42 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-10-23 18:14:42 +0100 |
| commit | af25e7277d3e95a3ea31023f31d8097ab5e2ac84 (patch) | |
| tree | 863e07f7049b458f905211a0330ad6c81286b1e5 /tests/fdc-test.c | |
| parent | bc79082e4cd12c1241fa03b0abceacf45f537740 (diff) | |
| parent | c07bc2c1658fffeee08eb46402b2f66d55b07586 (diff) | |
| download | focaccia-qemu-af25e7277d3e95a3ea31023f31d8097ab5e2ac84.tar.gz focaccia-qemu-af25e7277d3e95a3ea31023f31d8097ab5e2ac84.zip | |
Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging
Block layer patches
# gpg: Signature made Fri 23 Oct 2015 17:59:56 BST using RSA key ID C88F2FD6
# gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>"
* remotes/kevin/tags/for-upstream: (37 commits)
tests: Add test case for aio_disable_external
block: Add "drained begin/end" for internal snapshot
block: Add "drained begin/end" for transactional blockdev-backup
block: Add "drained begin/end" for transactional backup
block: Add "drained begin/end" for transactional external snapshot
block: Introduce "drained begin/end" API
aio: introduce aio_{disable,enable}_external
dataplane: Mark host notifiers' client type as "external"
nbd: Mark fd handlers client type as "external"
aio: Add "is_external" flag for event handlers
throttle: Remove throttle_group_lock/unlock()
blockdev: Allow more options for BB-less BDS tree
blockdev: Pull out blockdev option extraction
blockdev: Do not create BDS for empty drive
block: Prepare for NULL BDS
block: Add blk_insert_bs()
block: Prepare remaining BB functions for NULL BDS
block: Fail requests to empty BlockBackend
block: Make some BB functions fall back to BBRS
block: Add BlockBackendRootState
...
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests/fdc-test.c')
| -rw-r--r-- | tests/fdc-test.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/tests/fdc-test.c b/tests/fdc-test.c index 416394fc77..b5a4696d86 100644 --- a/tests/fdc-test.c +++ b/tests/fdc-test.c @@ -304,9 +304,7 @@ static void test_media_insert(void) qmp_discard_response("{'execute':'change', 'arguments':{" " 'device':'floppy0', 'target': %s, 'arg': 'raw' }}", test_image); - qmp_discard_response(""); /* ignore event - (FIXME open -> open transition?!) */ - qmp_discard_response(""); /* ignore event */ + qmp_discard_response(""); /* ignore event (open -> close) */ dir = inb(FLOPPY_BASE + reg_dir); assert_bit_set(dir, DSKCHG); |