[libvirt PATCH 3/4] nodedev: drop DKD_MEDIA_AVAILABLE property check

The access of DKD_MEDIA_AVAILABLE for floppy disks, is mistakenly protected by a check for ID_CDROM_MEDIA, introduced in: commit 10427db77983edfaafec74ec13cc5015bab6aa95 Author: Ján Tomko <jtomko(a)redhat.com&gt; Date: Fri Jun 3 16:10:21 2016 +0200 Only return two values in udevGetUintProperty Thus the check of DKD_MEDIA_AVAILABLE never run. In practice this didn't matter since this property is set by the DeviceKit-Disks daemon which was only around for 3 Fedora releases before being killed off around F13. Thus we can just remove this legacy property. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com&gt; --- src/node_device/node_device_udev.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c index e48e62dab8..a25babcf0d 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -837,11 +837,7 @@ udevProcessFloppy(struct udev_device *device, { int has_media = 0; - if (udevHasDeviceProperty(device, "ID_CDROM_MEDIA")) { - /* USB floppy */ - if (udevGetIntProperty(device, "DKD_MEDIA_AVAILABLE", &has_media, 0) < 0) - return -1; - } else if (udevHasDeviceProperty(device, "ID_FS_LABEL")) { + if (udevHasDeviceProperty(device, "ID_FS_LABEL")) { /* Legacy floppy */ has_media = 1; } -- 2.28.0