virsysinfo: Rename virSysinfoReadX86 to virSysinfoReadDMI

There's nothing x86 specific about this function. Rename the
function so that it has DMI suffix which enables it to be reused
on different arches (as using X86 from say ARM would look
suspicious).

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Andrea Bolognani <abologna@redhat.com>

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 909975750c9d560fb1b914fd6484b36349c3ccb3..f2b8dc445d0b32703ecc62f93a91eff733c3b249 100644 (file)
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -3070,9 +3070,9 @@ virSysinfoSystemDefFree;
 
 # util/virsysinfopriv.h
 virSysinfoReadARM;
+virSysinfoReadDMI;
 virSysinfoReadPPC;
 virSysinfoReadS390;
-virSysinfoReadX86;
 
 
 # util/virsystemd.h

diff --git a/src/util/virsysinfo.c b/src/util/virsysinfo.c
index 6c3adc23abfbe2e1cdbc69c47118599b6b268970..b371e8dd2679d332f3456e2568ef415b470a2892 100644 (file)
--- a/src/util/virsysinfo.c
+++ b/src/util/virsysinfo.c
@@ -1139,7 +1139,7 @@ virSysinfoParseX86Memory(const char *base, virSysinfoDefPtr ret)
 }
 
 virSysinfoDefPtr
-virSysinfoReadX86(void)
+virSysinfoReadDMI(void)
 {
     char *path;
     virSysinfoDefPtr ret = NULL;
@@ -1220,7 +1220,7 @@ virSysinfoRead(void)
     (defined(__x86_64__) || \
      defined(__i386__) || \
      defined(__amd64__))
-    return virSysinfoReadX86();
+    return virSysinfoReadDMI();
 #else /* WIN32 || not supported arch */
     /*
      * this can probably be extracted from Windows using API or registry

diff --git a/src/util/virsysinfopriv.h b/src/util/virsysinfopriv.h
index 3ef675441e8007df540338a296a510406037b714..b7beb44807dcf8ec22bb5721f5fd1ea296bd07d1 100644 (file)
--- a/src/util/virsysinfopriv.h
+++ b/src/util/virsysinfopriv.h
@@ -39,6 +39,6 @@ virSysinfoDefPtr
 virSysinfoReadS390(void);
 
 virSysinfoDefPtr
-virSysinfoReadX86(void);
+virSysinfoReadDMI(void);
 
 #endif /* LIBVIRT_VIRSYSINFOPRIV_H */

diff --git a/tests/sysinfotest.c b/tests/sysinfotest.c
index c7561492e33fee479c7851a16107a6354efb1379..6c845821105e1452503f0bc8243aa1ff96617c96 100644 (file)
--- a/tests/sysinfotest.c
+++ b/tests/sysinfotest.c
@@ -133,7 +133,7 @@ mymain(void)
     TEST("s390", virSysinfoReadS390);
     TEST("s390-freq", virSysinfoReadS390);
     TEST("ppc", virSysinfoReadPPC);
-    TEST_FULL("x86", virSysinfoReadX86, "/sysinfodata/x86dmidecode.sh");
+    TEST_FULL("x86", virSysinfoReadDMI, "/sysinfodata/x86dmidecode.sh");
     TEST("arm", virSysinfoReadARM);
     TEST("arm-rpi2", virSysinfoReadARM);
     TEST("aarch64", virSysinfoReadARM);