ia64/xen-unstable

changeset 16587:38febeb3033f

tools: Remove references to USB paravirt driver. Doesn't affect qemu usb args.

Some relics in the control tools still refer to the USB paravirt
driver. Remove this as it's dead code and is in the history for
anyone really interested. The Qemu device model has its own USB
configuration, which should still work.

Signed-off-by: Mark Williamson <mark.williamson@cl.cam.ac.uk>
author Keir Fraser <keir.fraser@citrix.com>
date Wed Dec 12 10:03:32 2007 +0000 (2007-12-12)
parents 309141220822
children 7441ee9013bf
files tools/python/xen/xend/XendDevices.py tools/python/xen/xend/server/usbif.py tools/python/xen/xm/create.py
line diff
     1.1 --- a/tools/python/xen/xend/XendDevices.py	Wed Dec 12 10:03:09 2007 +0000
     1.2 +++ b/tools/python/xen/xend/XendDevices.py	Wed Dec 12 10:03:32 2007 +0000
     1.3 @@ -19,7 +19,7 @@
     1.4  # A collection of DevControllers 
     1.5  #
     1.6  
     1.7 -from xen.xend.server import blkif, netif, tpmif, pciif, iopif, irqif, usbif, vfbif
     1.8 +from xen.xend.server import blkif, netif, tpmif, pciif, iopif, irqif, vfbif
     1.9  from xen.xend.server.BlktapController import BlktapController
    1.10  from xen.xend.server.ConsoleController import ConsoleController
    1.11  
    1.12 @@ -41,7 +41,6 @@ class XendDevices:
    1.13          'pci': pciif.PciController,
    1.14          'ioports': iopif.IOPortsController,
    1.15          'irq': irqif.IRQController,
    1.16 -        'usb': usbif.UsbifController,
    1.17          'tap': BlktapController,
    1.18          'vfb': vfbif.VfbifController,
    1.19          'vkbd': vfbif.VkbdifController,
     2.1 --- a/tools/python/xen/xend/server/usbif.py	Wed Dec 12 10:03:09 2007 +0000
     2.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.3 @@ -1,42 +0,0 @@
     2.4 -#============================================================================
     2.5 -# This library is free software; you can redistribute it and/or
     2.6 -# modify it under the terms of version 2.1 of the GNU Lesser General Public
     2.7 -# License as published by the Free Software Foundation.
     2.8 -#
     2.9 -# This library is distributed in the hope that it will be useful,
    2.10 -# but WITHOUT ANY WARRANTY; without even the implied warranty of
    2.11 -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    2.12 -# Lesser General Public License for more details.
    2.13 -#
    2.14 -# You should have received a copy of the GNU Lesser General Public
    2.15 -# License along with this library; if not, write to the Free Software
    2.16 -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
    2.17 -#============================================================================
    2.18 -# Copyright (C) 2004 Mike Wray <mike.wray@hp.com>
    2.19 -# Copyright (C) 2004 Intel Research Cambridge
    2.20 -# Copyright (C) 2004 Mark Williamson <mark.williamson@cl.cam.ac.uk>
    2.21 -# Copyright (C) 2005 XenSource Ltd
    2.22 -#============================================================================
    2.23 -
    2.24 -
    2.25 -"""Support for virtual USB hubs.
    2.26 -"""
    2.27 -
    2.28 -from xen.xend.server.DevController import DevController
    2.29 -
    2.30 -
    2.31 -class UsbifController(DevController):
    2.32 -    """USB device interface controller. Handles all USB devices
    2.33 -    for a domain.
    2.34 -    """
    2.35 -    
    2.36 -    def __init__(self, vm):
    2.37 -        """Create a USB device controller.
    2.38 -        """
    2.39 -        DevController.__init__(self, vm)
    2.40 -
    2.41 -
    2.42 -    def getDeviceDetails(self, _):
    2.43 -        """@see DevController.getDeviceDetails"""
    2.44 -
    2.45 -        return (self.allocateDeviceID(), {}, {})
     3.1 --- a/tools/python/xen/xm/create.py	Wed Dec 12 10:03:09 2007 +0000
     3.2 +++ b/tools/python/xen/xm/create.py	Wed Dec 12 10:03:32 2007 +0000
     3.3 @@ -309,11 +309,6 @@ gopts.var('irq', val='IRQ',
     3.4           For example 'irq=7'.
     3.5           This option may be repeated to add more than one IRQ.""")
     3.6  
     3.7 -gopts.var('usbport', val='PATH',
     3.8 -          fn=append_value, default=[],
     3.9 -          use="""Add a physical USB port to a domain, as specified by the path
    3.10 -          to that port.  This option may be repeated to add more than one port.""")
    3.11 -
    3.12  gopts.var('vfb', val="type={vnc,sdl},vncunused=1,vncdisplay=N,vnclisten=ADDR,display=DISPLAY,xauthority=XAUTHORITY,vncpasswd=PASSWORD",
    3.13            fn=append_value, default=[],
    3.14            use="""Make the domain a framebuffer backend.
    3.15 @@ -617,11 +612,6 @@ def configure_irq(config_devs, vals):
    3.16          config_irq = ['irq', ['irq', irq]]
    3.17          config_devs.append(['device', config_irq])
    3.18  
    3.19 -def configure_usb(config_devs, vals):
    3.20 -    for path in vals.usbport:
    3.21 -        config_usb = ['usbport', ['path', path]]
    3.22 -        config_devs.append(['device', config_usb])
    3.23 -
    3.24  def configure_vfbs(config_devs, vals):
    3.25      for f in vals.vfb:
    3.26          d = comma_sep_kv_to_dict(f)
    3.27 @@ -800,7 +790,6 @@ def make_config(vals):
    3.28      configure_ioports(config_devs, vals)
    3.29      configure_irq(config_devs, vals)
    3.30      configure_vifs(config_devs, vals)
    3.31 -    configure_usb(config_devs, vals)
    3.32      configure_vtpm(config_devs, vals)
    3.33      configure_vfbs(config_devs, vals)
    3.34      configure_security(config, vals)