diff options
| author | Peter Maydell | 2019-02-04 13:57:26 +0100 |
|---|---|---|
| committer | Peter Maydell | 2019-02-04 13:57:26 +0100 |
| commit | f3b4d5ca67f2e933c93457b701883c307b99c15c (patch) | |
| tree | 05d9e71f7f1a01369e820c5311f7b06242c135cc /hw/block/dataplane/xen-block.c | |
| parent | Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-4.0-20190204' into... (diff) | |
| parent | xen-block: handle resize callback (diff) | |
| download | qemu-f3b4d5ca67f2e933c93457b701883c307b99c15c.tar.gz qemu-f3b4d5ca67f2e933c93457b701883c307b99c15c.tar.xz qemu-f3b4d5ca67f2e933c93457b701883c307b99c15c.zip | |
Merge remote-tracking branch 'remotes/aperard/tags/pull-xen-20190204' into staging
Xen queue
* xen-block, the Xen PV backend, now handles resize.
* configure cleanup.
* xen-bus fix.
# gpg: Signature made Mon 04 Feb 2019 11:16:13 GMT
# gpg: using RSA key F80C006308E22CFD8A92E7980CF5572FD7FB55AF
# gpg: issuer "anthony.perard@citrix.com"
# gpg: Good signature from "Anthony PERARD <anthony.perard@gmail.com>" [marginal]
# gpg: aka "Anthony PERARD <anthony.perard@citrix.com>" [marginal]
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg: It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 5379 2F71 024C 600F 778A 7161 D8D5 7199 DF83 42C8
# Subkey fingerprint: F80C 0063 08E2 2CFD 8A92 E798 0CF5 572F D7FB 55AF
* remotes/aperard/tags/pull-xen-20190204:
xen-block: handle resize callback
xen: fix xen-bus state model to allow frontend re-connection
configure: Don't add Xen's libs to LDFLAGS
configure: xen: Stop build-testing for xc_domain_create
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/block/dataplane/xen-block.c')
| -rw-r--r-- | hw/block/dataplane/xen-block.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/hw/block/dataplane/xen-block.c b/hw/block/dataplane/xen-block.c index d0d8905a33..c6a15da024 100644 --- a/hw/block/dataplane/xen-block.c +++ b/hw/block/dataplane/xen-block.c @@ -50,7 +50,6 @@ struct XenBlockDataPlane { unsigned int nr_ring_ref; void *sring; int64_t file_blk; - int64_t file_size; int protocol; blkif_back_rings_t rings; int more_work; @@ -189,7 +188,7 @@ static int xen_block_parse_request(XenBlockRequest *request) request->req.seg[i].first_sect + 1) * dataplane->file_blk; request->size += len; } - if (request->start + request->size > dataplane->file_size) { + if (request->start + request->size > blk_getlength(dataplane->blk)) { error_report("error: access beyond end of file"); goto err; } @@ -638,7 +637,6 @@ XenBlockDataPlane *xen_block_dataplane_create(XenDevice *xendev, dataplane->xendev = xendev; dataplane->file_blk = conf->logical_block_size; dataplane->blk = conf->blk; - dataplane->file_size = blk_getlength(dataplane->blk); QLIST_INIT(&dataplane->inflight); QLIST_INIT(&dataplane->freelist); |