summaryrefslogtreecommitdiff
blob: 1fd8420f1e6caf91ff85102acb775f5e88528db1 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
--- kvm.orig	2007-07-25 09:22:14.042411511 -0500
+++ kvm	2007-07-25 09:24:54.087531962 -0500
@@ -17,18 +17,10 @@
 config = ShellConfigParser()
 config.read('config.mak')
 
-external_module = config.get('shell', 'want_module')
 privileged = os.getuid() == 0
 
 optparser = optparse.OptionParser()
 
-optparser.add_option('--no-reload-module',
-                     help = 'do not reload kvm module',
-                     action = 'store_false',
-                     dest = 'reload',
-                     default = privileged,
-                     )
-
 optparser.add_option('--install',
                      help = 'start up guest in installer boot cd',
                      action = 'store_true',
@@ -67,12 +59,6 @@
                      default = None,
                      )
 
-optparser.add_option('--no-kvm',
-                     help = 'use standard qemu, without kvm',
-                     action = 'store_false',
-                     dest = 'kvm',
-                     default = True,
-                     )
 optparser.add_option('--image',
                      help = 'select disk image',
                      dest = 'image',
@@ -124,52 +110,14 @@
 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:
-        raise Exception('failed to load kvm module')
-
-def probe_module(module):
-    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)
-    if external_module:
-        insmod = insert_module
-    else:
-        insmod = probe_module
-    for module in ['kvm', vendor_module]:
-        insmod(module)
-    commands.getstatusoutput('/sbin/udevsettle')
-    if not os.access('/dev/kvm', os.F_OK):
-        print '/dev/kvm not present'
+commands.getstatusoutput('/sbin/udevsettle')
+if not os.access('/dev/kvm', os.F_OK):
+    print '/dev/kvm not present'
 
 disk = options.image
 if options.install:
     (status, output) = commands.getstatusoutput(
-        'qemu/qemu-img create -f qcow2 "%s" 10G' % disk)
+        'qemu-img create -f qcow2 "%s" 10G' % disk)
     if status:
         raise Exception, output
 
@@ -184,12 +132,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',
@@ -200,9 +142,6 @@
 if options.cdrom:
     qemu_args += ('-cdrom', options.cdrom,)
 
-if not options.kvm:
-    qemu_args += ('-no-kvm',)
-
 if options.debugger:
     qemu_args += ('-s',)