rpms/virt-what
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Add: Recognize ppc64le (little endian) virtualization (RHBZ#1147876).

Browse Source
This commit is contained in:
Richard W.M. Jones 2017-10-17 14:49:40 +01:00
parent c39c7a7837
commit aff96098a0
5 changed files with 34 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
0001-Missing-have_cpuinfo-check.patch
View File

@ -1,7 +1,7 @@
From eefc1e7e3dd8fb422baf0f13aec1df9880541b83 Mon Sep 17 00:00:00 2001
From: Jasper Lievisse Adriaanse <bug@jasper.la>
Date: Thu, 10 Aug 2017 08:44:01 +0100
Subject: [PATCH 1/3] Missing have_cpuinfo check.
Subject: [PATCH 1/4] Missing have_cpuinfo check.
---
virt-what.in | 2 +-

2
0002-Remove-bashisms.patch
View File

@ -1,7 +1,7 @@
From 9d90704a05dee7704470eff818a1c44aeef6c880 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org>
Date: Fri, 4 Aug 2017 12:02:08 -0300
Subject: [PATCH 2/3] Remove bashisms
Subject: [PATCH 2/4] Remove bashisms
Use [ instead of [[ so we fall back to test if necessary:

2
0003-As-xen-pv-guest-can-access-cpuid-from-Intel-CPUs-sta.patch
View File

@ -1,7 +1,7 @@
From a821dc9961d457c086fffcc16a911cb6f9f8659a Mon Sep 17 00:00:00 2001
From: xiliang <xiliang@redhat.com>
Date: Sun, 18 Jun 2017 00:33:28 +0800
Subject: [PATCH 3/3] As xen pv guest can access cpuid from Intel CPUs started
Subject: [PATCH 3/4] As xen pv guest can access cpuid from Intel CPUs started
IvyBridge onwards have CPUID Faulting, added one more check in virt-what.
---

28
0004-Recognize-ppc64le-little-endian-virtualization-RHBZ-.patch Normal file
View File

@ -0,0 +1,28 @@
From 7db94c8fe63f2c7ec3ac27cc5ff54ec1e1686aeb Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Tue, 17 Oct 2017 14:47:09 +0100
Subject: [PATCH 4/4] Recognize ppc64le (little endian) virtualization
(RHBZ#1147876).
Tested by Laurent Vivier, see:
https://bugzilla.redhat.com/show_bug.cgi?id=1147876#c35 & ff.
---
virt-what.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/virt-what.in b/virt-what.in
index 247348e..29b7b0d 100644
--- a/virt-what.in
+++ b/virt-what.in
@@ -339,7 +339,7 @@ fi
# example /proc/ppc64/lparcfg systemtype line
# system_type=IBM pSeries (emulated by qemu)
-if [ "$arch" = "ppc64" ]; then
+if [ "$arch" = "ppc64" ] || [ "$arch" = "ppc64le" ] ; then
if have_cpuinfo && grep -q 'platform.**pSeries' "${root}/proc/cpuinfo"; then
if grep -q 'model.*emulated by qemu' "${root}/proc/cpuinfo"; then
echo ibm_power-kvm
--
2.13.2

5
virt-what.spec
View File

@ -1,6 +1,6 @@
Name: virt-what
Version: 1.18
Release: 3%{?dist}
Release: 4%{?dist}
Summary: Detect if we are running in a virtual machine
License: GPLv2+
@ -11,6 +11,7 @@ Source0: http://people.redhat.com/~rjones/virt-what/files/%{name}-%{versi
Patch0001: 0001-Missing-have_cpuinfo-check.patch
Patch0002: 0002-Remove-bashisms.patch
Patch0003: 0003-As-xen-pv-guest-can-access-cpuid-from-Intel-CPUs-sta.patch
Patch0004: 0004-Recognize-ppc64le-little-endian-virtualization-RHBZ-.patch
# This is provided by the build root, but we make it explicit
# anyway in case this was dropped from the build root in future.
@ -107,7 +108,7 @@ fi
%changelog
* Tue Oct 17 2017 Richard W.M. Jones <rjones@redhat.com> - 1.18-3
* Tue Oct 17 2017 Richard W.M. Jones <rjones@redhat.com> - 1.18-4
- Include upstream patches since 1.18 was released.
- dmidecode is also available on aarch64.