From owner-svn-ports-all@freebsd.org Fri Jul 3 17:59:50 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id A0918355479; Fri, 3 Jul 2020 17:59:50 +0000 (UTC) (envelope-from mikael@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49z2mQ3m0Lz4Z8t; Fri, 3 Jul 2020 17:59:50 +0000 (UTC) (envelope-from mikael@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 60DEBF4E9; Fri, 3 Jul 2020 17:59:50 +0000 (UTC) (envelope-from mikael@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 063HxopD060559; Fri, 3 Jul 2020 17:59:50 GMT (envelope-from mikael@FreeBSD.org) Received: (from mikael@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 063HxoSE060558; Fri, 3 Jul 2020 17:59:50 GMT (envelope-from mikael@FreeBSD.org) Message-Id: <202007031759.063HxoSE060558@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mikael set sender to mikael@FreeBSD.org using -f From: Mikael Urankar Date: Fri, 3 Jul 2020 17:59:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r541126 - head/devel/libvirt/files X-SVN-Group: ports-head X-SVN-Commit-Author: mikael X-SVN-Commit-Paths: head/devel/libvirt/files X-SVN-Commit-Revision: 541126 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Jul 2020 17:59:50 -0000 Author: mikael Date: Fri Jul 3 17:59:49 2020 New Revision: 541126 URL: https://svnweb.freebsd.org/changeset/ports/541126 Log: devel/libvirt: fix build on arm PR: 247722 Approved by: novel (maintainer) Added: head/devel/libvirt/files/patch-src_cpu_cpu__arm.c (contents, props changed) Added: head/devel/libvirt/files/patch-src_cpu_cpu__arm.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/libvirt/files/patch-src_cpu_cpu__arm.c Fri Jul 3 17:59:49 2020 (r541126) @@ -0,0 +1,39 @@ +--- src/cpu/cpu_arm.c.orig 2020-07-02 18:19:46 UTC ++++ src/cpu/cpu_arm.c +@@ -22,7 +22,9 @@ + + #include + #if defined(__aarch64__) +-# include ++# if defined(__linux__) ++# include ++# endif + # include + #endif + +@@ -518,11 +520,13 @@ virCPUarmCpuDataFromRegs(virCPUarmData *data) + int cpu_feature_index = 0; + size_t i; + ++#if defined(__linux__) + if (!(getauxval(AT_HWCAP) & HWCAP_CPUID)) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("CPUID registers unavailable")); + return -1; + } ++#endif + + /* read the cpuid data from MIDR_EL1 register */ + asm("mrs %0, MIDR_EL1" : "=r" (cpuid)); +@@ -533,7 +537,11 @@ virCPUarmCpuDataFromRegs(virCPUarmData *data) + /* parse the coresponding vendor_id bits */ + data->vendor_id = (cpuid >> 24) & 0xff; + ++#if defined(__linux__) + hwcaps = getauxval(AT_HWCAP); ++#elif defined(__FreeBSD__) ++ elf_aux_info(AT_HWCAP, &hwcaps, sizeof(u_long)); ++#endif + VIR_DEBUG("CPU flags read from register: 0x%016lx", hwcaps); + + features = g_new0(char *, MAX_CPU_FLAGS + 1);