Commit 939a1cc3 authored by Stefan Hajnoczi's avatar Stefan Hajnoczi Committed by Luiz Capitulino
Browse files

block: use proper qerrors in qmp_block_resize 



Let's report specific errors so that management tools and users can
identify the problem.

Two new qerrors are needed:
 * QERR_DEVICE_HAS_NO_MEDIUM for ENOMEDIUM
 * QERR_DEVICE_IS_READ_ONLY for EACCES

Signed-off-by: default avatarStefan Hajnoczi <stefanha@linux.vnet.ibm.com>
Signed-off-by: default avatarLuiz Capitulino <lcapitulino@redhat.com>
parent c1303596

blockdev.c

+18 −8
Original line number Diff line number Diff line
@@ -848,11 +848,6 @@ int do_drive_del(Monitor *mon, const QDict *qdict, QObject **ret_data) 
    return 0;

}



/*

 * XXX: replace the QERR_UNDEFINED_ERROR errors with real values once the

 * existing QERR_ macro mess is cleaned up.  A good example for better

 * error reports can be found in the qemu-img resize code.

 */

void qmp_block_resize(const char *device, int64_t size, Error **errp)

{

    BlockDriverState *bs;
@@ -864,12 +859,27 @@ void qmp_block_resize(const char *device, int64_t size, Error **errp) 
    }



    if (size < 0) {

        error_set(errp, QERR_UNDEFINED_ERROR);

        error_set(errp, QERR_INVALID_PARAMETER_VALUE, "size", "a >0 size");

        return;

    }



    if (bdrv_truncate(bs, size)) {

    switch (bdrv_truncate(bs, size)) {

    case 0:

        break;

    case -ENOMEDIUM:

        error_set(errp, QERR_DEVICE_HAS_NO_MEDIUM, device);

        break;

    case -ENOTSUP:

        error_set(errp, QERR_UNSUPPORTED);

        break;

    case -EACCES:

        error_set(errp, QERR_DEVICE_IS_READ_ONLY, device);

        break;

    case -EBUSY:

        error_set(errp, QERR_DEVICE_IN_USE, device);

        break;

    default:

        error_set(errp, QERR_UNDEFINED_ERROR);

        return;

        break;

    }

}

qapi-schema.json

+5 −2
Original line number Diff line number Diff line
@@ -1064,8 +1064,11 @@ 
#

# Returns: nothing on success

#          If @device is not a valid block device, DeviceNotFound

#

# Notes: This command returns UndefinedError in a number of error conditions.

#          If @size is negative, InvalidParameterValue

#          If the block device has no medium inserted, DeviceHasNoMedium

#          If the block device does not support resize, Unsupported

#          If the block device is read-only, DeviceIsReadOnly

#          If a long-running operation is using the device, DeviceInUse

#

# Since: 0.14.0

##

qerror.c

+8 −0
Original line number Diff line number Diff line
@@ -79,6 +79,10 @@ static const QErrorStringTable qerror_table[] = { 
        .error_fmt = QERR_DEVICE_FEATURE_BLOCKS_MIGRATION,

        .desc      = "Migration is disabled when using feature '%(feature)' in device '%(device)'",

    },

    {

        .error_fmt = QERR_DEVICE_HAS_NO_MEDIUM,

        .desc      = "Device '%(device)' has no medium",

    },

    {

        .error_fmt = QERR_DEVICE_INIT_FAILED,

        .desc      = "Device '%(device)' could not be initialized",
@@ -87,6 +91,10 @@ static const QErrorStringTable qerror_table[] = { 
        .error_fmt = QERR_DEVICE_IN_USE,

        .desc      = "Device '%(device)' is in use",

    },

    {

        .error_fmt = QERR_DEVICE_IS_READ_ONLY,

        .desc      = "Device '%(device)' is read only",

    },

    {

        .error_fmt = QERR_DEVICE_LOCKED,

        .desc      = "Device '%(device)' is locked",

qerror.h

+6 −0
Original line number Diff line number Diff line
@@ -81,12 +81,18 @@ QError *qobject_to_qerror(const QObject *obj); 
#define QERR_DEVICE_FEATURE_BLOCKS_MIGRATION \

    "{ 'class': 'DeviceFeatureBlocksMigration', 'data': { 'device': %s, 'feature': %s } }"



#define QERR_DEVICE_HAS_NO_MEDIUM \

    "{ 'class': 'DeviceHasNoMedium', 'data': { 'device': %s } }"



#define QERR_DEVICE_INIT_FAILED \

    "{ 'class': 'DeviceInitFailed', 'data': { 'device': %s } }"



#define QERR_DEVICE_IN_USE \

    "{ 'class': 'DeviceInUse', 'data': { 'device': %s } }"



#define QERR_DEVICE_IS_READ_ONLY \

    "{ 'class': 'DeviceIsReadOnly', 'data': { 'device': %s } }"



#define QERR_DEVICE_LOCKED \

    "{ 'class': 'DeviceLocked', 'data': { 'device': %s } }"