<div dir="ltr"><div dir="ltr">Thanks, Daniel<div> </div><div>Removed the outdated comments following your suggestion.</div><div> </div><div>Rgs,</div><div>Frank</div></div> <div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Wed, May 25, 2022 at 4:06 PM Daniel P. Berrangé <<a href="mailto:berrange@redhat.com" target="_blank">berrange@redhat.com</a>> wrote: </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">On Wed, May 25, 2022 at 02:34:53PM +0800, Frank Liang wrote: > Hello, > > aws arm virtual instances are running on top of Nitro hypervisor(KVM-based > hypervisor). > I am proposing this patch to keep virt-what output consistent with x86 > virtual instances. > Please review it. Thanks > > With this patch: > $ sudo virt-what > kvm > aws > $ cat /sys/devices/virtual/dmi/id/product_name > t4g.small > > Without it: > $ sudo virt-what > aws > > Here is the test pass log with this patch. > # cat test-suite.log > ====================================================== > virt-what 1.22: tests/aws-kvm-arm/test-suite.log > ====================================================== > > # TOTAL: 1 > # PASS: 1 > # SKIP: 0 > # XFAIL: 0 > # FAIL: 0 > # XPASS: 0 > # ERROR: 0 > > .. contents:: :depth: 2 > > Rgs, > Frank > From 931e5f24b9e7e6e61cebe3213166bd691df80db0 Mon Sep 17 00:00:00 2001 > From: Xiao Liang <<a href="mailto:xiliang@redhat.com" target="_blank">xiliang@redhat.com</a>> > Date: Tue, 24 May 2022 17:34:52 +0800 > Subject: [PATCH] detect AWS arm virtual instance as kvm > > AWS arm virtual instance is KVM based hypervisor. > With this patch: > $ sudo virt-what > kvm > aws > $ cat /sys/devices/virtual/dmi/id/product_name > t4g.small > > Without it: > $ sudo virt-what > aws > > Signed-off-by: Xiao Liang <<a href="mailto:xiliang@redhat.com" target="_blank">xiliang@redhat.com</a>> > --- > tests/aws-kvm-arm/test.sh | 3 ++- > <a href="http://virt-what.in" rel="noreferrer" target="_blank">virt-what.in</a> | 5 +++++ > 2 files changed, 7 insertions(+), 1 deletion(-) > > diff --git a/tests/aws-kvm-arm/test.sh b/tests/aws-kvm-arm/test.sh > index 5d31995..d469a99 100755 > --- a/tests/aws-kvm-arm/test.sh > +++ b/tests/aws-kvm-arm/test.sh > @@ -18,7 +18,8 @@ > output="$(PATH=../..:$PATH virt-what --test-root=. 2>&1)" > # XXX At the moment KVM cannot be detected on this platform. > # We hope to fix that, but for now the only fact printed is "aws". This comment looks outdated given the change you made > -expected="aws" > +expected="kvm > +aws" > > if [ "$output" != "$expected" ]; then > echo "$0: test failed because output did not match expected" > diff --git a/<a href="http://virt-what.in" rel="noreferrer" target="_blank">virt-what.in</a> b/<a href="http://virt-what.in" rel="noreferrer" target="_blank">virt-what.in</a> > index b59714e..9afbd40 100644 > --- a/<a href="http://virt-what.in" rel="noreferrer" target="_blank">virt-what.in</a> > +++ b/<a href="http://virt-what.in" rel="noreferrer" target="_blank">virt-what.in</a> > @@ -339,6 +339,11 @@ if ! "$skip_qemu_kvm"; then > echo qemu > skip_lkvm=true > fi > + if echo "$dmi" | grep -q 'Amazon EC2' && > + echo "$dmi" | grep -q 'System is a virtual machine'; then > + echo kvm > + skip_lkvm=true > + fi > elif [ -d ${root}/proc/device-tree/hypervisor ] && > grep -q "linux,kvm" /proc/device-tree/hypervisor/compatible; then > # We are running as a spapr KVM guest on ppc64 > -- > 2.36.1 > With regards, Daniel -- |: <a href="https://berrange.com" rel="noreferrer" target="_blank">https://berrange.com</a> -o- <a href="https://www.flickr.com/photos/dberrange" rel="noreferrer" target="_blank">https://www.flickr.com/photos/dberrange</a> :| |: <a href="https://libvirt.org" rel="noreferrer" target="_blank">https://libvirt.org</a> -o- <a href="https://fstop138.berrange.com" rel="noreferrer" target="_blank">https://fstop138.berrange.com</a> :| |: <a href="https://entangle-photo.org" rel="noreferrer" target="_blank">https://entangle-photo.org</a> -o- <a href="https://www.instagram.com/dberrange" rel="noreferrer" target="_blank">https://www.instagram.com/dberrange</a> :| </blockquote></div></div>