proxmox-mirrors/qemu-server
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu-server synced 2025-06-14 03:54:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

do not use ehci by default

Browse Source 
Because the ehci driver blocks migration (ehci is currently not migratable)
This commit is contained in:
Dietmar Maurer 2011-12-08 10:24:56 +01:00
parent d68afb26bf
commit 1c06086781
3 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -2,7 +2,7 @@ RELEASE=2.0
VERSION=2.0 VERSION=2.0
PACKAGE=qemu-server PACKAGE=qemu-server
PKGREL=10 PKGREL=11
DESTDIR= DESTDIR=
PREFIX=/usr PREFIX=/usr

15
PVE/QemuServer.pm
View File

@ -1952,12 +1952,23 @@ sub config_to_command {
push @$cmd, '-incoming', $migrate_uri if $migrate_uri; push @$cmd, '-incoming', $migrate_uri if $migrate_uri;
my $use_usb2 = 0;
for (my $i = 0; $i < $MAX_USB_DEVICES; $i++) {
next if !$conf->{"usb$i"};
$use_usb2 = 1;
}
# include usb device config # include usb device config
push @$cmd, '-readconfig', '/usr/share/qemu-server/pve-usb.cfg'; push @$cmd, '-readconfig', '/usr/share/qemu-server/pve-usb.cfg' if $use_usb2;
# enable absolute mouse coordinates (needed by vnc) # enable absolute mouse coordinates (needed by vnc)
my $tablet = defined($conf->{tablet}) ? $conf->{tablet} : $defaults->{tablet}; my $tablet = defined($conf->{tablet}) ? $conf->{tablet} : $defaults->{tablet};
push @$cmd, '-device', 'usb-tablet,bus=ehci.0,port=6' if $tablet; if ($tablet) {
if ($use_usb2) {
push @$cmd, '-device', 'usb-tablet,bus=ehci.0,port=6';
} else {
push @$cmd, '-usbdevice', 'tablet';
}
}
# host pci devices # host pci devices
for (my $i = 0; $i < $MAX_HOSTPCI_DEVICES; $i++) { for (my $i = 0; $i < $MAX_HOSTPCI_DEVICES; $i++) {

6
changelog.Debian
View File

@ -1,3 +1,9 @@
qemu-server (2.0-11) unstable; urgency=low
* do not use ehci by default
-- Proxmox Support Team <support@proxmox.com> Thu, 08 Dec 2011 10:26:36 +0100
qemu-server (2.0-10) unstable; urgency=low qemu-server (2.0-10) unstable; urgency=low
* set qm exit codes currectly * set qm exit codes currectly