[PATCH] virDomainDeviceInfoCheckABIStability: Implement proper check for CCW addresses

CCW addresses need to be also checked for ABI stability. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com&gt; --- src/conf/domain_conf.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 80f467ae7a..5ce1793c2d 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -19719,10 +19719,21 @@ virDomainDeviceInfoCheckABIStability(virDomainDeviceInfo *src, } break; + case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW: + if (src->addr.ccw.cssid != dst->addr.ccw.cssid || + src->addr.ccw.ssid != dst->addr.ccw.ssid || + src->addr.ccw.devno != dst->addr.ccw.devno) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Target device CCW address %1$x.%2$x.%3$04x does not match source %4$x.%5$x.%6$04x"), + dst->addr.ccw.cssid, dst->addr.ccw.ssid, dst->addr.ccw.devno, + src->addr.ccw.cssid, src->addr.ccw.ssid, src->addr.ccw.devno); + return false; + } + break; + case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_USB: case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_SPAPRVIO: case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_S390: - case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW: case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_MMIO: case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE: case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_UNASSIGNED: -- 2.41.0