diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-12-23 12:04:01 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-12-23 12:04:01 +0000 |
| commit | 05bec7eb0e6df6c166caea761b311d5c8c2b4cb8 (patch) | |
| tree | 31437dee97b18834b57a4c60cf5ca90fcdee7be6 /hw/block | |
| parent | 5dc42c186d63b7b338594fc071cf290805dcc5a5 (diff) | |
| parent | fc3e493bc8e96ef4bf7ae4f035f43cb39382c936 (diff) | |
| download | qemu-05bec7eb0e6df6c166caea761b311d5c8c2b4cb8.zip qemu-05bec7eb0e6df6c166caea761b311d5c8c2b4cb8.tar.gz qemu-05bec7eb0e6df6c166caea761b311d5c8c2b4cb8.tar.bz2 | |
Merge remote-tracking branch 'remotes/sstabellini/tags/xen-2015-12-22' into staging
Xen 2015/12/22
# gpg: Signature made Tue 22 Dec 2015 16:17:57 GMT using RSA key ID 70E1AE90
# gpg: Good signature from "Stefano Stabellini <stefano.stabellini@eu.citrix.com>"
* remotes/sstabellini/tags/xen-2015-12-22:
xen_disk: treat "vhd" as "vpc"
xen/pass-through: correctly deal with RW1C bits
xen/MSI-X: really enforce alignment
xen/MSI-X: latch MSI-X table writes
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/block')
| -rw-r--r-- | hw/block/xen_disk.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/hw/block/xen_disk.c b/hw/block/xen_disk.c index 8146650..a48e726 100644 --- a/hw/block/xen_disk.c +++ b/hw/block/xen_disk.c @@ -825,6 +825,9 @@ static int blk_init(struct XenDevice *xendev) if (!strcmp("aio", blkdev->fileproto)) { blkdev->fileproto = "raw"; } + if (!strcmp("vhd", blkdev->fileproto)) { + blkdev->fileproto = "vpc"; + } if (blkdev->mode == NULL) { blkdev->mode = xenstore_read_be_str(&blkdev->xendev, "mode"); } |