From: Peter Maydell <peter.maydell@linaro.org>
Date: Mon, 12 Oct 2015 14:52:54 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging
X-Git-Tag: TizenStudio_2.0_p2.3.2~120^2~1^2~138
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5451316ed07b758a187dedf21047bed8f843f7f1;p=sdk%2Femulator%2Fqemu.git

Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging

Pull request

v2:
 * Fix virtio 16lx -> HWADDR_PRIx format specifier [Peter]

# gpg: Signature made Mon 12 Oct 2015 11:19:06 BST using RSA key ID 81AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg:                 aka "Stefan Hajnoczi <stefanha@gmail.com>"

* remotes/stefanha/tags/block-pull-request:
  sdhci.c: Limit the maximum block size
  block: switch from g_slice allocator to malloc
  virtio dataplane: adapt dataplane for virtio Version 1
  virtio-blk: use blk_io_plug/unplug for Linux AIO batching
  sdhci: Pass drive parameter to sdhci-pci via qdev property

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---

5451316ed07b758a187dedf21047bed8f843f7f1