]> git.ipfire.org Git - thirdparty/qemu.git/commitdiff
iotests: Adjust fuse-allow-other expected output
authorEric Blake <eblake@redhat.com>
Tue, 21 Oct 2025 20:58:40 +0000 (15:58 -0500)
committerKevin Wolf <kwolf@redhat.com>
Wed, 29 Oct 2025 11:10:09 +0000 (12:10 +0100)
The iotest fuse-allow-other has been broken since commit effd60c8 in
v9.0.0; but as Dan Berrange's efforts to improve CI have proven, we
haven't been reliably running it to notice.  The change in that commit
was good (moving coroutine commands to run in the right context), but
it meant that "execute":"quit" now waits to complete until the
coroutines tearing down fuse have first reported the SHUTDOWN event,
in the opposite order of what happened pre-patch.

Signed-off-by: Eric Blake <eblake@redhat.com>
Fixes: effd60c8 ("monitor: only run coroutine commands in qemu_aio_context",
Reported-by: Daniel P. Berrangé <berrange@redhat.com>
Message-ID: <20251021205843.2585624-2-eblake@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
tests/qemu-iotests/tests/fuse-allow-other.out

index 543fa52a06369de0a4b21a66b6c4635f78c7f9f3..3219fc35e051b4b38179feba3db9a96d1c4a9ffb 100644 (file)
@@ -28,9 +28,9 @@ stat: cannot statx 'fuse-export': Permission denied
 cat: fuse-export: Permission denied
 stat: cannot statx 'fuse-export': Permission denied
 {'execute': 'quit'}
-{"return": {}}
 {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}}
 {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "BLOCK_EXPORT_DELETED", "data": {"id": "export"}}
+{"return": {}}
 
 --- allow-other=on ---
 {'execute': 'qmp_capabilities'}
@@ -55,9 +55,9 @@ Permissions seen by nobody: 444
 cat: fuse-export: Permission denied
 Permissions seen by nobody: 440
 {'execute': 'quit'}
-{"return": {}}
 {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}}
 {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "BLOCK_EXPORT_DELETED", "data": {"id": "export"}}
+{"return": {}}
 
 --- allow-other=auto ---
 {'execute': 'qmp_capabilities'}
@@ -82,7 +82,7 @@ Permissions seen by nobody: 444
 cat: fuse-export: Permission denied
 Permissions seen by nobody: 440
 {'execute': 'quit'}
-{"return": {}}
 {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}}
 {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "BLOCK_EXPORT_DELETED", "data": {"id": "export"}}
+{"return": {}}
 *** done