From 969b14b5ede9468282488dcf85af5dc1c9fbbe21 Mon Sep 17 00:00:00 2001 From: Marek Marczykowski Date: Fri, 11 Mar 2011 01:48:27 +0100 Subject: [PATCH] qvm-create: support for netvm and proxyvm Move PCI config from qvm-add-netvm to qvm-core. Remove qvm-add-netvm as useless when netvm is template-based --- dom0/qvm-core/qubes.py | 5 ++ dom0/qvm-tools/qvm-add-netvm | 119 ----------------------------------- dom0/qvm-tools/qvm-create | 73 ++++++++++++++++----- 3 files changed, 64 insertions(+), 133 deletions(-) delete mode 100755 dom0/qvm-tools/qvm-add-netvm diff --git a/dom0/qvm-core/qubes.py b/dom0/qvm-core/qubes.py index 270d0049..94d687c8 100755 --- a/dom0/qvm-core/qubes.py +++ b/dom0/qvm-core/qubes.py @@ -205,6 +205,9 @@ class QubesVm(object): else: self.icon_path = None + # PCI devices - used only by NetVM + self.pcidevs = "" + if not dry_run and xend_session.session is not None: self.refresh_xend_session() @@ -883,11 +886,13 @@ class QubesCowVm(QubesVm): rx_vmname = re.compile (r"%VMNAME%") rx_vmdir = re.compile (r"%VMDIR%") rx_template = re.compile (r"%TEMPLATEDIR%") + rx_pcidevs = re.compile (r"%PCIDEVS%") for line in conf_template: line = rx_vmname.sub (self.name, line) line = rx_vmdir.sub (self.dir_path, line) line = rx_template.sub (self.template_vm.dir_path, line) + line = rx_pcidevs.sub (self.pcidevs, line) conf_appvm.write(line) conf_template.close() diff --git a/dom0/qvm-tools/qvm-add-netvm b/dom0/qvm-tools/qvm-add-netvm deleted file mode 100755 index f5d3cde4..00000000 --- a/dom0/qvm-tools/qvm-add-netvm +++ /dev/null @@ -1,119 +0,0 @@ -#!/usr/bin/python2.6 -# -# The Qubes OS Project, http://www.qubes-os.org -# -# Copyright (C) 2010 Joanna Rutkowska -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# -# - -from optparse import OptionParser -import subprocess -import shutil -import re - -from qubes.qubes import QubesVmCollection -from qubes.qubes import QubesException - -def find_net_devices(): - p = subprocess.Popen (["lspci", "-mm", "-n"], stdout=subprocess.PIPE) - result = p.communicate() - retcode = p.returncode - if (retcode != 0): - print "ERROR when executing lspci!" - raise IOError - - net_devices = set() - rx_netdev = re.compile (r"^([0-9][0-9]:[0-9][0-9].[0-9]) \"02") - for dev in str(result[0]).splitlines(): - match = rx_netdev.match (dev) - if match is not None: - dev_bdf = match.group(1) - assert dev_bdf is not None - net_devices.add (dev_bdf) - - return net_devices - -def main(): - usage = "usage: %prog [options] " - parser = OptionParser (usage) - parser.add_option ("-p", "--path", dest="dir_path", - help="Specify path to the template directory") - parser.add_option ("-c", "--conf", dest="conf_file", - help="Specify the Xen VM .conf file to use\ - (relative to the template dir path)") - - - (options, args) = parser.parse_args () - if (len (args) != 1): - parser.error ("You must specify a NetVM name!") - netvmname = args[0] - - qvm_collection = QubesVmCollection() - qvm_collection.lock_db_for_writing() - qvm_collection.load() - - if qvm_collection.get_vm_by_name(netvmname) is not None: - print "ERROR: A VM with the name '{0}' already exists in the system.".format(netvmname) - exit(1) - - vm = qvm_collection.add_new_netvm(netvmname, - conf_file=options.conf_file, - dir_path=options.dir_path) - - try: - vm.verify_files() - except QubesException as err: - print "ERROR: {0}".format(err) - qvm_collection.pop(vm.qid) - exit (1) - - - net_devices = find_net_devices() - print "Found the following net devices in your system:" - dev_str = '' - for dev in net_devices: - print "--> {0}".format(dev) - dev_str += '"{0}", '.format(dev) - - print "Assigning them to the netvm '{0}'".format(netvmname) - rx_pcidevs = re.compile (r"%NETVMPCIDEVS%") - conf_template = open (vm.conf_file, "r") - conf_vm = open(vm.conf_file + ".processed", "w") - - for line in conf_template: - line = rx_pcidevs.sub(dev_str, line) - conf_vm.write(line) - - conf_template.close() - conf_vm.close() - - shutil.move (vm.conf_file + ".processed", vm.conf_file) - - - try: - pass - vm.add_to_xen_storage() - - except (IOError, OSError) as err: - print "ERROR: {0}".format(err) - qvm_collection.pop(vm.qid) - exit (1) - - qvm_collection.save() - qvm_collection.unlock_db() - -main() diff --git a/dom0/qvm-tools/qvm-create b/dom0/qvm-tools/qvm-create index b0f227ab..aa567b98 100755 --- a/dom0/qvm-tools/qvm-create +++ b/dom0/qvm-tools/qvm-create @@ -24,6 +24,26 @@ from qubes.qubes import QubesVmCollection from qubes.qubes import QubesVmLabels from optparse import OptionParser; import subprocess +import re + +def find_net_devices(): + p = subprocess.Popen (["lspci", "-mm", "-n"], stdout=subprocess.PIPE) + result = p.communicate() + retcode = p.returncode + if (retcode != 0): + print "ERROR when executing lspci!" + raise IOError + + net_devices = set() + rx_netdev = re.compile (r"^([0-9][0-9]:[0-9][0-9].[0-9]) \"02") + for dev in str(result[0]).splitlines(): + match = rx_netdev.match (dev) + if match is not None: + dev_bdf = match.group(1) + assert dev_bdf is not None + net_devices.add (dev_bdf) + + return net_devices def main(): @@ -33,6 +53,10 @@ def main(): help="Specify the TemplateVM to use") parser.add_option ("-l", "--label", dest="label", help="Specify the label to use for the new VM (e.g. red, yellow, green, ...)") + parser.add_option ("-p", "--proxy", action="store_true", dest="proxyvm", default=False, + help="Create ProxyVM") + parser.add_option ("-n", "--net", action="store_true", dest="netvm", default=False, + help="Create NetVM") parser.add_option ("-q", "--quiet", action="store_false", dest="verbose", default=True) (options, args) = parser.parse_args () @@ -40,20 +64,24 @@ def main(): parser.error ("You must specify VM name!") vmname = args[0] - if options.label is None: - print "You must choose a label for the new VM by passing the --label option." - print "Possible values are:" - for l in QubesVmLabels.values(): - print "* {0}".format(l.name) - exit (1) - - if options.label not in QubesVmLabels: - print "Wrong label name, supported values are the following:" - for l in QubesVmLabels.values(): - print "* {0}".format(l.name) - exit (1) - label = QubesVmLabels[options.label] + if options.netvm and options.proxyvm: + parser.error ("You must specify at most one of --proxy and --net") + + label = None + if not options.proxyvm and not options.netvm: + if options.label is None: + print "You must choose a label for the new VM by passing the --label option." + print "Possible values are:" + for l in QubesVmLabels.values(): + print "* {0}".format(l.name) + exit (1) + if options.label not in QubesVmLabels: + print "Wrong label name, supported values are the following:" + for l in QubesVmLabels.values(): + print "* {0}".format(l.name) + exit (1) + label = QubesVmLabels[options.label] qvm_collection = QubesVmCollection() qvm_collection.lock_db_for_writing() @@ -83,7 +111,24 @@ def main(): if (options.verbose): print "--> Using default TemplateVM: {0}".format(template_vm.name) - vm = qvm_collection.add_new_appvm(vmname, template_vm, label = label) + vm = None + if options.netvm: + vm = qvm_collection.add_new_netvm(vmname, template_vm) + + net_devices = find_net_devices() + print "Found the following net devices in your system:" + dev_str = '' + for dev in net_devices: + print "--> {0}".format(dev) + dev_str += '"{0}", '.format(dev) + + print "Assigning them to the netvm '{0}'".format(vmname) + vm.pcidevs = dev_str + + elif options.proxyvm: + vm = qvm_collection.add_new_proxyvm(vmname, template_vm) + else: + vm = qvm_collection.add_new_appvm(vmname, template_vm, label = label) try: vm.create_on_disk(verbose=options.verbose) vm.add_to_xen_storage()