OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

VFIO fixes 2017-05-03 

- Enable 8-byte memory region accesses (Jose Ricardo Ziviani)
  - Fix vfio-pci error message (Dong Jia Shi)
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
 iQIcBAABAgAGBQJZCkuXAAoJECObm247sIsijr4QAIQMh2SK2ES7m0RTVNDYq/JP
 HnOxSooFSxh3KoDmBi639vZL06tx7U0YDmFiUcQKekXVVxXuQgHWoqi+vATcTpj5
 Mehp3jDFWdZlFFWrkX0ncOkPNhL1M9V+KKhdo7Il7XAhEAM9yz86zQkbbfJjgS+I
 5c0wO8OTaaTdKC8vSBAJWGwdsC7IYzOkBSCvIXeVP+6gCBT/PoBZpNMN+gsrzRkT
 InNM34Gx52e74BlPfPrVN9Bn3/VN8vbY/pxU5xnRe1KqrYcfXG6GqoR5KSEqPkDI
 QEtIEdQnqdPmhAJMvpv3XtKkEFJhWzo+mTOObsBHjgcFXrk+q4HtT1nkah55SuXX
 xhyhcRtJ4S0vVNGCERQBfdJbYcO2w3Q/7P+esF05uz3BvZ01bEqOiMGFnCG9ask2
 kZwL09Yl+TAnXhsoxvvPTzbmPHii5sd5Kjv+ggkwHF9fdYsariLclquekYpbfK7N
 H/zyZgDmMGRpg3nUVIr2+8BrKImivrl0pCs6Zr049Y6C0bS7jDIeBs5qHktNTJ4k
 ubPt35/lMZMgZ1CxMDYNjvXwOTiuk3VWcESNJcCYZWiYW/5CEu4c3f8A46VxdsQ/
 S39QelED/+uagyRPLr0NDqdXp/KUpbr9nEWuYXpfal/GpihANgYuLjiyAkD9Xqwo
 ndwv4XcEXE6HGViOdFq9
 =Kuvv
 -----END PGP SIGNATURE-----

Merge remote-tracking branch 'awilliam/tags/vfio-updates-20170503.0' into staging

VFIO fixes 2017-05-03

 - Enable 8-byte memory region accesses (Jose Ricardo Ziviani)
 - Fix vfio-pci error message (Dong Jia Shi)

# gpg: Signature made Wed 03 May 2017 10:28:55 PM BST
# gpg:                using RSA key 0x239B9B6E3BB08B22
# gpg: Good signature from "Alex Williamson <alex.williamson@redhat.com>"
# gpg:                 aka "Alex Williamson <alex@shazbot.org>"
# gpg:                 aka "Alex Williamson <alwillia@redhat.com>"
# gpg:                 aka "Alex Williamson <alex.l.williamson@gmail.com>"
# Primary key fingerprint: 42F6 C04E 540B D1A9 9E7B  8A90 239B 9B6E 3BB0 8B22

* awilliam/tags/vfio-updates-20170503.0:
  vfio/pci: Fix incorrect error message
  vfio: enable 8-byte reads/writes to vfio
  vfio: Set MemoryRegionOps:max_access_size and min_access_size

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
Stefan Hajnoczi 2017-05-05 16:14:08 +01:00
parent 4f225f343a 6e4e6f0d40
commit 4f3652b3aa
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
hw/vfio/common.c
View File

@ -119,6 +119,9 @@ void vfio_region_write(void *opaque, hwaddr addr,
case 4:
buf.dword = cpu_to_le32(data);
break;
case 8:
buf.qword = cpu_to_le64(data);
break;
default:
hw_error("vfio: unsupported write size, %d bytes", size);
break;
@ -173,6 +176,9 @@ uint64_t vfio_region_read(void *opaque,
case 4:
data = le32_to_cpu(buf.dword);
break;
case 8:
data = le64_to_cpu(buf.qword);
break;
default:
hw_error("vfio: unsupported read size, %d bytes", size);
break;
@ -190,6 +196,14 @@ const MemoryRegionOps vfio_region_ops = {
.read = vfio_region_read,
.write = vfio_region_write,
.endianness = DEVICE_LITTLE_ENDIAN,
.valid = {
.min_access_size = 1,
.max_access_size = 8,
},
.impl = {
.min_access_size = 1,
.max_access_size = 8,
},
};
/*

4
hw/vfio/pci.c
View File

@ -2625,8 +2625,8 @@ static void vfio_realize(PCIDevice *pdev, Error **errp)
if (!(~vdev->host.domain || ~vdev->host.bus ||
~vdev->host.slot || ~vdev->host.function)) {
error_setg(errp, "No provided host device");
error_append_hint(errp, "Use -vfio-pci,host=DDDD:BB:DD.F "
"or -vfio-pci,sysfsdev=PATH_TO_DEVICE\n");
error_append_hint(errp, "Use -device vfio-pci,host=DDDD:BB:DD.F "
"or -device vfio-pci,sysfsdev=PATH_TO_DEVICE\n");
return;
}
vdev->vbasedev.sysfsdev =