|
 |
3a9410 |
From fcb45d357cc3b6e9ee413014e21de1ab2d20273f Mon Sep 17 00:00:00 2001
|
|
|
3a9410 |
Message-Id: <fcb45d357cc3b6e9ee413014e21de1ab2d20273f@dist-git>
|
|
|
3a9410 |
From: Boris Fiuczynski <fiuczy@linux.ibm.com>
|
|
|
3a9410 |
Date: Fri, 13 May 2022 12:31:05 +0200
|
|
|
3a9410 |
Subject: [PATCH] util: refactor virDomainCCWAddressIncrement into virccw
|
|
|
3a9410 |
|
|
|
3a9410 |
Refactor virDomainCCWAddressIncrement into virccw and rename method as
|
|
|
3a9410 |
virCCWDeviceAddressIncrement.
|
|
|
3a9410 |
|
|
|
3a9410 |
Signed-off-by: Boris Fiuczynski <fiuczy@linux.ibm.com>
|
|
|
3a9410 |
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
|
|
|
3a9410 |
(cherry picked from commit be1e16ed1161173b07f2e8f20f2ca3294ac49406)
|
|
|
3a9410 |
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2165011
|
|
|
3a9410 |
Signed-off-by: Thomas Huth <thuth@redhat.com>
|
|
|
3a9410 |
---
|
|
|
3a9410 |
src/conf/domain_addr.c | 16 +---------------
|
|
|
3a9410 |
src/libvirt_private.syms | 1 +
|
|
|
3a9410 |
src/util/virccw.c | 13 +++++++++++++
|
|
|
3a9410 |
src/util/virccw.h | 1 +
|
|
|
3a9410 |
4 files changed, 16 insertions(+), 15 deletions(-)
|
|
|
3a9410 |
|
|
|
3a9410 |
diff --git a/src/conf/domain_addr.c b/src/conf/domain_addr.c
|
|
|
3a9410 |
index 655f3cc09e..b04ab0628b 100644
|
|
|
3a9410 |
--- a/src/conf/domain_addr.c
|
|
|
3a9410 |
+++ b/src/conf/domain_addr.c
|
|
|
3a9410 |
@@ -1286,20 +1286,6 @@ virDomainPCIAddressSetAllMulti(virDomainDef *def)
|
|
|
3a9410 |
}
|
|
|
3a9410 |
|
|
|
3a9410 |
|
|
|
3a9410 |
-static int
|
|
|
3a9410 |
-virDomainCCWAddressIncrement(virCCWDeviceAddress *addr)
|
|
|
3a9410 |
-{
|
|
|
3a9410 |
- virCCWDeviceAddress ccwaddr = *addr;
|
|
|
3a9410 |
-
|
|
|
3a9410 |
- /* We are not touching subchannel sets and channel subsystems */
|
|
|
3a9410 |
- if (++ccwaddr.devno > VIR_CCW_DEVICE_MAX_DEVNO)
|
|
|
3a9410 |
- return -1;
|
|
|
3a9410 |
-
|
|
|
3a9410 |
- *addr = ccwaddr;
|
|
|
3a9410 |
- return 0;
|
|
|
3a9410 |
-}
|
|
|
3a9410 |
-
|
|
|
3a9410 |
-
|
|
|
3a9410 |
int
|
|
|
3a9410 |
virDomainCCWAddressAssign(virDomainDeviceInfo *dev,
|
|
|
3a9410 |
virDomainCCWAddressSet *addrs,
|
|
|
3a9410 |
@@ -1325,7 +1311,7 @@ virDomainCCWAddressAssign(virDomainDeviceInfo *dev,
|
|
|
3a9410 |
return -1;
|
|
|
3a9410 |
|
|
|
3a9410 |
while (virHashLookup(addrs->defined, addr)) {
|
|
|
3a9410 |
- if (virDomainCCWAddressIncrement(&addrs->next) < 0) {
|
|
|
3a9410 |
+ if (virCCWDeviceAddressIncrement(&addrs->next) < 0) {
|
|
|
3a9410 |
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
|
|
|
3a9410 |
_("There are no more free CCW devnos."));
|
|
|
3a9410 |
return -1;
|
|
|
3a9410 |
diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
|
|
|
3a9410 |
index e8d3edb0fe..eb56292b34 100644
|
|
|
3a9410 |
--- a/src/libvirt_private.syms
|
|
|
3a9410 |
+++ b/src/libvirt_private.syms
|
|
|
3a9410 |
@@ -1903,6 +1903,7 @@ virBufferVasprintf;
|
|
|
3a9410 |
|
|
|
3a9410 |
# util/virccw.h
|
|
|
3a9410 |
virCCWDeviceAddressAsString;
|
|
|
3a9410 |
+virCCWDeviceAddressIncrement;
|
|
|
3a9410 |
|
|
|
3a9410 |
|
|
|
3a9410 |
# util/vircgroup.h
|
|
|
3a9410 |
diff --git a/src/util/virccw.c b/src/util/virccw.c
|
|
|
3a9410 |
index 5a19d3a112..d14d432414 100644
|
|
|
3a9410 |
--- a/src/util/virccw.c
|
|
|
3a9410 |
+++ b/src/util/virccw.c
|
|
|
3a9410 |
@@ -27,3 +27,16 @@ virCCWDeviceAddressAsString(virCCWDeviceAddress *addr)
|
|
|
3a9410 |
{
|
|
|
3a9410 |
return g_strdup_printf(VIR_CCW_DEVICE_ADDRESS_FMT, addr->cssid, addr->ssid, addr->devno);
|
|
|
3a9410 |
}
|
|
|
3a9410 |
+
|
|
|
3a9410 |
+int
|
|
|
3a9410 |
+virCCWDeviceAddressIncrement(virCCWDeviceAddress *addr)
|
|
|
3a9410 |
+{
|
|
|
3a9410 |
+ virCCWDeviceAddress ccwaddr = *addr;
|
|
|
3a9410 |
+
|
|
|
3a9410 |
+ /* We are not touching subchannel sets and channel subsystems */
|
|
|
3a9410 |
+ if (++ccwaddr.devno > VIR_CCW_DEVICE_MAX_DEVNO)
|
|
|
3a9410 |
+ return -1;
|
|
|
3a9410 |
+
|
|
|
3a9410 |
+ *addr = ccwaddr;
|
|
|
3a9410 |
+ return 0;
|
|
|
3a9410 |
+}
|
|
|
3a9410 |
diff --git a/src/util/virccw.h b/src/util/virccw.h
|
|
|
3a9410 |
index c3a47127f1..4c48c9605e 100644
|
|
|
3a9410 |
--- a/src/util/virccw.h
|
|
|
3a9410 |
+++ b/src/util/virccw.h
|
|
|
3a9410 |
@@ -37,3 +37,4 @@ struct _virCCWDeviceAddress {
|
|
|
3a9410 |
|
|
|
3a9410 |
char* virCCWDeviceAddressAsString(virCCWDeviceAddress *addr)
|
|
|
3a9410 |
ATTRIBUTE_NONNULL(1);
|
|
|
3a9410 |
+int virCCWDeviceAddressIncrement(virCCWDeviceAddress *addr);
|
|
|
3a9410 |
--
|
|
|
3a9410 |
2.39.1
|
|
|
3a9410 |
|