https://bugzilla.redhat.com/show_bug.cgi?id=1471225 Since we can now easily determine from the node device driver which devices are physical cdrom devices, let's make in inquiry of the node device driver to get a list of all cdrom devices and compare the input resolved path to that list to ensure we haven't missed anything. Signed-off-by: John Ferlan <jferlan@xxxxxxxxxx> --- src/qemu/qemu_domain.c | 53 +++++++++++++++++++++++++++++++++++++++++++++---- src/qemu/qemu_domain.h | 2 ++ src/qemu/qemu_driver.c | 4 ++-- src/qemu/qemu_process.c | 2 +- 4 files changed, 54 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 1b0c778..a1302a5 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -41,6 +41,7 @@ #include "virfile.h" #include "domain_addr.h" #include "domain_event.h" +#include "node_device_conf.h" #include "virtime.h" #include "virnetdevopenvswitch.h" #include "virstoragefile.h" @@ -4723,6 +4724,7 @@ qemuDomainDefFormatLive(virQEMUDriverPtr driver, /* qemuDomainFilePathIsHostCDROM + * @conn: A virConnectPtr * @path: Supplied path. * * Determine if the path is a host CD-ROM path. Typically this is @@ -4730,23 +4732,64 @@ qemuDomainDefFormatLive(virQEMUDriverPtr driver, * it's also possible that @path resolves to /dev/srN, so check for * those conditions on @path in order to emit the tainted message. * + * If that doesn't work, then let's check with the nodedev driver to + * get a list of all cdrom's on the host and then compare the resolved + * linkpath for @path to each cdrom in the list looking for a match. + * * Returns true if the path is a CDROM, false otherwise or on error. */ static bool -qemuDomainFilePathIsHostCDROM(const char *path) +qemuDomainFilePathIsHostCDROM(virConnectPtr conn, + const char *path) { bool ret = false; char *linkpath = NULL; + int ndevices = 0; + virNodeDevicePtr *devices = NULL; + unsigned int flags = VIR_CONNECT_LIST_NODE_DEVICES_CAP_CDROM; + size_t i; + char *xml = NULL; + virNodeDeviceDefPtr def = NULL; if (virFileResolveLink(path, &linkpath) < 0) goto cleanup; if (STRPREFIX(path, "/dev/cdrom") || STRPREFIX(path, "/dev/sr") || - STRPREFIX(linkpath, "/dev/sr")) + STRPREFIX(linkpath, "/dev/sr")) { ret = true; + goto cleanup; + } + + /* Get a list of all 'cdrom' devices from NodeDevice and search + * through the list looking to compare the resolved @linkpath + * to list of host console device(s). */ + if (conn && + (ndevices = virConnectListAllNodeDevices(conn, &devices, flags) > 0)) { + for (i = 0; i < ndevices; i++) { + if (!(xml = virNodeDeviceGetXMLDesc(devices[i], 0))) + goto cleanup; + + if (!(def = virNodeDeviceDefParseString(xml, EXISTING_DEVICE, NULL))) + goto cleanup; + VIR_FREE(xml); + + if (STREQ(def->caps->data.storage.block, linkpath)) { + ret = true; + goto cleanup; + } + + virNodeDeviceDefFree(def); + def = NULL; + } + } cleanup: VIR_FREE(linkpath); + virNodeDeviceDefFree(def); + VIR_FREE(xml); + for (i = 0; i < ndevices; i++) + virObjectUnref(devices[i]); + VIR_FREE(devices); return ret; } @@ -4809,6 +4852,7 @@ void qemuDomainObjTaint(virQEMUDriverPtr driver, void qemuDomainObjCheckTaint(virQEMUDriverPtr driver, + virConnectPtr conn, virDomainObjPtr obj, qemuDomainLogContextPtr logCtxt) { @@ -4835,7 +4879,7 @@ void qemuDomainObjCheckTaint(virQEMUDriverPtr driver, qemuDomainObjTaint(driver, obj, VIR_DOMAIN_TAINT_HOST_CPU, logCtxt); for (i = 0; i < obj->def->ndisks; i++) - qemuDomainObjCheckDiskTaint(driver, obj, obj->def->disks[i], logCtxt); + qemuDomainObjCheckDiskTaint(driver, conn, obj, obj->def->disks[i], logCtxt); for (i = 0; i < obj->def->nhostdevs; i++) qemuDomainObjCheckHostdevTaint(driver, obj, obj->def->hostdevs[i], @@ -4852,6 +4896,7 @@ void qemuDomainObjCheckTaint(virQEMUDriverPtr driver, void qemuDomainObjCheckDiskTaint(virQEMUDriverPtr driver, + virConnectPtr conn, virDomainObjPtr obj, virDomainDiskDefPtr disk, qemuDomainLogContextPtr logCtxt) @@ -4869,7 +4914,7 @@ void qemuDomainObjCheckDiskTaint(virQEMUDriverPtr driver, if (disk->device == VIR_DOMAIN_DISK_DEVICE_CDROM && virStorageSourceGetActualType(disk->src) == VIR_STORAGE_TYPE_BLOCK && - disk->src->path && qemuDomainFilePathIsHostCDROM(disk->src->path)) + disk->src->path && qemuDomainFilePathIsHostCDROM(conn, disk->src->path)) qemuDomainObjTaint(driver, obj, VIR_DOMAIN_TAINT_CDROM_PASSTHROUGH, logCtxt); diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index 5f6e361..2e0a949 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -552,9 +552,11 @@ void qemuDomainObjTaint(virQEMUDriverPtr driver, qemuDomainLogContextPtr logCtxt); void qemuDomainObjCheckTaint(virQEMUDriverPtr driver, + virConnectPtr conn, virDomainObjPtr obj, qemuDomainLogContextPtr logCtxt); void qemuDomainObjCheckDiskTaint(virQEMUDriverPtr driver, + virConnectPtr conn, virDomainObjPtr obj, virDomainDiskDefPtr disk, qemuDomainLogContextPtr logCtxt); diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 6255d89..13d6ef7 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -7505,7 +7505,7 @@ qemuDomainAttachDeviceLive(virDomainObjPtr vm, switch ((virDomainDeviceType) dev->type) { case VIR_DOMAIN_DEVICE_DISK: - qemuDomainObjCheckDiskTaint(driver, vm, dev->data.disk, NULL); + qemuDomainObjCheckDiskTaint(driver, conn, vm, dev->data.disk, NULL); ret = qemuDomainAttachDeviceDiskLive(conn, driver, vm, dev); if (!ret) { alias = dev->data.disk->info.alias; @@ -7784,7 +7784,7 @@ qemuDomainUpdateDeviceLive(virConnectPtr conn, switch ((virDomainDeviceType) dev->type) { case VIR_DOMAIN_DEVICE_DISK: - qemuDomainObjCheckDiskTaint(driver, vm, dev->data.disk, NULL); + qemuDomainObjCheckDiskTaint(driver, conn, vm, dev->data.disk, NULL); ret = qemuDomainChangeDiskLive(conn, vm, dev, driver, force); break; case VIR_DOMAIN_DEVICE_GRAPHICS: diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index ab81d65..0aa3ebf 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -5557,7 +5557,7 @@ qemuProcessLaunch(virConnectPtr conn, qemuLogOperation(vm, "starting up", cmd, logCtxt); - qemuDomainObjCheckTaint(driver, vm, logCtxt); + qemuDomainObjCheckTaint(driver, conn, vm, logCtxt); qemuDomainLogContextMarkPosition(logCtxt); -- 2.9.5 -- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list
