ba698f40db
9a9f9ecd-ignore-comments-in-keymap-conf-files.patch 9617d126-systray-Use-APPLICATION_STATUS-for-appindicator.patch e73abe5a-diskbackend-convert-to-long-the-calculated-size.patch 6e6f59e7-diskbackend-get-a-proper-size-of-existing-block-device-while-cloning.patch 23aaf852-network-Set-bridge-name-to-None-instead-of-blank.patch d1e1cf64-progress-remove-trailing-white-space.patch 63fce081-pycodestyle-Use-isinstance-for-type-checking.patch 08a58d61-pycodestyle-remove-description-of-fixed-errors.patch bc3c9a9d-progress-remove-unused-import.patch 2d276ebe-progress-dont-overwrite-format.patch e2ad4b2f-convert-iteritems-to-items.patch dff00d4f-remove-deprecated-statvfs-module.patch 75210ed3-replace-StringIO-with-io.patch a2bcd6c4-dont-compare-between-None-and-int.patch 44de92b7-use-reload-from-imp-module.patch 69c84bea-import-reduce-from-functools-module.patch 37ea5207-replace-StandardError-with-Exception.patch f41aafc7-Use-enumerate-instead-of-range-and-len.patch 91c0669c-cli-Fix-OrderedDict-mutated-during-iteration-on-python3.patch b8fa0c6b-xmlnsqemu-order-XML-output-like-libvirt-does.patch d2648d81-virtconv-dont-implicitly-depend-on-dict-hash-order.patch 999dbb36-cli-Make-VirtCLIArgument-instantiation-less-crazy.patch 7f1b4cee-pycodestyle-fix-all-E125-warnings.patch d82022bd-manager-drop-python2-only-cmp-usage.patch 374a3779-urlfetcher-write-test-file-as-binary-content.patch f7c8cf9f-devicepanic-dont-return-empty-model-list.patch 3be78d1f-addhardware-dont-allow-panic-option-where-not-supported.patch 73de8285-systray-remove-redundant-variable-assignment.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=375
35 lines
1.3 KiB
Diff
35 lines
1.3 KiB
Diff
Subject: diskbackend: get a proper size of existing block device while cloning
|
|
From: Pavel Hrdina phrdina@redhat.com Tue Oct 3 16:59:13 2017 +0200
|
|
Date: Thu Oct 19 09:12:05 2017 +0200:
|
|
Git: 6e6f59e7abfd85b2a53554b7d091e553585e85c8
|
|
|
|
We cannot use os.statvfs() if the clone disk is a block device because
|
|
it gets stats about filesystem which in this case is "devtmpfs" mounted
|
|
as "/dev".
|
|
|
|
As a workaround we can seek to the end of the block device to get
|
|
the actual size.
|
|
|
|
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1450908
|
|
|
|
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
|
|
|
|
diff --git a/virtinst/diskbackend.py b/virtinst/diskbackend.py
|
|
index de745f4d..a08a23e5 100644
|
|
--- a/virtinst/diskbackend.py
|
|
+++ b/virtinst/diskbackend.py
|
|
@@ -387,8 +387,11 @@ class CloneStorageCreator(_StorageCreator):
|
|
def is_size_conflict(self):
|
|
ret = False
|
|
msg = None
|
|
- vfs = os.statvfs(os.path.dirname(self._path))
|
|
- avail = vfs[statvfs.F_FRSIZE] * vfs[statvfs.F_BAVAIL]
|
|
+ if self.get_dev_type() == "block":
|
|
+ avail = _stat_disk(self._path)[1]
|
|
+ else:
|
|
+ vfs = os.statvfs(os.path.dirname(self._path))
|
|
+ avail = vfs[statvfs.F_FRSIZE] * vfs[statvfs.F_BAVAIL]
|
|
need = long(self._size * 1024 * 1024 * 1024)
|
|
if need > avail:
|
|
if self._sparse:
|