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

parallel : new qemu syntax V2

Browse Source 
Signed-off-by: Derumier Alexandre <aderumier@odiso.com>
This commit is contained in:
Derumier Alexandre 2011-09-11 09:00:01 +02:00 committed by Dietmar Maurer
parent bae179aa1c
commit 1989a89c95
1 changed files with 43 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
PVE/QemuServer.pm
View File

@ -287,18 +287,6 @@ EODESC
typetext => '[[model=]i6300esb|ib700] [,[action=]reset|shutdown|poweroff|pause|debug|none]', 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 guest will be restarted (or execute the action specified)",
}, },
parallel => {
optional => 1,
type => 'string', format => 'pve-qm-parallel',
typetext => "PARALLELDEVICE { , PARALLELDEVICE }",
description => <<EODESCR,
Map host parallel devices. PARALLELDEVICE syntax is /dev/parport*
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
},
startdate => { startdate => {
optional => 1, optional => 1,
type => 'string', type => 'string',
@ -380,6 +368,7 @@ my $MAX_NETS = 6;
my $MAX_UNUSED_DISKS = 8; my $MAX_UNUSED_DISKS = 8;
my $MAX_HOSTPCI_DEVICES = 2; my $MAX_HOSTPCI_DEVICES = 2;
my $MAX_SERIAL_PORTS = 4; my $MAX_SERIAL_PORTS = 4;
my $MAX_PARALLEL_PORTS = 3;
my $nic_model_list = ['rtl8139', 'ne2k_pci', 'e1000', 'pcnet', 'virtio', my $nic_model_list = ['rtl8139', 'ne2k_pci', 'e1000', 'pcnet', 'virtio',
'ne2k_isa', 'i82551', 'i82557b', 'i82559er']; 'ne2k_isa', 'i82551', 'i82557b', 'i82559er'];
@ -495,6 +484,24 @@ EODESCR
}; };
PVE::JSONSchema::register_standard_option("pve-qm-serial", $serialdesc); PVE::JSONSchema::register_standard_option("pve-qm-serial", $serialdesc);
my $paralleldesc= {
optional => 1,
type => 'string', format => 'pve-qm-parallel',
typetext => "PARALLELDEVICE",
description => <<EODESCR,
Map host parallel devices. PARALLELDEVICE syntax is /dev/parport*
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
};
PVE::JSONSchema::register_standard_option("pve-qm-parallel", $paralleldesc);
for (my $i = 0; $i < $MAX_PARALLEL_PORTS; $i++) {
$confdesc->{"parallel$i"} = $paralleldesc;
}
for (my $i = 0; $i < $MAX_SERIAL_PORTS; $i++) { for (my $i = 0; $i < $MAX_SERIAL_PORTS; $i++) {
$confdesc->{"serial$i"} = $serialdesc; $confdesc->{"serial$i"} = $serialdesc;
} }
@ -1139,14 +1146,26 @@ PVE::JSONSchema::register_format('pve-qm-parallel', \&verify_parallel);
sub verify_parallel { sub verify_parallel {
my ($value, $noerr) = @_; my ($value, $noerr) = @_;
my @dl = split (/,/, $value); return $value if parse_parallel($value);
foreach my $v (@dl) {
if ($v !~ m|^/dev/parport\d+$|) { return undef if $noerr;
return undef if $noerr;
die "invalid device name\n"; die "invalid device name\n";
} }
sub parse_parallel {
my ($value) = @_;
return undef if !$value;
my $res = {};
if ($value =~ m|^/dev/parport\d+$|) {
$res->{dev} = $value;
} else {
return undef;
} }
return $value;
return $res;
} }
PVE::JSONSchema::register_format('pve-qm-serial', \&verify_serial); PVE::JSONSchema::register_format('pve-qm-serial', \&verify_serial);
@ -2041,14 +2060,11 @@ sub config_to_command {
} }
# parallel devices # parallel devices
if (my $pardl = $conf->{parallel}) { for (my $i = 0; $i < $MAX_PARALLEL_PORTS; $i++) {
my @dl = split (/,/, $pardl); my $d = parse_parallel($conf->{"parallel$i"});
foreach my $dev (@dl) { next if !$d;
next if !$dev; push @$cmd, '-chardev', "parport,id=parallel$i,path=$d->{dev}";
if (-c $dev) { push @$cmd, '-device', "isa-parallel,chardev=parallel$i";
push @$cmd, '-parallel', "$dev";
}
}
} }
my $vmname = $conf->{name} || "vm$vmid"; my $vmname = $conf->{name} || "vm$vmid";