Hello community, here is the log from the commit of package virt-what for openSUSE:Factory checked in at 2015-11-22 11:00:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/virt-what (Old) and /work/SRC/openSUSE:Factory/.virt-what.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "virt-what" Changes: -------- --- /work/SRC/openSUSE:Factory/virt-what/virt-what.changes 2015-08-29 20:05:14.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.virt-what.new/virt-what.changes 2015-11-22 11:02:54.000000000 +0100 @@ -1,0 +2,6 @@ +Thu Nov 19 12:37:02 UTC 2015 - tampak...@opensuse.org + +- Version bump 1.15. No upstream changelog, see + http://git.annexia.org/?p=virt-what.git;a=shortlog;h=refs/tags/1.15 + +------------------------------------------------------------------- Old: ---- virt-what-1.14.tar.gz New: ---- virt-what-1.15.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ virt-what.spec ++++++ --- /var/tmp/diff_new_pack.sYTnBG/_old 2015-11-22 11:02:55.000000000 +0100 +++ /var/tmp/diff_new_pack.sYTnBG/_new 2015-11-22 11:02:55.000000000 +0100 @@ -17,7 +17,7 @@ Name: virt-what -Version: 1.14 +Version: 1.15 Release: 0 Summary: Detect if running in a virtual machine License: GPL-2.0+ ++++++ virt-what-1.14.tar.gz -> virt-what-1.15.tar.gz ++++++ ++++ 1826 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/virt-what-1.14/Makefile.am new/virt-what-1.15/Makefile.am --- old/virt-what-1.14/Makefile.am 2013-04-17 21:16:22.000000000 +0200 +++ new/virt-what-1.15/Makefile.am 2015-04-21 13:13:25.000000000 +0200 @@ -32,27 +32,32 @@ virt-what.1: virt-what.pod pod2man -c "Virtualization Support" --release "$(PACKAGE)-$(VERSION)" \ - $< > $@ + $? > $@ virt-what.txt: virt-what.pod - pod2text $< > $@ + pod2text $? > $@ endif TESTS = \ tests/test-baremetal.sh \ + tests/test-docker.sh \ tests/test-esx4.1.sh \ tests/test-hyperv.sh \ tests/test-kvm.sh \ tests/test-kvm-explicit-cpu.sh \ tests/test-linux-vserver.sh \ + tests/test-lkvm.sh \ + tests/test-lkvm-arm.sh \ tests/test-lxc.sh \ tests/test-lx86.sh \ tests/test-parallels-desktop.sh \ tests/test-qemu.sh \ + tests/test-qemu-arm.sh \ tests/test-rhel5-xen-dom0.sh \ tests/test-rhel5-xen-domU-hvm.sh \ tests/test-rhel5-xen-domU-hvm-ia64.sh \ tests/test-rhel5-xen-domU-pv.sh \ + tests/test-xen-arm.sh \ tests/test-zvm.sh EXTRA_DIST = \ @@ -63,6 +68,12 @@ tests/baremetal/sbin/dmidecode \ tests/baremetal/sbin/uname \ tests/baremetal/sbin/virt-what-cpuid-helper \ + tests/docker/.dockerinit \ + tests/docker/proc/cpuinfo \ + tests/docker/proc/self/status \ + tests/docker/sbin/dmidecode \ + tests/docker/sbin/uname \ + tests/docker/sbin/virt-what-cpuid-helper \ tests/esx4.1/proc/cpuinfo \ tests/esx4.1/proc/self/status \ tests/esx4.1/sbin/dmidecode \ @@ -88,6 +99,17 @@ tests/linux-vserver/sbin/dmidecode \ tests/linux-vserver/sbin/uname \ tests/linux-vserver/sbin/virt-what-cpuid-helper \ + tests/lkvm/proc/cpuinfo \ + tests/lkvm/proc/self/status \ + tests/lkvm/sbin/dmidecode \ + tests/lkvm/sbin/uname \ + tests/lkvm/sbin/virt-what-cpuid-helper \ + tests/lkvm-arm/proc/cpuinfo \ + tests/lkvm-arm/proc/device-tree/compatible \ + tests/lkvm-arm/proc/self/status \ + tests/lkvm-arm/sbin/dmidecode \ + tests/lkvm-arm/sbin/uname \ + tests/lkvm-arm/sbin/virt-what-cpuid-helper \ tests/lxc/proc/1/environ \ tests/lxc/proc/cpuinfo \ tests/lxc/proc/self/status \ @@ -109,6 +131,12 @@ tests/qemu/sbin/dmidecode \ tests/qemu/sbin/uname \ tests/qemu/sbin/virt-what-cpuid-helper \ + tests/qemu-arm/proc/cpuinfo \ + tests/qemu-arm/proc/device-tree/fw-cfg@9020000/compatible \ + tests/qemu-arm/proc/self/status \ + tests/qemu-arm/sbin/dmidecode \ + tests/qemu-arm/sbin/uname \ + tests/qemu-arm/sbin/virt-what-cpuid-helper \ tests/rhel5-xen-dom0/proc/cpuinfo \ tests/rhel5-xen-dom0/proc/self/status \ tests/rhel5-xen-dom0/proc/xen/balloon \ @@ -172,6 +200,12 @@ tests/rhel5-xen-domU-pv/sys/hypervisor/compilation/compiled_by \ tests/rhel5-xen-domU-pv/sys/hypervisor/compilation/compile_date \ tests/rhel5-xen-domU-pv/sys/hypervisor/uuid \ + tests/xen-arm/proc/cpuinfo \ + tests/xen-arm/proc/device-tree/hypervisor/compatible \ + tests/xen-arm/proc/self/status \ + tests/xen-arm/sbin/dmidecode \ + tests/xen-arm/sbin/uname \ + tests/xen-arm/sbin/virt-what-cpuid-helper \ tests/zvm/proc/cpuinfo \ tests/zvm/proc/self/status \ tests/zvm/proc/sysinfo \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/virt-what-1.14/config.h.in new/virt-what-1.15/config.h.in --- old/virt-what-1.14/config.h.in 2014-01-07 13:37:15.000000000 +0100 +++ new/virt-what-1.15/config.h.in 2015-04-21 13:16:11.000000000 +0200 @@ -1,8 +1,5 @@ /* config.h.in. Generated from configure.ac by autoheader. */ -/* Define to 1 if your C compiler doesn't accept -c and -o together. */ -#undef NO_MINUS_C_MINUS_O - /* Name of package */ #undef PACKAGE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/virt-what-1.14/configure.ac new/virt-what-1.15/configure.ac --- old/virt-what-1.14/configure.ac 2014-01-07 13:36:58.000000000 +0100 +++ new/virt-what-1.15/configure.ac 2015-04-21 13:13:26.000000000 +0200 @@ -1,5 +1,5 @@ # virt-what -# Copyright (C) 2008-2011 Red Hat Inc. +# Copyright (C) 2008-2015 Red Hat Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -15,7 +15,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -AC_INIT([virt-what],[1.14]) +AC_INIT([virt-what],[1.15]) AM_INIT_AUTOMAKE([foreign]) dnl Check for basic C environment. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/virt-what-1.14/tests/docker/sbin/dmidecode new/virt-what-1.15/tests/docker/sbin/dmidecode --- old/virt-what-1.14/tests/docker/sbin/dmidecode 1970-01-01 01:00:00.000000000 +0100 +++ new/virt-what-1.15/tests/docker/sbin/dmidecode 2014-06-23 20:50:15.000000000 +0200 @@ -0,0 +1,6 @@ +#!/bin/sh - +cat <<'EOF' +# dmidecode 2.11 +/dev/mem: Operation not permitted +EOF +exit 1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/virt-what-1.14/tests/docker/sbin/uname new/virt-what-1.15/tests/docker/sbin/uname --- old/virt-what-1.14/tests/docker/sbin/uname 1970-01-01 01:00:00.000000000 +0100 +++ new/virt-what-1.15/tests/docker/sbin/uname 2014-06-23 20:50:15.000000000 +0200 @@ -0,0 +1,2 @@ +#!/bin/sh - +echo x86_64 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/virt-what-1.14/tests/docker/sbin/virt-what-cpuid-helper new/virt-what-1.15/tests/docker/sbin/virt-what-cpuid-helper --- old/virt-what-1.14/tests/docker/sbin/virt-what-cpuid-helper 1970-01-01 01:00:00.000000000 +0100 +++ new/virt-what-1.15/tests/docker/sbin/virt-what-cpuid-helper 2014-06-23 20:50:15.000000000 +0200 @@ -0,0 +1,2 @@ +#!/bin/sh - +echo @ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/virt-what-1.14/tests/lkvm/proc/cpuinfo new/virt-what-1.15/tests/lkvm/proc/cpuinfo --- old/virt-what-1.14/tests/lkvm/proc/cpuinfo 1970-01-01 01:00:00.000000000 +0100 +++ new/virt-what-1.15/tests/lkvm/proc/cpuinfo 2015-03-27 21:39:40.000000000 +0100 @@ -0,0 +1,19 @@ +processor : 0 +vendor_id : GenuineIntel +cpu family : 6 +model : 15 +model name : Intel(R) Core(TM)2 Duo CPU T7700 @ 2.40GHz +stepping : 11 +cpu MHz : 2659.998 +cache size : 4096 KB +fpu : yes +fpu_exception : yes +cpuid level : 10 +wp : yes +flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ss syscall nx lm constant_tsc up rep_good pni ssse3 cx16 hypervisor lahf_lm +bogomips : 5319.99 +clflush size : 64 +cache_alignment : 64 +address sizes : 40 bits physical, 48 bits virtual +power management: + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/virt-what-1.14/tests/lkvm/proc/self/status new/virt-what-1.15/tests/lkvm/proc/self/status --- old/virt-what-1.14/tests/lkvm/proc/self/status 1970-01-01 01:00:00.000000000 +0100 +++ new/virt-what-1.15/tests/lkvm/proc/self/status 2015-03-27 21:39:40.000000000 +0100 @@ -0,0 +1,39 @@ +Name: cat +State: R (running) +Tgid: 1618 +Pid: 1618 +PPid: 1609 +TracerPid: 0 +Uid: 0 0 0 0 +Gid: 0 0 0 0 +Utrace: 0 +FDSize: 256 +Groups: 0 1 2 3 4 6 10 +VmPeak: 101012 kB +VmSize: 101012 kB +VmLck: 0 kB +VmHWM: 472 kB +VmRSS: 472 kB +VmData: 184 kB +VmStk: 136 kB +VmExe: 44 kB +VmLib: 1728 kB +VmPTE: 44 kB +VmSwap: 0 kB +Threads: 1 +SigQ: 0/7858 +SigPnd: 0000000000000000 +ShdPnd: 0000000000000000 +SigBlk: 0000000000000000 +SigIgn: 0000000000000000 +SigCgt: 0000000000000000 +CapInh: 0000000000000000 +CapPrm: ffffffffffffffff +CapEff: ffffffffffffffff +CapBnd: ffffffffffffffff +Cpus_allowed: 1 +Cpus_allowed_list: 0 +Mems_allowed: 00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000001 +Mems_allowed_list: 0 +voluntary_ctxt_switches: 0 +nonvoluntary_ctxt_switches: 1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/virt-what-1.14/tests/lkvm/sbin/dmidecode new/virt-what-1.15/tests/lkvm/sbin/dmidecode --- old/virt-what-1.14/tests/lkvm/sbin/dmidecode 1970-01-01 01:00:00.000000000 +0100 +++ new/virt-what-1.15/tests/lkvm/sbin/dmidecode 2015-03-27 21:39:40.000000000 +0100 @@ -0,0 +1,2 @@ +#!/bin/sh - +exit 1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/virt-what-1.14/tests/lkvm/sbin/uname new/virt-what-1.15/tests/lkvm/sbin/uname --- old/virt-what-1.14/tests/lkvm/sbin/uname 1970-01-01 01:00:00.000000000 +0100 +++ new/virt-what-1.15/tests/lkvm/sbin/uname 2015-03-27 21:39:40.000000000 +0100 @@ -0,0 +1,2 @@ +#!/bin/sh - +echo x86_64 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/virt-what-1.14/tests/lkvm/sbin/virt-what-cpuid-helper new/virt-what-1.15/tests/lkvm/sbin/virt-what-cpuid-helper --- old/virt-what-1.14/tests/lkvm/sbin/virt-what-cpuid-helper 1970-01-01 01:00:00.000000000 +0100 +++ new/virt-what-1.15/tests/lkvm/sbin/virt-what-cpuid-helper 2015-03-27 21:39:40.000000000 +0100 @@ -0,0 +1,2 @@ +#!/bin/sh - +echo LKVMLKVMLKVM diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/virt-what-1.14/tests/lkvm-arm/proc/cpuinfo new/virt-what-1.15/tests/lkvm-arm/proc/cpuinfo --- old/virt-what-1.14/tests/lkvm-arm/proc/cpuinfo 1970-01-01 01:00:00.000000000 +0100 +++ new/virt-what-1.15/tests/lkvm-arm/proc/cpuinfo 2015-03-27 21:39:40.000000000 +0100 @@ -0,0 +1,63 @@ +processor : 0 +Features : fp asimd evtstrm +CPU implementer : 0x50 +CPU architecture: 8 +CPU variant : 0x0 +CPU part : 0x000 +CPU revision : 0 + +processor : 1 +Features : fp asimd evtstrm +CPU implementer : 0x50 +CPU architecture: 8 +CPU variant : 0x0 +CPU part : 0x000 +CPU revision : 0 + +processor : 2 +Features : fp asimd evtstrm +CPU implementer : 0x50 +CPU architecture: 8 +CPU variant : 0x0 +CPU part : 0x000 +CPU revision : 0 + +processor : 3 +Features : fp asimd evtstrm +CPU implementer : 0x50 +CPU architecture: 8 +CPU variant : 0x0 +CPU part : 0x000 +CPU revision : 0 + +processor : 4 +Features : fp asimd evtstrm +CPU implementer : 0x50 +CPU architecture: 8 +CPU variant : 0x0 +CPU part : 0x000 +CPU revision : 0 + +processor : 5 +Features : fp asimd evtstrm +CPU implementer : 0x50 +CPU architecture: 8 +CPU variant : 0x0 +CPU part : 0x000 +CPU revision : 0 + +processor : 6 +Features : fp asimd evtstrm +CPU implementer : 0x50 +CPU architecture: 8 +CPU variant : 0x0 +CPU part : 0x000 +CPU revision : 0 + +processor : 7 +Features : fp asimd evtstrm +CPU implementer : 0x50 +CPU architecture: 8 +CPU variant : 0x0 +CPU part : 0x000 +CPU revision : 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/virt-what-1.14/tests/lkvm-arm/proc/device-tree/compatible new/virt-what-1.15/tests/lkvm-arm/proc/device-tree/compatible --- old/virt-what-1.14/tests/lkvm-arm/proc/device-tree/compatible 1970-01-01 01:00:00.000000000 +0100 +++ new/virt-what-1.15/tests/lkvm-arm/proc/device-tree/compatible 2015-03-27 21:39:40.000000000 +0100 @@ -0,0 +1 @@ +linux,dummy-virt diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/virt-what-1.14/tests/lkvm-arm/proc/self/status new/virt-what-1.15/tests/lkvm-arm/proc/self/status --- old/virt-what-1.14/tests/lkvm-arm/proc/self/status 1970-01-01 01:00:00.000000000 +0100 +++ new/virt-what-1.15/tests/lkvm-arm/proc/self/status 2015-03-27 21:39:40.000000000 +0100 @@ -0,0 +1,41 @@ +Name: cat +State: R (running) +Tgid: 8307 +Ngid: 0 +Pid: 8307 +PPid: 1415 +TracerPid: 0 +Uid: 0 0 0 0 +Gid: 0 0 0 0 +FDSize: 256 +Groups: +VmPeak: 109696 kB +VmSize: 109696 kB +VmLck: 0 kB +VmPin: 0 kB +VmHWM: 832 kB +VmRSS: 832 kB +VmData: 320 kB +VmStk: 256 kB +VmExe: 64 kB +VmLib: 1536 kB +VmPTE: 192 kB +VmSwap: 0 kB +Threads: 1 +SigQ: 0/5821 +SigPnd: 0000000000000000 +ShdPnd: 0000000000000000 +SigBlk: 0000000000000000 +SigIgn: 0000000000000000 +SigCgt: 0000000000000000 +CapInh: 0000000000000000 +CapPrm: 0000003fffffffff +CapEff: 0000003fffffffff +CapBnd: 0000003fffffffff +Seccomp: 0 +Cpus_allowed: ff +Cpus_allowed_list: 0-7 +Mems_allowed: 1 +Mems_allowed_list: 0 +voluntary_ctxt_switches: 1 +nonvoluntary_ctxt_switches: 1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/virt-what-1.14/tests/lkvm-arm/sbin/dmidecode new/virt-what-1.15/tests/lkvm-arm/sbin/dmidecode --- old/virt-what-1.14/tests/lkvm-arm/sbin/dmidecode 1970-01-01 01:00:00.000000000 +0100 +++ new/virt-what-1.15/tests/lkvm-arm/sbin/dmidecode 2015-03-27 21:39:40.000000000 +0100 @@ -0,0 +1,2 @@ +#!/bin/sh - +exit 1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/virt-what-1.14/tests/lkvm-arm/sbin/uname new/virt-what-1.15/tests/lkvm-arm/sbin/uname --- old/virt-what-1.14/tests/lkvm-arm/sbin/uname 1970-01-01 01:00:00.000000000 +0100 +++ new/virt-what-1.15/tests/lkvm-arm/sbin/uname 2015-03-27 21:39:40.000000000 +0100 @@ -0,0 +1,2 @@ +#!/bin/sh - +echo aarch64 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/virt-what-1.14/tests/lkvm-arm/sbin/virt-what-cpuid-helper new/virt-what-1.15/tests/lkvm-arm/sbin/virt-what-cpuid-helper --- old/virt-what-1.14/tests/lkvm-arm/sbin/virt-what-cpuid-helper 1970-01-01 01:00:00.000000000 +0100 +++ new/virt-what-1.15/tests/lkvm-arm/sbin/virt-what-cpuid-helper 2015-03-27 21:39:40.000000000 +0100 @@ -0,0 +1,2 @@ +#!/bin/sh - +# nothing diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/virt-what-1.14/tests/qemu-arm/proc/cpuinfo new/virt-what-1.15/tests/qemu-arm/proc/cpuinfo --- old/virt-what-1.14/tests/qemu-arm/proc/cpuinfo 1970-01-01 01:00:00.000000000 +0100 +++ new/virt-what-1.15/tests/qemu-arm/proc/cpuinfo 2015-03-27 21:39:40.000000000 +0100 @@ -0,0 +1,63 @@ +processor : 0 +Features : fp asimd evtstrm +CPU implementer : 0x50 +CPU architecture: 8 +CPU variant : 0x0 +CPU part : 0x000 +CPU revision : 0 + +processor : 1 +Features : fp asimd evtstrm +CPU implementer : 0x50 +CPU architecture: 8 +CPU variant : 0x0 +CPU part : 0x000 +CPU revision : 0 + +processor : 2 +Features : fp asimd evtstrm +CPU implementer : 0x50 +CPU architecture: 8 +CPU variant : 0x0 +CPU part : 0x000 +CPU revision : 0 + +processor : 3 +Features : fp asimd evtstrm +CPU implementer : 0x50 +CPU architecture: 8 +CPU variant : 0x0 +CPU part : 0x000 +CPU revision : 0 + +processor : 4 +Features : fp asimd evtstrm +CPU implementer : 0x50 +CPU architecture: 8 +CPU variant : 0x0 +CPU part : 0x000 +CPU revision : 0 + +processor : 5 +Features : fp asimd evtstrm +CPU implementer : 0x50 +CPU architecture: 8 +CPU variant : 0x0 +CPU part : 0x000 +CPU revision : 0 + +processor : 6 +Features : fp asimd evtstrm +CPU implementer : 0x50 +CPU architecture: 8 +CPU variant : 0x0 +CPU part : 0x000 +CPU revision : 0 + +processor : 7 +Features : fp asimd evtstrm +CPU implementer : 0x50 +CPU architecture: 8 +CPU variant : 0x0 +CPU part : 0x000 +CPU revision : 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/virt-what-1.14/tests/qemu-arm/proc/device-tree/fw-cfg@9020000/compatible new/virt-what-1.15/tests/qemu-arm/proc/device-tree/fw-cfg@9020000/compatible --- old/virt-what-1.14/tests/qemu-arm/proc/device-tree/fw-cfg@9020000/compatible 1970-01-01 01:00:00.000000000 +0100 +++ new/virt-what-1.15/tests/qemu-arm/proc/device-tree/fw-cfg@9020000/compatible 2015-03-27 21:39:40.000000000 +0100 @@ -0,0 +1 @@ +qemu,fw-cfg-mmio diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/virt-what-1.14/tests/qemu-arm/proc/self/status new/virt-what-1.15/tests/qemu-arm/proc/self/status --- old/virt-what-1.14/tests/qemu-arm/proc/self/status 1970-01-01 01:00:00.000000000 +0100 +++ new/virt-what-1.15/tests/qemu-arm/proc/self/status 2015-03-27 21:39:40.000000000 +0100 @@ -0,0 +1,41 @@ +Name: cat +State: R (running) +Tgid: 8307 +Ngid: 0 +Pid: 8307 +PPid: 1415 +TracerPid: 0 +Uid: 0 0 0 0 +Gid: 0 0 0 0 +FDSize: 256 +Groups: +VmPeak: 109696 kB +VmSize: 109696 kB +VmLck: 0 kB +VmPin: 0 kB +VmHWM: 832 kB +VmRSS: 832 kB +VmData: 320 kB +VmStk: 256 kB +VmExe: 64 kB +VmLib: 1536 kB +VmPTE: 192 kB +VmSwap: 0 kB +Threads: 1 +SigQ: 0/5821 +SigPnd: 0000000000000000 +ShdPnd: 0000000000000000 +SigBlk: 0000000000000000 +SigIgn: 0000000000000000 +SigCgt: 0000000000000000 +CapInh: 0000000000000000 +CapPrm: 0000003fffffffff +CapEff: 0000003fffffffff +CapBnd: 0000003fffffffff +Seccomp: 0 +Cpus_allowed: ff +Cpus_allowed_list: 0-7 +Mems_allowed: 1 +Mems_allowed_list: 0 +voluntary_ctxt_switches: 1 +nonvoluntary_ctxt_switches: 1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/virt-what-1.14/tests/qemu-arm/sbin/dmidecode new/virt-what-1.15/tests/qemu-arm/sbin/dmidecode --- old/virt-what-1.14/tests/qemu-arm/sbin/dmidecode 1970-01-01 01:00:00.000000000 +0100 +++ new/virt-what-1.15/tests/qemu-arm/sbin/dmidecode 2015-03-27 21:39:40.000000000 +0100 @@ -0,0 +1,2 @@ +#!/bin/sh - +exit 1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/virt-what-1.14/tests/qemu-arm/sbin/uname new/virt-what-1.15/tests/qemu-arm/sbin/uname --- old/virt-what-1.14/tests/qemu-arm/sbin/uname 1970-01-01 01:00:00.000000000 +0100 +++ new/virt-what-1.15/tests/qemu-arm/sbin/uname 2015-03-27 21:39:40.000000000 +0100 @@ -0,0 +1,2 @@ +#!/bin/sh - +echo aarch64 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/virt-what-1.14/tests/qemu-arm/sbin/virt-what-cpuid-helper new/virt-what-1.15/tests/qemu-arm/sbin/virt-what-cpuid-helper --- old/virt-what-1.14/tests/qemu-arm/sbin/virt-what-cpuid-helper 1970-01-01 01:00:00.000000000 +0100 +++ new/virt-what-1.15/tests/qemu-arm/sbin/virt-what-cpuid-helper 2015-03-27 21:39:40.000000000 +0100 @@ -0,0 +1,2 @@ +#!/bin/sh - +# nothing diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/virt-what-1.14/tests/test-docker.sh new/virt-what-1.15/tests/test-docker.sh --- old/virt-what-1.14/tests/test-docker.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/virt-what-1.15/tests/test-docker.sh 2014-06-23 20:50:15.000000000 +0200 @@ -0,0 +1,34 @@ +# Test for Docker +# Copyright (C) 2008-2011 Red Hat Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +root=tests/docker + +output="$(./virt-what --test-root=$root 2>&1)" +expected="docker" + +if [ "$output" != "$expected" ]; then + echo "$0: test failed because output did not match expected" + echo "Expected output was:" + echo "----------------------------------------" + echo "$expected" + echo "----------------------------------------" + echo "But the actual output of the program was:" + echo "----------------------------------------" + echo "$output" + echo "----------------------------------------" + exit 1 +fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/virt-what-1.14/tests/test-lkvm-arm.sh new/virt-what-1.15/tests/test-lkvm-arm.sh --- old/virt-what-1.14/tests/test-lkvm-arm.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/virt-what-1.15/tests/test-lkvm-arm.sh 2015-03-27 21:39:40.000000000 +0100 @@ -0,0 +1,34 @@ +# Test for LKVM on ARM +# Copyright (C) 2015 Red Hat Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +root=tests/lkvm-arm + +output="$(./virt-what --test-root=$root 2>&1)" +expected="lkvm" + +if [ "$output" != "$expected" ]; then + echo "$0: test failed because output did not match expected" + echo "Expected output was:" + echo "----------------------------------------" + echo "$expected" + echo "----------------------------------------" + echo "But the actual output of the program was:" + echo "----------------------------------------" + echo "$output" + echo "----------------------------------------" + exit 1 +fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/virt-what-1.14/tests/test-lkvm.sh new/virt-what-1.15/tests/test-lkvm.sh --- old/virt-what-1.14/tests/test-lkvm.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/virt-what-1.15/tests/test-lkvm.sh 2015-03-27 21:39:40.000000000 +0100 @@ -0,0 +1,34 @@ +# Test for LKVM +# Copyright (C) 2015 Red Hat Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +root=tests/lkvm + +output="$(./virt-what --test-root=$root 2>&1)" +expected="lkvm" + +if [ "$output" != "$expected" ]; then + echo "$0: test failed because output did not match expected" + echo "Expected output was:" + echo "----------------------------------------" + echo "$expected" + echo "----------------------------------------" + echo "But the actual output of the program was:" + echo "----------------------------------------" + echo "$output" + echo "----------------------------------------" + exit 1 +fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/virt-what-1.14/tests/test-qemu-arm.sh new/virt-what-1.15/tests/test-qemu-arm.sh --- old/virt-what-1.14/tests/test-qemu-arm.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/virt-what-1.15/tests/test-qemu-arm.sh 2015-03-27 21:39:40.000000000 +0100 @@ -0,0 +1,34 @@ +# Test for qemu on ARM +# Copyright (C) 2015 Red Hat Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +root=tests/qemu-arm + +output="$(./virt-what --test-root=$root 2>&1)" +expected="qemu" + +if [ "$output" != "$expected" ]; then + echo "$0: test failed because output did not match expected" + echo "Expected output was:" + echo "----------------------------------------" + echo "$expected" + echo "----------------------------------------" + echo "But the actual output of the program was:" + echo "----------------------------------------" + echo "$output" + echo "----------------------------------------" + exit 1 +fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/virt-what-1.14/tests/test-xen-arm.sh new/virt-what-1.15/tests/test-xen-arm.sh --- old/virt-what-1.14/tests/test-xen-arm.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/virt-what-1.15/tests/test-xen-arm.sh 2015-03-27 21:39:40.000000000 +0100 @@ -0,0 +1,34 @@ +# Test for Xen on ARM +# Copyright (C) 2015 Red Hat Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +root=tests/xen-arm + +output="$(./virt-what --test-root=$root 2>&1)" +expected="xen" + +if [ "$output" != "$expected" ]; then + echo "$0: test failed because output did not match expected" + echo "Expected output was:" + echo "----------------------------------------" + echo "$expected" + echo "----------------------------------------" + echo "But the actual output of the program was:" + echo "----------------------------------------" + echo "$output" + echo "----------------------------------------" + exit 1 +fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/virt-what-1.14/tests/xen-arm/proc/cpuinfo new/virt-what-1.15/tests/xen-arm/proc/cpuinfo --- old/virt-what-1.14/tests/xen-arm/proc/cpuinfo 1970-01-01 01:00:00.000000000 +0100 +++ new/virt-what-1.15/tests/xen-arm/proc/cpuinfo 2015-03-27 21:39:40.000000000 +0100 @@ -0,0 +1,63 @@ +processor : 0 +Features : fp asimd evtstrm +CPU implementer : 0x50 +CPU architecture: 8 +CPU variant : 0x0 +CPU part : 0x000 +CPU revision : 0 + +processor : 1 +Features : fp asimd evtstrm +CPU implementer : 0x50 +CPU architecture: 8 +CPU variant : 0x0 +CPU part : 0x000 +CPU revision : 0 + +processor : 2 +Features : fp asimd evtstrm +CPU implementer : 0x50 +CPU architecture: 8 +CPU variant : 0x0 +CPU part : 0x000 +CPU revision : 0 + +processor : 3 +Features : fp asimd evtstrm +CPU implementer : 0x50 +CPU architecture: 8 +CPU variant : 0x0 +CPU part : 0x000 +CPU revision : 0 + +processor : 4 +Features : fp asimd evtstrm +CPU implementer : 0x50 +CPU architecture: 8 +CPU variant : 0x0 +CPU part : 0x000 +CPU revision : 0 + +processor : 5 +Features : fp asimd evtstrm +CPU implementer : 0x50 +CPU architecture: 8 +CPU variant : 0x0 +CPU part : 0x000 +CPU revision : 0 + +processor : 6 +Features : fp asimd evtstrm +CPU implementer : 0x50 +CPU architecture: 8 +CPU variant : 0x0 +CPU part : 0x000 +CPU revision : 0 + +processor : 7 +Features : fp asimd evtstrm +CPU implementer : 0x50 +CPU architecture: 8 +CPU variant : 0x0 +CPU part : 0x000 +CPU revision : 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/virt-what-1.14/tests/xen-arm/proc/device-tree/hypervisor/compatible new/virt-what-1.15/tests/xen-arm/proc/device-tree/hypervisor/compatible --- old/virt-what-1.14/tests/xen-arm/proc/device-tree/hypervisor/compatible 1970-01-01 01:00:00.000000000 +0100 +++ new/virt-what-1.15/tests/xen-arm/proc/device-tree/hypervisor/compatible 2015-03-27 21:39:40.000000000 +0100 @@ -0,0 +1 @@ +xen,xen diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/virt-what-1.14/tests/xen-arm/proc/self/status new/virt-what-1.15/tests/xen-arm/proc/self/status --- old/virt-what-1.14/tests/xen-arm/proc/self/status 1970-01-01 01:00:00.000000000 +0100 +++ new/virt-what-1.15/tests/xen-arm/proc/self/status 2015-03-27 21:39:40.000000000 +0100 @@ -0,0 +1,41 @@ +Name: cat +State: R (running) +Tgid: 8307 +Ngid: 0 +Pid: 8307 +PPid: 1415 +TracerPid: 0 +Uid: 0 0 0 0 +Gid: 0 0 0 0 +FDSize: 256 +Groups: +VmPeak: 109696 kB +VmSize: 109696 kB +VmLck: 0 kB +VmPin: 0 kB +VmHWM: 832 kB +VmRSS: 832 kB +VmData: 320 kB +VmStk: 256 kB +VmExe: 64 kB +VmLib: 1536 kB +VmPTE: 192 kB +VmSwap: 0 kB +Threads: 1 +SigQ: 0/5821 +SigPnd: 0000000000000000 +ShdPnd: 0000000000000000 +SigBlk: 0000000000000000 +SigIgn: 0000000000000000 +SigCgt: 0000000000000000 +CapInh: 0000000000000000 +CapPrm: 0000003fffffffff +CapEff: 0000003fffffffff +CapBnd: 0000003fffffffff +Seccomp: 0 +Cpus_allowed: ff +Cpus_allowed_list: 0-7 +Mems_allowed: 1 +Mems_allowed_list: 0 +voluntary_ctxt_switches: 1 +nonvoluntary_ctxt_switches: 1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/virt-what-1.14/tests/xen-arm/sbin/dmidecode new/virt-what-1.15/tests/xen-arm/sbin/dmidecode --- old/virt-what-1.14/tests/xen-arm/sbin/dmidecode 1970-01-01 01:00:00.000000000 +0100 +++ new/virt-what-1.15/tests/xen-arm/sbin/dmidecode 2015-03-27 21:39:40.000000000 +0100 @@ -0,0 +1,2 @@ +#!/bin/sh - +exit 1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/virt-what-1.14/tests/xen-arm/sbin/uname new/virt-what-1.15/tests/xen-arm/sbin/uname --- old/virt-what-1.14/tests/xen-arm/sbin/uname 1970-01-01 01:00:00.000000000 +0100 +++ new/virt-what-1.15/tests/xen-arm/sbin/uname 2015-03-27 21:39:40.000000000 +0100 @@ -0,0 +1,2 @@ +#!/bin/sh - +echo aarch64 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/virt-what-1.14/tests/xen-arm/sbin/virt-what-cpuid-helper new/virt-what-1.15/tests/xen-arm/sbin/virt-what-cpuid-helper --- old/virt-what-1.14/tests/xen-arm/sbin/virt-what-cpuid-helper 1970-01-01 01:00:00.000000000 +0100 +++ new/virt-what-1.15/tests/xen-arm/sbin/virt-what-cpuid-helper 2015-03-27 21:39:40.000000000 +0100 @@ -0,0 +1,2 @@ +#!/bin/sh - +# nothing diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/virt-what-1.14/virt-what.in new/virt-what-1.15/virt-what.in --- old/virt-what-1.14/virt-what.in 2013-12-12 09:47:31.000000000 +0100 +++ new/virt-what-1.15/virt-what.in 2015-03-27 21:39:40.000000000 +0100 @@ -1,4 +1,4 @@ -#!/bin/bash - +#!/bin/sh - # @configure_input@ # Copyright (C) 2008-2011 Red Hat Inc. # @@ -30,15 +30,20 @@ set -u root='' skip_qemu_kvm=false +skip_lkvm=false VERSION="@VERSION@" -function fail { +have_cpuinfo () { + test -e "${root}/proc/cpuinfo" +} + +fail () { echo "virt-what: $1" >&2 exit 1 } -function usage { +usage () { echo "virt-what [options]" echo "Options:" echo " --help Display this help" @@ -47,24 +52,21 @@ } # Handle the command line arguments, if any. - -TEMP=$(getopt -o v --long help --long version --long test-root: -n 'virt-what' -- "$@") -if [ $? != 0 ]; then exit 1; fi -eval set -- "$TEMP" - -while true; do +while test $# -gt 0; do case "$1" in --help) usage ;; - --test-root) + --test-root=*) # Deliberately undocumented: used for 'make check'. - root="$2" - shift 2 + root=$(echo "$1" | sed 's/.*=//') + shift 1 + test -z "$root" && fail "--test-root option requires a value" ;; -v|--version) echo "$VERSION"; exit 0 ;; --) shift; break ;; - *) fail "internal error ($1)" ;; + *) fail "unrecognized option '$1'";; esac done +test $# -gt 0 && fail "extra operand '$1'" # Add /sbin and /usr/sbin to the path so we can find system # binaries like dmidecode. @@ -74,11 +76,18 @@ PATH="${root}@libexecdir@:${root}/sbin:${root}/usr/sbin:${PATH}" # Check we're running as root. +EFFUID=$(id -u) || fail "failed to get current user id" -if [ "x$root" = "x" ] && [ "$EUID" -ne 0 ]; then +if [ "x$root" = "x" ] && [ "$EFFUID" -ne 0 ]; then fail "this script must be run as root" fi +# Try to locate the CPU-ID helper program +CPUID_HELPER=$(which virt-what-cpuid-helper 2>/dev/null) +if [ -z "$CPUID_HELPER" ] ; then + fail "virt-what-cpuid-helper program not found in \$PATH" +fi + # Many fullvirt hypervisors give an indication through CPUID. Use the # helper program to get this information. @@ -94,7 +103,7 @@ # Architecture. # Note for the purpose of testing, we only call uname with -p option. -arch=$(uname -p) +arch=$(uname -p | sed -e 's/i.86/i386/' | sed -e 's/arm.*/arm/') # Check for VMware. # cpuid check added by Chetan Loke. @@ -145,7 +154,8 @@ fi # Check for Linux-VServer -if cat "${root}/proc/self/status" | grep -q "VxID: [0-9]*"; then +if test -e "${root}/proc/self/status" \ + && cat "${root}/proc/self/status" | grep -q "VxID: [0-9]*"; then echo linux_vserver if grep -q "VxID: 0$" "${root}/proc/self/status"; then echo linux_vserver-host @@ -156,12 +166,13 @@ # Check for UML. # Added by Laurent Léonard. -if grep -q 'UML' "${root}/proc/cpuinfo"; then +if have_cpuinfo && grep -q 'UML' "${root}/proc/cpuinfo"; then echo uml fi # Check for IBM PowerVM Lx86 Linux/x86 emulator. -if grep -q '^vendor_id.*PowerVM Lx86' "${root}/proc/cpuinfo"; then +if have_cpuinfo && grep -q '^vendor_id.*PowerVM Lx86' "${root}/proc/cpuinfo" +then echo powervm_lx86 fi @@ -172,7 +183,7 @@ fi # Check for IBM SystemZ. -if grep -q '^vendor_id.*IBM/S390' "${root}/proc/cpuinfo"; then +if have_cpuinfo && grep -q '^vendor_id.*IBM/S390' "${root}/proc/cpuinfo"; then echo ibm_systemz if [ -f "${root}/proc/sysinfo" ]; then if grep -q 'VM.*Control Program.*z/VM' "${root}/proc/sysinfo"; then @@ -205,12 +216,20 @@ echo xen-domU fi skip_qemu_kvm=true + skip_lkvm=true elif [ -f "${root}/sys/hypervisor/type" ] && grep -q "xen" "${root}/sys/hypervisor/type"; then # Ordinary kernel with pv_ops. There does not seem to be # enough information at present to tell whether this is dom0 # or domU. XXX echo xen +elif [ "$arch" = "arm" ] || [ "$arch" = "aarch64" ]; then + if [ -d "${root}/proc/device-tree/hypervisor" ] && + grep -q "xen" "${root}/proc/device-tree/hypervisor/compatible"; then + echo xen + skip_qemu_kvm=true + skip_lkvm=true + fi elif [ "$arch" = "ia64" ]; then if [ -d "${root}/sys/bus/xen" -a ! -d "${root}/sys/bus/xen-backend" ]; then # PV-on-HVM drivers installed in a Xen guest. @@ -238,6 +257,14 @@ if ! "$skip_qemu_kvm"; then if [ "$cpuid" = "KVMKVMKVM" ]; then echo kvm + elif [ "$arch" = "arm" ] || [ "$arch" = "aarch64" ]; then + if [ -d "${root}/proc/device-tree" ] && + ls "${root}/proc/device-tree" | grep -q "fw-cfg"; then + # We don't have enough information to determine if we're + # using KVM acceleration or not. + echo qemu + skip_lkvm=true + fi else # XXX This is known to fail for qemu with the explicit -cpu # option, since /proc/cpuinfo will not contain the QEMU @@ -248,3 +275,19 @@ fi fi fi + +if ! "$skip_lkvm"; then + if [ "$cpuid" = "LKVMLKVMLKVM" ]; then + echo lkvm + elif [ "$arch" = "arm" ] || [ "$arch" = "aarch64" ]; then + if [ -d "${root}/proc/device-tree" ] && + grep -q "dummy-virt" "${root}/proc/device-tree/compatible"; then + echo lkvm + fi + fi +fi + +# Check for Docker. +if [ -f "${root}/.dockerinit" ]; then + echo docker +fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/virt-what-1.14/virt-what.pod new/virt-what-1.15/virt-what.pod --- old/virt-what-1.14/virt-what.pod 2013-09-02 16:29:46.000000000 +0200 +++ new/virt-what-1.15/virt-what.pod 2015-03-27 21:39:40.000000000 +0100 @@ -25,6 +25,12 @@ =over 4 +=item B<docker> + +This is a Docker container. + +Status: confirmed by Charles Nguyen + =item B<hyperv> This is Microsoft Hyper-V hypervisor. @@ -95,6 +101,14 @@ Status: confirmed by RWMJ. +=item B<lkvm> + +This guest is running on the KVM hypervisor using hardware +acceleration, and the userspace component of the hypervisor +is lkvm (a.k.a kvmtool). + +Status: contributed by Andrew Jones + =item B<openvz> The guest appears to be running inside an OpenVZ or Virtuozzo @@ -113,7 +127,7 @@ The guest is running inside IBM PowerVM Lx86 Linux/x86 emulator. -Status: data originally supplied by Jeffrey Scheel, confimed by +Status: data originally supplied by Jeffrey Scheel, confirmed by Yufang Zhang and RWMJ =item B<qemu>
