From: Jiri Denemark <jdenemar@redhat.com>
Date: Fri, 24 Jun 2016 16:43:19 +0000 (+0200)
Subject: cpu: Drop NR_DRIVERS macro
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=6ec4e28ecda40df91d048536e6771739e0ab1fa1;p=libvirt.git

cpu: Drop NR_DRIVERS macro

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
---

diff --git a/src/cpu/cpu.c b/src/cpu/cpu.c
index c8d50e74d8..11a68f0cfb 100644
--- a/src/cpu/cpu.c
+++ b/src/cpu/cpu.c
@@ -35,7 +35,6 @@
 #include "util/virstring.h"
 
 
-#define NR_DRIVERS ARRAY_CARDINALITY(drivers)
 #define VIR_FROM_THIS VIR_FROM_CPU
 
 VIR_LOG_INIT("cpu.cpu");
@@ -60,7 +59,7 @@ cpuGetSubDriver(virArch arch)
         return NULL;
     }
 
-    for (i = 0; i < NR_DRIVERS; i++) {
+    for (i = 0; i < ARRAY_CARDINALITY(drivers); i++) {
         for (j = 0; j < drivers[i]->narch; j++) {
             if (arch == drivers[i]->arch[j])
                 return drivers[i];
@@ -79,7 +78,7 @@ cpuGetSubDriverByName(const char *name)
 {
     size_t i;
 
-    for (i = 0; i < NR_DRIVERS; i++) {
+    for (i = 0; i < ARRAY_CARDINALITY(drivers); i++) {
         if (STREQ_NULLABLE(name, drivers[i]->name))
             return drivers[i];
     }