X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;ds=sidebyside;f=virt-what.in;h=2c2e6ac7656172edebc2e3c69ee43cf51167b926;hb=4754a01cdd94acf3c245a2e172a3ff719e21342a;hp=2de040a443846d1899ef8860602eef37b9c023a0;hpb=1b0df165bad0cebbff2c1a5b234672a647ea75eb;p=virt-what.git diff --git a/virt-what.in b/virt-what.in index 2de040a..2c2e6ac 100644 --- a/virt-what.in +++ b/virt-what.in @@ -54,16 +54,16 @@ usage () { # Handle the command line arguments, if any. while test $# -gt 0; do case "$1" in - --help) usage ;; + --help) usage ;; --test-root=*) # Deliberately undocumented: used for 'make check'. 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 "unrecognized option '$1'";; + -v|--version) echo "$VERSION"; exit 0 ;; + --) shift; break ;; + *) fail "unrecognized option '$1'";; esac done test $# -gt 0 && fail "extra operand '$1'" @@ -203,6 +203,11 @@ if echo "$dmi" | grep -q 'Vendor: Parallels'; then skip_qemu_kvm=true fi +# Check for oVirt. +if echo "$dmi" | grep -q 'Manufacturer: oVirt'; then + echo ovirt +fi + # Check for Xen. if [ "$cpuid" = "XenVMMXenVMM" ]; then @@ -256,7 +261,7 @@ fi if ! "$skip_qemu_kvm"; then if [ "$cpuid" = "KVMKVMKVM" ]; then - echo kvm + echo kvm elif [ "$arch" = "arm" ] || [ "$arch" = "aarch64" ]; then if [ -d "${root}/proc/device-tree" ] && ls "${root}/proc/device-tree" | grep -q "fw-cfg"; then @@ -276,8 +281,8 @@ if ! "$skip_qemu_kvm"; then # string. The long term fix for this would be to export # another CPUID leaf for non-accelerated qemu. if grep -q 'QEMU' "${root}/proc/cpuinfo"; then - echo qemu - fi + echo qemu + fi fi fi @@ -288,11 +293,11 @@ if ! "$skip_lkvm"; then if [ -d "${root}/proc/device-tree" ] && grep -q "dummy-virt" "${root}/proc/device-tree/compatible"; then echo lkvm - fi + fi fi fi # Check for Docker. if [ -f "${root}/.dockerinit" ]; then - echo docker + echo docker fi