[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[libvirt] [RFC PATCH 07/12] conf: Parse and format <target index='...'/>



---
 src/conf/domain_conf.c | 24 ++++++++++++++++++++++++
 src/conf/domain_conf.h |  1 +
 2 files changed, 25 insertions(+)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index fb33e9c..93e706c 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -1774,6 +1774,7 @@ virDomainControllerDefNew(virDomainControllerType type)
         def->opts.pciopts.chassis = -1;
         def->opts.pciopts.port = -1;
         def->opts.pciopts.busNr = -1;
+        def->opts.pciopts.idx = -1;
         def->opts.pciopts.numaNode = -1;
         break;
     case VIR_DOMAIN_CONTROLLER_TYPE_IDE:
@@ -8694,6 +8695,7 @@ virDomainControllerDefParseXML(xmlNodePtr node,
             goto error;
         }
         def->idx = idxVal;
+        VIR_FREE(idx);
     }
 
     cur = node->children;
@@ -8725,6 +8727,7 @@ virDomainControllerDefParseXML(xmlNodePtr node,
                 chassis = virXMLPropString(cur, "chassis");
                 port = virXMLPropString(cur, "port");
                 busNr = virXMLPropString(cur, "busNr");
+                idx = virXMLPropString(cur, "index");
                 processedTarget = true;
             }
         }
@@ -8940,6 +8943,23 @@ virDomainControllerDefParseXML(xmlNodePtr node,
                 goto error;
             }
         }
+        if (idx) {
+            if (virStrToLong_i(idx, NULL, 0,
+                               &def->opts.pciopts.idx) < 0) {
+                virReportError(VIR_ERR_XML_ERROR,
+                               _("Invalid index '%s' in PCI controller"),
+                               idx);
+                goto error;
+            }
+            if (def->opts.pciopts.idx < 0 ||
+                def->opts.pciopts.idx > 31) {
+                virReportError(VIR_ERR_XML_ERROR,
+                               _("PCI controller index '%s' out of range "
+                                 "- must be 0-31"),
+                               idx);
+                goto error;
+            }
+        }
         if (numaNode >= 0)
             def->opts.pciopts.numaNode = numaNode;
         break;
@@ -20967,6 +20987,7 @@ virDomainControllerDefFormat(virBufferPtr buf,
             def->opts.pciopts.chassis != -1 ||
             def->opts.pciopts.port != -1 ||
             def->opts.pciopts.busNr != -1 ||
+            def->opts.pciopts.idx != -1 ||
             def->opts.pciopts.numaNode != -1)
             pciTarget = true;
         break;
@@ -21007,6 +21028,9 @@ virDomainControllerDefFormat(virBufferPtr buf,
             if (def->opts.pciopts.busNr != -1)
                 virBufferAsprintf(buf, " busNr='%d'",
                                   def->opts.pciopts.busNr);
+            if (def->opts.pciopts.idx != -1)
+                virBufferAsprintf(buf, " index='%d'",
+                                  def->opts.pciopts.idx);
             if (def->opts.pciopts.numaNode == -1) {
                 virBufferAddLit(buf, "/>\n");
             } else {
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 1e53cc3..0cf9c58 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -768,6 +768,7 @@ struct _virDomainPCIControllerOpts {
     int chassis;
     int port;
     int busNr; /* used by pci-expander-bus, -1 == unspecified */
+    int idx; /* used by spapr-pci-host-bridge, -1 == unspecified */
     /* numaNode is a *subelement* of target (to match existing
      * item in memory target config) -1 == unspecified
      */
-- 
2.7.4


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]