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

util: refactor ccw address constants into virccw

Browse Source 
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:04 +02:00 committed by Michal Privoznik
parent b41163005c
commit 5fe90d471a
4 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/conf/device_conf.c
View File

@ -261,9 +261,9 @@ virPCIDeviceAddressFormat(virBuffer *buf,
bool bool
virDomainDeviceCCWAddressIsValid(virCCWDeviceAddress *addr) virDomainDeviceCCWAddressIsValid(virCCWDeviceAddress *addr)
{ {
return addr->cssid <= VIR_DOMAIN_DEVICE_CCW_MAX_CSSID && return addr->cssid <= VIR_CCW_DEVICE_MAX_CSSID &&
addr->ssid <= VIR_DOMAIN_DEVICE_CCW_MAX_SSID && addr->ssid <= VIR_CCW_DEVICE_MAX_SSID &&
addr->devno <= VIR_DOMAIN_DEVICE_CCW_MAX_DEVNO; addr->devno <= VIR_CCW_DEVICE_MAX_DEVNO;
} }
int int

4
src/conf/device_conf.h
View File

@ -70,10 +70,6 @@ struct _virDomainDeviceVirtioSerialAddress {
unsigned int port; unsigned int port;
}; };
#define VIR_DOMAIN_DEVICE_CCW_MAX_CSSID 254
#define VIR_DOMAIN_DEVICE_CCW_MAX_SSID 3
#define VIR_DOMAIN_DEVICE_CCW_MAX_DEVNO 65535
typedef struct _virDomainDeviceCcidAddress virDomainDeviceCcidAddress; typedef struct _virDomainDeviceCcidAddress virDomainDeviceCcidAddress;
struct _virDomainDeviceCcidAddress { struct _virDomainDeviceCcidAddress {
unsigned int controller; unsigned int controller;

2
src/conf/domain_addr.c
View File

@ -1309,7 +1309,7 @@ virDomainCCWAddressIncrement(virCCWDeviceAddress *addr)
virCCWDeviceAddress ccwaddr = *addr; virCCWDeviceAddress ccwaddr = *addr;
/* We are not touching subchannel sets and channel subsystems */ /* We are not touching subchannel sets and channel subsystems */
if (++ccwaddr.devno > VIR_DOMAIN_DEVICE_CCW_MAX_DEVNO) if (++ccwaddr.devno > VIR_CCW_DEVICE_MAX_DEVNO)
return -1; return -1;
*addr = ccwaddr; *addr = ccwaddr;

3
src/util/virccw.h
View File

@ -22,6 +22,9 @@
#include "internal.h" #include "internal.h"
#define VIR_CCW_DEVICE_MAX_CSSID 254
#define VIR_CCW_DEVICE_MAX_SSID 3
#define VIR_CCW_DEVICE_MAX_DEVNO 65535
#define VIR_CCW_DEVICE_ADDRESS_FMT "%x.%x.%04x" #define VIR_CCW_DEVICE_ADDRESS_FMT "%x.%x.%04x"
typedef struct _virCCWDeviceAddress virCCWDeviceAddress; typedef struct _virCCWDeviceAddress virCCWDeviceAddress;