42 lines
1.8 KiB
Diff
42 lines
1.8 KiB
Diff
|
Subject: virt-clone: fix force-copy of empty cdrom or floppy disk
|
||
|
|
From: Pavel Hrdina phrdina@redhat.com Thu Feb 28 17:53:58 2019 +0100
|
||
|
|
Date: Thu Feb 28 18:05:31 2019 +0100:
|
||
|
|
Git: 57db41854c86704af331d283810db0d86786825a
|
||
|
|
|
||
|
|
There is nothing to copy so don't try to generate new path.
|
||
|
|
|
||
|
|
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1564863
|
||
|
|
|
||
|
|
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
|
||
|
|
|
||
|
|
Index: virt-manager-2.1.0/tests/clitest.py
|
||
|
|
===================================================================
|
||
|
|
--- virt-manager-2.1.0.orig/tests/clitest.py
|
||
|
|
+++ virt-manager-2.1.0/tests/clitest.py
|
||
|
|
@@ -1047,6 +1047,7 @@ c.add_invalid("--original-xml " + _CLONE
|
||
|
|
c.add_invalid("--original-xml " + _CLONE_UNMANAGED + " --file %(NEWCLONEIMG1)s --file %(NEWCLONEIMG2)s --force-copy=hdc") # XML w/ disks, force copy but not enough disks passed
|
||
|
|
c.add_invalid("--original-xml " + _CLONE_MANAGED + " --file /tmp/clonevol") # XML w/ managed storage, specify unmanaged path (should fail)
|
||
|
|
c.add_invalid("--original-xml " + _CLONE_NOEXIST + " --file %(EXISTIMG1)s") # XML w/ non-existent storage, WITHOUT --preserve
|
||
|
|
+c.add_valid("--original-xml " + _CLONE_MANAGED + " --auto-clone --force-copy fda") # force copy empty floppy drive
|
||
|
|
|
||
|
|
|
||
|
|
|
||
|
|
Index: virt-manager-2.1.0/virt-clone
|
||
|
|
===================================================================
|
||
|
|
--- virt-manager-2.1.0.orig/virt-clone
|
||
|
|
+++ virt-manager-2.1.0/virt-clone
|
||
|
|
@@ -67,11 +67,10 @@ def get_clone_diskfile(new_diskfiles, de
|
||
|
|
new_diskfiles.append(None)
|
||
|
|
newpath = new_diskfiles[newidx]
|
||
|
|
|
||
|
|
- if newpath is None and auto_clone:
|
||
|
|
- newpath = design.generate_clone_disk_path(origpath)
|
||
|
|
-
|
||
|
|
if origpath is None:
|
||
|
|
newpath = None
|
||
|
|
+ elif newpath is None and auto_clone:
|
||
|
|
+ newpath = design.generate_clone_disk_path(origpath)
|
||
|
|
|
||
|
|
clonepaths.append(newpath)
|
||
|
|
newidx += 1
|