Hello community, here is the log from the commit of package hwinfo for openSUSE:Factory checked in at 2020-03-27 21:55:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hwinfo (Old) and /work/SRC/openSUSE:Factory/.hwinfo.new.3160 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "hwinfo" Fri Mar 27 21:55:06 2020 rev:173 rq:787876 version:21.69 Changes: -------- --- /work/SRC/openSUSE:Factory/hwinfo/hwinfo.changes 2020-01-24 14:10:51.614403311 +0100 +++ /work/SRC/openSUSE:Factory/.hwinfo.new.3160/hwinfo.changes 2020-03-27 21:55:17.474722735 +0100 @@ -0,0 +1,8 @@ +-------------------------------------------------------------------- +Tue Mar 24 16:50:34 UTC 2020 - [email protected] + +- merge gh#openSUSE/hwinfo#85 +- fix xen detection (bsc#1167561) +- add link to cpuid doc +- 21.69 + Old: ---- hwinfo-21.68.tar.xz New: ---- hwinfo-21.69.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hwinfo.spec ++++++ --- /var/tmp/diff_new_pack.HKf6XU/_old 2020-03-27 21:55:19.166723719 +0100 +++ /var/tmp/diff_new_pack.HKf6XU/_new 2020-03-27 21:55:19.170723722 +0100 @@ -1,7 +1,7 @@ # # spec file for package hwinfo # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -36,8 +36,8 @@ # Until migration to github this should be correct url License: GPL-2.0-or-later Group: Hardware/Other -URL: http://gitorious.org/opensuse/hwinfo -Version: 21.68 +Url: http://gitorious.org/opensuse/hwinfo +Version: 21.69 Release: 0 Source: %{name}-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ hwinfo-21.68.tar.xz -> hwinfo-21.69.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hwinfo-21.68/VERSION new/hwinfo-21.69/VERSION --- old/hwinfo-21.68/VERSION 2020-01-14 11:38:50.000000000 +0100 +++ new/hwinfo-21.69/VERSION 2020-03-24 17:50:34.000000000 +0100 @@ -1 +1 @@ -21.68 +21.69 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hwinfo-21.68/changelog new/hwinfo-21.69/changelog --- old/hwinfo-21.68/changelog 2020-01-14 11:38:50.000000000 +0100 +++ new/hwinfo-21.69/changelog 2020-03-24 17:50:34.000000000 +0100 @@ -1,3 +1,8 @@ +2020-03-24: 21.69 + - merge gh#openSUSE/hwinfo#85 + - fix xen detection (bsc#1167561) + - add link to cpuid doc + 2020-01-14: 21.68 - merge gh#openSUSE/hwinfo#84 - the /sbin/udevadm compat symlink is gone diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hwinfo-21.68/src/hd/hd.c new/hwinfo-21.69/src/hd/hd.c --- old/hwinfo-21.68/src/hd/hd.c 2020-01-14 11:38:50.000000000 +0100 +++ new/hwinfo-21.69/src/hd/hd.c 2020-03-24 17:50:34.000000000 +0100 @@ -3150,42 +3150,27 @@ } - - /* * check for xen hypervisor + * + * see https://www.sandpile.org/x86/cpuid.htm#level_4000_0000h */ int hd_is_xen(hd_data_t *hd_data) { #if defined(__i386__) || defined(__x86_64__) - char signature[13]; - unsigned u, foo; + unsigned eax, ebx, ecx, edx; __asm__( -#ifdef __i386__ - "push %%ebx\n\t" - "cpuid\n\t" - "mov %%ebx,(%%esi)\n\t" - "mov %%ecx,4(%%esi)\n\t" - "mov %%edx,8(%%esi)\n\t" - "pop %%ebx" -#else - "push %%rbx\n\t" - "cpuid\n\t" - "mov %%ebx,(%%rsi)\n\t" - "mov %%ecx,4(%%rsi)\n\t" - "mov %%edx,8(%%rsi)\n\t" - "pop %%rbx" -#endif - : "=a" (u), "=c" (foo) - : "a" (0x40000000), "c" (0), "S" (signature) - : "%edx" + "cpuid" + : "=a" (eax), "=b" (ebx), "=c" (ecx), "=d" (edx) + : "a" (0x40000000), "c" (0) ); - signature[12] = 0; - - return u < 0x40000002 || strcmp(signature, "XenVMMXenVMM") ? 0 : 1; + return eax >= 0x40000002 && + ebx == 0x566e6558 /* "XenV" */ && + ecx == 0x65584d4d /* "MMXe" */ && + edx == 0x4d4d566e /* "nVMM" */; #else
