use PVE::Cluster qw(cfs_register_file cfs_read_file cfs_write_file cfs_lock_file);
use PVE::INotify;
use PVE::ProcFSTools;
+use PVE::QemuConfig;
use PVE::QMPClient;
use PVE::RPCEnvironment;
use Time::HiRes qw(gettimeofday);
use File::Copy qw(copy);
+use URI::Escape;
my $qemu_snap_storage = {rbd => 1, sheepdog => 1};
my $pcisysfs = "/sys/bus/pci";
-my $cpudesc = {
+my $cpu_fmt = {
cputype => {
description => "Emulated CPU type.",
type => 'string',
enum => [ qw(486 athlon pentium pentium2 pentium3 coreduo core2duo kvm32 kvm64 qemu32 qemu64 phenom Conroe Penryn Nehalem Westmere SandyBridge IvyBridge Haswell Haswell-noTSX Broadwell Broadwell-noTSX Opteron_G1 Opteron_G2 Opteron_G3 Opteron_G4 Opteron_G5 host) ],
+ format_description => 'cputype',
default => 'kvm64',
default_key => 1,
},
},
};
+my $watchdog_fmt = {
+ model => {
+ default_key => 1,
+ type => 'string',
+ enum => [qw(i6300esb ib700)],
+ description => "Watchdog type to emulate.",
+ default => 'i6300esb',
+ optional => 1,
+ },
+ action => {
+ type => 'string',
+ enum => [qw(reset shutdown poweroff pause debug none)],
+ description => "The action to perform if after activation the guest fails to poll the watchdog in time.",
+ optional => 1,
+ },
+};
+PVE::JSONSchema::register_format('pve-qm-watchdog', $watchdog_fmt);
+
my $confdesc = {
onboot => {
optional => 1,
cpulimit => {
optional => 1,
type => 'number',
- description => "Limit of CPU usage. Note if the computer has 2 CPUs, it has total of '2' CPU time. Value '0' indicates no CPU limit.",
+ description => "Limit of CPU usage.\n\nNOTE: If the computer has 2 CPUs, it has total of '2' CPU time. Value '0' indicates no CPU limit.",
minimum => 0,
maximum => 128,
default => 0,
numa => {
optional => 1,
type => 'boolean',
- description => "Enable/disable Numa.",
+ description => "Enable/disable NUMA.",
default => 0,
},
vcpus => {
vga => {
optional => 1,
type => 'string',
- description => "Select VGA type. If you want to use high resolution modes (>= 1280x1024x16) then you should use option 'std' or 'vmware'. Default is 'std' for win8/win7/w2k8, and 'cirrur' for other OS types. Option 'qxl' enables the SPICE display sever. You can also run without any graphic card using a serial devive as terminal.",
+ description => "Select the VGA type. If you want to use high resolution" .
+ " modes (>= 1280x1024x16) then you should use the options " .
+ "'std' or 'vmware'. Default is 'std' for win8/win7/w2k8, and " .
+ "'cirrus' for other OS types. The 'qxl' option enables the SPICE " .
+ "display sever. For win* OS you can select how many independent " .
+ "displays you want, Linux guests can add displays them self. " .
+ "You can also run without any graphic card, using a serial device" .
+ " as terminal.",
enum => [qw(std cirrus vmware qxl serial0 serial1 serial2 serial3 qxl2 qxl3 qxl4)],
},
watchdog => {
optional => 1,
type => 'string', format => 'pve-qm-watchdog',
- typetext => '[[model=]i6300esb|ib700] [,[action=]reset|shutdown|poweroff|pause|debug|none]',
- description => "Create a virtual hardware watchdog device. Once enabled (by a guest action), the watchdog must be periodically polled by an agent inside the guest or else the guest will be restarted (or execute the action specified)",
+ description => "Create a virtual hardware watchdog device. Once enabled" .
+ " (by a guest action), the watchdog must be periodically polled " .
+ "by an agent inside the guest or else the watchdog will reset " .
+ "the guest (or execute the respective action specified)",
},
startdate => {
optional => 1,
optional => 1,
type => 'string',
description => <<EODESCR,
-Note: this option is for experts only. It allows you to pass arbitrary arguments to kvm, for example:
+Arbitrary arguments passed to kvm, for example:
args: -no-reboot -no-hpet
+
+NOTE: this option is for experts only.
EODESCR
},
tablet => {
optional => 1,
type => 'boolean',
default => 1,
- description => "Enable/disable the usb tablet device. This device is usually needed to allow absolute mouse positioning with VNC. Else the mouse runs out of sync with normal VNC clients. If you're running lots of console-only guests on one host, you may consider disabling this to save some context switches. This is turned of by default if you use spice (vga=qxl).",
+ description => "Enable/disable the USB tablet device. This device is " .
+ "usually needed to allow absolute mouse positioning with VNC. " .
+ "Else the mouse runs out of sync with normal VNC clients. " .
+ "If you're running lots of console-only guests on one host, " .
+ "you may consider disabling this to save some context switches. " .
+ "This is turned off by default if you use spice (-vga=qxl).",
},
migrate_speed => {
optional => 1,
optional => 1,
description => "Emulated CPU type.",
type => 'string',
- format => $cpudesc,
+ format => $cpu_fmt,
},
parent => get_standard_option('pve-snapshot-name', {
optional => 1,
my $MAX_MEM = 4194304;
my $STATICMEM = 1024;
+my $numa_fmt = {
+ cpus => {
+ type => "string",
+ pattern => qr/\d+(?:-\d+)?(?:;\d+(?:-\d+)?)*/,
+ description => "CPUs accessing this numa node.",
+ format_description => "id[-id];...",
+ },
+ memory => {
+ type => "number",
+ description => "Amount of memory this numa node provides.",
+ format_description => "mb",
+ optional => 1,
+ },
+ hostnodes => {
+ type => "string",
+ pattern => qr/\d+(?:-\d+)?(?:;\d+(?:-\d+)?)*/,
+ description => "host numa nodes to use",
+ format_description => "id[-id];...",
+ optional => 1,
+ },
+ policy => {
+ type => 'string',
+ enum => [qw(preferred bind interleave)],
+ format_description => 'preferred|bind|interleave',
+ description => "numa allocation policy.",
+ optional => 1,
+ },
+};
+PVE::JSONSchema::register_format('pve-qm-numanode', $numa_fmt);
my $numadesc = {
optional => 1,
- type => 'string', format => 'pve-qm-numanode',
- typetext => "cpus=<id[-id],memory=<mb>[[,hostnodes=<id[-id]>] [,policy=<preferred|bind|interleave>]]",
+ type => 'string', format => $numa_fmt,
description => "numa topology",
};
PVE::JSONSchema::register_standard_option("pve-qm-numanode", $numadesc);
'e1000-82540em', 'e1000-82544gc', 'e1000-82545em'];
my $nic_model_list_txt = join(' ', sort @$nic_model_list);
+my $net_fmt = {
+ macaddr => {
+ type => 'string',
+ pattern => qr/[0-9a-f]{2}(?::[0-9a-f]{2}){5}/i,
+ description => "MAC address",
+ format_description => "XX:XX:XX:XX:XX:XX",
+ optional => 1,
+ },
+ model => { alias => 'macaddr', default_key => 1 },
+ (map { $_ => { group => 'model' } } @$nic_model_list),
+ bridge => {
+ type => 'string',
+ description => 'Bridge to attach the network device to.',
+ format_description => 'bridge',
+ optional => 1,
+ },
+ queues => {
+ type => 'integer',
+ minimum => 0, maximum => 16,
+ description => 'Number of packet queues to be used on the device.',
+ format_description => 'number',
+ optional => 1,
+ },
+ rate => {
+ type => 'number',
+ minimum => 0,
+ description => 'Rate limit in mbps as floating point number.',
+ format_description => 'mbps',
+ optional => 1,
+ },
+ tag => {
+ type => 'integer',
+ minimum => 2, maximum => 4094,
+ description => 'VLAN tag to apply to packets on this interface.',
+ format_description => 'vlanid',
+ optional => 1,
+ },
+ trunks => {
+ type => 'string',
+ pattern => qr/\d+(?:-\d+)?(?:;\d+(?:-\d+)?)*/,
+ description => 'VLAN trunks to pass through this interface.',
+ format_description => 'id;id...',
+ optional => 1,
+ },
+ firewall => {
+ type => 'boolean',
+ description => 'Whether this interface should be protected by the firewall.',
+ format_description => '0|1',
+ optional => 1,
+ },
+ link_down => {
+ type => 'boolean',
+ description => 'Whether this interface should be DISconnected (like pulling the plug).',
+ format_description => '0|1',
+ optional => 1,
+ },
+};
my $netdesc = {
optional => 1,
type => 'string', format => 'pve-qm-net',
- typetext => "MODEL=XX:XX:XX:XX:XX:XX [,bridge=<dev>][,queues=<nbqueues>][,rate=<mbps>] [,tag=<vlanid>][,trunks=<vlanid[;vlanid]>][,firewall=0|1],link_down=0|1]",
description => <<EODESCR,
Specify network devices.
$confdesc->{"net$i"} = $netdesc;
}
+PVE::JSONSchema::register_format('pve-volume-id-or-qm-path', \&verify_volume_id_or_qm_path);
+sub verify_volume_id_or_qm_path {
+ my ($volid, $noerr) = @_;
+
+ if ($volid eq 'none' || $volid eq 'cdrom' || $volid =~ m|^/|) {
+ return $volid;
+ }
+
+ # if its neither 'none' nor 'cdrom' nor a path, check if its a volume-id
+ $volid = eval { PVE::JSONSchema::check_format('pve-volume-id', $volid, '') };
+ if ($@) {
+ return undef if $noerr;
+ die $@;
+ }
+ return $volid;
+}
+
my $drivename_hash;
my %drivedesc_base = (
volume => { alias => 'file' },
file => {
- type => 'pve-volume-id',
+ type => 'string',
+ format => 'pve-volume-id-or-qm-path',
default_key => 1,
format_description => 'volume',
description => "The drive's backing volume.",
},
serial => {
type => 'string',
+ format => 'urlencoded',
format_description => 'serial',
- description => "The drive's reported serial number.",
+ maxLength => 20*3, # *3 since it's %xx url enoded
+ description => "The drive's reported serial number, url-encoded, up to 20 bytes long.",
optional => 1,
}
);
my %model_fmt = (
model => {
type => 'string',
+ format => 'urlencoded',
format_description => 'model',
- description => "The drive's reported model name.",
+ maxLength => 40*3, # *3 since it's %xx url enoded
+ description => "The drive's reported model name, url-encoded, up to 40 bytes long.",
optional => 1,
},
);
$add_throttle_desc->('bps', 'integer', 'r/w speed', 'bps', 'bytes');
$add_throttle_desc->('bps_rd', 'integer', 'read speed', 'bps', 'bytes');
$add_throttle_desc->('bps_wr', 'integer', 'write speed', 'bps', 'bytes');
-$add_throttle_desc->('mbps', 'float', 'r/w speed', 'mbps', 'megabytes');
-$add_throttle_desc->('mbps_rd', 'float', 'read speed', 'mbps', 'megabytes');
-$add_throttle_desc->('mbps_wr', 'float', 'write speed', 'mbps', 'megabytes');
+$add_throttle_desc->('mbps', 'number', 'r/w speed', 'mbps', 'megabytes');
+$add_throttle_desc->('mbps_rd', 'number', 'read speed', 'mbps', 'megabytes');
+$add_throttle_desc->('mbps_wr', 'number', 'write speed', 'mbps', 'megabytes');
$add_throttle_desc->('iops', 'integer', 'r/w I/O', 'iops', 'operations');
$add_throttle_desc->('iops_rd', 'integer', 'read I/O', 'iops', 'operations');
$add_throttle_desc->('iops_wr', 'integer', 'write I/O', 'iops', 'operations');
# pools: (pool of IO before throttling starts taking effect)
-$add_throttle_desc->('mbps_max', 'float', 'unthrottled r/w pool', 'mbps', 'megabytes');
-$add_throttle_desc->('mbps_rd_max', 'float', 'unthrottled read pool', 'mbps', 'megabytes');
-$add_throttle_desc->('mbps_wr_max', 'float', 'unthrottled write pool', 'mbps', 'megabytes');
+$add_throttle_desc->('mbps_max', 'number', 'unthrottled r/w pool', 'mbps', 'megabytes');
+$add_throttle_desc->('mbps_rd_max', 'number', 'unthrottled read pool', 'mbps', 'megabytes');
+$add_throttle_desc->('mbps_wr_max', 'number', 'unthrottled write pool', 'mbps', 'megabytes');
$add_throttle_desc->('iops_max', 'integer', 'unthrottled r/w I/O pool', 'iops', 'operations');
$add_throttle_desc->('iops_rd_max', 'integer', 'unthrottled read I/O pool', 'iops', 'operations');
$add_throttle_desc->('iops_wr_max', 'integer', 'unthrottled write I/O pool', 'iops', 'operations');
%queues_fmt,
};
-my $usbformat = {
+my $usb_fmt = {
host => {
default_key => 1,
type => 'string', format => 'pve-qm-usb-device',
my $usbdesc = {
optional => 1,
- type => 'string', format => $usbformat,
+ type => 'string', format => $usb_fmt,
description => <<EODESCR,
Configure an USB device (n is 0 to 4). This can be used to
pass-through usb devices to the guest. HOSTUSBDEVICE syntax is:
You can use the 'lsusb -t' command to list existing usb devices.
-Note: This option allows direct access to host hardware. So it is no longer possible to migrate such machines - use with special care.
+NOTE: This option allows direct access to host hardware. So it is no longer possible to migrate such machines - use with special care.
The value 'spice' can be used to add a usb redirection devices for spice.
};
PVE::JSONSchema::register_standard_option("pve-qm-usb", $usbdesc);
+# NOTE: the match-groups of this regex are used in parse_hostpci
+my $PCIRE = qr/([a-f0-9]{2}:[a-f0-9]{2})(?:\.([a-f0-9]))?/;
+my $hostpci_fmt = {
+ host => {
+ default_key => 1,
+ type => 'string',
+ pattern => qr/$PCIRE(;$PCIRE)*/,
+ format_description => 'HOSTPCIID[;HOSTPCIID2...]',
+ description => "The PCI ID of a host's PCI device or a list of PCI virtual functions of the host.",
+ },
+ rombar => {
+ type => 'boolean',
+ optional => 1,
+ default => 1,
+ },
+ pcie => {
+ type => 'boolean',
+ optional => 1,
+ default => 0,
+ },
+ 'x-vga' => {
+ type => 'boolean',
+ optional => 1,
+ default => 0,
+ },
+};
+PVE::JSONSchema::register_format('pve-qm-hostpci', $hostpci_fmt);
+
my $hostpcidesc = {
optional => 1,
type => 'string', format => 'pve-qm-hostpci',
- typetext => "[host=]HOSTPCIDEVICE [,rombar=on|off] [,pcie=0|1] [,x-vga=on|off]",
description => <<EODESCR,
Map host pci devices. HOSTPCIDEVICE syntax is:
The 'rombar' option determines whether or not the device's ROM will be visible in the guest's memory map (default is 'on').
-Note: This option allows direct access to host hardware. So it is no longer possible to migrate such machines - use with special care.
+NOTE: This option allows direct access to host hardware. So it is no longer possible to migrate such machines - use with special care.
Experimental: user reported problems with this option.
EODESCR
description => <<EODESCR,
Create a serial device inside the VM (n is 0 to 3), and pass through a host serial device (i.e. /dev/ttyS0), or create a unix socket on the host side (use 'qm terminal' to open a terminal connection).
-Note: If you pass through a host serial device, it is no longer possible to migrate such machines - use with special care.
+NOTE: If you pass through a host serial device, it is no longer possible to migrate such machines - use with special care.
Experimental: user reported problems with this option.
EODESCR
description => <<EODESCR,
Map host parallel devices (n is 0 to 2).
-Note: This option allows direct access to host hardware. So it is no longer possible to migrate such machines - use with special care.
+NOTE: This option allows direct access to host hardware. So it is no longer possible to migrate such machines - use with special care.
Experimental: user reported problems with this option.
EODESCR
$kvm_user_version = 'unknown';
- my $tmp = `kvm -help 2>/dev/null`;
+ my $code = sub {
+ my $line = shift;
+ if ($line =~ m/^QEMU( PC)? emulator version (\d+\.\d+(\.\d+)?)(\.\d+)?[,\s]/) {
+ $kvm_user_version = $2;
+ }
+ };
- if ($tmp =~ m/^QEMU( PC)? emulator version (\d+\.\d+(\.\d+)?)(\.\d+)?[,\s]/) {
- $kvm_user_version = $2;
- }
+ eval { run_command("kvm -version", outfunc => $code); };
+ warn $@ if $@;
return $kvm_user_version;
my $kernel_has_vhost_net = -c '/dev/vhost-net';
-sub disknames {
+sub valid_drive_names {
# order is important - used to autoselect boot disk
return ((map { "ide$_" } (0 .. ($MAX_IDE_DISKS - 1))),
(map { "scsi$_" } (0 .. ($MAX_SCSI_DISKS - 1))),
(map { "sata$_" } (0 .. ($MAX_SATA_DISKS - 1))));
}
-sub valid_drivename {
+sub is_valid_drivename {
my $dev = shift;
return defined($drivename_hash->{$dev});
$drive->{media} = 'cdrom' if !$drive->{media} && $drive->{file} =~ m/^(cdrom|none)$/;
}
-sub create_conf_nolock {
- my ($vmid, $settings) = @_;
-
- my $filename = config_file($vmid);
-
- die "configuration file '$filename' already exists\n" if -f $filename;
-
- my $defaults = load_defaults();
-
- $settings->{name} = "vm$vmid" if !$settings->{name};
- $settings->{memory} = $defaults->{memory} if !$settings->{memory};
-
- my $data = '';
- foreach my $opt (keys %$settings) {
- next if !$confdesc->{$opt};
-
- my $value = $settings->{$opt};
- next if !$value;
-
- $data .= "$opt: $value\n";
- }
-
- PVE::Tools::file_set_contents($filename, $data);
-}
-
sub parse_hotplug_features {
my ($data) = @_;
my ($maxdev, $controller, $controller_prefix) = scsihw_infos($conf, $drive);
my $unit = $drive->{index} % $maxdev;
my $devicetype = 'hd';
- my $path = '';
- if (drive_is_cdrom($drive)) {
- $devicetype = 'cd';
+ my $path = '';
+ if (drive_is_cdrom($drive)) {
+ $devicetype = 'cd';
} else {
- if ($drive->{file} =~ m|^/|) {
- $path = $drive->{file};
- } else {
- $path = PVE::Storage::path($storecfg, $drive->{file});
- }
-
- if($path =~ m/^iscsi\:\/\//){
- $devicetype = 'generic';
- } else {
- if (my $info = path_is_scsi($path)) {
- if ($info->{type} == 0) {
- $devicetype = 'block';
- } elsif ($info->{type} == 1) { # tape
- $devicetype = 'generic';
- }
- }
- }
- }
+ if ($drive->{file} =~ m|^/|) {
+ $path = $drive->{file};
+ if (my $info = path_is_scsi($path)) {
+ if ($info->{type} == 0) {
+ $devicetype = 'block';
+ } elsif ($info->{type} == 1) { # tape
+ $devicetype = 'generic';
+ }
+ }
+ } else {
+ $path = PVE::Storage::path($storecfg, $drive->{file});
+ }
- if (!$conf->{scsihw} || ($conf->{scsihw} =~ m/^lsi/)){
- $device = "scsi-$devicetype,bus=$controller_prefix$controller.0,scsi-id=$unit,drive=drive-$drive->{interface}$drive->{index},id=$drive->{interface}$drive->{index}";
- } else {
- $device = "scsi-$devicetype,bus=$controller_prefix$controller.0,channel=0,scsi-id=0,lun=$drive->{index},drive=drive-$drive->{interface}$drive->{index},id=$drive->{interface}$drive->{index}";
- }
+ if($path =~ m/^iscsi\:\/\//){
+ $devicetype = 'generic';
+ }
+ }
+
+ if (!$conf->{scsihw} || ($conf->{scsihw} =~ m/^lsi/)){
+ $device = "scsi-$devicetype,bus=$controller_prefix$controller.0,scsi-id=$unit,drive=drive-$drive->{interface}$drive->{index},id=$drive->{interface}$drive->{index}";
+ } else {
+ $device = "scsi-$devicetype,bus=$controller_prefix$controller.0,channel=0,scsi-id=0,lun=$drive->{index},drive=drive-$drive->{interface}$drive->{index},id=$drive->{interface}$drive->{index}";
+ }
} elsif ($drive->{interface} eq 'ide'){
$maxdev = 2;
$device = "ide-$devicetype,bus=ide.$controller,unit=$unit,drive=drive-$drive->{interface}$drive->{index},id=$drive->{interface}$drive->{index}";
if ($devicetype eq 'hd' && (my $model = $drive->{model})) {
+ $model = URI::Escape::uri_unescape($model);
$device .= ",model=$model";
}
} elsif ($drive->{interface} eq 'sata'){
return $initiator;
}
-my @qemu_drive_options = qw(heads secs cyls trans media format cache snapshot rerror werror aio discard iops iops_rd iops_wr iops_max iops_rd_max iops_wr_max serial);
sub print_drive_full {
my ($storecfg, $vmid, $drive) = @_;
}
my $opts = '';
+ my @qemu_drive_options = qw(heads secs cyls trans media format cache snapshot rerror werror aio discard iops iops_rd iops_wr iops_max iops_rd_max iops_wr_max);
foreach my $o (@qemu_drive_options) {
- next if $o eq 'bootindex';
$opts .= ",$o=$drive->{$o}" if $drive->{$o};
}
+ if (my $serial = $drive->{serial}) {
+ $serial = URI::Escape::uri_unescape($serial);
+ $opts .= ",serial=$serial";
+ }
$opts .= ",format=$format" if $format && !$drive->{format};
}
-sub parse_numa {
- my ($data) = @_;
-
- my $res = {};
-
- foreach my $kvp (split(/,/, $data)) {
-
- if ($kvp =~ m/^memory=(\S+)$/) {
- $res->{memory} = $1;
- } elsif ($kvp =~ m/^policy=(preferred|bind|interleave)$/) {
- $res->{policy} = $1;
- } elsif ($kvp =~ m/^cpus=(\d+)(-(\d+))?$/) {
- $res->{cpus}->{start} = $1;
- $res->{cpus}->{end} = $3;
- } elsif ($kvp =~ m/^hostnodes=(\d+)(-(\d+))?$/) {
- $res->{hostnodes}->{start} = $1;
- $res->{hostnodes}->{end} = $3;
+sub parse_number_sets {
+ my ($set) = @_;
+ my $res = [];
+ foreach my $part (split(/;/, $set)) {
+ if ($part =~ /^\s*(\d+)(?:-(\d+))?\s*$/) {
+ die "invalid range: $part ($2 < $1)\n" if defined($2) && $2 < $1;
+ push @$res, [ $1, $2 ];
} else {
- return undef;
+ die "invalid range: $part\n";
}
}
+ return $res;
+}
+
+sub parse_numa {
+ my ($data) = @_;
+ my $res = PVE::JSONSchema::parse_property_string($numa_fmt, $data);
+ $res->{cpus} = parse_number_sets($res->{cpus}) if defined($res->{cpus});
+ $res->{hostnodes} = parse_number_sets($res->{hostnodes}) if defined($res->{hostnodes});
return $res;
}
return undef if !$value;
+ my $res = PVE::JSONSchema::parse_property_string($hostpci_fmt, $value);
- my @list = split(/,/, $value);
- my $found;
-
- my $res = {};
- foreach my $kv (@list) {
-
- if ($kv =~ m/^(host=)?([a-f0-9]{2}:[a-f0-9]{2})(\.([a-f0-9]))?$/) {
- $found = 1;
- if(defined($4)){
- push @{$res->{pciid}}, { id => $2 , function => $4};
-
- }else{
- my $pcidevices = lspci($2);
- $res->{pciid} = $pcidevices->{$2};
- }
- } elsif ($kv =~ m/^rombar=(on|off)$/) {
- $res->{rombar} = $1;
- } elsif ($kv =~ m/^x-vga=(on|off)$/) {
- $res->{'x-vga'} = $1;
- } elsif ($kv =~ m/^pcie=(\d+)$/) {
- $res->{pcie} = 1 if $1 == 1;
+ my @idlist = split(/;/, $res->{host});
+ delete $res->{host};
+ foreach my $id (@idlist) {
+ if ($id =~ /^$PCIRE$/) {
+ push @{$res->{pciid}}, { id => $1, function => ($2//'0') };
} else {
- warn "unknown hostpci setting '$kv'\n";
+ # should have been caught by parse_property_string already
+ die "failed to parse PCI id: $id\n";
}
}
-
- return undef if !$found;
-
return $res;
}
sub parse_net {
my ($data) = @_;
- my $res = {};
-
- foreach my $kvp (split(/,/, $data)) {
-
- if ($kvp =~ m/^(ne2k_pci|e1000|e1000-82540em|e1000-82544gc|e1000-82545em|rtl8139|pcnet|virtio|ne2k_isa|i82551|i82557b|i82559er|vmxnet3)(=([0-9a-f]{2}(:[0-9a-f]{2}){5}))?$/i) {
- my $model = lc($1);
- my $mac = defined($3) ? uc($3) : PVE::Tools::random_ether_addr();
- $res->{model} = $model;
- $res->{macaddr} = $mac;
- } elsif ($kvp =~ m/^bridge=(\S+)$/) {
- $res->{bridge} = $1;
- } elsif ($kvp =~ m/^queues=(\d+)$/) {
- $res->{queues} = $1;
- } elsif ($kvp =~ m/^rate=(\d+(\.\d+)?)$/) {
- $res->{rate} = $1;
- } elsif ($kvp =~ m/^tag=(\d+)$/) {
- $res->{tag} = $1;
- } elsif ($kvp =~ m/^trunks=([0-9;]+)$/) {
- $res->{trunks} = $1;
- } elsif ($kvp =~ m/^firewall=([01])$/) {
- $res->{firewall} = $1;
- } elsif ($kvp =~ m/^link_down=([01])$/) {
- $res->{link_down} = $1;
- } else {
- return undef;
- }
-
+ my $res = eval { PVE::JSONSchema::parse_property_string($net_fmt, $data) };
+ if ($@) {
+ warn $@;
+ return undef;
}
-
- return undef if !$res->{model};
-
+ $res->{macaddr} = PVE::Tools::random_ether_addr() if !defined($res->{macaddr});
return $res;
}
sub print_net {
my $net = shift;
- my $res = "$net->{model}";
- $res .= "=$net->{macaddr}" if $net->{macaddr};
- $res .= ",bridge=$net->{bridge}" if $net->{bridge};
- $res .= ",rate=$net->{rate}" if $net->{rate};
- $res .= ",tag=$net->{tag}" if $net->{tag};
- $res .= ",trunks=$net->{trunks}" if $net->{trunks};
- $res .= ",firewall=1" if $net->{firewall};
- $res .= ",link_down=1" if $net->{link_down};
- $res .= ",queues=$net->{queues}" if $net->{queues};
-
- return $res;
+ return PVE::JSONSchema::print_property_string($net, $net_fmt);
}
sub add_random_macs {
}
}
-sub add_unused_volume {
- my ($config, $volid) = @_;
-
- my $key;
- for (my $ind = $MAX_UNUSED_DISKS - 1; $ind >= 0; $ind--) {
- my $test = "unused$ind";
- if (my $vid = $config->{$test}) {
- return if $vid eq $volid; # do not add duplicates
- } else {
- $key = $test;
- }
- }
-
- die "To many unused volume - please delete them first.\n" if !$key;
-
- $config->{$key} = $volid;
-
- return $key;
-}
-
sub vm_is_volid_owner {
my ($storecfg, $vmid, $volid) = @_;
if (!drive_is_cdrom($drive)) {
my $volid = $drive->{file};
if (vm_is_volid_owner($storecfg, $vmid, $volid)) {
- add_unused_volume($conf, $volid, $vmid);
+ PVE::QemuConfig->add_unused_volume($conf, $volid, $vmid);
}
}
}
}
# smbios: [manufacturer=str][,product=str][,version=str][,serial=str][,uuid=uuid][,sku=str][,family=str]
-my $smbios1_desc = {
+my $smbios1_fmt = {
uuid => {
type => 'string',
pattern => '[a-fA-F0-9]{8}(?:-[a-fA-F0-9]{4}){3}-[a-fA-F0-9]{12}',
sub parse_smbios1 {
my ($data) = @_;
- my $res = eval { PVE::JSONSchema::parse_property_string($smbios1_desc, $data) };
+ my $res = eval { PVE::JSONSchema::parse_property_string($smbios1_fmt, $data) };
warn $@ if $@;
return $res;
}
sub print_smbios1 {
my ($smbios1) = @_;
- return PVE::JSONSchema::print_property_string($smbios1, $smbios1_desc);
+ return PVE::JSONSchema::print_property_string($smbios1, $smbios1_fmt);
}
-PVE::JSONSchema::register_format('pve-qm-smbios1', $smbios1_desc);
+PVE::JSONSchema::register_format('pve-qm-smbios1', $smbios1_fmt);
PVE::JSONSchema::register_format('pve-qm-bootdisk', \&verify_bootdisk);
sub verify_bootdisk {
my ($value, $noerr) = @_;
- return $value if valid_drivename($value);
+ return $value if is_valid_drivename($value);
return undef if $noerr;
die "invalid boot disk '$value'\n";
}
-PVE::JSONSchema::register_format('pve-qm-numanode', \&verify_numa);
-sub verify_numa {
- my ($value, $noerr) = @_;
-
- return $value if parse_numa($value);
-
- return undef if $noerr;
-
- die "unable to parse numa options\n";
-}
-
PVE::JSONSchema::register_format('pve-qm-net', \&verify_net);
sub verify_net {
my ($value, $noerr) = @_;
die "unable to parse network options\n";
}
-PVE::JSONSchema::register_format('pve-qm-hostpci', \&verify_hostpci);
-sub verify_hostpci {
- my ($value, $noerr) = @_;
-
- return $value if parse_hostpci($value);
-
- return undef if $noerr;
-
- die "unable to parse pci id\n";
-}
-
-PVE::JSONSchema::register_format('pve-qm-watchdog', \&verify_watchdog);
-sub verify_watchdog {
- my ($value, $noerr) = @_;
-
- return $value if parse_watchdog($value);
-
- return undef if $noerr;
-
- die "unable to parse watchdog options\n";
-}
-
sub parse_watchdog {
my ($value) = @_;
return undef if !$value;
- my $res = {};
-
- foreach my $p (split(/,/, $value)) {
- next if $p =~ m/^\s*$/;
-
- if ($p =~ m/^(model=)?(i6300esb|ib700)$/) {
- $res->{model} = $2;
- } elsif ($p =~ m/^(action=)?(reset|shutdown|poweroff|pause|debug|none)$/) {
- $res->{action} = $2;
- } else {
- return undef;
- }
- }
-
+ my $res = eval { PVE::JSONSchema::parse_property_string($watchdog_fmt, $value) };
+ warn $@ if $@;
return $res;
}
}
}
-sub lock_config_full {
- my ($vmid, $timeout, $code, @param) = @_;
-
- my $filename = config_file_lock($vmid);
-
- my $res = lock_file($filename, $timeout, $code, @param);
-
- die $@ if $@;
-
- return $res;
-}
-
-sub lock_config_mode {
- my ($vmid, $timeout, $shared, $code, @param) = @_;
-
- my $filename = config_file_lock($vmid);
-
- my $res = lock_file_full($filename, $timeout, $shared, $code, @param);
-
- die $@ if $@;
-
- return $res;
-}
-
-sub lock_config {
- my ($vmid, $code, @param) = @_;
-
- return lock_config_full($vmid, 10, $code, @param);
-}
-
-sub cfs_config_path {
- my ($vmid, $node) = @_;
-
- $node = $nodename if !$node;
- return "nodes/$node/qemu-server/$vmid.conf";
-}
-
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
}
-sub config_file {
- my ($vmid, $node) = @_;
-
- my $cfspath = cfs_config_path($vmid, $node);
- return "/etc/pve/$cfspath";
-}
-
-sub config_file_lock {
- my ($vmid) = @_;
-
- return "$lock_dir/lock-$vmid.conf";
-}
-
sub touch_config {
my ($vmid) = @_;
- my $conf = config_file($vmid);
+ my $conf = PVE::QemuConfig->config_file($vmid);
utime undef, undef, $conf;
}
sub destroy_vm {
my ($storecfg, $vmid, $keep_empty_config, $skiplock) = @_;
- my $conffile = config_file($vmid);
+ my $conffile = PVE::QemuConfig->config_file($vmid);
- my $conf = load_config($vmid);
+ my $conf = PVE::QemuConfig->load_config($vmid);
- check_lock($conf) if !$skiplock;
+ PVE::QemuConfig->check_lock($conf) if !$skiplock;
# only remove disks owned by this VM
foreach_drive($conf, sub {
warn $@ if $@;
}
-sub load_config {
- my ($vmid, $node) = @_;
-
- my $cfspath = cfs_config_path($vmid, $node);
-
- my $conf = PVE::Cluster::cfs_read_file($cfspath);
-
- die "no such VM ('$vmid')\n" if !defined($conf);
-
- return $conf;
-}
-
sub parse_vm_config {
my ($filename, $raw) = @_;
$cref->{$key} = $value;
- if (!$snapname && valid_drivename($key)) {
+ if (!$snapname && is_valid_drivename($key)) {
my $drive = parse_drive($key, $value);
$used_volids->{$drive->{file}} = 1 if $drive && $drive->{file};
}
return $raw;
}
-sub write_config {
- my ($vmid, $conf) = @_;
-
- my $cfspath = cfs_config_path($vmid);
-
- PVE::Cluster::cfs_write_file($cfspath, $conf);
-}
-
sub load_defaults {
my $res = {};
return $nodehash
}
-sub check_lock {
- my ($conf) = @_;
-
- die "VM is locked ($conf->{lock})\n" if $conf->{lock};
-}
-
sub check_cmdline {
my ($pidfile, $pid) = @_;
sub check_running {
my ($vmid, $nocheck, $node) = @_;
- my $filename = config_file($vmid, $node);
+ my $filename = PVE::QemuConfig->config_file($vmid, $node);
die "unable to find configuration file for VM $vmid - no such machine\n"
if !$nocheck && ! -f $filename;
my $bootdisk = $conf->{bootdisk};
return undef if !$bootdisk;
- return undef if !valid_drivename($bootdisk);
+ return undef if !is_valid_drivename($bootdisk);
return undef if !$conf->{$bootdisk};
foreach my $vmid (keys %$list) {
next if $opt_vmid && ($vmid ne $opt_vmid);
- my $cfspath = cfs_config_path($vmid);
+ my $cfspath = PVE::QemuConfig->cfs_config_path($vmid);
my $conf = PVE::Cluster::cfs_read_file($cfspath) || {};
my $d = {};
$d->{diskread} = 0;
$d->{diskwrite} = 0;
- $d->{template} = is_template($conf);
+ $d->{template} = PVE::QemuConfig->is_template($conf);
$res->{$vmid} = $d;
}
sub foreach_drive {
my ($conf, $func) = @_;
- foreach my $ds (keys %$conf) {
- next if !valid_drivename($ds);
+ foreach my $ds (valid_drive_names()) {
+ next if !defined($conf->{$ds});
my $drive = parse_drive($ds, $conf->{$ds});
next if !$drive;
my $bridges = {};
my $kvmver = kvm_user_version();
my $vernum = 0; # unknown
- my $ost = $conf->{ostype};
+ my $ostype = $conf->{ostype};
if ($kvmver =~ m/^(\d+)\.(\d+)$/) {
$vernum = $1*1000000+$2*1000;
} elsif ($kvmver =~ m/^(\d+)\.(\d+)\.(\d+)$/) {
$pciaddr = print_pci_addr("hostpci$i", $bridges);
}
- my $rombar = $d->{rombar} && $d->{rombar} eq 'off' ? ",rombar=0" : "";
- my $xvga = $d->{'x-vga'} && $d->{'x-vga'} eq 'on' ? ",x-vga=on" : "";
- if ($xvga && $xvga ne '') {
+ my $rombar = defined($d->{rombar}) && !$d->{rombar} ? ',rombar=0' : '';
+ my $xvga = '';
+ if ($d->{'x-vga'}) {
+ $xvga = ',x-vga=on';
$kvm_off = 1;
$vga = 'none';
- if ($ost eq 'win7' || $ost eq 'win8' || $ost eq 'w2k8') {
+ if ($ostype eq 'win7' || $ostype eq 'win8' || $ostype eq 'w2k8') {
push @$cpuFlags , 'hv_vendor_id=proxmox';
}
if ($conf->{bios} && $conf->{bios} eq 'ovmf') {
my $nokvm = defined($conf->{kvm}) && $conf->{kvm} == 0 ? 1 : 0;
my $useLocaltime = $conf->{localtime};
- if ($ost) {
+ if ($ostype) {
# other, wxp, w2k, w2k3, w2k8, wvista, win7, win8, l24, l26, solaris
- if ($ost =~ m/^w/) { # windows
+ if ($ostype =~ m/^w/) { # windows
$useLocaltime = 1 if !defined($conf->{localtime});
# use time drift fix when acpi is enabled
}
}
- if ($ost eq 'win7' || $ost eq 'win8' || $ost eq 'w2k8' ||
- $ost eq 'wvista') {
+ if ($ostype eq 'win7' || $ostype eq 'win8' || $ostype eq 'w2k8' ||
+ $ostype eq 'wvista') {
push @$globalFlags, 'kvm-pit.lost_tick_policy=discard';
push @$cmd, '-no-hpet';
if (qemu_machine_feature_enabled ($machine_type, $kvmver, 2, 3)) {
}
}
- if ($ost eq 'win7' || $ost eq 'win8') {
+ if ($ostype eq 'win7' || $ostype eq 'win8') {
push @$cpuFlags , 'hv_relaxed' if !$nokvm;
}
}
my $cpu = $nokvm ? "qemu64" : "kvm64";
if (my $cputype = $conf->{cpu}) {
- my $cpuconf = PVE::JSONSchema::parse_property_string($cpudesc, $cputype)
+ my $cpuconf = PVE::JSONSchema::parse_property_string($cpu_fmt, $cputype)
or die "Cannot parse cpu description: $cputype\n";
$cpu = $cpuconf->{cputype};
$kvm_off = 1 if $cpuconf->{hidden};
my $numa_object = "memory-backend-ram,id=ram-node$i,size=${numa_memory}M";
# cpus
- my $cpus_start = $numa->{cpus}->{start};
- die "missing numa node$i cpus\n" if !defined($cpus_start);
- my $cpus_end = $numa->{cpus}->{end} if defined($numa->{cpus}->{end});
- my $cpus = $cpus_start;
- if (defined($cpus_end)) {
- $cpus .= "-$cpus_end";
- die "numa node$i : cpu range $cpus is incorrect\n" if $cpus_end <= $cpus_start;
- }
+ my $cpulists = $numa->{cpus};
+ die "missing numa node$i cpus\n" if !defined($cpulists);
+ my $cpus = join(',', map {
+ my ($start, $end) = @$_;
+ defined($end) ? "$start-$end" : $start
+ } @$cpulists);
# hostnodes
- my $hostnodes_start = $numa->{hostnodes}->{start};
- if (defined($hostnodes_start)) {
- my $hostnodes_end = $numa->{hostnodes}->{end} if defined($numa->{hostnodes}->{end});
- my $hostnodes = $hostnodes_start;
- if (defined($hostnodes_end)) {
- $hostnodes .= "-$hostnodes_end";
- die "host node $hostnodes range is incorrect\n" if $hostnodes_end <= $hostnodes_start;
- }
-
- my $hostnodes_end_range = defined($hostnodes_end) ? $hostnodes_end : $hostnodes_start;
- for (my $i = $hostnodes_start; $i <= $hostnodes_end_range; $i++ ) {
- die "host numa node$i don't exist\n" if ! -d "/sys/devices/system/node/node$i/";
+ my $hostnodelists = $numa->{hostnodes};
+ if (defined($hostnodelists)) {
+ my $hostnodes;
+ foreach my $hostnoderange (@$hostnodelists) {
+ my ($start, $end) = @$hostnoderange;
+ $hostnodes .= ',' if $hostnodes;
+ $hostnodes .= $start;
+ $hostnodes .= "-$end" if defined($end);
+ $end //= $start;
+ for (my $i = $start; $i <= $end; ++$i ) {
+ die "host numa node$i don't exist\n" if ! -d "/sys/devices/system/node/node$i/";
+ }
}
# policy
#if dimm_memory is not aligned to dimm map
if($current_size > $memory) {
$conf->{memory} = $current_size;
- write_config($vmid, $conf);
+ PVE::QemuConfig->write_config($vmid, $conf);
}
});
}
my $devices_list = vm_devices_list($vmid);
foreach my $opt (keys %{$devices_list}) {
- if (PVE::QemuServer::valid_drivename($opt)) {
+ if (PVE::QemuServer::is_valid_drivename($opt)) {
my $drive = PVE::QemuServer::parse_drive($opt, $conf->{$opt});
if($drive->{interface} eq 'scsi' && $drive->{index} < (($maxdev-1)*($controller+1))) {
return 1;
}
#update conf after each succesful module hotplug
$conf->{memory} = $current_size;
- write_config($vmid, $conf);
+ PVE::QemuConfig->write_config($vmid, $conf);
});
} else {
$conf->{memory} = $current_size;
eval { qemu_objectdel($vmid, "mem-$name"); };
- write_config($vmid, $conf);
+ PVE::QemuConfig->write_config($vmid, $conf);
});
}
}
}
if ($changes) {
- write_config($vmid, $conf);
- $conf = load_config($vmid); # update/reload
+ PVE::QemuConfig->write_config($vmid, $conf);
+ $conf = PVE::QemuConfig->load_config($vmid); # update/reload
}
my $hotplug_features = parse_hotplug_features(defined($conf->{hotplug}) ? $conf->{hotplug} : '1');
} elsif ($opt =~ m/^net(\d+)$/) {
die "skip\n" if !$hotplug_features->{network};
vm_deviceunplug($vmid, $conf, $opt);
- } elsif (valid_drivename($opt)) {
+ } elsif (is_valid_drivename($opt)) {
die "skip\n" if !$hotplug_features->{disk} || $opt =~ m/(ide|sata)(\d+)/;
vm_deviceunplug($vmid, $conf, $opt);
vmconfig_delete_or_detach_drive($vmid, $storecfg, $conf, $opt, $force);
# save new config if hotplug was successful
delete $conf->{$opt};
vmconfig_undelete_pending_option($conf, $opt);
- write_config($vmid, $conf);
- $conf = load_config($vmid); # update/reload
+ PVE::QemuConfig->write_config($vmid, $conf);
+ $conf = PVE::QemuConfig->load_config($vmid); # update/reload
}
}
# some changes can be done without hotplug
vmconfig_update_net($storecfg, $conf, $hotplug_features->{network},
$vmid, $opt, $value);
- } elsif (valid_drivename($opt)) {
+ } elsif (is_valid_drivename($opt)) {
# some changes can be done without hotplug
vmconfig_update_disk($storecfg, $conf, $hotplug_features->{disk},
$vmid, $opt, $value, 1);
# save new config if hotplug was successful
$conf->{$opt} = $value;
delete $conf->{pending}->{$opt};
- write_config($vmid, $conf);
- $conf = load_config($vmid); # update/reload
+ PVE::QemuConfig->write_config($vmid, $conf);
+ $conf = PVE::QemuConfig->load_config($vmid); # update/reload
}
}
}
my $pending_delete_hash = split_flagged_list($conf->{pending}->{delete});
while (my ($opt, $force) = each %$pending_delete_hash) {
die "internal error" if $opt =~ m/^unused/;
- $conf = load_config($vmid); # update/reload
+ $conf = PVE::QemuConfig->load_config($vmid); # update/reload
if (!defined($conf->{$opt})) {
vmconfig_undelete_pending_option($conf, $opt);
- write_config($vmid, $conf);
- } elsif (valid_drivename($opt)) {
+ PVE::QemuConfig->write_config($vmid, $conf);
+ } elsif (is_valid_drivename($opt)) {
vmconfig_delete_or_detach_drive($vmid, $storecfg, $conf, $opt, $force);
vmconfig_undelete_pending_option($conf, $opt);
delete $conf->{$opt};
- write_config($vmid, $conf);
+ PVE::QemuConfig->write_config($vmid, $conf);
} else {
vmconfig_undelete_pending_option($conf, $opt);
delete $conf->{$opt};
- write_config($vmid, $conf);
+ PVE::QemuConfig->write_config($vmid, $conf);
}
}
- $conf = load_config($vmid); # update/reload
+ $conf = PVE::QemuConfig->load_config($vmid); # update/reload
foreach my $opt (keys %{$conf->{pending}}) { # add/change
- $conf = load_config($vmid); # update/reload
+ $conf = PVE::QemuConfig->load_config($vmid); # update/reload
if (defined($conf->{$opt}) && ($conf->{$opt} eq $conf->{pending}->{$opt})) {
# skip if nothing changed
- } elsif (valid_drivename($opt)) {
+ } elsif (is_valid_drivename($opt)) {
vmconfig_register_unused_drive($storecfg, $vmid, $conf, parse_drive($opt, $conf->{$opt}))
if defined($conf->{$opt});
$conf->{$opt} = $conf->{pending}->{$opt};
}
delete $conf->{pending}->{$opt};
- write_config($vmid, $conf);
+ PVE::QemuConfig->write_config($vmid, $conf);
}
}
die "internal error" if $opt !~ m/net(\d+)/;
my $iface = "tap${vmid}i$1";
- if (&$safe_num_ne($oldnet->{rate}, $newnet->{rate})) {
- PVE::Network::tap_rate_limit($iface, $newnet->{rate});
- }
-
if (&$safe_string_ne($oldnet->{bridge}, $newnet->{bridge}) ||
&$safe_num_ne($oldnet->{tag}, $newnet->{tag}) ||
&$safe_string_ne($oldnet->{trunks}, $newnet->{trunks}) ||
&$safe_num_ne($oldnet->{firewall}, $newnet->{firewall})) {
PVE::Network::tap_unplug($iface);
- PVE::Network::tap_plug($iface, $newnet->{bridge}, $newnet->{tag}, $newnet->{firewall}, $newnet->{trunks});
+ PVE::Network::tap_plug($iface, $newnet->{bridge}, $newnet->{tag}, $newnet->{firewall}, $newnet->{trunks}, $newnet->{rate});
+ } elsif (&$safe_num_ne($oldnet->{rate}, $newnet->{rate})) {
+ # Rate can be applied on its own but any change above needs to
+ # include the rate in tap_plug since OVS resets everything.
+ PVE::Network::tap_rate_limit($iface, $newnet->{rate});
}
if (&$safe_string_ne($oldnet->{link_down}, $newnet->{link_down})) {
my ($storecfg, $vmid, $statefile, $skiplock, $migratedfrom, $paused,
$forcemachine, $spice_ticket) = @_;
- lock_config($vmid, sub {
- my $conf = load_config($vmid, $migratedfrom);
+ PVE::QemuConfig->lock_config($vmid, sub {
+ my $conf = PVE::QemuConfig->load_config($vmid, $migratedfrom);
- die "you can't start a vm if it's a template\n" if is_template($conf);
+ die "you can't start a vm if it's a template\n" if PVE::QemuConfig->is_template($conf);
- check_lock($conf) if !$skiplock;
+ PVE::QemuConfig->check_lock($conf) if !$skiplock;
die "VM $vmid already running\n" if check_running($vmid, undef, $migratedfrom);
if (!$statefile && scalar(keys %{$conf->{pending}})) {
vmconfig_apply_pending($vmid, $conf, $storecfg);
- $conf = load_config($vmid); # update/reload
+ $conf = PVE::QemuConfig->load_config($vmid); # update/reload
}
my $defaults = load_defaults();
eval { run_command($cmd, timeout => $statefile ? undef : 30,
umask => 0077); };
- my $err = $@;
- die "start failed: $err" if $err;
+
+ if (my $err = $@) {
+ # deactivate volumes if start fails
+ eval { PVE::Storage::deactivate_volumes($storecfg, $vollist); };
+ die "start failed: $err";
+ }
print "migration listens on $migrate_uri\n" if $migrate_uri;
sub vm_commandline {
my ($storecfg, $vmid) = @_;
- my $conf = load_config($vmid);
+ my $conf = PVE::QemuConfig->load_config($vmid);
my $defaults = load_defaults();
sub vm_reset {
my ($vmid, $skiplock) = @_;
- lock_config($vmid, sub {
+ PVE::QemuConfig->lock_config($vmid, sub {
- my $conf = load_config($vmid);
+ my $conf = PVE::QemuConfig->load_config($vmid);
- check_lock($conf) if !$skiplock;
+ PVE::QemuConfig->check_lock($conf) if !$skiplock;
vm_mon_cmd($vmid, "system_reset");
});
if ($migratedfrom){
my $pid = check_running($vmid, $nocheck, $migratedfrom);
kill 15, $pid if $pid;
- my $conf = load_config($vmid, $migratedfrom);
+ my $conf = PVE::QemuConfig->load_config($vmid, $migratedfrom);
vm_stop_cleanup($storecfg, $vmid, $conf, $keepActive, 0);
return;
}
- lock_config($vmid, sub {
+ PVE::QemuConfig->lock_config($vmid, sub {
my $pid = check_running($vmid, $nocheck);
return if !$pid;
my $conf;
if (!$nocheck) {
- $conf = load_config($vmid);
- check_lock($conf) if !$skiplock;
+ $conf = PVE::QemuConfig->load_config($vmid);
+ PVE::QemuConfig->check_lock($conf) if !$skiplock;
if (!defined($timeout) && $shutdown && $conf->{startup}) {
my $opts = PVE::JSONSchema::pve_parse_startup_order($conf->{startup});
$timeout = $opts->{down} if $opts->{down};
sub vm_suspend {
my ($vmid, $skiplock) = @_;
- lock_config($vmid, sub {
+ PVE::QemuConfig->lock_config($vmid, sub {
- my $conf = load_config($vmid);
+ my $conf = PVE::QemuConfig->load_config($vmid);
- check_lock($conf) if !($skiplock || ($conf->{lock} && $conf->{lock} eq 'backup'));
+ PVE::QemuConfig->check_lock($conf)
+ if !($skiplock || PVE::QemuConfig->has_lock($conf, 'backup'));
vm_mon_cmd($vmid, "stop");
});
sub vm_resume {
my ($vmid, $skiplock, $nocheck) = @_;
- lock_config($vmid, sub {
+ PVE::QemuConfig->lock_config($vmid, sub {
if (!$nocheck) {
- my $conf = load_config($vmid);
+ my $conf = PVE::QemuConfig->load_config($vmid);
- check_lock($conf) if !($skiplock || ($conf->{lock} && $conf->{lock} eq 'backup'));
+ PVE::QemuConfig->check_lock($conf)
+ if !($skiplock || PVE::QemuConfig->has_lock($conf, 'backup'));
vm_mon_cmd($vmid, "cont");
sub vm_sendkey {
my ($vmid, $skiplock, $key) = @_;
- lock_config($vmid, sub {
+ PVE::QemuConfig->lock_config($vmid, sub {
- my $conf = load_config($vmid);
+ my $conf = PVE::QemuConfig->load_config($vmid);
# there is no qmp command, so we use the human monitor command
vm_human_monitor_command($vmid, "sendkey $key");
sub vm_destroy {
my ($storecfg, $vmid, $skiplock) = @_;
- lock_config($vmid, sub {
+ PVE::QemuConfig->lock_config($vmid, sub {
- my $conf = load_config($vmid);
+ my $conf = PVE::QemuConfig->load_config($vmid);
if (!check_running($vmid)) {
destroy_vm($storecfg, $vmid, undef, $skiplock);
foreach my $key (keys %$cref) {
my $value = $cref->{$key};
- if (valid_drivename($key)) {
+ if (is_valid_drivename($key)) {
next if $skip_drive && $key eq $skip_drive;
my $drive = parse_drive($key, $value);
next if !$drive || !$drive->{file} || drive_is_cdrom($drive);
# update size info
foreach my $opt (keys %$conf) {
- if (valid_drivename($opt)) {
+ if (is_valid_drivename($opt)) {
my $drive = parse_drive($opt, $conf->{$opt});
my $volid = $drive->{file};
next if !$volid;
next if !$path; # just to be sure
next if $usedpath->{$path};
$changes = 1;
- add_unused_volume($conf, $volid);
+ PVE::QemuConfig->add_unused_volume($conf, $volid);
$usedpath->{$path} = 1; # avoid to add more than once (aliases)
}
sub rescan {
my ($vmid, $nolock) = @_;
- my $cfg = PVE::Cluster::cfs_read_file("storage.cfg");
+ my $cfg = PVE::Storage::config();
my $volid_hash = scan_volids($cfg, $vmid);
my $updatefn = sub {
my ($vmid) = @_;
- my $conf = load_config($vmid);
+ my $conf = PVE::QemuConfig->load_config($vmid);
- check_lock($conf);
+ PVE::QemuConfig->check_lock($conf);
my $vm_volids = {};
foreach my $volid (keys %$volid_hash) {
my $changes = update_disksize($vmid, $conf, $vm_volids);
- write_config($vmid, $conf) if $changes;
+ PVE::QemuConfig->write_config($vmid, $conf) if $changes;
};
if (defined($vmid)) {
if ($nolock) {
&$updatefn($vmid);
} else {
- lock_config($vmid, $updatefn, $vmid);
+ PVE::QemuConfig->lock_config($vmid, $updatefn, $vmid);
}
} else {
my $vmlist = config_list();
if ($nolock) {
&$updatefn($vmid);
} else {
- lock_config($vmid, $updatefn, $vmid);
+ PVE::QemuConfig->lock_config($vmid, $updatefn, $vmid);
}
}
}
my $rpcenv = PVE::RPCEnvironment::get();
- my $conffile = config_file($vmid);
+ my $conffile = PVE::QemuConfig->config_file($vmid);
my $tmpfn = "$conffile.$$.tmp";
# Note: $oldconf is undef if VM does not exists
- my $oldconf = PVE::Cluster::cfs_read_file(cfs_config_path($vmid));
+ my $cfs_path = PVE::QemuConfig->cfs_config_path($vmid);
+ my $oldconf = PVE::Cluster::cfs_read_file($cfs_path);
my $print_devmap = sub {
my $virtdev_hash = {};
if !$devinfo->{$devname}->{virtdev};
}
- my $cfg = cfs_read_file('storage.cfg');
+ my $cfg = PVE::Storage::config();
# create empty/temp config
if ($oldconf) {
PVE::Storage::activate_volumes($cfg,[$volid]);
my $write_zeros = 1;
- # fixme: what other storages types initialize volumes with zero?
- if ($scfg->{type} eq 'dir' || $scfg->{type} eq 'nfs' || $scfg->{type} eq 'glusterfs' ||
- $scfg->{type} eq 'sheepdog' || $scfg->{type} eq 'rbd') {
+ if (PVE::Storage::volume_has_feature($cfg, 'sparseinit', $volid)) {
$write_zeros = 0;
}
push @$vollist, $volid if $volid;
}
- my $cfg = cfs_read_file('storage.cfg');
+ my $cfg = PVE::Storage::config();
PVE::Storage::deactivate_volumes($cfg, $vollist);
unlink $mapfifo;
if $firstfile ne 'qemu-server.conf';
}
- my $storecfg = cfs_read_file('storage.cfg');
+ my $storecfg = PVE::Storage::config();
# destroy existing data - keep empty config
- my $vmcfgfn = config_file($vmid);
+ my $vmcfgfn = PVE::QemuConfig->config_file($vmid);
destroy_vm($storecfg, $vmid, 1) if -f $vmcfgfn;
my $tocmd = "/usr/lib/qemu-server/qmextract";
local $ENV{VZDUMP_VMID} = $vmid;
local $ENV{VZDUMP_USER} = $user;
- my $conffile = config_file($vmid);
+ my $conffile = PVE::QemuConfig->config_file($vmid);
my $tmpfn = "$conffile.$$.tmp";
# disable interrupts (always do cleanups)
warn $@ if $@;
};
-
-# Internal snapshots
-
-# NOTE: Snapshot create/delete involves several non-atomic
-# action, and can take a long time.
-# So we try to avoid locking the file and use 'lock' variable
-# inside the config file instead.
-
-my $snapshot_copy_config = sub {
- my ($source, $dest) = @_;
-
- foreach my $k (keys %$source) {
- next if $k eq 'snapshots';
- next if $k eq 'snapstate';
- next if $k eq 'snaptime';
- next if $k eq 'vmstate';
- next if $k eq 'lock';
- next if $k eq 'digest';
- next if $k eq 'description';
- next if $k =~ m/^unused\d+$/;
-
- $dest->{$k} = $source->{$k};
- }
-};
-
-my $snapshot_apply_config = sub {
- my ($conf, $snap) = @_;
-
- # copy snapshot list
- my $newconf = {
- snapshots => $conf->{snapshots},
- };
-
- # keep description and list of unused disks
- foreach my $k (keys %$conf) {
- next if !($k =~ m/^unused\d+$/ || $k eq 'description');
- $newconf->{$k} = $conf->{$k};
- }
-
- &$snapshot_copy_config($snap, $newconf);
-
- return $newconf;
-};
-
sub foreach_writable_storage {
my ($conf, $func) = @_;
my $sidhash = {};
foreach my $ds (keys %$conf) {
- next if !valid_drivename($ds);
+ next if !is_valid_drivename($ds);
my $drive = parse_drive($ds, $conf->{$ds});
next if !$drive;
}
}
-my $alloc_vmstate_volid = sub {
- my ($storecfg, $vmid, $conf, $snapname) = @_;
-
- # Note: we try to be smart when selecting a $target storage
-
- my $target;
-
- # search shared storage first
- foreach_writable_storage($conf, sub {
- my ($sid) = @_;
- my $scfg = PVE::Storage::storage_config($storecfg, $sid);
- return if !$scfg->{shared};
-
- $target = $sid if !$target || $scfg->{path}; # prefer file based storage
- });
-
- if (!$target) {
- # now search local storage
- foreach_writable_storage($conf, sub {
- my ($sid) = @_;
- my $scfg = PVE::Storage::storage_config($storecfg, $sid);
- return if $scfg->{shared};
-
- $target = $sid if !$target || $scfg->{path}; # prefer file based storage;
- });
- }
-
- $target = 'local' if !$target;
-
- my $driver_state_size = 500; # assume 32MB is enough to safe all driver state;
- # we abort live save after $conf->{memory}, so we need at max twice that space
- my $size = $conf->{memory}*2 + $driver_state_size;
-
- my $name = "vm-$vmid-state-$snapname";
- my $scfg = PVE::Storage::storage_config($storecfg, $target);
- $name .= ".raw" if $scfg->{path}; # add filename extension for file base storage
- my $volid = PVE::Storage::vdisk_alloc($storecfg, $target, $vmid, 'raw', $name, $size*1024);
-
- return $volid;
-};
-
-my $snapshot_save_vmstate = sub {
- my ($vmid, $conf, $snapname, $storecfg) = @_;
-
- my $snap = $conf->{snapshots}->{$snapname};
-
- $snap->{vmstate} = &$alloc_vmstate_volid($storecfg, $vmid, $conf, $snapname);
- # always overwrite machine if we save vmstate. This makes sure we
- # can restore it later using correct machine type
- $snap->{machine} = get_current_qemu_machine($vmid);
-};
-
-my $snapshot_prepare = sub {
- my ($vmid, $snapname, $save_vmstate, $comment) = @_;
-
- my $snap;
-
- my $updatefn = sub {
-
- my $conf = load_config($vmid);
-
- die "you can't take a snapshot if it's a template\n"
- if is_template($conf);
-
- check_lock($conf);
-
- $conf->{lock} = 'snapshot';
-
- die "snapshot name '$snapname' already used\n"
- if defined($conf->{snapshots}->{$snapname});
-
- my $storecfg = PVE::Storage::config();
- die "snapshot feature is not available\n" if !has_feature('snapshot', $conf, $storecfg);
-
- $snap = $conf->{snapshots}->{$snapname} = {};
-
- if ($save_vmstate && check_running($vmid)) {
- &$snapshot_save_vmstate($vmid, $conf, $snapname, $storecfg);
- }
-
- &$snapshot_copy_config($conf, $snap);
-
- $snap->{snapstate} = "prepare";
- $snap->{snaptime} = time();
- $snap->{description} = $comment if $comment;
-
- write_config($vmid, $conf);
- };
-
- lock_config($vmid, $updatefn);
-
- return $snap;
-};
-
-my $snapshot_commit = sub {
- my ($vmid, $snapname) = @_;
-
- my $updatefn = sub {
-
- my $conf = load_config($vmid);
-
- die "missing snapshot lock\n"
- if !($conf->{lock} && $conf->{lock} eq 'snapshot');
-
- my $has_machine_config = defined($conf->{machine});
-
- my $snap = $conf->{snapshots}->{$snapname};
-
- die "snapshot '$snapname' does not exist\n" if !defined($snap);
-
- die "wrong snapshot state\n"
- if !($snap->{snapstate} && $snap->{snapstate} eq "prepare");
-
- delete $snap->{snapstate};
- delete $conf->{lock};
-
- my $newconf = &$snapshot_apply_config($conf, $snap);
-
- delete $newconf->{machine} if !$has_machine_config;
-
- $newconf->{parent} = $snapname;
-
- write_config($vmid, $newconf);
- };
-
- lock_config($vmid, $updatefn);
-};
-
-sub snapshot_rollback {
- my ($vmid, $snapname) = @_;
-
- my $prepare = 1;
-
- my $storecfg = PVE::Storage::config();
-
- my $conf = load_config($vmid);
-
- my $get_snapshot_config = sub {
-
- die "you can't rollback if vm is a template\n" if is_template($conf);
-
- my $res = $conf->{snapshots}->{$snapname};
-
- die "snapshot '$snapname' does not exist\n" if !defined($res);
-
- return $res;
- };
-
- my $snap = &$get_snapshot_config();
-
- foreach_drive($snap, sub {
- my ($ds, $drive) = @_;
-
- return if drive_is_cdrom($drive);
-
- my $volid = $drive->{file};
-
- PVE::Storage::volume_rollback_is_possible($storecfg, $volid, $snapname);
- });
-
- my $updatefn = sub {
-
- $conf = load_config($vmid);
-
- $snap = &$get_snapshot_config();
-
- die "unable to rollback to incomplete snapshot (snapstate = $snap->{snapstate})\n"
- if $snap->{snapstate};
-
- if ($prepare) {
- check_lock($conf);
- vm_stop($storecfg, $vmid, undef, undef, 5, undef, undef);
- }
-
- die "unable to rollback vm $vmid: vm is running\n"
- if check_running($vmid);
-
- if ($prepare) {
- $conf->{lock} = 'rollback';
- } else {
- die "got wrong lock\n" if !($conf->{lock} && $conf->{lock} eq 'rollback');
- delete $conf->{lock};
- }
-
- my $forcemachine;
-
- if (!$prepare) {
- my $has_machine_config = defined($conf->{machine});
-
- # copy snapshot config to current config
- $conf = &$snapshot_apply_config($conf, $snap);
- $conf->{parent} = $snapname;
-
- # Note: old code did not store 'machine', so we try to be smart
- # and guess the snapshot was generated with kvm 1.4 (pc-i440fx-1.4).
- $forcemachine = $conf->{machine} || 'pc-i440fx-1.4';
- # we remove the 'machine' configuration if not explicitly specified
- # in the original config.
- delete $conf->{machine} if $snap->{vmstate} && !$has_machine_config;
- }
-
- write_config($vmid, $conf);
-
- if (!$prepare && $snap->{vmstate}) {
- my $statefile = PVE::Storage::path($storecfg, $snap->{vmstate});
- vm_start($storecfg, $vmid, $statefile, undef, undef, undef, $forcemachine);
- }
- };
-
- lock_config($vmid, $updatefn);
-
- foreach_drive($snap, sub {
- my ($ds, $drive) = @_;
-
- return if drive_is_cdrom($drive);
-
- my $volid = $drive->{file};
- my $device = "drive-$ds";
-
- PVE::Storage::volume_snapshot_rollback($storecfg, $volid, $snapname);
- });
-
- $prepare = 0;
- lock_config($vmid, $updatefn);
-}
-
-my $savevm_wait = sub {
- my ($vmid) = @_;
-
- for(;;) {
- my $stat = vm_mon_cmd_nocheck($vmid, "query-savevm");
- if (!$stat->{status}) {
- die "savevm not active\n";
- } elsif ($stat->{status} eq 'active') {
- sleep(1);
- next;
- } elsif ($stat->{status} eq 'completed') {
- last;
- } else {
- die "query-savevm returned status '$stat->{status}'\n";
- }
- }
-};
-
sub do_snapshots_with_qemu {
my ($storecfg, $volid) = @_;
return 1;
}
-sub snapshot_create {
- my ($vmid, $snapname, $save_vmstate, $comment) = @_;
-
- my $snap = &$snapshot_prepare($vmid, $snapname, $save_vmstate, $comment);
-
- $save_vmstate = 0 if !$snap->{vmstate}; # vm is not running
-
- my $config = load_config($vmid);
-
- my $running = check_running($vmid);
-
- my $freezefs = $running && $config->{agent} && qga_check_running($vmid);
- $freezefs = 0 if $snap->{vmstate}; # not needed if we save RAM
-
- my $drivehash = {};
-
- if ($freezefs) {
- eval { vm_mon_cmd($vmid, "guest-fsfreeze-freeze"); };
- warn "guest-fsfreeze-freeze problems - $@" if $@;
- }
-
- eval {
- # create internal snapshots of all drives
-
- my $storecfg = PVE::Storage::config();
-
- if ($running) {
- if ($snap->{vmstate}) {
- my $path = PVE::Storage::path($storecfg, $snap->{vmstate});
- vm_mon_cmd($vmid, "savevm-start", statefile => $path);
- &$savevm_wait($vmid);
- } else {
- vm_mon_cmd($vmid, "savevm-start");
- }
- };
-
- foreach_drive($snap, sub {
- my ($ds, $drive) = @_;
-
- return if drive_is_cdrom($drive);
-
- my $volid = $drive->{file};
- my $device = "drive-$ds";
-
- qemu_volume_snapshot($vmid, $device, $storecfg, $volid, $snapname);
- $drivehash->{$ds} = 1;
- });
- };
- my $err = $@;
-
- if ($running) {
- eval { vm_mon_cmd($vmid, "savevm-end") };
- warn $@ if $@;
-
- if ($freezefs) {
- eval { vm_mon_cmd($vmid, "guest-fsfreeze-thaw"); };
- warn "guest-fsfreeze-thaw problems - $@" if $@;
- }
-
- # savevm-end is async, we need to wait
- for (;;) {
- my $stat = vm_mon_cmd_nocheck($vmid, "query-savevm");
- if (!$stat->{bytes}) {
- last;
- } else {
- print "savevm not yet finished\n";
- sleep(1);
- next;
- }
- }
- }
-
- if ($err) {
- warn "snapshot create failed: starting cleanup\n";
- eval { snapshot_delete($vmid, $snapname, 0, $drivehash); };
- warn $@ if $@;
- die $err;
- }
-
- &$snapshot_commit($vmid, $snapname);
-}
-
-# Note: $drivehash is only set when called from snapshot_create.
-sub snapshot_delete {
- my ($vmid, $snapname, $force, $drivehash) = @_;
-
- my $prepare = 1;
-
- my $snap;
- my $unused = [];
-
- my $unlink_parent = sub {
- my ($confref, $new_parent) = @_;
-
- if ($confref->{parent} && $confref->{parent} eq $snapname) {
- if ($new_parent) {
- $confref->{parent} = $new_parent;
- } else {
- delete $confref->{parent};
- }
- }
- };
-
- my $updatefn = sub {
- my ($remove_drive) = @_;
-
- my $conf = load_config($vmid);
-
- if (!$drivehash) {
- check_lock($conf);
- die "you can't delete a snapshot if vm is a template\n"
- if is_template($conf);
- }
-
- $snap = $conf->{snapshots}->{$snapname};
-
- die "snapshot '$snapname' does not exist\n" if !defined($snap);
-
- # remove parent refs
- if (!$prepare) {
- &$unlink_parent($conf, $snap->{parent});
- foreach my $sn (keys %{$conf->{snapshots}}) {
- next if $sn eq $snapname;
- &$unlink_parent($conf->{snapshots}->{$sn}, $snap->{parent});
- }
- }
-
- if ($remove_drive) {
- if ($remove_drive eq 'vmstate') {
- delete $snap->{$remove_drive};
- } else {
- my $drive = parse_drive($remove_drive, $snap->{$remove_drive});
- my $volid = $drive->{file};
- delete $snap->{$remove_drive};
- add_unused_volume($conf, $volid);
- }
- }
-
- if ($prepare) {
- $snap->{snapstate} = 'delete';
- } else {
- delete $conf->{snapshots}->{$snapname};
- delete $conf->{lock} if $drivehash;
- foreach my $volid (@$unused) {
- add_unused_volume($conf, $volid);
- }
- }
-
- write_config($vmid, $conf);
- };
-
- lock_config($vmid, $updatefn);
-
- # now remove vmstate file
-
- my $storecfg = PVE::Storage::config();
-
- if ($snap->{vmstate}) {
- eval { PVE::Storage::vdisk_free($storecfg, $snap->{vmstate}); };
- if (my $err = $@) {
- die $err if !$force;
- warn $err;
- }
- # save changes (remove vmstate from snapshot)
- lock_config($vmid, $updatefn, 'vmstate') if !$force;
- };
-
- # now remove all internal snapshots
- foreach_drive($snap, sub {
- my ($ds, $drive) = @_;
-
- return if drive_is_cdrom($drive);
-
- my $volid = $drive->{file};
- my $device = "drive-$ds";
-
- if (!$drivehash || $drivehash->{$ds}) {
- eval { qemu_volume_snapshot_delete($vmid, $device, $storecfg, $volid, $snapname); };
- if (my $err = $@) {
- die $err if !$force;
- warn $err;
- }
- }
-
- # save changes (remove drive fron snapshot)
- lock_config($vmid, $updatefn, $ds) if !$force;
- push @$unused, $volid;
- });
-
- # now cleanup config
- $prepare = 0;
- lock_config($vmid, $updatefn);
-}
-
-sub has_feature {
- my ($feature, $conf, $storecfg, $snapname, $running) = @_;
-
- my $err;
- foreach_drive($conf, sub {
- my ($ds, $drive) = @_;
-
- return if drive_is_cdrom($drive);
- my $volid = $drive->{file};
- $err = 1 if !PVE::Storage::volume_has_feature($storecfg, $feature, $volid, $snapname, $running);
- });
-
- return $err ? 0 : 1;
-}
-
sub template_create {
my ($vmid, $conf, $disk) = @_;
my $voliddst = PVE::Storage::vdisk_create_base($storecfg, $volid);
$drive->{file} = $voliddst;
$conf->{$ds} = print_drive($vmid, $drive);
- write_config($vmid, $conf);
+ PVE::QemuConfig->write_config($vmid, $conf);
});
}
-sub is_template {
- my ($conf) = @_;
-
- return 1 if defined $conf->{template} && $conf->{template} == 1;
-}
-
sub qemu_img_convert {
- my ($src_volid, $dst_volid, $size, $snapname) = @_;
+ my ($src_volid, $dst_volid, $size, $snapname, $is_zero_initialized) = @_;
my $storecfg = PVE::Storage::config();
my ($src_storeid, $src_volname) = PVE::Storage::parse_volume_id($src_volid, 1);
my $cmd = [];
push @$cmd, '/usr/bin/qemu-img', 'convert', '-t', 'writeback', '-p', '-n';
push @$cmd, '-s', $snapname if($snapname && $src_format eq "qcow2");
- push @$cmd, '-f', $src_format, '-O', $dst_format, $src_path, $dst_path;
+ push @$cmd, '-f', $src_format, '-O', $dst_format, $src_path;
+ if ($is_zero_initialized) {
+ push @$cmd, "zeroinit:$dst_path";
+ } else {
+ push @$cmd, $dst_path;
+ }
my $parser = sub {
my $line = shift;
}
sub qemu_drive_mirror {
- my ($vmid, $drive, $dst_volid, $vmiddst) = @_;
+ my ($vmid, $drive, $dst_volid, $vmiddst, $is_zero_initialized) = @_;
my $storecfg = PVE::Storage::config();
my ($dst_storeid, $dst_volname) = PVE::Storage::parse_volume_id($dst_volid);
my $dst_path = PVE::Storage::path($storecfg, $dst_volid);
- my $opts = { timeout => 10, device => "drive-$drive", mode => "existing", sync => "full", target => $dst_path };
+ my $qemu_target = $is_zero_initialized ? "zeroinit:$dst_path" : $dst_path;
+
+ my $opts = { timeout => 10, device => "drive-$drive", mode => "existing", sync => "full", target => $qemu_target };
$opts->{format} = $format if $format;
print "drive mirror is starting (scanning bitmap) : this step can take some minutes/hours, depend of disk size and storage speed\n";
+ my $finish_job = sub {
+ while (1) {
+ my $stats = vm_mon_cmd($vmid, "query-block-jobs");
+ my $stat = @$stats[0];
+ last if !$stat;
+ sleep 1;
+ }
+ };
+
eval {
vm_mon_cmd($vmid, "drive-mirror", %$opts);
while (1) {
# try to switch the disk if source and destination are on the same guest
eval { vm_mon_cmd($vmid, "block-job-complete", device => "drive-$drive") };
- last if !$@;
+ if (!$@) {
+ &$finish_job();
+ last;
+ }
die $@ if $@ !~ m/cannot be completed/;
}
sleep 1;
my $cancel_job = sub {
vm_mon_cmd($vmid, "block-job-cancel", device => "drive-$drive");
- while (1) {
- my $stats = vm_mon_cmd($vmid, "query-block-jobs");
- my $stat = @$stats[0];
- last if !$stat;
- sleep 1;
- }
+ &$finish_job();
};
if ($err) {
PVE::Storage::activate_volumes($storecfg, $newvollist);
+ my $sparseinit = PVE::Storage::volume_has_feature($storecfg, 'sparseinit', $newvolid);
if (!$running || $snapname) {
- qemu_img_convert($drive->{file}, $newvolid, $size, $snapname);
+ qemu_img_convert($drive->{file}, $newvolid, $size, $snapname, $sparseinit);
} else {
- qemu_drive_mirror($vmid, $drivename, $newvolid, $newvmid);
+ qemu_drive_mirror($vmid, $drivename, $newvolid, $newvmid, $sparseinit);
}
}
last;
}
+ return $machine;
}
sub qemu_use_old_bios_files {
$machine_type = $1;
$use_old_bios_files = 1;
} else {
+ my $kvmver = kvm_user_version();
# Note: kvm version < 2.4 use non-efi pxe files, and have problems when we
# load new efi bios files on migration. So this hack is required to allow
# live migration from qemu-2.2 to qemu-2.4, which is sometimes used when
# updrading from proxmox-ve-3.X to proxmox-ve 4.0
- $use_old_bios_files = !qemu_machine_feature_enabled ($machine_type, undef, 2, 4);
+ $use_old_bios_files = !qemu_machine_feature_enabled ($machine_type, $kvmver, 2, 4);
}
return ($use_old_bios_files, $machine_type);
projects / qemu-server.git / blobdiff