Hello community, here is the log from the commit of package vm-install for openSUSE:Factory checked in at 2014-06-01 19:41:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/vm-install (Old) and /work/SRC/openSUSE:Factory/.vm-install.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "vm-install" Changes: -------- --- /work/SRC/openSUSE:Factory/vm-install/vm-install.changes 2014-05-16 18:18:21.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.vm-install.new/vm-install.changes 2014-06-01 19:41:19.000000000 +0200 @@ -1,0 +2,13 @@ +Tue May 27 13:44:15 MDT 2014 - carn...@suse.com + +- Add temporary 'suse-diskcache-disable-flush' flag for Xen + installation performance + +------------------------------------------------------------------- +Mon May 19 17:18:02 MDT 2014 - carn...@suse.com + +- Allow the backend type of 'tap' to be specified thereby allowing + a different backend to be used besides qdisk +- Version 0.8.20 + +------------------------------------------------------------------- Old: ---- vm-install-0.8.19.tar.bz2 New: ---- vm-install-0.8.20.tar.bz2 vm-install-0.8.21.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vm-install.spec ++++++ --- /var/tmp/diff_new_pack.QmqLiw/_old 2014-06-01 19:41:20.000000000 +0200 +++ /var/tmp/diff_new_pack.QmqLiw/_new 2014-06-01 19:41:20.000000000 +0200 @@ -27,12 +27,12 @@ %endif # For directory ownership: BuildRequires: yast2 -Version: 0.8.19 +Version: 0.8.21 Release: 0 Summary: Tool to Define a Virtual Machine and Install Its Operating System License: GPL-2.0 Group: System/Emulators/PC -Source0: %{name}-0.8.19.tar.bz2 +Source0: %{name}-0.8.21.tar.bz2 Source1: vm-install.conf BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 x86_64 s390x ppc64le ++++++ vm-install-0.8.19.tar.bz2 -> vm-install-0.8.20.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.8.19/Makefile new/vm-install-0.8.20/Makefile --- old/vm-install-0.8.19/Makefile 2014-05-15 19:11:02.000000000 +0200 +++ new/vm-install-0.8.20/Makefile 2014-05-20 01:20:22.000000000 +0200 @@ -1,5 +1,5 @@ PACKAGE = vm-install -VER = 0.8.19 +VER = 0.8.20 default: @echo "Run 'make install DESTDIR=$destdir' to install." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.8.19/setup.py new/vm-install-0.8.20/setup.py --- old/vm-install-0.8.19/setup.py 2014-05-15 19:10:59.000000000 +0200 +++ new/vm-install-0.8.20/setup.py 2014-05-20 01:20:19.000000000 +0200 @@ -1,7 +1,7 @@ from distutils.core import setup setup(name='vminstall', - version='0.8.19', + version='0.8.20', description='Define a virtual machine and install its operating system', author='Charles Coffing', author_email='ccoff...@novell.com', diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.8.19/src/vmdisks/disks.py new/vm-install-0.8.20/src/vmdisks/disks.py --- old/vm-install-0.8.19/src/vmdisks/disks.py 2014-05-09 02:41:30.000000000 +0200 +++ new/vm-install-0.8.20/src/vmdisks/disks.py 2014-05-21 23:36:30.000000000 +0200 @@ -362,6 +362,7 @@ DRIVERS = { 'file': LoopDriver('file'), + 'tap:file': LoopDriver('tap:file'), 'iscsi': Driver('iscsi'), 'nbd': Driver('nbd'), 'npiv': Driver('npiv'), @@ -374,7 +375,7 @@ 'tap:vmdk': TapVmdkDriver('tap:vmdk'), } xend_protocols = ["file:", "iscsi:", "nbd:", "npiv:", "phy:", "tap:cdrom:", "tap:qcow2:", "tap:vhd:", "tap:vmdk:"] -xl_protocols = ["file:", "iscsi:", "nbd:", "npiv:", "phy:", "qcow2:", "vhd:"] +xl_protocols = ["file:", "tap:file:", "iscsi:", "nbd:", "npiv:", "phy:", "qcow2:", "tap:qcow2:", "vhd:", "tap:vhd:"] KVM_DRIVERS = { 'bochs': QemuDriver('bochs'), @@ -397,6 +398,7 @@ protocol_file_extensions = { 'file': "raw", + 'tap:file': "raw", 'raw': "raw", 'qcow2': "qcow2", 'tap:qcow2': "qcow2", @@ -416,7 +418,7 @@ } file_extension_protocols = { - 'raw': ['file','raw'], + 'raw': ['file','raw','tap:file'], 'qcow2': ['qcow2','tap:qcow2'], 'qcow': ['qcow'], 'qed': ['qed'], @@ -1195,10 +1197,16 @@ mode = 'r' if vminstall.util.is_xend_running(): return "'%s,%s,%s'" % (self.get_pdev(), vdev, mode) - # xl disk config file format: ['target','format','vdev','access'] + # xl disk config file format: ['target','format','vdev','access','backendtype=tap'] proto = self.get_proto() + tap = False + if proto.startswith('tap:'): + proto = proto.split(':')[1] + tap = True if proto == 'file': proto = 'raw' + if tap: + return "'%s,%s,%s,%s,backendtype=tap'" % (self.get_path(), proto, vdev, mode) return "'%s,%s,%s,%s'" % (self.get_path(), proto, vdev, mode) def __str__(self): ++++++ vm-install-0.8.19.tar.bz2 -> vm-install-0.8.21.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.8.19/Makefile new/vm-install-0.8.21/Makefile --- old/vm-install-0.8.19/Makefile 2014-05-15 19:11:02.000000000 +0200 +++ new/vm-install-0.8.21/Makefile 2014-05-29 17:02:48.000000000 +0200 @@ -1,5 +1,5 @@ PACKAGE = vm-install -VER = 0.8.19 +VER = 0.8.21 default: @echo "Run 'make install DESTDIR=$destdir' to install." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.8.19/setup.py new/vm-install-0.8.21/setup.py --- old/vm-install-0.8.19/setup.py 2014-05-15 19:10:59.000000000 +0200 +++ new/vm-install-0.8.21/setup.py 2014-05-29 17:02:48.000000000 +0200 @@ -1,7 +1,7 @@ from distutils.core import setup setup(name='vminstall', - version='0.8.19', + version='0.8.21', description='Define a virtual machine and install its operating system', author='Charles Coffing', author_email='ccoff...@novell.com', diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.8.19/src/vmdisks/disks.py new/vm-install-0.8.21/src/vmdisks/disks.py --- old/vm-install-0.8.19/src/vmdisks/disks.py 2014-05-09 02:41:30.000000000 +0200 +++ new/vm-install-0.8.21/src/vmdisks/disks.py 2014-05-29 17:02:43.000000000 +0200 @@ -362,6 +362,7 @@ DRIVERS = { 'file': LoopDriver('file'), + 'tap:file': LoopDriver('tap:file'), 'iscsi': Driver('iscsi'), 'nbd': Driver('nbd'), 'npiv': Driver('npiv'), @@ -374,7 +375,7 @@ 'tap:vmdk': TapVmdkDriver('tap:vmdk'), } xend_protocols = ["file:", "iscsi:", "nbd:", "npiv:", "phy:", "tap:cdrom:", "tap:qcow2:", "tap:vhd:", "tap:vmdk:"] -xl_protocols = ["file:", "iscsi:", "nbd:", "npiv:", "phy:", "qcow2:", "vhd:"] +xl_protocols = ["file:", "tap:file:", "iscsi:", "nbd:", "npiv:", "phy:", "qcow2:", "tap:qcow2:", "vhd:", "tap:vhd:"] KVM_DRIVERS = { 'bochs': QemuDriver('bochs'), @@ -397,6 +398,7 @@ protocol_file_extensions = { 'file': "raw", + 'tap:file': "raw", 'raw': "raw", 'qcow2': "qcow2", 'tap:qcow2': "qcow2", @@ -416,7 +418,7 @@ } file_extension_protocols = { - 'raw': ['file','raw'], + 'raw': ['file','raw','tap:file'], 'qcow2': ['qcow2','tap:qcow2'], 'qcow': ['qcow'], 'qed': ['qed'], @@ -1103,12 +1105,12 @@ # type: The sub-type. # if len(vals) == 1: + if self._cache_mode: + cache_mode = " cache='" + self._cache_mode + "'" + else: + cache_mode = "" if vminstall.caps.is_kvm() or vminstall.caps.is_qemu(): - if self._cache_mode: - cache_mode = " cache='" + self._cache_mode + "'" - else: - cache_mode = "" - if vals[0] == "file": + if vals[0] == "file" or vals[0] == "raw": opts.append("<driver name='qemu' type='raw'%s/>" % cache_mode) elif vals[0] != "phy": opts.append("<driver name='qemu' type='%s'%s/>" % (vals[0],cache_mode)) @@ -1116,7 +1118,7 @@ opts.append("<driver name='qemu'%s/>" % cache_mode) else: if vals[0] == "file": - opts.append("<driver name='qemu'/>") + opts.append("<driver name='qemu'%s/>" % cache_mode) else: opts.append("<driver name='%s'/>" % vals[0]) else: @@ -1195,11 +1197,20 @@ mode = 'r' if vminstall.util.is_xend_running(): return "'%s,%s,%s'" % (self.get_pdev(), vdev, mode) - # xl disk config file format: ['target','format','vdev','access'] + # xl disk config file format: ['target','format','vdev','access','suse-diskcache-disable-flush','backendtype=tap'] proto = self.get_proto() + tap = False + if proto.startswith('tap:'): + proto = proto.split(':')[1] + tap = True if proto == 'file': proto = 'raw' - return "'%s,%s,%s,%s'" % (self.get_path(), proto, vdev, mode) + extra = "" + if self._cache_mode == "unsafe": + extra = ",suse-diskcache-disable-flush" + if tap: + extra = extra + ",backendtype=tap" + return "'%s,%s,%s,%s%s'" % (self.get_path(), proto, vdev, mode, extra) def __str__(self): size = '' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.8.19/src/vminstall/xen_guest.py new/vm-install-0.8.21/src/vminstall/xen_guest.py --- old/vm-install-0.8.19/src/vminstall/xen_guest.py 2014-01-29 23:26:53.000000000 +0100 +++ new/vm-install-0.8.21/src/vminstall/xen_guest.py 2014-05-29 17:02:48.000000000 +0200 @@ -110,17 +110,33 @@ def _get_disk_xml(self): """Get the disk config in the libvirt XML format""" ret = [] + saved_mode = None + target_disk = self.options.disks[0] + if self.isInstall and target_disk: + index, saved_mode = target_disk.get_cache_mode() + # The destination disk only during installation is this considered safe to do + target_disk.set_cache_mode("unsafe") for disk in self.options.disks + self.tmpdisks: ret.extend(disk.get_xml_config()) + if self.isInstall and target_disk: + target_disk.set_cache_mode(saved_mode) return ret def _get_disk_xen(self): """Get the disk config in the xend python format""" ret = 'disk=[ ' + saved_mode = None + target_disk = self.options.disks[0] + if self.isInstall and target_disk: + index, saved_mode = target_disk.get_cache_mode() + # The destination disk only during installation is this considered safe to do + target_disk.set_cache_mode("unsafe") for disk in self.options.disks + self.tmpdisks: ret += disk.get_xen_config() ret += ', ' ret += ']' + if self.isInstall and target_disk: + target_disk.set_cache_mode(saved_mode) return ret def _get_network_xml(self): -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org