use PVE::QemuServer::Memory;
use PVE::QemuServer::USB qw(parse_usb_device);
use PVE::QemuServer::Cloudinit;
+use PVE::SysFSTools;
use PVE::Systemd;
use Time::HiRes qw(gettimeofday);
use File::Copy qw(copy);
my $lock_dir = "/var/lock/qemu-server";
mkdir $lock_dir;
-my $pcisysfs = "/sys/bus/pci";
-
my $cpu_vendor_list = {
# Intel CPUs
486 => 'GenuineIntel',
if (defined($2)) {
push @{$res->{pciid}}, { id => $1, function => $2 };
} else {
- my $pcidevices = lspci($1);
+ my $pcidevices = PVE::SysFSTools::lspci($1);
$res->{pciid} = $pcidevices->{$1};
}
} else {
}
}
-sub check_iommu_support{
- #fixme : need to check IOMMU support
- #http://www.linux-kvm.org/page/How_to_assign_devices_with_VT-d_in_KVM
-
- my $iommu=1;
- return $iommu;
-
-}
-
sub touch_config {
my ($vmid) = @_;
}
}
- push @$cpuFlags , '+lahf_lm' if $cpu eq 'kvm64';
+ push @$cpuFlags , '+lahf_lm' if $cpu eq 'kvm64' && $arch eq 'x86_64';
push @$cpuFlags , '-x2apic'
if $conf->{ostype} && $conf->{ostype} eq 'solaris';
push @$cpuFlags, '-rdtscp' if $cpu =~ m/^Opteron/;
- if (qemu_machine_feature_enabled ($machine_type, $kvmver, 2, 3)) {
+ if (qemu_machine_feature_enabled ($machine_type, $kvmver, 2, 3) && $arch eq 'x86_64') {
push @$cpuFlags , '+kvm_pv_unhalt' if $kvm;
push @$cpuFlags , '+kvm_pv_eoi' if $kvm;
add_hyperv_enlightenments($cpuFlags, $winversion, $machine_type, $kvmver, $conf->{bios}, $gpu_passthrough) if $kvm;
- push @$cpuFlags, 'enforce' if $cpu ne 'host' && $kvm;
+ push @$cpuFlags, 'enforce' if $cpu ne 'host' && $kvm && $arch eq 'x86_64';
push @$cpuFlags, 'kvm=off' if $kvm_off;
push @$cmd, '-mon', "chardev=qmp,mode=control";
if (qemu_machine_feature_enabled($machine_type, $kvmver, 2, 12)) {
- my $eventsocket = qmp_socket($vmid, 0, 'event');
- push @$cmd, '-chardev', "socket,id=qmp-event,path=$eventsocket,server,nowait";
+ push @$cmd, '-chardev', "socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect=5";
push @$cmd, '-mon', "chardev=qmp-event,mode=control";
}
$vga->{type} = 'qxl' if $qxlnum;
if (!$vga->{type}) {
- if (qemu_machine_feature_enabled($machine_type, $kvmver, 2, 9)) {
+ if ($arch eq 'aarch64') {
+ $vga->{type} = 'virtio';
+ } elsif (qemu_machine_feature_enabled($machine_type, $kvmver, 2, 9)) {
$vga->{type} = (!$winversion || $winversion >= 6) ? 'std' : 'cirrus';
} else {
$vga->{type} = ($winversion >= 6) ? 'std' : 'cirrus';
foreach my $pcidevice (@$pcidevices) {
my $pciid = $pcidevice->{id}.".".$pcidevice->{function};
- my $info = pci_device_info("0000:$pciid");
- die "IOMMU not present\n" if !check_iommu_support();
+ my $info = PVE::SysFSTools::pci_device_info("0000:$pciid");
+ die "IOMMU not present\n" if !PVE::SysFSTools::check_iommu_support();
die "no pci device info for device '$pciid'\n" if !$info;
- die "can't unbind/bind pci group to vfio '$pciid'\n" if !pci_dev_group_bind_to_vfio($pciid);
- die "can't reset pci device '$pciid'\n" if $info->{has_fl_reset} and !pci_dev_reset($info);
+ die "can't unbind/bind pci group to vfio '$pciid'\n"
+ if !PVE::SysFSTools::pci_dev_group_bind_to_vfio($pciid);
+ die "can't reset pci device '$pciid'\n"
+ if $info->{has_fl_reset} and !PVE::SysFSTools::pci_dev_reset($info);
}
}
});
}
-# pci helpers
-
-sub file_write {
- my ($filename, $buf) = @_;
-
- my $fh = IO::File->new($filename, "w");
- return undef if !$fh;
-
- my $res = print $fh $buf;
-
- $fh->close();
-
- return $res;
-}
-
-sub pci_device_info {
- my ($name) = @_;
-
- my $res;
-
- return undef if $name !~ m/^([a-f0-9]{4}):([a-f0-9]{2}):([a-f0-9]{2})\.([a-f0-9])$/;
- my ($domain, $bus, $slot, $func) = ($1, $2, $3, $4);
-
- my $irq = file_read_firstline("$pcisysfs/devices/$name/irq");
- return undef if !defined($irq) || $irq !~ m/^\d+$/;
-
- my $vendor = file_read_firstline("$pcisysfs/devices/$name/vendor");
- return undef if !defined($vendor) || $vendor !~ s/^0x//;
-
- my $product = file_read_firstline("$pcisysfs/devices/$name/device");
- return undef if !defined($product) || $product !~ s/^0x//;
-
- $res = {
- name => $name,
- vendor => $vendor,
- product => $product,
- domain => $domain,
- bus => $bus,
- slot => $slot,
- func => $func,
- irq => $irq,
- has_fl_reset => -f "$pcisysfs/devices/$name/reset" || 0,
- };
-
- return $res;
-}
-
-sub pci_dev_reset {
- my ($dev) = @_;
-
- my $name = $dev->{name};
-
- my $fn = "$pcisysfs/devices/$name/reset";
-
- return file_write($fn, "1");
-}
-
-sub pci_dev_bind_to_vfio {
- my ($dev) = @_;
-
- my $name = $dev->{name};
-
- my $vfio_basedir = "$pcisysfs/drivers/vfio-pci";
-
- if (!-d $vfio_basedir) {
- system("/sbin/modprobe vfio-pci >/dev/null 2>/dev/null");
- }
- die "Cannot find vfio-pci module!\n" if !-d $vfio_basedir;
-
- my $testdir = "$vfio_basedir/$name";
- return 1 if -d $testdir;
-
- my $data = "$dev->{vendor} $dev->{product}";
- return undef if !file_write("$vfio_basedir/new_id", $data);
-
- my $fn = "$pcisysfs/devices/$name/driver/unbind";
- if (!file_write($fn, $name)) {
- return undef if -f $fn;
- }
-
- $fn = "$vfio_basedir/bind";
- if (! -d $testdir) {
- return undef if !file_write($fn, $name);
- }
-
- return -d $testdir;
-}
-
-sub pci_dev_group_bind_to_vfio {
- my ($pciid) = @_;
-
- my $vfio_basedir = "$pcisysfs/drivers/vfio-pci";
-
- if (!-d $vfio_basedir) {
- system("/sbin/modprobe vfio-pci >/dev/null 2>/dev/null");
- }
- die "Cannot find vfio-pci module!\n" if !-d $vfio_basedir;
-
- # get IOMMU group devices
- opendir(my $D, "$pcisysfs/devices/0000:$pciid/iommu_group/devices/") || die "Cannot open iommu_group: $!\n";
- my @devs = grep /^0000:/, readdir($D);
- closedir($D);
-
- foreach my $pciid (@devs) {
- $pciid =~ m/^([:\.\da-f]+)$/ or die "PCI ID $pciid not valid!\n";
-
- # pci bridges, switches or root ports are not supported
- # they have a pci_bus subdirectory so skip them
- next if (-e "$pcisysfs/devices/$pciid/pci_bus");
-
- my $info = pci_device_info($1);
- pci_dev_bind_to_vfio($info) || die "Cannot bind $pciid to vfio\n";
- }
-
- return 1;
-}
-
# vzdump restore implementaion
sub tar_archive_read_firstfile {
return ($volid, $vars_size);
}
-sub lspci {
-
- my $devices = {};
-
- dir_glob_foreach("$pcisysfs/devices", '[a-f0-9]{4}:([a-f0-9]{2}:[a-f0-9]{2})\.([0-9])', sub {
- my (undef, $id, $function) = @_;
- my $res = { id => $id, function => $function};
- push @{$devices->{$id}}, $res;
- });
-
- # Entries should be sorted by functions.
- foreach my $id (keys %$devices) {
- my $dev = $devices->{$id};
- $devices->{$id} = [ sort { $a->{function} <=> $b->{function} } @$dev ];
- }
-
- return $devices;
-}
-
sub vm_iothreads_list {
my ($vmid) = @_;
projects / qemu-server.git / blobdiff