From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 94A771FF15C for ; Wed, 8 Jan 2025 15:34:24 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 126441C3B4; Wed, 8 Jan 2025 15:34:11 +0100 (CET) Date: Wed, 8 Jan 2025 15:34:07 +0100 (CET) From: =?UTF-8?Q?Fabian_Gr=C3=BCnbichler?= To: Proxmox VE development discussion Message-ID: <1423204970.15.1736346847444@webmail.proxmox.com> In-Reply-To: References: <20241216091229.3142660-1-alexandre.derumier@groupe-cyllene.com> MIME-Version: 1.0 X-Priority: 3 Importance: Normal X-Mailer: Open-Xchange Mailer v7.10.6-Rev72 X-Originating-Client: open-xchange-appsuite X-SPAM-LEVEL: Spam detection results: 0 AWL 0.047 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [qemuserver.pm] Subject: Re: [pve-devel] [PATCH v3 qemu-server 05/11] blockdev: convert cdrom media eject/insert 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: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" > Alexandre Derumier via pve-devel hat am 16.12.2024 10:12 CET geschrieben: > Signed-off-by: Alexandre Derumier > --- > PVE/QemuServer.pm | 15 ++++++++++----- > 1 file changed, 10 insertions(+), 5 deletions(-) > > diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm > index 3b33fd7d..758c8240 100644 > --- a/PVE/QemuServer.pm > +++ b/PVE/QemuServer.pm > @@ -5694,7 +5694,10 @@ sub vmconfig_update_disk { > } else { # cdrom > > if ($drive->{file} eq 'none') { > - mon_cmd($vmid, "eject", force => JSON::true, id => "$opt"); > + mon_cmd($vmid, "blockdev-open-tray", force => JSON::true, id => $opt); > + mon_cmd($vmid, "blockdev-remove-medium", id => $opt); > + qemu_drivedel($vmid, $opt); the drivedel here > + > if (drive_is_cloudinit($old_drive)) { > vmconfig_register_unused_drive($storecfg, $vmid, $conf, $old_drive); > } > @@ -5702,14 +5705,16 @@ sub vmconfig_update_disk { > my $path = get_iso_path($storecfg, $vmid, $drive->{file}); > > # force eject if locked > - mon_cmd($vmid, "eject", force => JSON::true, id => "$opt"); > + mon_cmd($vmid, "blockdev-open-tray", force => JSON::true, id => $opt); > + mon_cmd($vmid, "blockdev-remove-medium", id => $opt); > + eval { qemu_drivedel($vmid, $opt) }; and here > > if ($path) { > - mon_cmd($vmid, "blockdev-change-medium", > - id => "$opt", filename => "$path"); > + qemu_driveadd($storecfg, $vmid, $drive); and the driveadd here seem kind of weird.. are they really needed (also see comments on other patches)? > + mon_cmd($vmid, "blockdev-insert-medium", id => $opt, 'node-name' => "drive-$opt"); > + mon_cmd($vmid, "blockdev-close-tray", id => $opt); > } > } > - > return 1; > } > } > -- > 2.39.5 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel