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 virDomainDeviceCCWAddressEqual into virccw

Browse Source 
Refactor virDomainDeviceCCWAddressEqual into virccw and rename method as
virCCWDeviceAddressEqual.

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:07 +02:00 committed by Michal Privoznik
parent 38756ce5ba
commit 784b876035
6 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/conf/device_conf.c
View File

@ -298,18 +298,6 @@ virDomainDeviceCCWAddressParseXML(xmlNodePtr node,
return 0; return 0;
} }
bool
virDomainDeviceCCWAddressEqual(virCCWDeviceAddress *addr1,
virCCWDeviceAddress *addr2)
{
if (addr1->cssid == addr2->cssid &&
addr1->ssid == addr2->ssid &&
addr1->devno == addr2->devno) {
return true;
}
return false;
}
int int
virDomainDeviceDriveAddressParseXML(xmlNodePtr node, virDomainDeviceDriveAddressParseXML(xmlNodePtr node,
virDomainDeviceDriveAddress *addr) virDomainDeviceDriveAddress *addr)

2
src/conf/device_conf.h
View File

@ -195,8 +195,6 @@ void virPCIDeviceAddressFormat(virBuffer *buf,
int virDomainDeviceCCWAddressParseXML(xmlNodePtr node, int virDomainDeviceCCWAddressParseXML(xmlNodePtr node,
virCCWDeviceAddress *addr); virCCWDeviceAddress *addr);
bool virDomainDeviceCCWAddressEqual(virCCWDeviceAddress *addr1,
virCCWDeviceAddress *addr2);
int virDomainDeviceDriveAddressParseXML(xmlNodePtr node, int virDomainDeviceDriveAddressParseXML(xmlNodePtr node,
virDomainDeviceDriveAddress *addr); virDomainDeviceDriveAddress *addr);

8
src/conf/domain_conf.c
View File

@ -15516,7 +15516,7 @@ virDomainDiskIndexByAddress(virDomainDef *def,
return i; return i;
if (vdisk->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW && if (vdisk->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW &&
ccw_addr && ccw_addr &&
virDomainDeviceCCWAddressEqual(&vdisk->info.addr.ccw, ccw_addr)) { virCCWDeviceAddressEqual(&vdisk->info.addr.ccw, ccw_addr)) {
return i; return i;
} }
if (vdisk->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_DRIVE) { if (vdisk->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_DRIVE) {
@ -15705,8 +15705,8 @@ virDomainNetFindIdx(virDomainDef *def, virDomainNetDef *net)
continue; continue;
if (CCWAddrSpecified && if (CCWAddrSpecified &&
!virDomainDeviceCCWAddressEqual(&def->nets[i]->info.addr.ccw, !virCCWDeviceAddressEqual(&def->nets[i]->info.addr.ccw,
&net->info.addr.ccw)) &net->info.addr.ccw))
continue; continue;
if (net->info.alias && def->nets[i]->info.alias && if (net->info.alias && def->nets[i]->info.alias &&
@ -16142,7 +16142,7 @@ virDomainControllerFindByCCWAddress(virDomainDef *def,
virDomainDeviceInfo *info = &def->controllers[i]->info; virDomainDeviceInfo *info = &def->controllers[i]->info;
if (info->type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW && if (info->type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW &&
virDomainDeviceCCWAddressEqual(&info->addr.ccw, addr)) virCCWDeviceAddressEqual(&info->addr.ccw, addr))
return i; return i;
} }

2
src/libvirt_private.syms
View File

@ -131,7 +131,6 @@ virDeviceInfoPCIAddressIsWanted;
virDomainDeviceAddressIsValid; virDomainDeviceAddressIsValid;
virDomainDeviceAddressTypeToString; virDomainDeviceAddressTypeToString;
virDomainDeviceCcidAddressParseXML; virDomainDeviceCcidAddressParseXML;
virDomainDeviceCCWAddressEqual;
virDomainDeviceCCWAddressParseXML; virDomainDeviceCCWAddressParseXML;
virDomainDeviceDriveAddressParseXML; virDomainDeviceDriveAddressParseXML;
virDomainDeviceInfoAddressIsEqual; virDomainDeviceInfoAddressIsEqual;
@ -1926,6 +1925,7 @@ virBufferVasprintf;
# util/virccw.h # util/virccw.h
virCCWDeviceAddressAsString; virCCWDeviceAddressAsString;
virCCWDeviceAddressEqual;
virCCWDeviceAddressIncrement; virCCWDeviceAddressIncrement;
virCCWDeviceAddressIsValid; virCCWDeviceAddressIsValid;

12
src/util/virccw.c
View File

@ -30,6 +30,18 @@ virCCWDeviceAddressIsValid(virCCWDeviceAddress *addr)
addr->devno <= VIR_CCW_DEVICE_MAX_DEVNO; addr->devno <= VIR_CCW_DEVICE_MAX_DEVNO;
} }
bool
virCCWDeviceAddressEqual(virCCWDeviceAddress *addr1,
virCCWDeviceAddress *addr2)
{
if (addr1->cssid == addr2->cssid &&
addr1->ssid == addr2->ssid &&
addr1->devno == addr2->devno) {
return true;
}
return false;
}
char* char*
virCCWDeviceAddressAsString(virCCWDeviceAddress *addr) virCCWDeviceAddressAsString(virCCWDeviceAddress *addr)
{ {

2
src/util/virccw.h
View File

@ -36,6 +36,8 @@ struct _virCCWDeviceAddress {
}; };
bool virCCWDeviceAddressIsValid(virCCWDeviceAddress *addr); bool virCCWDeviceAddressIsValid(virCCWDeviceAddress *addr);
bool virCCWDeviceAddressEqual(virCCWDeviceAddress *addr1,
virCCWDeviceAddress *addr2);
char* virCCWDeviceAddressAsString(virCCWDeviceAddress *addr) char* virCCWDeviceAddressAsString(virCCWDeviceAddress *addr)
ATTRIBUTE_NONNULL(1); ATTRIBUTE_NONNULL(1);