From nobody Mon Feb 9 03:29:09 2026 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=1642096233; cv=none; d=zohomail.com; s=zohoarc; b=cw6NZEia8gNUe1S/OsSBl8GIij2fvZTTlOKn7fILL44DN374pOowFzJT7nVqcKGZ9kkdb742K9eaFey3cgQHC6J+uNAgR9eGlfSz2sQQXjl80RUHlWxizaQiBEhrfAvqGJ7ICMGfk2+YQfB+um3fXmFlLtqQGwHJWcdQi6fof4c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1642096233; 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=o4Olw0l6TWD5pnee1C18Y4Qrvvd95K0UY1gNyGkPM94=; b=jhCUgnFOufmc6Yp0MX32UgXRZrt4SFCn5q02RVsLW9ujjw7Jt+OZDI/C0vPM/vv0dDSCdLwzCbuja3JNqTrT5fOmOwqWQnoZKJX69QaVZkKkCiMVDZaUh+SKNi/0hrBSZ8iOw8GKVwWIPcBhkFcWJaDp7BJ3D0TiiaiFHaoh648= 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 164209623331728.04239662897487; Thu, 13 Jan 2022 09:50:33 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-213-mOMmJC0IPYaYtSI8oLBCdw-1; Thu, 13 Jan 2022 12:50:30 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6E0BB101AFD5; Thu, 13 Jan 2022 17:50:24 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 373CC3468A; Thu, 13 Jan 2022 17:50:24 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id F0DE34BB7C; Thu, 13 Jan 2022 17:50:23 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 20DHlw7H004986 for ; Thu, 13 Jan 2022 12:47:58 -0500 Received: by smtp.corp.redhat.com (Postfix) id B63C72ED67; Thu, 13 Jan 2022 17:47:58 +0000 (UTC) Received: from hjs.redhat.com (unknown [10.43.2.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 18FC82E053 for ; Thu, 13 Jan 2022 17:47:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1642096232; 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=o4Olw0l6TWD5pnee1C18Y4Qrvvd95K0UY1gNyGkPM94=; b=SrNC0L+WocY+/lHL3kyGSMei9p0jCCbwB/ux7nhkMdQtNXbi7v6kgKRMz0YBYTRd9SsMid i2x6Tbjt7HZv4ZULgyEMDEIe1kjutihxgzMTOImo+cYNV2EWN0zdNalp+0R/++lGuT4V6W 1xCee4y/O+rVVGdttXH+nv9FIUVdm1I= X-MC-Unique: mOMmJC0IPYaYtSI8oLBCdw-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 4/7] qemu: remove sharedDevices hash table Date: Thu, 13 Jan 2022 18:47:39 +0100 Message-Id: <0125ff0281902a85580578b2e84217f6c6fcb69b.1642095763.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1642096235584100001 Its only use was to check conflicts of the sgio attributes between devices shared with other domains. Signed-off-by: J=C3=A1n Tomko --- src/qemu/qemu_conf.c | 292 ---------------------------------------- src/qemu/qemu_conf.h | 35 ----- src/qemu/qemu_driver.c | 3 - src/qemu/qemu_hostdev.c | 28 ---- src/qemu/qemu_hotplug.c | 20 --- src/qemu/qemu_process.c | 27 +--- 6 files changed, 1 insertion(+), 404 deletions(-) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 28cbdd6e61..81449b8b77 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -1450,298 +1450,6 @@ virQEMUDriverGetDomainCapabilities(virQEMUDriver *d= river, } =20 =20 -struct _qemuSharedDeviceEntry { - size_t ref; - char **domains; /* array of domain names */ -}; - -/* Construct the hash key for sharedDevices as "major:minor" */ -char * -qemuGetSharedDeviceKey(const char *device_path) -{ - int maj, min; - int rc; - - if ((rc =3D virGetDeviceID(device_path, &maj, &min)) < 0) { - virReportSystemError(-rc, - _("Unable to get minor number of device '%s'"= ), - device_path); - return NULL; - } - - return g_strdup_printf("%d:%d", maj, min); -} - - -bool -qemuSharedDeviceEntryDomainExists(qemuSharedDeviceEntry *entry, - const char *name, - int *idx) -{ - size_t i; - - for (i =3D 0; i < entry->ref; i++) { - if (STREQ(entry->domains[i], name)) { - if (idx) - *idx =3D i; - return true; - } - } - - return false; -} - -void -qemuSharedDeviceEntryFree(void *payload) -{ - qemuSharedDeviceEntry *entry =3D payload; - size_t i; - - if (!entry) - return; - - for (i =3D 0; i < entry->ref; i++) - g_free(entry->domains[i]); - g_free(entry->domains); - g_free(entry); -} - - -static int -qemuSharedDeviceEntryInsert(virQEMUDriver *driver, - const char *key, - const char *name) -{ - qemuSharedDeviceEntry *entry =3D NULL; - - if ((entry =3D virHashLookup(driver->sharedDevices, key))) { - /* Nothing to do if the shared scsi host device is already - * recorded in the table. - */ - if (!qemuSharedDeviceEntryDomainExists(entry, name, NULL)) { - VIR_EXPAND_N(entry->domains, entry->ref, 1); - entry->domains[entry->ref - 1] =3D g_strdup(name); - } - } else { - entry =3D g_new0(qemuSharedDeviceEntry, 1); - entry->domains =3D g_new0(char *, 1); - - entry->domains[0] =3D g_strdup(name); - - entry->ref =3D 1; - - if (virHashAddEntry(driver->sharedDevices, key, entry) < 0) - goto error; - } - - return 0; - - error: - qemuSharedDeviceEntryFree(entry); - return -1; -} - - -static int -qemuSharedDeviceEntryRemove(virQEMUDriver *driver, - const char *key, - const char *name) -{ - qemuSharedDeviceEntry *entry =3D NULL; - int idx; - - if (!(entry =3D virHashLookup(driver->sharedDevices, key))) - return -1; - - /* Nothing to do if the shared disk is not recorded in the table. */ - if (!qemuSharedDeviceEntryDomainExists(entry, name, &idx)) - return 0; - - if (entry->ref !=3D 1) { - VIR_FREE(entry->domains[idx]); - VIR_DELETE_ELEMENT(entry->domains, idx, entry->ref); - } else { - ignore_value(virHashRemoveEntry(driver->sharedDevices, key)); - } - - return 0; -} - - -static int -qemuSharedDiskAddRemoveInternal(virQEMUDriver *driver, - virDomainDiskDef *disk, - const char *name, - bool addDisk) -{ - g_autofree char *key =3D NULL; - int ret =3D -1; - - if (virStorageSourceIsEmpty(disk->src) || - !disk->src->shared || - !virStorageSourceIsBlockLocal(disk->src)) - return 0; - - qemuDriverLock(driver); - - if (!(key =3D qemuGetSharedDeviceKey(virDomainDiskGetSource(disk)))) - goto cleanup; - - if (addDisk) { - if (qemuSharedDeviceEntryInsert(driver, key, name) < 0) - goto cleanup; - } else { - if (qemuSharedDeviceEntryRemove(driver, key, name) < 0) - goto cleanup; - } - - ret =3D 0; - cleanup: - qemuDriverUnlock(driver); - return ret; -} - - -/* qemuAddSharedDisk: - * @driver: Pointer to qemu driver struct - * @src: disk source - * @name: The domain name - * - * Increase ref count and add the domain name into the list which - * records all the domains that use the shared device if the entry - * already exists, otherwise add a new entry. - */ -int -qemuAddSharedDisk(virQEMUDriver *driver, - virDomainDiskDef *disk, - const char *name) -{ - return qemuSharedDiskAddRemoveInternal(driver, disk, name, true); -} - - -static bool -qemuIsSharedHostdev(virDomainHostdevDef *hostdev) -{ - return (hostdev->shareable && - (virHostdevIsSCSIDevice(hostdev) && - hostdev->source.subsys.u.scsi.protocol !=3D - VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE_ISCSI)); -} - - -static char * -qemuGetHostdevPath(virDomainHostdevDef *hostdev) -{ - virDomainHostdevSubsysSCSI *scsisrc =3D &hostdev->source.subsys.u.scsi; - virDomainHostdevSubsysSCSIHost *scsihostsrc =3D &scsisrc->u.host; - g_autofree char *dev_name =3D NULL; - - if (!(dev_name =3D virSCSIDeviceGetDevName(NULL, - scsihostsrc->adapter, - scsihostsrc->bus, - scsihostsrc->target, - scsihostsrc->unit))) - return NULL; - - return g_strdup_printf("/dev/%s", dev_name); -} - - -static int -qemuSharedHostdevAddRemoveInternal(virQEMUDriver *driver, - virDomainHostdevDef *hostdev, - const char *name, - bool addDevice) -{ - g_autofree char *dev_path =3D NULL; - g_autofree char *key =3D NULL; - int ret =3D -1; - - if (!qemuIsSharedHostdev(hostdev)) - return 0; - - if (!(dev_path =3D qemuGetHostdevPath(hostdev)) || - !(key =3D qemuGetSharedDeviceKey(dev_path))) - return -1; - - qemuDriverLock(driver); - - if (addDevice) - ret =3D qemuSharedDeviceEntryInsert(driver, key, name); - else - ret =3D qemuSharedDeviceEntryRemove(driver, key, name); - - qemuDriverUnlock(driver); - - return ret; -} - -static int -qemuSharedDeviceAddRemoveInternal(virQEMUDriver *driver, - virDomainDeviceDef *dev, - const char *name, - bool addDevice) -{ - /* Currently the only conflicts we have to care about for - * the shared disk and shared host device is "sgio" setting, - * which is only valid for block disk and scsi host device. - */ - if (dev->type =3D=3D VIR_DOMAIN_DEVICE_DISK) - return qemuSharedDiskAddRemoveInternal(driver, dev->data.disk, - name, addDevice); - if (dev->type =3D=3D VIR_DOMAIN_DEVICE_HOSTDEV) - return qemuSharedHostdevAddRemoveInternal(driver, dev->data.hostde= v, - name, addDevice); - return 0; -} - - -/* qemuAddSharedDevice: - * @driver: Pointer to qemu driver struct - * @dev: The device def - * @name: The domain name - * - * Increase ref count and add the domain name into the list which - * records all the domains that use the shared device if the entry - * already exists, otherwise add a new entry. - */ -int -qemuAddSharedDevice(virQEMUDriver *driver, - virDomainDeviceDef *dev, - const char *name) -{ - return qemuSharedDeviceAddRemoveInternal(driver, dev, name, true); -} - - -int -qemuRemoveSharedDisk(virQEMUDriver *driver, - virDomainDiskDef *disk, - const char *name) -{ - return qemuSharedDiskAddRemoveInternal(driver, disk, name, false); -} - - -/* qemuRemoveSharedDevice: - * @driver: Pointer to qemu driver struct - * @device: The device def - * @name: The domain name - * - * Decrease ref count and remove the domain name from the list which - * records all the domains that use the shared device if ref is not - * 1, otherwise remove the entry. - */ -int -qemuRemoveSharedDevice(virQEMUDriver *driver, - virDomainDeviceDef *dev, - const char *name) -{ - return qemuSharedDeviceAddRemoveInternal(driver, dev, name, false); -} - - int qemuDriverAllocateID(virQEMUDriver *driver) { return g_atomic_int_add(&driver->lastvmid, 1) + 1; diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h index 5961b0b205..c71a666aea 100644 --- a/src/qemu/qemu_conf.h +++ b/src/qemu/qemu_conf.h @@ -292,9 +292,6 @@ struct _virQEMUDriver { =20 virHostdevManager *hostdevMgr; =20 - /* Immutable pointer. Unsafe APIs. XXX */ - GHashTable *sharedDevices; - /* Immutable pointer, immutable object */ virPortAllocatorRange *remotePorts; =20 @@ -344,38 +341,6 @@ virQEMUDriverGetDomainCapabilities(virQEMUDriver *driv= er, virArch arch, virDomainVirtType virttype); =20 -typedef struct _qemuSharedDeviceEntry qemuSharedDeviceEntry; - -bool qemuSharedDeviceEntryDomainExists(qemuSharedDeviceEntry *entry, - const char *name, - int *idx) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); - -char *qemuGetSharedDeviceKey(const char *disk_path) - ATTRIBUTE_NONNULL(1); - -void qemuSharedDeviceEntryFree(void *payload); - -int qemuAddSharedDisk(virQEMUDriver *driver, - virDomainDiskDef *disk, - const char *name) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3); - -int qemuAddSharedDevice(virQEMUDriver *driver, - virDomainDeviceDef *dev, - const char *name) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3); - -int qemuRemoveSharedDevice(virQEMUDriver *driver, - virDomainDeviceDef *dev, - const char *name) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3); - -int qemuRemoveSharedDisk(virQEMUDriver *driver, - virDomainDiskDef *disk, - const char *name) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3); - int qemuDriverAllocateID(virQEMUDriver *driver); virDomainXMLOption *virQEMUDriverCreateXMLConf(virQEMUDriver *driver, const char *defsecmodel); diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 65ac5ef367..028b53b4ad 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -735,8 +735,6 @@ qemuStateInitialize(bool privileged, if (!(qemu_driver->hostdevMgr =3D virHostdevManagerGetDefault())) goto error; =20 - qemu_driver->sharedDevices =3D virHashNew(qemuSharedDeviceEntryFree); - if (qemuMigrationDstErrorInit(qemu_driver) < 0) goto error; =20 @@ -1078,7 +1076,6 @@ qemuStateCleanup(void) virPortAllocatorRangeFree(qemu_driver->migrationPorts); virPortAllocatorRangeFree(qemu_driver->webSocketPorts); virPortAllocatorRangeFree(qemu_driver->remotePorts); - g_clear_pointer(&qemu_driver->sharedDevices, g_hash_table_unref); virObjectUnref(qemu_driver->hostdevMgr); virObjectUnref(qemu_driver->securityManager); virObjectUnref(qemu_driver->domainEventState); diff --git a/src/qemu/qemu_hostdev.c b/src/qemu/qemu_hostdev.c index 5461de459a..dfe657c51e 100644 --- a/src/qemu/qemu_hostdev.c +++ b/src/qemu/qemu_hostdev.c @@ -272,25 +272,8 @@ qemuHostdevPrepareSCSIDevices(virQEMUDriver *driver, virDomainHostdevDef **hostdevs, int nhostdevs) { - size_t i; virHostdevManager *hostdev_mgr =3D driver->hostdevMgr; =20 - /* Loop 1: Add the shared scsi host device to shared device - * table. - */ - for (i =3D 0; i < nhostdevs; i++) { - virDomainDeviceDef dev; - - if (!virHostdevIsSCSIDevice(hostdevs[i])) - continue; - - dev.type =3D VIR_DOMAIN_DEVICE_HOSTDEV; - dev.data.hostdev =3D hostdevs[i]; - - if (qemuAddSharedDevice(driver, &dev, name) < 0) - return -1; - } - return virHostdevPrepareSCSIDevices(hostdev_mgr, QEMU_DRIVER_NAME, name, hostdevs, nhostdevs); } @@ -426,19 +409,8 @@ qemuHostdevReAttachSCSIDevices(virQEMUDriver *driver, virDomainHostdevDef **hostdevs, int nhostdevs) { - size_t i; virHostdevManager *hostdev_mgr =3D driver->hostdevMgr; =20 - for (i =3D 0; i < nhostdevs; i++) { - virDomainHostdevDef *hostdev =3D hostdevs[i]; - virDomainDeviceDef dev; - - dev.type =3D VIR_DOMAIN_DEVICE_HOSTDEV; - dev.data.hostdev =3D hostdev; - - ignore_value(qemuRemoveSharedDevice(driver, &dev, name)); - } - virHostdevReAttachSCSIDevices(hostdev_mgr, QEMU_DRIVER_NAME, name, hostdevs, nhostdevs); } diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 0dd3121221..9dc74d89d2 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -603,7 +603,6 @@ qemuDomainChangeEjectableMedia(virQEMUDriver *driver, qemuDomainObjPrivate *priv =3D vm->privateData; virStorageSource *oldsrc =3D disk->src; qemuDomainDiskPrivate *diskPriv =3D QEMU_DOMAIN_DISK_PRIVATE(disk); - bool sharedAdded =3D false; bool managedpr =3D virStorageSourceChainHasManagedPR(oldsrc) || virStorageSourceChainHasManagedPR(newsrc); int ret =3D -1; @@ -620,11 +619,6 @@ qemuDomainChangeEjectableMedia(virQEMUDriver *driver, if (virDomainDiskTranslateSourcePool(disk) < 0) goto cleanup; =20 - if (qemuAddSharedDisk(driver, disk, vm->def->name) < 0) - goto cleanup; - - sharedAdded =3D true; - if (qemuDomainDetermineDiskChain(driver, vm, disk, NULL, true) < 0) goto cleanup; =20 @@ -649,7 +643,6 @@ qemuDomainChangeEjectableMedia(virQEMUDriver *driver, =20 /* remove the old source from shared device list */ disk->src =3D oldsrc; - ignore_value(qemuRemoveSharedDisk(driver, disk, vm->def->name)); ignore_value(qemuDomainStorageSourceChainAccessRevoke(driver, vm, olds= rc)); =20 /* media was changed, so we can remove the old media definition now */ @@ -662,9 +655,6 @@ qemuDomainChangeEjectableMedia(virQEMUDriver *driver, cleanup: /* undo changes to the new disk */ if (ret < 0) { - if (sharedAdded) - ignore_value(qemuRemoveSharedDisk(driver, disk, vm->def->name)= ); - ignore_value(qemuDomainStorageSourceChainAccessRevoke(driver, vm, = newsrc)); } =20 @@ -977,9 +967,6 @@ qemuDomainAttachDeviceDiskLiveInternal(virQEMUDriver *d= river, if (virDomainDiskTranslateSourcePool(disk) < 0) goto cleanup; =20 - if (qemuAddSharedDevice(driver, dev, vm->def->name) < 0) - goto cleanup; - if (qemuDomainDetermineDiskChain(driver, vm, disk, NULL, true) < 0) goto cleanup; =20 @@ -1076,8 +1063,6 @@ qemuDomainAttachDeviceDiskLiveInternal(virQEMUDriver = *driver, =20 cleanup: if (ret < 0) { - ignore_value(qemuRemoveSharedDevice(driver, dev, vm->def->name)); - if (releaseUSB) virDomainUSBAddressRelease(priv->usbaddrs, &disk->info); =20 @@ -4418,7 +4403,6 @@ qemuDomainRemoveDiskDevice(virQEMUDriver *driver, { qemuDomainDiskPrivate *diskPriv =3D QEMU_DOMAIN_DISK_PRIVATE(disk); g_autoptr(qemuBlockStorageSourceChainData) diskBackend =3D NULL; - virDomainDeviceDef dev; size_t i; qemuDomainObjPrivate *priv =3D vm->privateData; bool blockdev =3D virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV); @@ -4482,10 +4466,6 @@ qemuDomainRemoveDiskDevice(virQEMUDriver *driver, if (diskBackend) qemuDomainStorageSourceChainAccessRevoke(driver, vm, disk->src); =20 - dev.type =3D VIR_DOMAIN_DEVICE_DISK; - dev.data.disk =3D disk; - ignore_value(qemuRemoveSharedDevice(driver, &dev, vm->def->name)); - if (virStorageSourceChainHasManagedPR(disk->src) && qemuHotplugRemoveManagedPR(driver, vm, QEMU_ASYNC_JOB_NONE) < 0) goto cleanup; diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index b425acfec1..6203efef3a 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -5022,7 +5022,7 @@ qemuProcessSetupGraphics(virQEMUDriver *driver, =20 =20 static int -qemuProcessSetupRawIO(virQEMUDriver *driver, +qemuProcessSetupRawIO(virQEMUDriver *driver G_GNUC_UNUSED, virDomainObj *vm, virCommand *cmd G_GNUC_UNUSED) { @@ -5032,7 +5032,6 @@ qemuProcessSetupRawIO(virQEMUDriver *driver, =20 /* in case a certain disk is desirous of CAP_SYS_RAWIO, add this */ for (i =3D 0; i < vm->def->ndisks; i++) { - virDomainDeviceDef dev; virDomainDiskDef *disk =3D vm->def->disks[i]; =20 if (disk->rawio =3D=3D VIR_TRISTATE_BOOL_YES) { @@ -5041,11 +5040,6 @@ qemuProcessSetupRawIO(virQEMUDriver *driver, break; #endif } - - dev.type =3D VIR_DOMAIN_DEVICE_DISK; - dev.data.disk =3D disk; - if (qemuAddSharedDevice(driver, &dev, vm->def->name) < 0) - goto cleanup; } =20 /* If rawio not already set, check hostdevs as well */ @@ -5066,7 +5060,6 @@ qemuProcessSetupRawIO(virQEMUDriver *driver, =20 ret =3D 0; =20 - cleanup: if (rawio) { #ifdef CAP_SYS_RAWIO if (ret =3D=3D 0) @@ -8134,15 +8127,6 @@ void qemuProcessStop(virQEMUDriver *driver, qemuSecurityRestoreAllLabel(driver, vm, !!(flags & VIR_QEMU_PROCESS_STOP_MIGRA= TED)); =20 - for (i =3D 0; i < vm->def->ndisks; i++) { - virDomainDeviceDef dev; - virDomainDiskDef *disk =3D vm->def->disks[i]; - - dev.type =3D VIR_DOMAIN_DEVICE_DISK; - dev.data.disk =3D disk; - ignore_value(qemuRemoveSharedDevice(driver, &dev, vm->def->name)); - } - /* Clear out dynamically assigned labels */ for (i =3D 0; i < vm->def->nseclabels; i++) { if (vm->def->seclabels[i]->type =3D=3D VIR_DOMAIN_SECLABEL_DYNAMIC) @@ -8789,12 +8773,8 @@ qemuProcessReconnect(void *opaque) if (qemuDomainInitializePflashStorageSource(obj) < 0) goto error; =20 - /* XXX: Need to change as long as lock is introduced for - * qemu_driver->sharedDevices. - */ for (i =3D 0; i < obj->def->ndisks; i++) { virDomainDiskDef *disk =3D obj->def->disks[i]; - virDomainDeviceDef dev; =20 if (virDomainDiskTranslateSourcePool(disk) < 0) goto error; @@ -8811,11 +8791,6 @@ qemuProcessReconnect(void *opaque) } else { VIR_DEBUG("skipping backing chain detection for '%s'", disk->d= st); } - - dev.type =3D VIR_DOMAIN_DEVICE_DISK; - dev.data.disk =3D disk; - if (qemuAddSharedDevice(driver, &dev, obj->def->name) < 0) - goto error; } =20 for (i =3D 0; i < obj->def->ngraphics; i++) { --=20 2.31.1