External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-22 11:22:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

virSysinfoRead: Simplify #ifdef underbush

Browse Source 
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Michal Privoznik 2019-05-07 16:10:21 +02:00
parent 44b8df4cb4
commit c57b205ccf
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/util/virsysinfo.c
View File

@ -1212,13 +1212,12 @@ virSysinfoRead(void)
return virSysinfoReadARM(); return virSysinfoReadARM();
#elif defined(__s390__) || defined(__s390x__) #elif defined(__s390__) || defined(__s390x__)
return virSysinfoReadS390(); return virSysinfoReadS390();
#elif defined(WIN32) || \ #elif !defined(WIN32) && \
!(defined(__x86_64__) || \ (defined(__x86_64__) || \
defined(__i386__) || \ defined(__i386__) || \
defined(__amd64__) || \ defined(__amd64__))
defined(__arm__) || \ return virSysinfoReadX86();
defined(__aarch64__) || \ #else /* WIN32 || not supported arch */
defined(__powerpc__))
/* /*
* this can probably be extracted from Windows using API or registry * this can probably be extracted from Windows using API or registry
* http://www.microsoft.com/whdc/system/platform/firmware/SMBIOS.mspx * http://www.microsoft.com/whdc/system/platform/firmware/SMBIOS.mspx
@ -1226,9 +1225,7 @@ virSysinfoRead(void)
virReportSystemError(ENOSYS, "%s", virReportSystemError(ENOSYS, "%s",
_("Host sysinfo extraction not supported on this platform")); _("Host sysinfo extraction not supported on this platform"));
return NULL; return NULL;
#else /* !WIN32 && x86 */ #endif /* WIN32 || not supported arch */
return virSysinfoReadX86();
#endif /* !WIN32 && x86 */
} }