From b00f32c34d42a279cb10c9595577a5301e3164f9 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A1n=20Tomko?= Date: Tue, 21 May 2019 15:05:37 +0200 Subject: [PATCH] Introduce DOMAIN_DEVICE_ITERATE_MISSING_INFO MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Rename the DOMAIN_DEVICE_ITERATE_GRAPHICS flag. It was introduced by commit dd45c2710f6fd2d4f8a47f97960532d0e0091e7d with the intention to run the Validate callback even on the graphics device. However, enumerating every single device in virDomainDeviceIterateFlags is unsustainable and what really was special about the graphics device was the lack of DeviceInfo. Rename the flag and iterate over more info-less devices. (and leases) Signed-off-by: Ján Tomko --- src/conf/domain_conf.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 732d37329f..926c2139b7 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -4074,7 +4074,7 @@ virDomainSkipBackcompatConsole(virDomainDefPtr def, enum { DOMAIN_DEVICE_ITERATE_ALL_CONSOLES = 1 << 0, - DOMAIN_DEVICE_ITERATE_GRAPHICS = 1 << 1 + DOMAIN_DEVICE_ITERATE_MISSING_INFO = 1 << 1, } virDomainDeviceIterateFlags; /* @@ -4240,15 +4240,26 @@ virDomainDeviceInfoIterateInternal(virDomainDefPtr def, return rc; } - /* If the flag below is set, make sure @cb can handle @info being NULL, as - * graphics don't have any boot info */ - if (iteratorFlags & DOMAIN_DEVICE_ITERATE_GRAPHICS) { + /* If the flag below is set, make sure @cb can handle @info being NULL */ + if (iteratorFlags & DOMAIN_DEVICE_ITERATE_MISSING_INFO) { device.type = VIR_DOMAIN_DEVICE_GRAPHICS; for (i = 0; i < def->ngraphics; i++) { device.data.graphics = def->graphics[i]; if ((rc = cb(def, &device, NULL, opaque)) != 0) return rc; } + device.type = VIR_DOMAIN_DEVICE_LEASE; + for (i = 0; i < def->nleases; i++) { + device.data.lease = def->leases[i]; + if ((rc = cb(def, &device, NULL, opaque)) != 0) + return rc; + } + device.type = VIR_DOMAIN_DEVICE_IOMMU; + if (def->iommu) { + device.data.iommu = def->iommu; + if ((rc = cb(def, &device, NULL, opaque)) != 0) + return rc; + } } /* Coverity is not very happy with this - all dead_error_condition */ @@ -6923,7 +6934,7 @@ virDomainDefValidate(virDomainDefPtr def, if (virDomainDeviceInfoIterateInternal(def, virDomainDefValidateDeviceIterator, (DOMAIN_DEVICE_ITERATE_ALL_CONSOLES | - DOMAIN_DEVICE_ITERATE_GRAPHICS), + DOMAIN_DEVICE_ITERATE_MISSING_INFO), &data) < 0) return -1; -- 2.39.5