mirror of
git://git.proxmox.com/git/qemu-server.git
synced 2025-02-02 09:47:13 +03:00
do not use ehci by default
Because the ehci driver blocks migration (ehci is currently not migratable)
This commit is contained in:
parent
d68afb26bf
commit
1c06086781
2
Makefile
2
Makefile
@ -2,7 +2,7 @@ RELEASE=2.0
|
||||
|
||||
VERSION=2.0
|
||||
PACKAGE=qemu-server
|
||||
PKGREL=10
|
||||
PKGREL=11
|
||||
|
||||
DESTDIR=
|
||||
PREFIX=/usr
|
||||
|
@ -1952,12 +1952,23 @@ sub config_to_command {
|
||||
|
||||
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
|
||||
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)
|
||||
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
|
||||
for (my $i = 0; $i < $MAX_HOSTPCI_DEVICES; $i++) {
|
||||
|
@ -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
|
||||
|
||||
* set qm exit codes currectly
|
||||
|
Loading…
x
Reference in New Issue
Block a user