threading: transform *-cpu-set nodes from list items to nodes

Part of Ticket 2321 work to remove unnecessary lists from
the config file.

Ticket: 2321

diff --git a/src/util-affinity.c b/src/util-affinity.c
index 6271a2726ff6a17cc02f0c24b0273390e663a688..66347c3bc5086a63131dc6a24791af34a8d9146a 100644 (file)
--- a/src/util-affinity.c
+++ b/src/util-affinity.c
@@ -338,7 +338,7 @@ void AffinitySetupLoadFromConfig(void)
 
     SCConfNode *affinity;
     TAILQ_FOREACH(affinity, &root->head, next) {
-        const char *setname = GetAffinitySetName(affinity->val);
+        const char *setname = GetAffinitySetName(affinity->name);
         if (setname == NULL) {
             continue;
         }

diff --git a/suricata.yaml.in b/suricata.yaml.in
index 64784f47f30e01aa82caac4279f29111cbb9af51..138a094bd57acb3d657701ee2aaf83bd274748ed 100644 (file)
--- a/suricata.yaml.in
+++ b/suricata.yaml.in
@@ -1879,11 +1879,11 @@ threading:
   # verdict-cpu-set is used for IPS verdict threads
   #
   cpu-affinity:
-    - management-cpu-set:
+    management-cpu-set:
       cpu: [ 0 ]  # include only these CPUs in affinity settings
-    - receive-cpu-set:
+    receive-cpu-set:
       cpu: [ 0 ]  # include only these CPUs in affinity settings
-    - worker-cpu-set:
+    worker-cpu-set:
       cpu: [ "all" ]
       mode: "exclusive"
       # Use explicitly 3 threads and don't compute number by using
@@ -1894,7 +1894,7 @@ threading:
         medium: [ "1-2" ]
         high: [ 3 ]
         default: "medium"
-    #- verdict-cpu-set:
+    #verdict-cpu-set:
     #  cpu: [ 0 ]
     #  prio:
     #    default: "high"