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

add efidisk0 to config

Browse Source 
just a simple disk (only size, format and volid) for
efivars disk

also do not add it to command line in foreach_drive

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
This commit is contained in:
Dominik Csapak 2016-09-08 11:02:59 +02:00 committed by Dietmar Maurer
parent 201e618d5b
commit 6470743ff9
1 changed files with 44 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
PVE/QemuServer.pm
View File

@ -901,6 +901,39 @@ my $alldrive_fmt = {
%queues_fmt, %queues_fmt,
}; };
my $efidisk_fmt = {
volume => { alias => 'file' },
file => {
type => 'string',
format => 'pve-volume-id-or-qm-path',
default_key => 1,
format_description => 'volume',
description => "The drive's backing volume.",
},
format => {
type => 'string',
format_description => 'image format',
enum => [qw(raw cow qcow qed qcow2 vmdk cloop)],
description => "The drive's backing file's data format.",
optional => 1,
},
size => {
type => 'string',
format => 'disk-size',
format_description => 'DiskSize',
description => "Disk size. This is purely informational and has no effect.",
optional => 1,
},
};
my $efidisk_desc = {
optional => 1,
type => 'string', format => $efidisk_fmt,
description => "Configure a Disk for storing EFI vars",
};
PVE::JSONSchema::register_standard_option("pve-qm-efidisk", $efidisk_desc);
my $usb_fmt = { my $usb_fmt = {
host => { host => {
default_key => 1, default_key => 1,
@ -1050,6 +1083,9 @@ for (my $i = 0; $i < $MAX_VIRTIO_DISKS; $i++) {
$confdesc->{"virtio$i"} = $virtiodesc; $confdesc->{"virtio$i"} = $virtiodesc;
} }
$drivename_hash->{efidisk0} = 1;
$confdesc->{efidisk0} = $efidisk_desc;
for (my $i = 0; $i < $MAX_USB_DEVICES; $i++) { for (my $i = 0; $i < $MAX_USB_DEVICES; $i++) {
$confdesc->{"usb$i"} = $usbdesc; $confdesc->{"usb$i"} = $usbdesc;
} }
@ -1111,7 +1147,8 @@ sub valid_drive_names {
return ((map { "ide$_" } (0 .. ($MAX_IDE_DISKS - 1))), return ((map { "ide$_" } (0 .. ($MAX_IDE_DISKS - 1))),
(map { "scsi$_" } (0 .. ($MAX_SCSI_DISKS - 1))), (map { "scsi$_" } (0 .. ($MAX_SCSI_DISKS - 1))),
(map { "virtio$_" } (0 .. ($MAX_VIRTIO_DISKS - 1))), (map { "virtio$_" } (0 .. ($MAX_VIRTIO_DISKS - 1))),
(map { "sata$_" } (0 .. ($MAX_SATA_DISKS - 1)))); (map { "sata$_" } (0 .. ($MAX_SATA_DISKS - 1))),
'efidisk0');
} }
sub is_valid_drivename { sub is_valid_drivename {
@ -3136,6 +3173,11 @@ sub config_to_command {
$ahcicontroller->{$controller}=1; $ahcicontroller->{$controller}=1;
} }
if ($drive->{interface} eq 'efidisk') {
# this will be added somewhere else
return;
}
my $drive_cmd = print_drive_full($storecfg, $vmid, $drive); my $drive_cmd = print_drive_full($storecfg, $vmid, $drive);
push @$devices, '-drive',$drive_cmd; push @$devices, '-drive',$drive_cmd;
push @$devices, '-device', print_drivedevice_full($storecfg, $conf, $vmid, $drive, $bridges); push @$devices, '-device', print_drivedevice_full($storecfg, $conf, $vmid, $drive, $bridges);
@ -4964,7 +5006,7 @@ sub restore_update_config_line {
$net->{macaddr} = PVE::Tools::random_ether_addr($dc->{mac_prefix}) if $net->{macaddr}; $net->{macaddr} = PVE::Tools::random_ether_addr($dc->{mac_prefix}) if $net->{macaddr};
$netstr = print_net($net); $netstr = print_net($net);
print $outfd "$id: $netstr\n"; print $outfd "$id: $netstr\n";
} elsif ($line =~ m/^((ide|scsi|virtio|sata)\d+):\s*(\S+)\s*$/) { } elsif ($line =~ m/^((ide|scsi|virtio|sata|efidisk)\d+):\s*(\S+)\s*$/) {
my $virtdev = $1; my $virtdev = $1;
my $value = $3; my $value = $3;
my $di = parse_drive($virtdev, $value); my $di = parse_drive($virtdev, $value);