| Message ID | 1369917299-5725-7-git-send-email-stefanha@redhat.com |
|---|---|
| State | New |
| Headers | show |
On 05/30/2013 06:34 AM, Stefan Hajnoczi wrote: > @drive-backup > > Start a point-in-time copy of a block device to a new destination. The > status of ongoing drive-backup operations can be checked with > query-block-jobs where the BlockJobInfo.type field has the value 'backup'. > The operation can be stopped before it has completed using the > block-job-cancel command. > > Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> > --- > blockdev.c | 97 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ > qapi-schema.json | 46 +++++++++++++++++++++++++++ > qmp-commands.hx | 46 +++++++++++++++++++++++++++ > 3 files changed, 189 insertions(+) Reviewed-by: Eric Blake <eblake@redhat.com>
Am 30.05.2013 um 14:34 hat Stefan Hajnoczi geschrieben: > @drive-backup > > Start a point-in-time copy of a block device to a new destination. The > status of ongoing drive-backup operations can be checked with > query-block-jobs where the BlockJobInfo.type field has the value 'backup'. > The operation can be stopped before it has completed using the > block-job-cancel command. > > @device: the name of the device which should be copied. > > @target: the target of the new image. If the file exists, or if it > is a device, the existing file/device will be used as the new > destination. If it does not exist, a new file will be created. > > @format: #optional the format of the new destination, default is to > probe if @mode is 'existing', else the format of the source > > @mode: #optional whether and how QEMU should create a new image, default is > 'absolute-paths'. > > @speed: #optional the maximum speed, in bytes per second > > @on-source-error: #optional the action to take on an error on the source, > default 'report'. 'stop' and 'enospc' can only be used > if the block device supports io-status (see BlockInfo). > > @on-target-error: #optional the action to take on an error on the target, > default 'report' (no limitations, since this applies to > a different block device than @device). > > Note that @on-source-error and @on-target-error only affect background I/O. > If an error occurs during a guest write request, the device's rerror/werror > actions will be used. > > Returns: nothing on success > If @device is not a valid block device, DeviceNotFound > > Since 1.6 > > Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> Reviewed-by: Kevin Wolf <kwolf@redhat.com> But what about HMP, the series doesn't seem to have a separate patch to add a command there?
On Wed, Jun 19, 2013 at 01:07:42PM +0200, Kevin Wolf wrote: > Am 30.05.2013 um 14:34 hat Stefan Hajnoczi geschrieben: > > @drive-backup > > > > Start a point-in-time copy of a block device to a new destination. The > > status of ongoing drive-backup operations can be checked with > > query-block-jobs where the BlockJobInfo.type field has the value 'backup'. > > The operation can be stopped before it has completed using the > > block-job-cancel command. > > > > @device: the name of the device which should be copied. > > > > @target: the target of the new image. If the file exists, or if it > > is a device, the existing file/device will be used as the new > > destination. If it does not exist, a new file will be created. > > > > @format: #optional the format of the new destination, default is to > > probe if @mode is 'existing', else the format of the source > > > > @mode: #optional whether and how QEMU should create a new image, default is > > 'absolute-paths'. > > > > @speed: #optional the maximum speed, in bytes per second > > > > @on-source-error: #optional the action to take on an error on the source, > > default 'report'. 'stop' and 'enospc' can only be used > > if the block device supports io-status (see BlockInfo). > > > > @on-target-error: #optional the action to take on an error on the target, > > default 'report' (no limitations, since this applies to > > a different block device than @device). > > > > Note that @on-source-error and @on-target-error only affect background I/O. > > If an error occurs during a guest write request, the device's rerror/werror > > actions will be used. > > > > Returns: nothing on success > > If @device is not a valid block device, DeviceNotFound > > > > Since 1.6 > > > > Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> > > Reviewed-by: Kevin Wolf <kwolf@redhat.com> > > But what about HMP, the series doesn't seem to have a separate patch to > add a command there? I can send it as a follow-up if you want. The test cases use QMP and so do management tools - I didn't feel the need for HMP. Stefan
Am 20.06.2013 um 14:19 hat Stefan Hajnoczi geschrieben: > On Wed, Jun 19, 2013 at 01:07:42PM +0200, Kevin Wolf wrote: > > Am 30.05.2013 um 14:34 hat Stefan Hajnoczi geschrieben: > > > @drive-backup > > > > > > Start a point-in-time copy of a block device to a new destination. The > > > status of ongoing drive-backup operations can be checked with > > > query-block-jobs where the BlockJobInfo.type field has the value 'backup'. > > > The operation can be stopped before it has completed using the > > > block-job-cancel command. > > > > > > @device: the name of the device which should be copied. > > > > > > @target: the target of the new image. If the file exists, or if it > > > is a device, the existing file/device will be used as the new > > > destination. If it does not exist, a new file will be created. > > > > > > @format: #optional the format of the new destination, default is to > > > probe if @mode is 'existing', else the format of the source > > > > > > @mode: #optional whether and how QEMU should create a new image, default is > > > 'absolute-paths'. > > > > > > @speed: #optional the maximum speed, in bytes per second > > > > > > @on-source-error: #optional the action to take on an error on the source, > > > default 'report'. 'stop' and 'enospc' can only be used > > > if the block device supports io-status (see BlockInfo). > > > > > > @on-target-error: #optional the action to take on an error on the target, > > > default 'report' (no limitations, since this applies to > > > a different block device than @device). > > > > > > Note that @on-source-error and @on-target-error only affect background I/O. > > > If an error occurs during a guest write request, the device's rerror/werror > > > actions will be used. > > > > > > Returns: nothing on success > > > If @device is not a valid block device, DeviceNotFound > > > > > > Since 1.6 > > > > > > Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> > > > > Reviewed-by: Kevin Wolf <kwolf@redhat.com> > > > > But what about HMP, the series doesn't seem to have a separate patch to > > add a command there? > > I can send it as a follow-up if you want. The test cases use QMP and so > do management tools - I didn't feel the need for HMP. Yes, please do. HMP is what plain qemu users use. I wouldn't consider it legacy - quite the opposite: Having QMP as a stable machine-readable protocol gives us more freedom to make HMP a good interface for human users. Kevin
diff --git a/blockdev.c b/blockdev.c index 73b175b..5de33f5 100644 --- a/blockdev.c +++ b/blockdev.c @@ -1346,6 +1346,103 @@ void qmp_block_commit(const char *device, drive_get_ref(drive_get_by_blockdev(bs)); } +void qmp_drive_backup(const char *device, const char *target, + bool has_format, const char *format, + bool has_mode, enum NewImageMode mode, + bool has_speed, int64_t speed, + bool has_on_source_error, BlockdevOnError on_source_error, + bool has_on_target_error, BlockdevOnError on_target_error, + Error **errp) +{ + BlockDriverState *bs; + BlockDriverState *target_bs; + BlockDriver *drv = NULL; + Error *local_err = NULL; + int flags; + int64_t size; + int ret; + + if (!has_speed) { + speed = 0; + } + if (!has_on_source_error) { + on_source_error = BLOCKDEV_ON_ERROR_REPORT; + } + if (!has_on_target_error) { + on_target_error = BLOCKDEV_ON_ERROR_REPORT; + } + if (!has_mode) { + mode = NEW_IMAGE_MODE_ABSOLUTE_PATHS; + } + + bs = bdrv_find(device); + if (!bs) { + error_set(errp, QERR_DEVICE_NOT_FOUND, device); + return; + } + + if (!bdrv_is_inserted(bs)) { + error_set(errp, QERR_DEVICE_HAS_NO_MEDIUM, device); + return; + } + + if (!has_format) { + format = mode == NEW_IMAGE_MODE_EXISTING ? NULL : bs->drv->format_name; + } + if (format) { + drv = bdrv_find_format(format); + if (!drv) { + error_set(errp, QERR_INVALID_BLOCK_FORMAT, format); + return; + } + } + + if (bdrv_in_use(bs)) { + error_set(errp, QERR_DEVICE_IN_USE, device); + return; + } + + flags = bs->open_flags | BDRV_O_RDWR; + + size = bdrv_getlength(bs); + if (size < 0) { + error_setg_errno(errp, -size, "bdrv_getlength failed"); + return; + } + + if (mode != NEW_IMAGE_MODE_EXISTING) { + assert(format && drv); + bdrv_img_create(target, format, + NULL, NULL, NULL, size, flags, &local_err, false); + } + + if (error_is_set(&local_err)) { + error_propagate(errp, local_err); + return; + } + + target_bs = bdrv_new(""); + ret = bdrv_open(target_bs, target, NULL, flags, drv); + if (ret < 0) { + bdrv_delete(target_bs); + error_set(errp, QERR_OPEN_FILE_FAILED, target); + return; + } + + backup_start(bs, target_bs, speed, on_source_error, on_target_error, + block_job_cb, bs, &local_err); + if (local_err != NULL) { + bdrv_delete(target_bs); + error_propagate(errp, local_err); + return; + } + + /* Grab a reference so hotplug does not delete the BlockDriverState from + * underneath us. + */ + drive_get_ref(drive_get_by_blockdev(bs)); +} + #define DEFAULT_MIRROR_BUF_SIZE (10 << 20) void qmp_drive_mirror(const char *device, const char *target, diff --git a/qapi-schema.json b/qapi-schema.json index ef1f657..55b1a37 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -1730,6 +1730,52 @@ '*speed': 'int' } } ## +# @drive-backup +# +# Start a point-in-time copy of a block device to a new destination. The +# status of ongoing drive-backup operations can be checked with +# query-block-jobs where the BlockJobInfo.type field has the value 'backup'. +# The operation can be stopped before it has completed using the +# block-job-cancel command. +# +# @device: the name of the device which should be copied. +# +# @target: the target of the new image. If the file exists, or if it +# is a device, the existing file/device will be used as the new +# destination. If it does not exist, a new file will be created. +# +# @format: #optional the format of the new destination, default is to +# probe if @mode is 'existing', else the format of the source +# +# @mode: #optional whether and how QEMU should create a new image, default is +# 'absolute-paths'. +# +# @speed: #optional the maximum speed, in bytes per second +# +# @on-source-error: #optional the action to take on an error on the source, +# default 'report'. 'stop' and 'enospc' can only be used +# if the block device supports io-status (see BlockInfo). +# +# @on-target-error: #optional the action to take on an error on the target, +# default 'report' (no limitations, since this applies to +# a different block device than @device). +# +# Note that @on-source-error and @on-target-error only affect background I/O. +# If an error occurs during a guest write request, the device's rerror/werror +# actions will be used. +# +# Returns: nothing on success +# If @device is not a valid block device, DeviceNotFound +# +# Since 1.6 +## +{ 'command': 'drive-backup', + 'data': { 'device': 'str', 'target': 'str', '*format': 'str', + '*mode': 'NewImageMode', '*speed': 'int', + '*on-source-error': 'BlockdevOnError', + '*on-target-error': 'BlockdevOnError' } } + +## # @drive-mirror # # Start mirroring a block device's writes to a new destination. diff --git a/qmp-commands.hx b/qmp-commands.hx index ffd130e..d1f7766 100644 --- a/qmp-commands.hx +++ b/qmp-commands.hx @@ -912,6 +912,52 @@ EQMP }, { + .name = "drive-backup", + .args_type = "device:B,target:s,speed:i?,mode:s?,format:s?," + "on-source-error:s?,on-target-error:s?", + .mhandler.cmd_new = qmp_marshal_input_drive_backup, + }, + +SQMP +drive-backup +------------ + +Start a point-in-time copy of a block device to a new destination. The +status of ongoing drive-backup operations can be checked with +query-block-jobs where the BlockJobInfo.type field has the value 'backup'. +The operation can be stopped before it has completed using the +block-job-cancel command. + +Arguments: + +- "device": the name of the device which should be copied. + (json-string) +- "target": the target of the new image. If the file exists, or if it is a + device, the existing file/device will be used as the new + destination. If it does not exist, a new file will be created. + (json-string) +- "format": the format of the new destination, default is to probe if 'mode' is + 'existing', else the format of the source + (json-string, optional) +- "mode": whether and how QEMU should create a new image + (NewImageMode, optional, default 'absolute-paths') +- "speed": the maximum speed, in bytes per second (json-int, optional) +- "on-source-error": the action to take on an error on the source, default + 'report'. 'stop' and 'enospc' can only be used + if the block device supports io-status. + (BlockdevOnError, optional) +- "on-target-error": the action to take on an error on the target, default + 'report' (no limitations, since this applies to + a different block device than device). + (BlockdevOnError, optional) + +Example: +-> { "execute": "drive-backup", "arguments": { "device": "drive0", + "target": "backup.img" } } +<- { "return": {} } +EQMP + + { .name = "block-job-set-speed", .args_type = "device:B,speed:o", .mhandler.cmd_new = qmp_marshal_input_block_job_set_speed,
@drive-backup Start a point-in-time copy of a block device to a new destination. The status of ongoing drive-backup operations can be checked with query-block-jobs where the BlockJobInfo.type field has the value 'backup'. The operation can be stopped before it has completed using the block-job-cancel command. @device: the name of the device which should be copied. @target: the target of the new image. If the file exists, or if it is a device, the existing file/device will be used as the new destination. If it does not exist, a new file will be created. @format: #optional the format of the new destination, default is to probe if @mode is 'existing', else the format of the source @mode: #optional whether and how QEMU should create a new image, default is 'absolute-paths'. @speed: #optional the maximum speed, in bytes per second @on-source-error: #optional the action to take on an error on the source, default 'report'. 'stop' and 'enospc' can only be used if the block device supports io-status (see BlockInfo). @on-target-error: #optional the action to take on an error on the target, default 'report' (no limitations, since this applies to a different block device than @device). Note that @on-source-error and @on-target-error only affect background I/O. If an error occurs during a guest write request, the device's rerror/werror actions will be used. Returns: nothing on success If @device is not a valid block device, DeviceNotFound Since 1.6 Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> --- blockdev.c | 97 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ qapi-schema.json | 46 +++++++++++++++++++++++++++ qmp-commands.hx | 46 +++++++++++++++++++++++++++ 3 files changed, 189 insertions(+)