[patch] kvm-kvm-21.patch

kvm-kvm-21.patch (text/plain), 2.14 KB, created by Matthew Schultz on 2007-04-28 20:50:05 UTC

--- kvm.orig	2007-04-28 11:22:20.072127914 -0500
+++ kvm	2007-04-28 11:25:15.090101620 -0500
@@ -5,13 +5,6 @@
 
 optparser = optparse.OptionParser()
 
-optparser.add_option('--no-reload-module',
-                     help = 'do not reload kvm module',
-                     action = 'store_false',
-                     dest = 'reload',
-                     default = True,
-                     )
-
 optparser.add_option('--install',
                      help = 'start up guest in installer boot cd',
                      action = 'store_true',
@@ -100,37 +93,7 @@
 if len(args) > 1:
     options.cdrom = args[1]
 
-def remove_module(module):
-    module = module.replace('-', '_')
-    lines = commands.getoutput('/sbin/lsmod').split('\n')
-    for x in lines:
-        if x.startswith(module + ' '):
-            if os.spawnl(os.P_WAIT, '/sbin/rmmod', 'rmmod', module) != 0:
-                raise Exception('failed to remove %s module' % (module,))
-
-def insert_module(module):
-    if os.spawnl(os.P_WAIT, '/sbin/insmod', 'insmod',
-                 'kernel/%s.ko' % (module,)) != 0:
-        if os.spawnl(os.P_WAIT, '/sbin/modprobe', 'modprobe', module) != 0:
-            raise Exception('failed to load kvm module')
-
-def vendor():
-    for x in file('/proc/cpuinfo').readlines():
-        m = re.match(r'vendor_id[ \t]*: *([a-zA-Z]+),*', x)
-        if m:
-            return m.group(1)
-    return unknown
-
-vendor_module = {
-    'GenuineIntel': 'kvm-intel',
-    'AuthenticAMD': 'kvm-amd',
-    }[vendor()]
-
-if options.kvm and options.reload:
-    for module in [vendor_module, 'kvm']:
-        remove_module(module)
-    for module in ['kvm', vendor_module]:
-        insert_module(module)
+if options.kvm:
     commands.getstatusoutput('/sbin/udevsettle')
     if not os.access('/dev/kvm', os.F_OK):
         print '/dev/kvm not present'
@@ -157,12 +120,6 @@
 else:
     cmd = 'qemu'
 
-local_cmd = 'qemu/' + arch + '-softmmu/' + cmd
-if os.access(local_cmd, os.F_OK):
-    cmd = local_cmd
-else:
-    cmd = '/usr/bin/kvm'
-
 qemu_args = (cmd, '-boot', bootdisk,
              '-hda', disk, '-m', str(options.memory),
              '-serial', 'file:/tmp/serial.log',