diff --git a/tools/python/xen/xend/XendDevices.py b/tools/python/xen/xend/XendDevices.py index 70557855a1..635ff923f8 100644 --- a/tools/python/xen/xend/XendDevices.py +++ b/tools/python/xen/xend/XendDevices.py @@ -19,7 +19,7 @@ # A collection of DevControllers # -from xen.xend.server import blkif, netif, tpmif, pciif, iopif, irqif, usbif, vfbif +from xen.xend.server import blkif, netif, tpmif, pciif, iopif, irqif, vfbif from xen.xend.server.BlktapController import BlktapController from xen.xend.server.ConsoleController import ConsoleController @@ -41,7 +41,6 @@ class XendDevices: 'pci': pciif.PciController, 'ioports': iopif.IOPortsController, 'irq': irqif.IRQController, - 'usb': usbif.UsbifController, 'tap': BlktapController, 'vfb': vfbif.VfbifController, 'vkbd': vfbif.VkbdifController, diff --git a/tools/python/xen/xend/server/usbif.py b/tools/python/xen/xend/server/usbif.py deleted file mode 100644 index ccc212f885..0000000000 --- a/tools/python/xen/xend/server/usbif.py +++ /dev/null @@ -1,42 +0,0 @@ -#============================================================================ -# This library is free software; you can redistribute it and/or -# modify it under the terms of version 2.1 of the GNU Lesser General Public -# License as published by the Free Software Foundation. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -#============================================================================ -# Copyright (C) 2004 Mike Wray -# Copyright (C) 2004 Intel Research Cambridge -# Copyright (C) 2004 Mark Williamson -# Copyright (C) 2005 XenSource Ltd -#============================================================================ - - -"""Support for virtual USB hubs. -""" - -from xen.xend.server.DevController import DevController - - -class UsbifController(DevController): - """USB device interface controller. Handles all USB devices - for a domain. - """ - - def __init__(self, vm): - """Create a USB device controller. - """ - DevController.__init__(self, vm) - - - def getDeviceDetails(self, _): - """@see DevController.getDeviceDetails""" - - return (self.allocateDeviceID(), {}, {}) diff --git a/tools/python/xen/xm/create.py b/tools/python/xen/xm/create.py index 5159eb1ee8..297b819fdb 100644 --- a/tools/python/xen/xm/create.py +++ b/tools/python/xen/xm/create.py @@ -309,11 +309,6 @@ gopts.var('irq', val='IRQ', For example 'irq=7'. This option may be repeated to add more than one IRQ.""") -gopts.var('usbport', val='PATH', - fn=append_value, default=[], - use="""Add a physical USB port to a domain, as specified by the path - to that port. This option may be repeated to add more than one port.""") - gopts.var('vfb', val="type={vnc,sdl},vncunused=1,vncdisplay=N,vnclisten=ADDR,display=DISPLAY,xauthority=XAUTHORITY,vncpasswd=PASSWORD", fn=append_value, default=[], use="""Make the domain a framebuffer backend. @@ -617,11 +612,6 @@ def configure_irq(config_devs, vals): config_irq = ['irq', ['irq', irq]] config_devs.append(['device', config_irq]) -def configure_usb(config_devs, vals): - for path in vals.usbport: - config_usb = ['usbport', ['path', path]] - config_devs.append(['device', config_usb]) - def configure_vfbs(config_devs, vals): for f in vals.vfb: d = comma_sep_kv_to_dict(f) @@ -800,7 +790,6 @@ def make_config(vals): configure_ioports(config_devs, vals) configure_irq(config_devs, vals) configure_vifs(config_devs, vals) - configure_usb(config_devs, vals) configure_vtpm(config_devs, vals) configure_vfbs(config_devs, vals) configure_security(config, vals)