From nobody Mon Dec 15 23:05:15 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1658846421; cv=none; d=zohomail.com; s=zohoarc; b=U50O78NtAUXrGOj4UdxBcU3IdScyEaMPz1bXdTvEChdPY8JIXQYN45AYXn06tnjQsmxLCPtJFEf3QeEGXOzRxN3IilW7AmnRmZU6wx/Wb7ZfhEkXs/k/dSEtNS/5N5wyZfOEAEDv/wXZkfI9oSrFIceW1oTmIxmlOkLgNBD29ig= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1658846421; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ImImdb04WGGryD64J4MkBtJZnAKmchTQh9DnTa9kcRY=; b=IwJ6YFDREGJZTGvaPTH6z2AiCw0P6h0rsGIWQRNz5lCcnHtak9aQ4rL6RoxSXnjlGidQ5HzJE5L7rKGZ2lu2eeBagRLYbhY4l0RWSExaA1b0ZNpUMd8yLSqWXTuTpl5aHCHn8WCOI/d7vR3ekIAvKZr18ECf+tOH8Z6HM8vfl88= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1658846421314909.918991145918; Tue, 26 Jul 2022 07:40:21 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-376-uOtGvxz6NeSiZfrnWvvJuA-1; Tue, 26 Jul 2022 10:39:33 -0400 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 4C3358032F1; Tue, 26 Jul 2022 14:39:04 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 39A4F492CA2; Tue, 26 Jul 2022 14:39:04 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 0B105194706A; Tue, 26 Jul 2022 14:39:00 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 971B21947B9E for ; Tue, 26 Jul 2022 14:38:55 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 80A6740CFD0A; Tue, 26 Jul 2022 14:38:55 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.32]) by smtp.corp.redhat.com (Postfix) with ESMTP id 074E440CF8EE for ; Tue, 26 Jul 2022 14:38:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1658846420; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=ImImdb04WGGryD64J4MkBtJZnAKmchTQh9DnTa9kcRY=; b=ORtIFXHSMI6Pho5eGR0tf7mGidxprZJhXukuLQ2Ky6+taq2WBVTrJo7pWAI2o7CNfxnvIC /kykDZKheC8WUFMncKVCHMCEc2tJINFYwwdCl5uFAtil8KKZpHbn60SAb/hLtyZzvPDxez WElyDroL5JOmYiqroQSz1bZDvp9sFMs= X-MC-Unique: uOtGvxz6NeSiZfrnWvvJuA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 56/80] qemu: hotplug: Remove pre-blockdev code path from qemuDomainChangeEjectableMedia Date: Tue, 26 Jul 2022 16:37:34 +0200 Message-Id: <0ff0dfb651d4a9947f8c23c2a59067404fc62c4a.1658843187.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.11.54.1 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 2.85 on 10.11.54.9 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1658846424354100001 Content-Type: text/plain; charset="utf-8" All media are changed in blockdev-instantiated cdroms now, remove the old code. Signed-off-by: Peter Krempa Reviewed-by: Pavel Hrdina --- src/qemu/qemu_hotplug.c | 88 +---------------------------------------- 1 file changed, 1 insertion(+), 87 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 28e4284e62..a57db12144 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -269,89 +269,6 @@ qemuHotplugWaitForTrayEject(virDomainObj *vm, } -/** - * qemuDomainChangeMediaLegacy: - * @driver: qemu driver structure - * @vm: domain definition - * @disk: disk definition to change the source of - * @newsrc: new disk source to change to - * @force: force the change of media - * - * Change the media in an ejectable device to the one described by - * @newsrc. This function also removes the old source from the - * shared device table if appropriate. Note that newsrc is consumed - * on success and the old source is freed on success. - * - * Returns 0 on success, -1 on error and reports libvirt error - */ -static int -qemuDomainChangeMediaLegacy(virQEMUDriver *driver, - virDomainObj *vm, - virDomainDiskDef *disk, - virStorageSource *newsrc, - bool force) -{ - int rc; - g_autofree char *driveAlias =3D NULL; - qemuDomainObjPrivate *priv =3D vm->privateData; - qemuDomainDiskPrivate *diskPriv =3D QEMU_DOMAIN_DISK_PRIVATE(disk); - const char *format =3D NULL; - g_autofree char *sourcestr =3D NULL; - - if (!disk->info.alias) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("missing disk device alias name for %s"), disk->d= st); - return -1; - } - - if (!(driveAlias =3D qemuAliasDiskDriveFromDisk(disk))) - return -1; - - qemuDomainObjEnterMonitor(driver, vm); - rc =3D qemuMonitorEjectMedia(priv->mon, driveAlias, force); - qemuDomainObjExitMonitor(vm); - - /* If the tray is present wait for it to open. */ - if (!force && diskPriv->tray) { - rc =3D qemuHotplugWaitForTrayEject(vm, disk); - if (rc < 0) - return -1; - - /* re-issue ejection command to pop out the media */ - qemuDomainObjEnterMonitor(driver, vm); - rc =3D qemuMonitorEjectMedia(priv->mon, driveAlias, false); - qemuDomainObjExitMonitor(vm); - if (rc < 0) - return -1; - - } else { - /* otherwise report possible errors from the attempt to eject the = media */ - if (rc < 0) - return -1; - } - - if (!virStorageSourceIsEmpty(newsrc)) { - if (qemuGetDriveSourceString(newsrc, NULL, &sourcestr) < 0) - return -1; - - if (virStorageSourceGetActualType(newsrc) !=3D VIR_STORAGE_TYPE_DI= R) - format =3D virStorageFileFormatTypeToString(newsrc->format); - - qemuDomainObjEnterMonitor(driver, vm); - rc =3D qemuMonitorChangeMedia(priv->mon, - driveAlias, - sourcestr, - format); - qemuDomainObjExitMonitor(vm); - } - - if (rc < 0) - return -1; - - return 0; -} - - /** * qemuHotplugAttachDBusVMState: * @driver: QEMU driver object @@ -671,10 +588,7 @@ qemuDomainChangeEjectableMedia(virQEMUDriver *driver, if (qemuHotplugAttachManagedPR(driver, vm, newsrc, VIR_ASYNC_JOB_NONE)= < 0) goto cleanup; - if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV)) - rc =3D qemuDomainChangeMediaBlockdev(driver, vm, disk, oldsrc, new= src, force); - else - rc =3D qemuDomainChangeMediaLegacy(driver, vm, disk, newsrc, force= ); + rc =3D qemuDomainChangeMediaBlockdev(driver, vm, disk, oldsrc, newsrc,= force); virDomainAuditDisk(vm, oldsrc, newsrc, "update", rc >=3D 0); --=20 2.36.1