diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-10-24 10:26:44 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-10-24 10:26:44 +0100 |
| commit | 4387f5671f9676336c87b68f5e87ba54fbea3714 (patch) | |
| tree | a0cf4005a503f0c8120d645cc028ec74f1a8fc5c /hw/usb/xen-usb.c | |
| parent | b49e452fe994f8fbcd22bf5a87b79a2355481318 (diff) | |
| parent | 35132016dc1c27de2b1354b161df6cc22f3ac5bf (diff) | |
| download | focaccia-qemu-4387f5671f9676336c87b68f5e87ba54fbea3714.tar.gz focaccia-qemu-4387f5671f9676336c87b68f5e87ba54fbea3714.zip | |
Merge remote-tracking branch 'remotes/sstabellini/tags/xen-20161021-tag' into staging
Xen 2016/10/21 # gpg: Signature made Fri 21 Oct 2016 20:52:42 BST # gpg: using RSA key 0x894F8F4870E1AE90 # gpg: Good signature from "Stefano Stabellini <sstabellini@kernel.org>" # gpg: aka "Stefano Stabellini <stefano.stabellini@eu.citrix.com>" # Primary key fingerprint: D04E 33AB A51F 67BA 07D3 0AEA 894F 8F48 70E1 AE90 * remotes/sstabellini/tags/xen-20161021-tag: xen_platform: SUSE xenlinux unplug for emulated PCI xen_platform: unplug also SCSI disks xen-usb: do not reference PAGE_SIZE Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/usb/xen-usb.c')
| -rw-r--r-- | hw/usb/xen-usb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/usb/xen-usb.c b/hw/usb/xen-usb.c index 174d715e3e..de2ebd6210 100644 --- a/hw/usb/xen-usb.c +++ b/hw/usb/xen-usb.c @@ -160,7 +160,7 @@ static int usbback_gnttab_map(struct usbback_req *usbback_req) for (i = 0; i < nr_segs; i++) { if ((unsigned)usbback_req->req.seg[i].offset + - (unsigned)usbback_req->req.seg[i].length > PAGE_SIZE) { + (unsigned)usbback_req->req.seg[i].length > XC_PAGE_SIZE) { xen_be_printf(xendev, 0, "segment crosses page boundary\n"); return -EINVAL; } @@ -183,7 +183,7 @@ static int usbback_gnttab_map(struct usbback_req *usbback_req) for (i = 0; i < usbback_req->nr_buffer_segs; i++) { seg = usbback_req->req.seg + i; - addr = usbback_req->buffer + i * PAGE_SIZE + seg->offset; + addr = usbback_req->buffer + i * XC_PAGE_SIZE + seg->offset; qemu_iovec_add(&usbback_req->packet.iov, addr, seg->length); } } |