From nobody Wed Nov 27 04:35:27 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1557474766; cv=none; d=zoho.com; s=zohoarc; b=dXEhe0yzbiJd7JcumMZT0zbpW0ffvhT25HDnwnx8MeWbgv8JomXWUcln4rFbv/VahYv0mwH0ga8GbAhS7Fx+zTnx6gp+vmNEZFqc78I06eA8z8x5J0pcYACwzR8EXn1f8kXLG9h19jDn2Rous1DM2rGLbUI888KeEms49riAj3E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1557474766; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=Jb3OJS3U4qxXRRC95k2at/fa5ApDQKJL4HPuQo45FaY=; b=kQyNk1qvMtWBoSXkBwDPh7rFLGLow2X8VEfZ2SEHmfNI+JoN+130b8473ZQ1LFsZvGKDU7rEPWE3HIokVA9aUk9o1CLMIgM+rCYrlYBg/Cr7zBQnqt6uPJHoqF8EcZ0nDNQ+voVBasYmOsb7E03iJ7fpm/1frPdUQARMdWlUX1E= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1557474766378936.9273177581441; Fri, 10 May 2019 00:52:46 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id DA853308FBB4; Fri, 10 May 2019 07:52:44 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B3C1661084; Fri, 10 May 2019 07:52:44 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 6E73541F5C; Fri, 10 May 2019 07:52:44 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x4A7qXTN002709 for ; Fri, 10 May 2019 03:52:33 -0400 Received: by smtp.corp.redhat.com (Postfix) id 2677A1001E79; Fri, 10 May 2019 07:52:33 +0000 (UTC) Received: from moe.brq.redhat.com (unknown [10.43.2.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id A36861001E6C for ; Fri, 10 May 2019 07:52:32 +0000 (UTC) From: Michal Privoznik To: libvir-list@redhat.com Date: Fri, 10 May 2019 09:52:26 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 1/3] virSysinfoRead: Simplify #ifdef underbush X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.43]); Fri, 10 May 2019 07:52:45 +0000 (UTC) Content-Type: text/plain; charset="utf-8" Signed-off-by: Michal Privoznik --- src/util/virsysinfo.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/src/util/virsysinfo.c b/src/util/virsysinfo.c index 79a935b90a..9e60d1a553 100644 --- a/src/util/virsysinfo.c +++ b/src/util/virsysinfo.c @@ -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 */ } =20 =20 --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list