1.1 --- a/tools/examples/xmexample.hvm	Fri Aug 04 09:28:34 2006 +0100
     1.2 +++ b/tools/examples/xmexample.hvm	Fri Aug 04 09:31:06 2006 +0100
     1.3 @@ -149,8 +149,8 @@ serial='pty'
     1.4  
     1.5  
     1.6  #-----------------------------------------------------------------------------
     1.7 -#   enable audio support
     1.8 -#audio=1
     1.9 +#   enable sound card support, [sb16|es1370|all|..,..], default none
    1.10 +#soundhw='sb16'
    1.11  
    1.12  
    1.13  #-----------------------------------------------------------------------------

     2.1 --- a/tools/python/xen/xend/image.py	Fri Aug 04 09:28:34 2006 +0100
     2.2 +++ b/tools/python/xen/xend/image.py	Fri Aug 04 09:31:06 2006 +0100
     2.3 @@ -249,7 +249,7 @@ class HVMImageHandler(ImageHandler):
     2.4      # Return a list of cmd line args to the device models based on the
     2.5      # xm config file
     2.6      def parseDeviceModelArgs(self, imageConfig, deviceConfig):
     2.7 -        dmargs = [ 'boot', 'fda', 'fdb', 'audio',
     2.8 +        dmargs = [ 'boot', 'fda', 'fdb', 'soundhw',
     2.9                     'localtime', 'serial', 'stdvga', 'isa', 'vcpus',
    2.10  		   'usb', 'usbdevice']
    2.11          ret = []
    2.12 @@ -258,10 +258,9 @@ class HVMImageHandler(ImageHandler):
    2.13  
    2.14              # python doesn't allow '-' in variable names
    2.15              if a == 'stdvga': a = 'std-vga'
    2.16 -            if a == 'audio': a = 'enable-audio'
    2.17  
    2.18              # Handle booleans gracefully
    2.19 -            if a in ['localtime', 'std-vga', 'isa', 'enable-audio', 'usb']:
    2.20 +            if a in ['localtime', 'std-vga', 'isa', 'usb']:
    2.21                  if v != None: v = int(v)
    2.22                  if v: ret.append("-%s" % a)
    2.23              else:

     3.1 --- a/tools/python/xen/xm/create.py	Fri Aug 04 09:28:34 2006 +0100
     3.2 +++ b/tools/python/xen/xm/create.py	Fri Aug 04 09:31:06 2006 +0100
     3.3 @@ -400,9 +400,9 @@ gopts.var('nographic', val='no|yes',
     3.4            fn=set_bool, default=0,
     3.5            use="Should device models use graphics?")
     3.6  
     3.7 -gopts.var('audio', val='no|yes',
     3.8 -          fn=set_bool, default=0,
     3.9 -          use="Should device models enable audio?")
    3.10 +gopts.var('soundhw', val='audiodev',
    3.11 +          fn=set_value, default='',
    3.12 +          use="Should device models enable audio device?")
    3.13  
    3.14  gopts.var('vnc', val='',
    3.15            fn=set_value, default=None,
    3.16 @@ -626,7 +626,7 @@ def configure_hvm(config_image, vals):
    3.17      """Create the config for HVM devices.
    3.18      """
    3.19      args = [ 'device_model', 'pae', 'vcpus', 'boot', 'fda', 'fdb',
    3.20 -             'localtime', 'serial', 'stdvga', 'isa', 'nographic', 'audio',
    3.21 +             'localtime', 'serial', 'stdvga', 'isa', 'nographic', 'soundhw',
    3.22               'vnc', 'vncdisplay', 'vncconsole', 'sdl', 'display',
    3.23               'acpi', 'apic', 'xauthority', 'usb', 'usbdevice' ]
    3.24      for a in args: