diff --git a/po/POTFILES b/po/POTFILES index a0f4077977..faaba53c8f 100644 --- a/po/POTFILES +++ b/po/POTFILES @@ -248,6 +248,7 @@ src/util/virauth.c src/util/virauthconfig.c src/util/virbitmap.c src/util/vircgroup.c +src/util/virccw.c src/util/vircgroupbackend.c src/util/vircgroupbackend.h src/util/vircgroupv1.c diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 6f50b4ca1d..bfedd85326 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1926,6 +1926,7 @@ virBufferVasprintf; # util/virccw.h virCCWDeviceAddressAsString; virCCWDeviceAddressEqual; +virCCWDeviceAddressFromString; virCCWDeviceAddressIncrement; virCCWDeviceAddressIsValid; virCCWDeviceAddressParseFromString; diff --git a/src/util/virccw.c b/src/util/virccw.c index 33df1c2428..d741743050 100644 --- a/src/util/virccw.c +++ b/src/util/virccw.c @@ -20,8 +20,11 @@ #include #include "virccw.h" +#include "virerror.h" #include "virstring.h" +#define VIR_FROM_THIS VIR_FROM_NONE + bool virCCWDeviceAddressIsValid(virCCWDeviceAddress *addr) @@ -49,6 +52,26 @@ virCCWDeviceAddressAsString(virCCWDeviceAddress *addr) return g_strdup_printf(VIR_CCW_DEVICE_ADDRESS_FMT, addr->cssid, addr->ssid, addr->devno); } +virCCWDeviceAddress * +virCCWDeviceAddressFromString(const char *address) +{ + g_autofree virCCWDeviceAddress *ccw = NULL; + + ccw = g_new0(virCCWDeviceAddress, 1); + + if (virCCWDeviceAddressParseFromString(address, + &ccw->cssid, + &ccw->ssid, + &ccw->devno) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Failed to parse CCW address '%s'"), + address); + return NULL; + } + + return g_steal_pointer(&ccw); +} + int virCCWDeviceAddressIncrement(virCCWDeviceAddress *addr) { diff --git a/src/util/virccw.h b/src/util/virccw.h index df0273bcac..80cc716811 100644 --- a/src/util/virccw.h +++ b/src/util/virccw.h @@ -41,6 +41,9 @@ bool virCCWDeviceAddressEqual(virCCWDeviceAddress *addr1, char* virCCWDeviceAddressAsString(virCCWDeviceAddress *addr) ATTRIBUTE_NONNULL(1); +virCCWDeviceAddress *virCCWDeviceAddressFromString(const char *address) + ATTRIBUTE_NONNULL(1); + int virCCWDeviceAddressIncrement(virCCWDeviceAddress *addr); int virCCWDeviceAddressParseFromString(const char *address,