NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

Remove PROPERTY_* constants

Browse Source 
They are no longer used.
This commit is contained in:
Ján Tomko 2016-06-03 18:54:43 +02:00
parent 4ab526ef71
commit c40ed871cc
2 changed files with 13 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/node_device/node_device_udev.c
View File

@ -206,10 +206,10 @@ static int udevGetUint64SysfsAttr(struct udev_device *udev_device,
if (str && virStrToLong_ull(str, NULL, 0, value) < 0) {
VIR_ERROR(_("Failed to convert '%s' to unsigned long long"), str);
return PROPERTY_ERROR;
return -1;
}
return str == NULL ? PROPERTY_MISSING : PROPERTY_FOUND;
return 0;
}
@ -687,18 +687,12 @@ static int udevProcessDisk(struct udev_device *device,
virNodeDevCapDataPtr data = &def->caps->data;
int ret = 0;
if (udevGetUint64SysfsAttr(device,
"size",
&data->storage.num_blocks) == PROPERTY_ERROR) {
if (udevGetUint64SysfsAttr(device, "size", &data->storage.num_blocks) < 0)
goto out;
}
if (udevGetUint64SysfsAttr(device,
"queue/logical_block_size",
&data->storage.logical_block_size)
== PROPERTY_ERROR) {
if (udevGetUint64SysfsAttr(device, "queue/logical_block_size",
&data->storage.logical_block_size) < 0)
goto out;
}
data->storage.size = data->storage.num_blocks *
data->storage.logical_block_size;
@ -729,17 +723,13 @@ static int udevProcessRemoveableMedia(struct udev_device *device,
&data->storage.media_label) < 0)
goto out;
if (udevGetUint64SysfsAttr(device,
"size",
&data->storage.num_blocks) == PROPERTY_ERROR) {
if (udevGetUint64SysfsAttr(device, "size",
&data->storage.num_blocks) < 0)
goto out;
}
if (udevGetUint64SysfsAttr(device,
"queue/logical_block_size",
&data->storage.logical_block_size) == PROPERTY_ERROR) {
if (udevGetUint64SysfsAttr(device, "queue/logical_block_size",
&data->storage.logical_block_size) < 0)
goto out;
}
/* XXX This calculation is wrong for the qemu virtual cdrom
* which reports the size in 512 byte blocks, but the logical
@ -801,18 +791,13 @@ static int udevProcessSD(struct udev_device *device,
virNodeDevCapDataPtr data = &def->caps->data;
int ret = 0;
if (udevGetUint64SysfsAttr(device,
"size",
&data->storage.num_blocks) == PROPERTY_ERROR) {
if (udevGetUint64SysfsAttr(device, "size",
&data->storage.num_blocks) < 0)
goto out;
}
if (udevGetUint64SysfsAttr(device,
"queue/logical_block_size",
&data->storage.logical_block_size)
== PROPERTY_ERROR) {
if (udevGetUint64SysfsAttr(device, "queue/logical_block_size",
&data->storage.logical_block_size) < 0)
goto out;
}
data->storage.size = data->storage.num_blocks *
data->storage.logical_block_size;

3
src/node_device/node_device_udev.h
View File

@ -29,6 +29,3 @@ typedef struct _udevPrivate udevPrivate;
#define DRV_STATE_UDEV_MONITOR(ds) (((udevPrivate *)((ds)->privateData))->udev_monitor)
#define DMI_DEVPATH "/sys/devices/virtual/dmi/id"
#define DMI_DEVPATH_FALLBACK "/sys/class/dmi/id"
#define PROPERTY_FOUND 0
#define PROPERTY_MISSING 1
#define PROPERTY_ERROR -1