Merge remote-tracking branch 'woju/pull/23/head' into core3-devel

qubes/tools/qvm_start.py

@@ -128,17 +128,9 @@ def main(args=None):
         vm.debug = args.debug
 
     try:
-        vm.verify_files()
-    except (IOError, OSError) as e:
-        parser.error(
-            'error verifying files for domain {!r}: {!r}'.format(vm.name, e))
-
-    try:
-        #xid =
         vm.start(
             preparing_dvm=args.preparing_dvm,
             start_guid=args.start_guid)
-            # notify_function=
     except qubes.exc.QubesException as e:
         parser.error_runtime('Qubes error: {!r}'.format(e))
 

qubes/vm/mix/net.py

@@ -325,7 +325,7 @@ class NetVMMixin(qubes.events.Emitter):
         pass
 
     @qubes.events.handler('firewall-changed', 'domain-spawn')
-    def on_firewall_changed(self, event):
+    def on_firewall_changed(self, event, **kwargs):
         ''' Reloads the firewall if vm is running and has a NetVM assigned '''
         # pylint: disable=unused-argument
         if self.is_running() and self.netvm: