NuKVM/virt-manager
3
0
Fork 0
mirror of https://github.com/virt-manager/virt-manager.git synced 2025-02-25 18:55:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

virt-convert: Don't print 'convert' output with --print-xml

Browse Source
This commit is contained in:
Cole Robinson 2014-05-31 16:39:57 -04:00
parent ceab99cf7b
commit eca6cd9471
4 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/cli-test-xml/compare/virt-convert-ovf-compare.xml
View File

@ -1,5 +1,3 @@
Copying test.ovf-disk1.vmdk to /tmp/test.ovf-disk1
Copying testfile to /tmp/testfile
<domain type="kvm"> <domain type="kvm">
<name>test.ovf</name> <name>test.ovf</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid> <uuid>00000000-1111-2222-3333-444444444444</uuid>

1
tests/cli-test-xml/compare/virt-convert-vmx-compare.xml
View File

@ -1,4 +1,3 @@
Running /usr/bin/qemu-img convert -O qcow2 fedora.vmdk /var/lib/libvirt/images/fedora.qcow2
<domain type="kvm"> <domain type="kvm">
<name>fedora</name> <name>fedora</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid> <uuid>00000000-1111-2222-3333-444444444444</uuid>

5
virt-convert
View File

@ -97,9 +97,12 @@ def main(conn=None):
options.quiet = True options.quiet = True
conscb = options.autoconsole and cli.show_console_for_guest or None conscb = options.autoconsole and cli.show_console_for_guest or None
print_cb = print_stdout
if options.quiet:
print_cb = None
converter = VirtConverter(conn, options.input, converter = VirtConverter(conn, options.input,
input_name=options.input_format, print_cb=print_stdout) input_name=options.input_format, print_cb=print_cb)
try: try:
converter.convert_disks(options.disk_format or "none", converter.convert_disks(options.disk_format or "none",
destdir=options.destination, dry=options.dry) destdir=options.destination, dry=options.dry)

9
virtconv/formats.py
View File

@ -174,15 +174,20 @@ class VirtConverter(object):
""" """
Public interface for actually performing the conversion Public interface for actually performing the conversion
""" """
def __init__(self, conn, input_file, print_cb=None, input_name=None): def __init__(self, conn, input_file, print_cb=-1, input_name=None):
self.conn = conn self.conn = conn
self._err_clean = [] self._err_clean = []
self._force_clean = [] self._force_clean = []
if print_cb is None: if print_cb == -1:
def cb(msg): def cb(msg):
print msg print msg
print_cb = cb print_cb = cb
if print_cb is None:
def cb(msg):
ignore = msg
pass
print_cb = cb
self.print_cb = print_cb self.print_cb = print_cb
parser = None parser = None