enable sound card support for qemu

[HVM] [RESEND] enable sound card support for qemu
need a sound card to pass some benchmark check

Signed-off-by Edwin Zhai <[email protected]>

diff -r 2abb1c801ab7 tools/examples/xmexample.hvm

tools/examples/xmexample.hvm Thu Jul 20 21:19:07 2006 +0800 renamed from tools/examples/xmexample.hvm Wed Jul 19 16:09:59 2006 +0800 +2 -2

@@ -153,8 +153,8 @@ serial='pty'
 
 
 #-----------------------------------------------------------------------------
-#   enable audio support
-#audio=1
+#   enable sound card support, [sb16|es1370|all|..,..], default none
+#soundhw='sb16'
 
 
 #-----------------------------------------------------------------------------

diff -r 2abb1c801ab7 tools/python/xen/xend/image.py

tools/python/xen/xend/image.py Thu Jul 20 21:19:07 2006 +0800 renamed from tools/python/xen/xend/image.py Wed Jul 19 16:09:59 2006 +0800 +2 -3

@@ -249,7 +249,7 @@ class HVMImageHandler(ImageHandler):
     # Return a list of cmd line args to the device models based on the
     # xm config file
     def parseDeviceModelArgs(self, imageConfig, deviceConfig):
-        dmargs = [ 'cdrom', 'boot', 'fda', 'fdb', 'audio',
+        dmargs = [ 'cdrom', 'boot', 'fda', 'fdb', 'soundhw',
                    'localtime', 'serial', 'stdvga', 'isa', 'vcpus',
                   'usb', 'usbdevice']
         ret = []

@@ -258,10 +258,9 @@ class HVMImageHandler(ImageHandler):
 
             # python doesn't allow '-' in variable names
             if a == 'stdvga': a = 'std-vga'
-            if a == 'audio': a = 'enable-audio'
 
             # Handle booleans gracefully
-            if a in ['localtime', 'std-vga', 'isa', 'enable-audio', 'usb']:
+            if a in ['localtime', 'std-vga', 'isa', 'usb']:
                 if v != None: v = int(v)
                 if v: ret.append("-%s" % a)
             else:

diff -r 2abb1c801ab7 tools/python/xen/xm/create.py

tools/python/xen/xm/create.py Thu Jul 20 21:19:07 2006 +0800 renamed from tools/python/xen/xm/create.py Wed Jul 19 16:09:59 2006 +0800 +4 -4

@@ -404,9 +404,9 @@ gopts.var('nographic', val='no|yes',
           fn=set_bool, default=0,
           use="Should device models use graphics?")
 
-gopts.var('audio', val='no|yes',
-          fn=set_bool, default=0,
-          use="Should device models enable audio?")
+gopts.var('soundhw', val='audiodev',
+          fn=set_value, default='',
+          use="Should device models enable audio device?")
 
 gopts.var('vnc', val='',
           fn=set_value, default=None,

@@ -630,7 +630,7 @@ def configure_hvm(config_image, vals):
     """Create the config for HVM devices.
     """
     args = [ 'device_model', 'pae', 'vcpus', 'cdrom', 'boot', 'fda', 'fdb',
-             'localtime', 'serial', 'stdvga', 'isa', 'nographic', 'audio',
+             'localtime', 'serial', 'stdvga', 'isa', 'nographic', 'soundhw',
              'vnc', 'vncdisplay', 'vncconsole', 'sdl', 'display',
              'acpi', 'apic', 'xauthority', 'usb', 'usbdevice' ]
     for a in args:

_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel