diff options
| author | Stefano Stabellini <sstabellini@kernel.org> | 2016-10-21 12:08:27 -0700 |
|---|---|---|
| committer | Stefano Stabellini <sstabellini@kernel.org> | 2016-10-21 12:08:27 -0700 |
| commit | c6d25aa6bab44e841ef6585cbbd9af05b7a90b65 (patch) | |
| tree | 2b7b971af1a0a501e1a67c2549635042af1f0753 | |
| parent | b49e452fe994f8fbcd22bf5a87b79a2355481318 (diff) | |
| download | focaccia-qemu-c6d25aa6bab44e841ef6585cbbd9af05b7a90b65.tar.gz focaccia-qemu-c6d25aa6bab44e841ef6585cbbd9af05b7a90b65.zip | |
xen-usb: do not reference PAGE_SIZE
PAGE_SIZE is undefined on ARM64. Use XC_PAGE_SIZE instead, which is always 4096 even when page granularity is 64K. For this to actually work with 64K pages, more changes are required. Signed-off-by: Stefano Stabellini <sstabellini@kernel.org> Reviewed-by: Juergen Gross <jgross@suse.com> Release-acked-by: Wei Liu <wei.liu2@citrix.com>
| -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); } } |