vmguest: add qemu-guest-agent support for aarch64 and armh

features.in/vmguest/config.mk

 # various VM guest modules/tools
-ifeq (,$(filter-out i586 x86_64 aarch64,$(ARCH)))
+ifeq (,$(filter-out i586 x86_64 aarch64 armh,$(ARCH)))
 
 use/vmguest:
 	@$(call add_feature)
@@ -9,14 +9,8 @@ use/vmguest:
 use/vmguest/kvm: use/vmguest
 	@$(call add,THE_PACKAGES,qemu-guest-agent)
 
-ifeq (,$(filter-out aarch64,$(ARCH)))
-+vmguest: use/vmguest/kvm; @:
-endif
-
 ifeq (,$(filter-out i586 x86_64,$(ARCH)))
 
-+vmguest: use/vmguest/complete; @:
-
 use/vmguest/base: use/vmguest/vbox use/vmguest/vmware use/vmguest/kvm; @:
 use/vmguest/complete: use/vmguest/base \
 	use/vmguest/vbox/x11 use/vmguest/vmware/x11 use/vmguest/kvm/x11; @:
@@ -40,10 +34,18 @@ use/vmguest/vmware:
 use/vmguest/vmware/x11: use/vmguest/vmware
 	@$(call add,THE_PACKAGES,xorg-drv-vmware xorg-drv-vmmouse open-vm-tools-desktop)
 
++vmguest: use/vmguest/complete; @:
+
+else
+
+# non-x86
++vmguest: use/vmguest/kvm; @:
+
+endif
+
 else
 
 # kvm-unsupported guest arch
 +vmguest: ;@:
 
 endif
-endif