[Qemu-commits] [qemu/qemu] 4082e8: s390x: fix s390 virtio aliases

[GitHub]

  Branch: refs/heads/stable-1.1
  Home:   https://github.com/qemu/qemu
  Commit: 4082e889ee8aa43b303105180399bab14312231e
      
https://github.com/qemu/qemu/commit/4082e889ee8aa43b303105180399bab14312231e
  Author: Alexander Graf <address@hidden>
  Date:   2012-07-10 (Tue, 10 Jul 2012)

  Changed paths:
    M hw/qdev-monitor.c

  Log Message:
  -----------
  s390x: fix s390 virtio aliases

Some of the virtio devices have the same frontend name, but actually
implement different devices behind the scenes through aliases.

The indicator which device type to use is the architecture. On s390, we
want s390 virtio devices. On everything else, we want PCI devices.

Reflect this in the alias selection code. This way we fix commands like
-device virtio-blk on s390x which with this patch applied select the
correct virtio-blk-s390 device rather than virtio-blk-pci.

Reported-by: Christian Borntraeger <address@hidden>
Signed-off-by: Anthony Liguori <address@hidden>
Signed-off-by: Alexander Graf <address@hidden>


  Commit: f52d0d639e96f30b226b853d931881d034c57308
      
https://github.com/qemu/qemu/commit/f52d0d639e96f30b226b853d931881d034c57308
  Author: Michael Roth <address@hidden>
  Date:   2012-07-10 (Tue, 10 Jul 2012)

  Changed paths:
    M hw/qdev-monitor.c

  Log Message:
  -----------
  Merge remote-tracking branch 'agraf/s390-for-upstream-1.1' into HEAD


  Commit: 785adb09b9fd0d4df6707f00247ec519c42fcfc6
      
https://github.com/qemu/qemu/commit/785adb09b9fd0d4df6707f00247ec519c42fcfc6
  Author: Michael Roth <address@hidden>
  Date:   2012-07-12 (Thu, 12 Jul 2012)

  Changed paths:
    M VERSION

  Log Message:
  -----------
  update VERSION for v1.1.1

Signed-off-by: Michael Roth <address@hidden>


Compare: https://github.com/qemu/qemu/compare/b7093f294c33...785adb09b9fd