diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-11-24 15:01:54 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-11-24 15:01:54 +0000 |
| commit | 3d4a70f80fead02a3b3872790b4c8f07ee804494 (patch) | |
| tree | 57f2f35b50760ef5a604c8ad6334106d76313de3 | |
| parent | a31a7475e930dc0b8f27fb71f01ff4f0db92d1f4 (diff) | |
| parent | 24bf10dac389942b58f0d24e96590c927251b3d6 (diff) | |
Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging
Block patches for 2.2.0-rc3
# gpg: Signature made Mon 24 Nov 2014 12:52:23 GMT using RSA key ID C88F2FD6
# gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>"
* remotes/kevin/tags/for-upstream:
Revert "qemu-img info: show nocow info"
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | block/qapi.c | 26 | ||||
| -rw-r--r-- | qapi/block-core.json | 5 |
2 files changed, 1 insertions, 30 deletions
diff --git a/block/qapi.c b/block/qapi.c index 1301144bbc..a87a34a8b4 100644 --- a/block/qapi.c +++ b/block/qapi.c @@ -29,13 +29,6 @@ #include "qapi/qmp-output-visitor.h" #include "qapi/qmp/types.h" #include "sysemu/block-backend.h" -#ifdef __linux__ -#include <linux/fs.h> -#include <sys/ioctl.h> -#ifndef FS_NOCOW_FL -#define FS_NOCOW_FL 0x00800000 /* Do not cow file */ -#endif -#endif BlockDeviceInfo *bdrv_block_device_info(BlockDriverState *bs) { @@ -180,9 +173,6 @@ void bdrv_query_image_info(BlockDriverState *bs, int ret; Error *err = NULL; ImageInfo *info; -#ifdef __linux__ - int fd, attr; -#endif size = bdrv_getlength(bs); if (size < 0) { @@ -212,18 +202,6 @@ void bdrv_query_image_info(BlockDriverState *bs, info->format_specific = bdrv_get_specific_info(bs); info->has_format_specific = info->format_specific != NULL; -#ifdef __linux__ - /* get NOCOW info */ - fd = qemu_open(bs->filename, O_RDONLY | O_NONBLOCK); - if (fd >= 0) { - if (ioctl(fd, FS_IOC_GETFLAGS, &attr) == 0 && (attr & FS_NOCOW_FL)) { - info->has_nocow = true; - info->nocow = true; - } - qemu_close(fd); - } -#endif - backing_filename = bs->backing_file; if (backing_filename[0] != '\0') { info->backing_filename = g_strdup(backing_filename); @@ -655,8 +633,4 @@ void bdrv_image_info_dump(fprintf_function func_fprintf, void *f, func_fprintf(f, "Format specific information:\n"); bdrv_image_info_specific_dump(func_fprintf, f, info->format_specific); } - - if (info->has_nocow && info->nocow) { - func_fprintf(f, "NOCOW flag: set\n"); - } } diff --git a/qapi/block-core.json b/qapi/block-core.json index 8c3e45d4c3..a14e6ab1fd 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -119,8 +119,6 @@ # @format-specific: #optional structure supplying additional format-specific # information (since 1.7) # -# @nocow: #optional info of whether NOCOW flag is set or not. (since 2.2) -# # Since: 1.3 # ## @@ -132,8 +130,7 @@ '*backing-filename': 'str', '*full-backing-filename': 'str', '*backing-filename-format': 'str', '*snapshots': ['SnapshotInfo'], '*backing-image': 'ImageInfo', - '*format-specific': 'ImageInfoSpecific', - '*nocow': 'bool' } } + '*format-specific': 'ImageInfoSpecific' } } ## # @ImageCheck: |