From nobody Thu Apr 25 06:20:16 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 From nobody Thu Apr 25 06:20:16 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=1557474770; cv=none; d=zoho.com; s=zohoarc; b=B8NBNclvNN8h3K9YoQz3i5J3XGn+akRna1Rzo9lBEfLzoX7UvuJ4CUlgIulx8qVGDNUDMOteO2n6w/43jaVMyQszNuo6QU7XF9fyg7THO3qgXPLwpXtt2/n2e0sjQ1SLpNEAADdx+22puSP30wRljKNbRoVyznFMzM8VH7tlQ5Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1557474770; 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=XkAAkYiJzhR1S1Ha1nDDU86RYRDGyUTL048h5t5QCIg=; b=UUxLVdR4xIN+K60QxuuwhufOtnSwBRIzXGztWaQG92cLK6VIkMR9/s8DzN4l0mWhc/SE2f64lHqRCcvHcoNlxdpyYOD+/RaG4Xs3qjlxfH1hwgHY8gkT/NU+xVn/R9FSNf4eat0UVXUzW2hQQgUfyu+ZbneiSGp9zMmpd4HQ0ts= 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 1557474770495330.00991940366157; Fri, 10 May 2019 00:52:50 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 9E137308339E; Fri, 10 May 2019 07:52:48 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 77DB517B4F; Fri, 10 May 2019 07:52:48 +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 3C95318089D1; Fri, 10 May 2019 07:52:48 +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 x4A7qXL8002718 for ; Fri, 10 May 2019 03:52:34 -0400 Received: by smtp.corp.redhat.com (Postfix) id EE9A41001E81; 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 75B631001E6C for ; Fri, 10 May 2019 07:52:33 +0000 (UTC) From: Michal Privoznik To: libvir-list@redhat.com Date: Fri, 10 May 2019 09:52:27 +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 2/3] virSysinfoParseX86BaseBoard: Free memory upfront if no board detected 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.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.44]); Fri, 10 May 2019 07:52:49 +0000 (UTC) Content-Type: text/plain; charset="utf-8" If no board was detected then VIR_REALLOC_N() done at the end of the function will actually free the memory (because nborads =3D=3D 0), but @boards will be set to a non-NULL pointer. This makes it unnecessary harder for a caller to see if any board was detected. Signed-off-by: Michal Privoznik --- src/util/virsysinfo.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/util/virsysinfo.c b/src/util/virsysinfo.c index 9e60d1a553..6c3adc23ab 100644 --- a/src/util/virsysinfo.c +++ b/src/util/virsysinfo.c @@ -844,8 +844,12 @@ virSysinfoParseX86BaseBoard(const char *base, nboards--; } =20 - /* This is safe, as we can be only shrinking the memory */ - ignore_value(VIR_REALLOC_N(boards, nboards)); + if (nboards =3D=3D 0) { + VIR_FREE(boards); + } else { + /* This is safe, as we can be only shrinking the memory */ + ignore_value(VIR_REALLOC_N(boards, nboards)); + } =20 *baseBoard =3D boards; *nbaseBoard =3D nboards; --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Thu Apr 25 06:20:16 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=1557474758; cv=none; d=zoho.com; s=zohoarc; b=hGWlUE92jXp6AUe6I3j8J+z2YQxncuGIGZTwAEYybFD7/GObhvIGqvT647dEIRHy2Zhd1EarVP2UaLpieoZMOIaMFsMQ36h9+/UyewG8n0MG1UlpBYZLFjZEC5/9YAmxI6LcgZ9rmyeytM60an+n/6DQwzZKkFwqh9fnZWTl6Zk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1557474758; 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=0AEM+H2WLUhz8w6emiOPFgYJj7WnmqnNbCYDkLYJJX4=; b=gZj9TOgCL79+sL9/oS9qzc0fAJnQQ3VcSoh1O7EyMUFGvD3GcwHrt93VvLXmOV8SAEvI3DUf1yTLux6ICArRzIP2LqhhZfLd4B+e/sjYOHPG5pcdMF8O+EwoinhyHw1e+94FqGYD34cpo08mUVkpn7uhlsvH2Wk2g0zpjbwRocg= 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 1557474758752379.3303553350444; Fri, 10 May 2019 00:52:38 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 11E698666D; Fri, 10 May 2019 07:52:36 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D974D5D6A9; Fri, 10 May 2019 07:52:35 +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 2AF7418089CB; Fri, 10 May 2019 07:52:35 +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 x4A7qYtk002725 for ; Fri, 10 May 2019 03:52:34 -0400 Received: by smtp.corp.redhat.com (Postfix) id C0D4A1001E79; Fri, 10 May 2019 07:52:34 +0000 (UTC) Received: from moe.brq.redhat.com (unknown [10.43.2.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id 488F51001E6C for ; Fri, 10 May 2019 07:52:34 +0000 (UTC) From: Michal Privoznik To: libvir-list@redhat.com Date: Fri, 10 May 2019 09:52:28 +0200 Message-Id: <7b1e879984dcee505a7d752e1c7235156b0bce25.1557474558.git.mprivozn@redhat.com> 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 3/3] virSysinfoReadARM: Try reading DMI table 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.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Fri, 10 May 2019 07:52:36 +0000 (UTC) Content-Type: text/plain; charset="utf-8" https://bugzilla.redhat.com/show_bug.cgi?id=3D1426162 Turns out, some aarch64 systems have SMBIOS info. That means we can use dmidecode to fetch some information. If that fails, fall back to the old behaviour. Signed-off-by: Michal Privoznik --- src/util/virsysinfo.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/src/util/virsysinfo.c b/src/util/virsysinfo.c index 6c3adc23ab..783440314c 100644 --- a/src/util/virsysinfo.c +++ b/src/util/virsysinfo.c @@ -192,6 +192,14 @@ void virSysinfoDefFree(virSysinfoDefPtr def) } =20 =20 +static bool +virSysinfoDefEmpty(const virSysinfoDef *def) +{ + return !(def->bios || def->system || def->nbaseBoard || + def->chassis || def->nprocessor || def->nmemory || def->oemSt= rings); +} + + static int virSysinfoParsePPCSystem(const char *base, virSysinfoSystemDefPtr *sysdef) { @@ -433,6 +441,16 @@ virSysinfoReadARM(void) virSysinfoDefPtr ret =3D NULL; char *outbuf =3D NULL; =20 + /* Some ARM systems have DMI tables available. */ + if ((ret =3D virSysinfoReadX86())) { + if (!virSysinfoDefEmpty(ret)) + return ret; + virSysinfoDefFree(ret); + } + + /* Well, we've tried. Fall back to parsing cpuinfo */ + virResetLastError(); + if (VIR_ALLOC(ret) < 0) goto no_memory; =20 --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list