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

cfg: use the 'urlencoded' format for drive model and serial

Browse Source
This commit is contained in:
Wolfgang Bumiller 2016-03-18 11:42:33 +01:00 committed by Dietmar Maurer
parent 918d09150e
commit 46630a5fd4
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
PVE/QemuServer.pm
View File

@ -32,6 +32,7 @@ use PVE::QMPClient;
use PVE::RPCEnvironment; use PVE::RPCEnvironment;
use Time::HiRes qw(gettimeofday); use Time::HiRes qw(gettimeofday);
use File::Copy qw(copy); use File::Copy qw(copy);
use URI::Escape;
my $qemu_snap_storage = {rbd => 1, sheepdog => 1}; my $qemu_snap_storage = {rbd => 1, sheepdog => 1};
@ -617,8 +618,9 @@ my %drivedesc_base = (
}, },
serial => { serial => {
type => 'string', type => 'string',
format => 'urlencoded',
format_description => 'serial', format_description => 'serial',
description => "The drive's reported serial number.", description => "The drive's reported serial number, url-encoded.",
optional => 1, optional => 1,
} }
); );
@ -643,8 +645,9 @@ my %iothread_fmt = ( iothread => {
my %model_fmt = ( my %model_fmt = (
model => { model => {
type => 'string', type => 'string',
format => 'urlencoded',
format_description => 'model', format_description => 'model',
description => "The drive's reported model name.", description => "The drive's reported model name, url-encoded.",
optional => 1, optional => 1,
}, },
); );
@ -1262,6 +1265,7 @@ sub print_drivedevice_full {
$device = "ide-$devicetype,bus=ide.$controller,unit=$unit,drive=drive-$drive->{interface}$drive->{index},id=$drive->{interface}$drive->{index}"; $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})) { if ($devicetype eq 'hd' && (my $model = $drive->{model})) {
$model = URI::Escape::uri_unescape($model);
$device .= ",model=$model"; $device .= ",model=$model";
} }
} elsif ($drive->{interface} eq 'sata'){ } elsif ($drive->{interface} eq 'sata'){
@ -1316,10 +1320,14 @@ sub print_drive_full {
} }
my $opts = ''; 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 serial); 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) { foreach my $o (@qemu_drive_options) {
$opts .= ",$o=$drive->{$o}" if $drive->{$o}; $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}; $opts .= ",format=$format" if $format && !$drive->{format};