Use the same pattern for all machine types on all archs and same archs
for hvm and exe types.
Signed-off-by: NMartin Kletzander <mkletzan@redhat.com>