block: add 'force' parameter to 'blockdev-change-medium' command
PATCH v3 1/1 block: add 'force' parameter to 'blockdev-change-medium' command
'blockdev-change-medium' is a convinient wrapper for the following sequence of commands:
* blockdev-open-tray
* blockdev-remove-medium
* blockdev-insert-medium
* blockdev-close-tray
and should be used f.e. to change ISO image inside the CD-ROM tray. Though the guest could lock the tray and some linux guests like CentOS 8.5 actually does that. In this case the execution if this command results in the error like the following:
Device 'scsi0-0-1-0' is locked and force was not specified, wait for tray to open and try again.
This situation is could be resolved 'blockdev-open-tray' by passing flag 'force' inside. Thus is seems reasonable to add the same capability for 'blockdev-change-medium' too.
--- block/qapi-sysemu.c | 3 ++- hmp-commands.hx | 11 +++++++---- monitor/hmp-cmds.c | 4 +++- qapi/block.json | 6 ++++++ ui/cocoa.m | 1 + 5 files changed, 19 insertions(+), 6 deletions(-)
Changes from v2:
- fixed parameter's order in changeDeviceMedia(). This is a VERY interesting story, actually. Both versions of the patch (v2 & v3) compile silently. In order to see the difference one needs to enable -Weverything compilation option!
Changes from v1:
- added kludge to Objective C code
- simplified a bit call of do_open_tray() (thanks, Vova!)
- added record to hmp-command.hx
block/qapi-sysemu.c +2 -1
@@ -318,6 +318,7 @@ void qmp_blockdev_change_medium(bool has_device, const char *device, bool has_id, const char *id, const char *filename, bool has_format, const char *format, + bool has_force, bool force, bool has_read_only, BlockdevChangeReadOnlyMode read_only, Error **errp)
@@ -380,7 +381,7 @@ void qmp_blockdev_change_medium(bool has_device, const char *device, rc =do_open_tray (has_device ? device :NULL , has_id ? id :NULL , - false, &err); + force, &err);if (rc && rc != -ENOSYS ) {error_propagate (errp, err); goto fail;
hmp-commands.hx +7 -4
@@ -202,9 +202,9 @@ ERST { .name = "change", - .args_type = "device:B,target:F,arg:s?,read-only-mode:s?", - .params = "device filename [format [read-only-mode]]", - .help = "change a removable medium, optional format", + .args_type = "device:B,force:-f,target:F,arg:s?,read-only-mode:s?", + .params = "device [-f] filename [format [read-only-mode]]", + .help = "change a removable medium, optional format, use -f to force the operation", .cmd = hmp_change, },
@@ -212,11 +212,14 @@ SRST ``change`` *device* *setting* Change the configuration of a device. - ``change`` *diskdevice* *filename* [*format* [*read-only-mode*]] + ``change`` *diskdevice* [-f] *filename* [*format* [*read-only-mode*]] Change the medium for a removable disk device to point to *filename*. eg:: (qemu) change ide1-cd0 /path/to/some.iso + ``-f`` + forces the operation even if the guest has locked the tray. + *format* is optional. *read-only-mode* may be used to change the read-only status of the device.
monitor/hmp-cmds.c +3 -1
@@ -1472,6 +1472,7 @@ void hmp_change(Monitor *mon, const QDict *qdict)const char *target =qdict_get_str (qdict,"target" );const char *arg =qdict_get_try_str (qdict,"arg" );const char *read_only =qdict_get_try_str (qdict,"read-only-mode" ); +bool force =qdict_get_try_bool (qdict,"force" , false);BlockdevChangeReadOnlyMode read_only_mode =0 ;Error *err =NULL ;
@@ -1508,7 +1509,8 @@ void hmp_change(Monitor *mon, const QDict *qdict) }qmp_blockdev_change_medium (true, device, false,NULL , target, - !!arg, arg, !!read_only, read_only_mode, + !!arg, arg, true, force, + !!read_only, read_only_mode, &err); }
qapi/block.json +6 -0
@@ -326,6 +326,11 @@ # @read-only-mode: change the read-only mode of the device; defaults # to 'retain' # +# @force: if false (the default), an eject request through blockdev-open-tray +# will be sent to the guest if it has locked the tray (and the tray +# will not be opened immediately); if true, the tray will be opened +# regardless of whether it is locked. (since 7.1) +# # Features: # @deprecated: Member @device is deprecated. Use @id instead. #
@@ -367,6 +372,7 @@ '*id': 'str', 'filename': 'str', '*format': 'str', + '*force': 'bool', '*read-only-mode': 'BlockdevChangeReadOnlyMode' } }
ui/cocoa.m +1 -0
@@ -1529,6 +1529,7 @@ - (void)changeDeviceMedia:(id)sender false, NULL, [file cStringUsingEncoding: NSASCIIStringEncoding], true, "raw", + true, false, false, 0, &err);
Signature · 1 line
2.32.0
Quoted 38 lines · Denis V. Lunev
'blockdev-change-medium' is a convinient wrapper for the following sequence of commands:
* blockdev-open-tray
* blockdev-remove-medium
* blockdev-insert-medium
* blockdev-close-tray
and should be used f.e. to change ISO image inside the CD-ROM tray. Though the guest could lock the tray and some linux guests like CentOS 8.5 actually does that. In this case the execution if this command results in the error like the following:
Device 'scsi0-0-1-0' is locked and force was not specified, wait for tray to open and try again.This situation is could be resolved 'blockdev-open-tray' by passing flag 'force' inside. Thus is seems reasonable to add the same capability for 'blockdev-change-medium' too.
Signed-off-by Denis V. Lunev <[email protected]>Reviewed-by Vladimir Sementsov-Ogievskiy <[email protected]>CC Kevin Wolf <[email protected]>CC Hanna Reitz <[email protected]>CC Eric Blake <[email protected]>CC Markus Armbruster <[email protected]>--- block/qapi-sysemu.c | 3 ++- hmp-commands.hx | 11 +++++++---- monitor/hmp-cmds.c | 4 +++- qapi/block.json | 6 ++++++ ui/cocoa.m | 1 + 5 files changed, 19 insertions(+), 6 deletions(-)Changes from v2:
- fixed parameter's order inchangeDeviceMedia(). This is a VERY interesting story, actually. Both versions of the patch (v2 & v3) compile silently. In order to see the difference one needs to enable -Weverything compilation option!
Quoted 4 lines
Changes from v1:
- added kludge to Objective C code
- simplified a bit call ofdo_open_tray()(thanks, Vova!)
- added record to hmp-command.hx
With regards,
Daniel
Signature · 3 lines
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
Hanna Reitz
AppliedQuoted 24 lines · Denis V. Lunev
'blockdev-change-medium' is a convinient wrapper for the following sequence of commands:
* blockdev-open-tray
* blockdev-remove-medium
* blockdev-insert-medium
* blockdev-close-tray
and should be used f.e. to change ISO image inside the CD-ROM tray. Though the guest could lock the tray and some linux guests like CentOS 8.5 actually does that. In this case the execution if this command results in the error like the following:
Device 'scsi0-0-1-0' is locked and force was not specified, wait for tray to open and try again.This situation is could be resolved 'blockdev-open-tray' by passing flag 'force' inside. Thus is seems reasonable to add the same capability for 'blockdev-change-medium' too.
Signed-off-by Denis V. Lunev <[email protected]>Reviewed-by Vladimir Sementsov-Ogievskiy <[email protected]>CC Kevin Wolf <[email protected]>CC Hanna Reitz <[email protected]>CC Eric Blake <[email protected]>CC Markus Armbruster <[email protected]>
Quoted 7 lines
--- block/qapi-sysemu.c | 3 ++- hmp-commands.hx | 11 +++++++---- monitor/hmp-cmds.c | 4 +++- qapi/block.json | 6 ++++++ ui/cocoa.m | 1 + 5 files changed, 19 insertions(+), 6 deletions(-)
Thanks, applied to my block branch: