[pve-devel] r6469 - in qemu-server/pve2: . PVE

[svn-commits at proxmox.com]

Author: dietmar
Date: 2011-08-12 12:25:42 +0200 (Fri, 12 Aug 2011)
New Revision: 6469

Added:
   qemu-server/pve2/pve-usb.cfg
Modified:
   qemu-server/pve2/ChangeLog
   qemu-server/pve2/Makefile
   qemu-server/pve2/PVE/QemuServer.pm
Log:
	* PVE/QemuServer.pm (config_to_command): include usb2
	configuration.

	* pve-usb.cfg: use extra file for usb2 configuration



Modified: qemu-server/pve2/ChangeLog
===================================================================
--- qemu-server/pve2/ChangeLog	2011-08-12 10:13:41 UTC (rev 6468)
+++ qemu-server/pve2/ChangeLog	2011-08-12 10:25:42 UTC (rev 6469)
@@ -1,5 +1,10 @@
 2011-08-12  Proxmox Support Team  <support at proxmox.com>
 
+	* PVE/QemuServer.pm (config_to_command): include usb2
+	configuration.
+
+	* pve-usb.cfg: use extra file for usb2 configuration
+
 	* PVE/QemuServer.pm (config_to_command): fix for 0.15.0 - supress
 	network boot
 

Modified: qemu-server/pve2/Makefile
===================================================================
--- qemu-server/pve2/Makefile	2011-08-12 10:13:41 UTC (rev 6468)
+++ qemu-server/pve2/Makefile	2011-08-12 10:25:42 UTC (rev 6469)
@@ -58,6 +58,8 @@
 	install -d ${DESTDIR}${LIBDIR}
 	install -d ${DESTDIR}${VARLIBDIR}
 	install -d ${DESTDIR}/usr/share/man/man1
+	install -d ${DESTDIR}/usr/share/qemu-server
+	install -m 0644 pve-usb.cfg ${DESTDIR}/usr/share/qemu-server
 	install -d ${DESTDIR}/var/run/qemu-server
 	install -d ${DESTDIR}/var/lock/qemu-server
 	make -C PVE install

Modified: qemu-server/pve2/PVE/QemuServer.pm
===================================================================
--- qemu-server/pve2/PVE/QemuServer.pm	2011-08-12 10:13:41 UTC (rev 6468)
+++ qemu-server/pve2/PVE/QemuServer.pm	2011-08-12 10:25:42 UTC (rev 6469)
@@ -1832,6 +1832,9 @@
 
     push @$cmd, '-incoming', $migrate_uri if $migrate_uri;
 
+    # include usb device config
+    push @$cmd, '-readconfig', '/usr/share/qemu-server/pve-usb.cfg';
+    
     # enable absolute mouse coordinates (needed by vnc)
     my $tablet = defined ($conf->{tablet}) ? $conf->{tablet} : $defaults->{tablet};
     push @$cmd, '-usbdevice', 'tablet' if $tablet;

Added: qemu-server/pve2/pve-usb.cfg
===================================================================
--- qemu-server/pve2/pve-usb.cfg	                        (rev 0)
+++ qemu-server/pve2/pve-usb.cfg	2011-08-12 10:25:42 UTC (rev 6469)
@@ -0,0 +1,25 @@
+[device "ehci"]
+  driver = "ich9-usb-ehci1"
+  addr = "1d.7"
+  multifunction = "on"
+
+[device "uhci-1"]
+  driver = "ich9-usb-uhci1"
+  addr = "1d.0"
+  multifunction = "on"
+  masterbus = "ehci.0"
+  firstport = "0"
+
+[device "uhci-2"]
+  driver = "ich9-usb-uhci2"
+  addr = "1d.1"
+  multifunction = "on"
+  masterbus = "ehci.0"
+  firstport = "2"
+
+[device "uhci-3"]
+  driver = "ich9-usb-uhci3"
+  addr = "1d.2"
+  multifunction = "on"
+  masterbus = "ehci.0"
+  firstport = "4"