Commit 24fb4133 authored by Max Reitz's avatar Max Reitz Committed by Kevin Wolf
Browse files

qmp: Introduce blockdev-change-medium 



Introduce a new QMP command 'blockdev-change-medium' which is intended
to replace the 'change' command for block devices. The existing function
qmp_change_blockdev() is accordingly renamed to
qmp_blockdev_change_medium().

Signed-off-by: default avatarMax Reitz <mreitz@redhat.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent f1f57066

blockdev.c

+4 −3
Original line number Diff line number Diff line
@@ -2143,8 +2143,9 @@ void qmp_blockdev_insert_medium(const char *device, const char *node_name, 
    qmp_blockdev_insert_anon_medium(device, bs, errp);

}



void qmp_change_blockdev(const char *device, const char *filename,

                         const char *format, Error **errp)

void qmp_blockdev_change_medium(const char *device, const char *filename,

                                bool has_format, const char *format,

                                Error **errp)

{

    BlockBackend *blk;

    BlockDriverState *medium_bs = NULL;
@@ -2165,7 +2166,7 @@ void qmp_change_blockdev(const char *device, const char *filename, 


    bdrv_flags = blk_get_open_flags_from_root_state(blk);



    if (format) {

    if (has_format) {

        options = qdict_new();

        qdict_put(options, "driver", qstring_from_str(format));

    }

include/sysemu/blockdev.h

+0 −2
Original line number Diff line number Diff line
@@ -63,8 +63,6 @@ DriveInfo *drive_new(QemuOpts *arg, BlockInterfaceType block_default_type); 


/* device-hotplug */



void qmp_change_blockdev(const char *device, const char *filename,

                         const char *format, Error **errp);

void hmp_commit(Monitor *mon, const QDict *qdict);

void hmp_drive_del(Monitor *mon, const QDict *qdict);

#endif

qapi-schema.json

+4 −2
Original line number Diff line number Diff line
@@ -1856,8 +1856,10 @@ 
#          device's password.  The behavior of reads and writes to the block

#          device between when these calls are executed is undefined.

#

# Notes:  It is strongly recommended that this interface is not used especially

#         for changing block devices.

# Notes:  This interface is deprecated, and it is strongly recommended that you

#         avoid using it.  For changing block devices, use

#         blockdev-change-medium; for changing VNC parameters, use

#         change-vnc-password.

#

# Since: 0.14.0

##

qapi/block-core.json

+23 −0
Original line number Diff line number Diff line
@@ -1958,6 +1958,29 @@ 
            'node-name': 'str'} }





##

# @blockdev-change-medium:

#

# Changes the medium inserted into a block device by ejecting the current medium

# and loading a new image file which is inserted as the new medium (this command

# combines blockdev-open-tray, blockdev-remove-medium, blockdev-insert-medium

# and blockdev-close-tray).

#

# @device:          block device name

#

# @filename:        filename of the new image to be loaded

#

# @format:          #optional, format to open the new image with (defaults to

#                   the probed format)

#

# Since: 2.5

##

{ 'command': 'blockdev-change-medium',

  'data': { 'device': 'str',

            'filename': 'str',

            '*format': 'str' } }





##

# @BlockErrorAction

#

qmp-commands.hx

+31 −0
Original line number Diff line number Diff line
@@ -4179,6 +4179,37 @@ Example: 
                      }

                   } } ] }



EQMP



    {

        .name       = "blockdev-change-medium",

        .args_type  = "device:B,filename:F,format:s?",

        .mhandler.cmd_new = qmp_marshal_blockdev_change_medium,

    },



SQMP

blockdev-change-medium

----------------------



Changes the medium inserted into a block device by ejecting the current medium

and loading a new image file which is inserted as the new medium.



Arguments:



- "device": device name (json-string)

- "filename": filename of the new image (json-string)

- "format": format of the new image (json-string, optional)



Examples:



1. Change a removable medium



-> { "execute": "blockdev-change-medium",

             "arguments": { "device": "ide1-cd0",

                            "filename": "/srv/images/Fedora-12-x86_64-DVD.iso",

                            "format": "raw" } }

<- { "return": {} }



EQMP



    {