proxmox-mirrors/qemu-server
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu-server synced 2025-05-08 19:29:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

cleanup previous patch

Browse Source
This commit is contained in:
Dietmar Maurer 2014-06-18 06:54:45 +02:00
parent f8e83f0548
commit db656e5f24
1 changed files with 36 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
PVE/QemuServer.pm
View File

@ -1059,6 +1059,23 @@ sub path_is_scsi {
return $res; return $res;
} }
sub machine_type_is_q35 {
my ($conf) = @_;
return $conf->{machine} && ($conf->{machine} =~ m/q35/) ? 1 : 0;
}
sub print_tabletdevice_full {
my ($conf) = @_;
my $q35 = machine_type_is_q35($conf);
# we use uhci for old VMs because tablet driver was buggy in older qemu
my $usbbus = $q35 ? "ehci" : "uhci";
return "usb-tablet,id=tablet,bus=$usbbus.0,port=1";
}
sub print_drivedevice_full { sub print_drivedevice_full {
my ($storecfg, $conf, $vmid, $drive, $bridges) = @_; my ($storecfg, $conf, $vmid, $drive, $bridges) = @_;
@ -2331,7 +2348,8 @@ sub config_to_command {
my $have_ovz = -f '/proc/vz/vestat'; my $have_ovz = -f '/proc/vz/vestat';
my $q35 = 1 if($conf->{machine} && $conf->{machine} =~ m/q35/); my $q35 = machine_type_is_q35($conf);
push @$cmd, '/usr/bin/kvm'; push @$cmd, '/usr/bin/kvm';
push @$cmd, '-id', $vmid; push @$cmd, '-id', $vmid;
@ -2349,19 +2367,21 @@ sub config_to_command {
push @$cmd, '-daemonize'; push @$cmd, '-daemonize';
if($q35){ if ($q35) {
# the q35 chipset support native usb2, so we enable usb controller
# by default for this machine type
push @$devices, '-readconfig', '/usr/share/qemu-server/pve-q35.cfg'; push @$devices, '-readconfig', '/usr/share/qemu-server/pve-q35.cfg';
}else{ } else {
$pciaddr = print_pci_addr("piix3", $bridges); $pciaddr = print_pci_addr("piix3", $bridges);
push @$devices, '-device', "piix3-usb-uhci,id=uhci$pciaddr.0x2"; push @$devices, '-device', "piix3-usb-uhci,id=uhci$pciaddr.0x2";
my $use_usb2 = 0; my $use_usb2 = 0;
for (my $i = 0; $i < $MAX_USB_DEVICES; $i++) { for (my $i = 0; $i < $MAX_USB_DEVICES; $i++) {
next if !$conf->{"usb$i"}; next if !$conf->{"usb$i"};
$use_usb2 = 1; $use_usb2 = 1;
} }
# include usb device config # include usb device config
push @$devices, '-readconfig', '/usr/share/qemu-server/pve-usb.cfg' if $use_usb2; push @$devices, '-readconfig', '/usr/share/qemu-server/pve-usb.cfg' if $use_usb2;
} }
my $vga = $conf->{vga}; my $vga = $conf->{vga};
@ -2389,8 +2409,7 @@ sub config_to_command {
$tablet = 0 if $vga =~ m/^serial\d+$/; # disable if we use serial terminal (no vga card) $tablet = 0 if $vga =~ m/^serial\d+$/; # disable if we use serial terminal (no vga card)
} }
my $usbbus = $q35 ? "ehci" : "uhci"; push @$devices, '-device', print_tabletdevice_full($conf) if $tablet;
push @$devices, '-device', "usb-tablet,id=tablet,bus=$usbbus.0,port=1" if $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++) {
@ -2677,8 +2696,8 @@ sub config_to_command {
push @$devices, '-device', $netdevicefull; push @$devices, '-device', $netdevicefull;
} }
if(!$q35){ if (!$q35) {
#bridges # add pci bridges
while (my ($k, $v) = each %$bridges) { while (my ($k, $v) = each %$bridges) {
$pciaddr = print_pci_addr("pci.$k"); $pciaddr = print_pci_addr("pci.$k");
unshift @$devices, '-device', "pci-bridge,id=pci.$k,chassis_nr=$k$pciaddr" if $k > 0; unshift @$devices, '-device', "pci-bridge,id=pci.$k,chassis_nr=$k$pciaddr" if $k > 0;
@ -2763,11 +2782,11 @@ sub vm_deviceplug {
my ($storecfg, $conf, $vmid, $deviceid, $device) = @_; my ($storecfg, $conf, $vmid, $deviceid, $device) = @_;
return 1 if !check_running($vmid); return 1 if !check_running($vmid);
my $q35 = 1 if ($conf->{machine} && $conf->{machine} =~ m/q35/);
my $q35 = machine_type_is_q35($conf);
if ($deviceid eq 'tablet') { if ($deviceid eq 'tablet') {
my $usbbus = $q35 ? "ehci" : "uhci"; qemu_deviceadd($vmid, print_tabletdevice_full($conf));
my $devicefull = "usb-tablet,id=tablet,bus=$usbbus.0,port=1";
qemu_deviceadd($vmid, $devicefull);
return 1; return 1;
} }