|
@@ -28,7 +28,6 @@
|
|
#include "block/qdict.h"
|
|
#include "block/qdict.h"
|
|
#include "qapi/error.h"
|
|
#include "qapi/error.h"
|
|
#include "qapi/qmp/qdict.h"
|
|
#include "qapi/qmp/qdict.h"
|
|
-#include "qapi/qmp/qerror.h"
|
|
|
|
#include "qapi/qmp/qstring.h"
|
|
#include "qapi/qmp/qstring.h"
|
|
#include "qemu/option.h"
|
|
#include "qemu/option.h"
|
|
#include "sysemu/block-backend.h"
|
|
#include "sysemu/block-backend.h"
|
|
@@ -359,7 +358,8 @@ int bdrv_snapshot_delete(BlockDriverState *bs,
|
|
GLOBAL_STATE_CODE();
|
|
GLOBAL_STATE_CODE();
|
|
|
|
|
|
if (!drv) {
|
|
if (!drv) {
|
|
- error_setg(errp, QERR_DEVICE_HAS_NO_MEDIUM, bdrv_get_device_name(bs));
|
|
|
|
|
|
+ error_setg(errp, "Device '%s' has no medium",
|
|
|
|
+ bdrv_get_device_name(bs));
|
|
return -ENOMEDIUM;
|
|
return -ENOMEDIUM;
|
|
}
|
|
}
|
|
if (!snapshot_id && !name) {
|
|
if (!snapshot_id && !name) {
|
|
@@ -437,7 +437,8 @@ int bdrv_snapshot_load_tmp(BlockDriverState *bs,
|
|
GRAPH_RDLOCK_GUARD_MAINLOOP();
|
|
GRAPH_RDLOCK_GUARD_MAINLOOP();
|
|
|
|
|
|
if (!drv) {
|
|
if (!drv) {
|
|
- error_setg(errp, QERR_DEVICE_HAS_NO_MEDIUM, bdrv_get_device_name(bs));
|
|
|
|
|
|
+ error_setg(errp, "Device '%s' has no medium",
|
|
|
|
+ bdrv_get_device_name(bs));
|
|
return -ENOMEDIUM;
|
|
return -ENOMEDIUM;
|
|
}
|
|
}
|
|
if (!snapshot_id && !name) {
|
|
if (!snapshot_id && !name) {
|