Block patches for 2.2.0-rc3
-----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) iQIcBAABAgAGBQJUcyoHAAoJEH8JsnLIjy/W8yEP/RgLkY5H1UAZRRmK2qd3qqFd NLR56G2ZGsRnDObqsPeFBk/w5DjIfVUL3J5sQiMpN+q/Jt3MhnevN6EZ7fmEnYKQ dxxhi8BvSvxdZqEc9UKM7V1EKnm7VWoqyOZi47OqM4Rj62hw4IbIHaeKFUe0HC8D kYtARvuvHdN2Ny57dhgQOqi5ZU7xfohPT7Z/nMNKJn8YS8JWZTGBa//1O17f+gz5 whdQLVTVi6XH1VFcAd/YNRN0mmPwpEnm2kpnvlQRLcB4l5/otDwCmt/jzfom05HU 9bnfQMm3OOrYhzlbp5LSBKgZo+Eaqsgsdhaq3d/QzYDgkY1ry1nkJgiVqlAXbtJ7 2e44gDWddI/GLXW8gBMEIgjrowqMydmkuVKJgZNP3e2R+2aeWwirLfavtC6/ygQv t6Uz3iH9MZ7jy61JyXga9HkQWShhZzfeI2wEGdKBWEuyyqIaGjXZk+vpIskQs2K7 QDk8eM3nzw+pEOuAFBwQB7aMciadMmCRsxAa6NSdtHedZXgCSY8ao+VEQi5TnQB1 yeYTIO1QJO1KYLR4Z+gqVvbJKetKrBd9+ikGgd9w1BWopgS1mb58nMV/JTlN69QF Swz6kZ8iUoew2SrI1JtzMphmFmb+h5n19jWsb7sCIQQVLASqRRTaa2mUs1TpDRCo ZICyYlJMN/guF6HhfG+X =GKHw -----END PGP SIGNATURE----- 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>
This commit is contained in:
commit
3d4a70f80f
26
block/qapi.c
26
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");
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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:
|
||||
|
|
Loading…
Reference in a new issue