virSysinfoRead: Simplify #ifdef underbush

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

View File

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