External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-22 11:22:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

util: refactor virDomainDeviceCCWAddressIsValid into virccw

Browse Source 
Refactor virDomainDeviceCCWAddressIsValid into virccw and rename method
as virCCWDeviceAddressIsValid.

Signed-off-by: Boris Fiuczynski <fiuczy@linux.ibm.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Boris Fiuczynski 2022-05-13 12:31:06 +02:00 committed by Michal Privoznik
parent be1e16ed11
commit 38756ce5ba
5 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/conf/device_conf.c
View File

@ -258,14 +258,6 @@ virPCIDeviceAddressFormat(virBuffer *buf,
addr.function); addr.function);
} }
bool
virDomainDeviceCCWAddressIsValid(virCCWDeviceAddress *addr)
{
return addr->cssid <= VIR_CCW_DEVICE_MAX_CSSID &&
addr->ssid <= VIR_CCW_DEVICE_MAX_SSID &&
addr->devno <= VIR_CCW_DEVICE_MAX_DEVNO;
}
int int
virDomainDeviceCCWAddressParseXML(xmlNodePtr node, virDomainDeviceCCWAddressParseXML(xmlNodePtr node,
virCCWDeviceAddress *addr) virCCWDeviceAddress *addr)
@ -288,7 +280,7 @@ virDomainDeviceCCWAddressParseXML(xmlNodePtr node,
&addr->devno)) < 0) &addr->devno)) < 0)
return -1; return -1;
if (!virDomainDeviceCCWAddressIsValid(addr)) { if (!virCCWDeviceAddressIsValid(addr)) {
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
_("Invalid specification for virtio ccw address: cssid='0x%x' ssid='0x%x' devno='0x%04x'"), _("Invalid specification for virtio ccw address: cssid='0x%x' ssid='0x%x' devno='0x%04x'"),
addr->cssid, addr->ssid, addr->devno); addr->cssid, addr->ssid, addr->devno);
@ -453,7 +445,7 @@ virDomainDeviceAddressIsValid(virDomainDeviceInfo *info,
return true; return true;
case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW: case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW:
return virDomainDeviceCCWAddressIsValid(&info->addr.ccw); return virCCWDeviceAddressIsValid(&info->addr.ccw);
case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_USB: case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_USB:
return true; return true;

1
src/conf/device_conf.h
View File

@ -193,7 +193,6 @@ void virPCIDeviceAddressFormat(virBuffer *buf,
virPCIDeviceAddress addr, virPCIDeviceAddress addr,
bool includeTypeInAddr); bool includeTypeInAddr);
bool virDomainDeviceCCWAddressIsValid(virCCWDeviceAddress *addr);
int virDomainDeviceCCWAddressParseXML(xmlNodePtr node, int virDomainDeviceCCWAddressParseXML(xmlNodePtr node,
virCCWDeviceAddress *addr); virCCWDeviceAddress *addr);
bool virDomainDeviceCCWAddressEqual(virCCWDeviceAddress *addr1, bool virDomainDeviceCCWAddressEqual(virCCWDeviceAddress *addr1,

2
src/libvirt_private.syms
View File

@ -132,7 +132,6 @@ virDomainDeviceAddressIsValid;
virDomainDeviceAddressTypeToString; virDomainDeviceAddressTypeToString;
virDomainDeviceCcidAddressParseXML; virDomainDeviceCcidAddressParseXML;
virDomainDeviceCCWAddressEqual; virDomainDeviceCCWAddressEqual;
virDomainDeviceCCWAddressIsValid;
virDomainDeviceCCWAddressParseXML; virDomainDeviceCCWAddressParseXML;
virDomainDeviceDriveAddressParseXML; virDomainDeviceDriveAddressParseXML;
virDomainDeviceInfoAddressIsEqual; virDomainDeviceInfoAddressIsEqual;
@ -1928,6 +1927,7 @@ virBufferVasprintf;
# util/virccw.h # util/virccw.h
virCCWDeviceAddressAsString; virCCWDeviceAddressAsString;
virCCWDeviceAddressIncrement; virCCWDeviceAddressIncrement;
virCCWDeviceAddressIsValid;
# util/vircgroup.h # util/vircgroup.h

8
src/util/virccw.c
View File

@ -22,6 +22,14 @@
#include "virccw.h" #include "virccw.h"
bool
virCCWDeviceAddressIsValid(virCCWDeviceAddress *addr)
{
return addr->cssid <= VIR_CCW_DEVICE_MAX_CSSID &&
addr->ssid <= VIR_CCW_DEVICE_MAX_SSID &&
addr->devno <= VIR_CCW_DEVICE_MAX_DEVNO;
}
char* char*
virCCWDeviceAddressAsString(virCCWDeviceAddress *addr) virCCWDeviceAddressAsString(virCCWDeviceAddress *addr)
{ {

2
src/util/virccw.h
View File

@ -35,6 +35,8 @@ struct _virCCWDeviceAddress {
bool assigned; bool assigned;
}; };
bool virCCWDeviceAddressIsValid(virCCWDeviceAddress *addr);
char* virCCWDeviceAddressAsString(virCCWDeviceAddress *addr) char* virCCWDeviceAddressAsString(virCCWDeviceAddress *addr)
ATTRIBUTE_NONNULL(1); ATTRIBUTE_NONNULL(1);
int virCCWDeviceAddressIncrement(virCCWDeviceAddress *addr); int virCCWDeviceAddressIncrement(virCCWDeviceAddress *addr);