shaba/virt-manager
1
0
Fork 0
mirror of https://github.com/virt-manager/virt-manager.git synced 2024-12-22 13:34:07 +03:00
Code Issues Projects Releases Wiki Activity

virt-clone: fix force-copy of empty cdrom or floppy disk

Browse Source 
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>
This commit is contained in:
Pavel Hrdina 2019-02-28 17:53:58 +01:00
parent 6f5762ab1f
commit 57db41854c
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tests/clitest.py
View File

@ -1048,6 +1048,7 @@ c.add_invalid("--original-xml " + _CLONE_UNMANAGED + " --file virt-install --fil
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

5
virt-clone
View File

@ -67,11 +67,10 @@ def get_clone_diskfile(new_diskfiles, design, preserve, auto_clone):
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