From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 135B16BE9C for ; Thu, 5 Aug 2021 14:09:35 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 03BF62A56B for ; Thu, 5 Aug 2021 14:09:05 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 005262A55F for ; Thu, 5 Aug 2021 14:09:03 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id C233942DF7 for ; Thu, 5 Aug 2021 14:09:03 +0200 (CEST) Date: Thu, 05 Aug 2021 14:08:56 +0200 From: Fabian =?iso-8859-1?q?Gr=FCnbichler?= To: Proxmox VE development discussion References: <20210805115301.3415307-1-d.csapak@proxmox.com> In-Reply-To: <20210805115301.3415307-1-d.csapak@proxmox.com> MIME-Version: 1.0 User-Agent: astroid/0.15.0 (https://github.com/astroidmail/astroid) Message-Id: <1628165326.xa3ecf8qsn.astroid@nora.none> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-SPAM-LEVEL: Spam detection results: 0 AWL 0.439 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] applied: [PATCH qemu-server] api2: only add ide drives for non-legacy bootorders X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Aug 2021 12:09:35 -0000 thanks! On August 5, 2021 1:53 pm, Dominik Csapak wrote: > @bootorder only contains entries for non-legacy bootorder entries, > but the default one contains all cdroms anyway, and if the user > explicitely disabled cdroms, it is ok to not add them back > for the new cdrom drive. >=20 > Signed-off-by: Dominik Csapak > --- > view with -w to see the actual change > PVE/API2/Qemu.pm | 15 +++++++++------ > 1 file changed, 9 insertions(+), 6 deletions(-) >=20 > diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm > index 94cc0d2..ef0d877 100644 > --- a/PVE/API2/Qemu.pm > +++ b/PVE/API2/Qemu.pm > @@ -1358,12 +1358,15 @@ my $update_vm_api =3D sub { > =20 > &$create_disks($rpcenv, $authuser, $conf->{pending}, $arch, $store= cfg, $vmid, undef, {$opt =3D> $param->{$opt}}); > =20 > - # append new CD drives to bootorder to mark them bootable > - my $drive =3D PVE::QemuServer::parse_drive($opt, $param->{$opt}); > - if (PVE::QemuServer::drive_is_cdrom($drive, 1) && !grep(/^$opt$/, = @bootorder)) { > - push @bootorder, $opt; > - $conf->{pending}->{boot} =3D PVE::QemuServer::print_bootorder(\@booto= rder); > - $modified->{boot} =3D 1; > + # default legacy boot order implies all cdroms anyway > + if (@bootorder) { > + # append new CD drives to bootorder to mark them bootable > + my $drive =3D PVE::QemuServer::parse_drive($opt, $param->{$opt}); > + if (PVE::QemuServer::drive_is_cdrom($drive, 1) && !grep(/^$opt$/, @bo= otorder)) { > + push @bootorder, $opt; > + $conf->{pending}->{boot} =3D PVE::QemuServer::print_bootorder(\@b= ootorder); > + $modified->{boot} =3D 1; > + } > } > } elsif ($opt =3D~ m/^serial\d+/) { > if ((!defined($conf->{$opt}) || $conf->{$opt} eq 'socket') && $par= am->{$opt} eq 'socket') { > --=20 > 2.30.2 >=20 >=20 >=20 > _______________________________________________ > pve-devel mailing list > pve-devel@lists.proxmox.com > https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel >=20 >=20 >=20