Tidy qemu build

snapcraft.yaml

@@ -331,7 +331,6 @@ parts:
     stage-packages:
       - conntrack
       - coreutils
-      - qemu-utils
       - haproxy
     override-build: |
       # Ensure libvirt is discovered from previous built part
@@ -564,6 +563,18 @@ parts:
       - --localstatedir=/var/snap/$SNAPCRAFT_PROJECT_NAME/common
       - --sysconfdir=/var/snap/$SNAPCRAFT_PROJECT_NAME/common
       - --extra-cflags=-DCONFIG_QEMU_DATAPATH='"/snap/$SNAPCRAFT_PROJECT_NAME/current/usr/share/qemu:/snap/$SNAPCRAFT_PROJECT_NAME/current/usr/share/seabios:/snap/$SNAPCRAFT_PROJECT_NAME/current/usr/lib/ipxe/qemu"'
+      - on amd64:
+        - --target-list=x86_64-softmmu
+      - on i386:
+        - --target-list=i386-softmmu
+      - on arm64:
+        - --target-list=aarch64-softmmu
+      - on armhf:
+        - --target-list=arm-softmmu
+      - on ppc64el:
+        - --target-list=ppc64-softmmu
+      - on s390x:
+        - --target-list=s390x-softmmu
     override-build: |
       wget http://archive.ubuntu.com/ubuntu/pool/main/q/qemu/qemu_2.5+dfsg.orig.tar.xz
       wget http://archive.ubuntu.com/ubuntu/pool/main/q/qemu/qemu_2.5+dfsg-5ubuntu10.32.debian.tar.xz
@@ -576,22 +587,6 @@ parts:
       # runtime
       # * is not used to avoid directory merge conflicts
       snap/microstack/current/: ./
-    filesets:
-      qemu:
-        - usr/lib/*
-        - lib/*
-        - usr/share/*
-        - on amd64:
-          - bin/qemu-system-x86
-        - on i386:
-          - bin/qemu-system-x86
-        - on armhf:
-          - bin/qemu-system-arm
-        - on arm64:
-          - bin/qemu-system-arm
-    stage: [$qemu]
-    prime: [$qemu]
-
 
   kvm-support:
     plugin: nil