← Back to branch summary

~ubuntu-branches/ubuntu/vivid/qemu/vivid

« back to all changes in this revision

Viewing changes to hw/block/xen_disk.c

  • Committer: Package Import Robot
  • Author(s): Serge Hallyn
  • Date: 2014-02-25 22:31:43 UTC
  • mfrom: (1.8.5)
  • Revision ID: package-import@ubuntu.com-20140225223143-odhqxfc60wxrjl15
Tags: 2.0.0~rc1+dfsg-0ubuntu1
https://launchpad.net/bugs/1294823
https://launchpad.net/bugs/1295072
* Merge 2.0.0-rc1
* debian/rules: consolidate ppc filter entries.
* Move qemu-system-arch64 into qemu-system-arm
* debian/patches/define-trusty-machine-type.patch: define a trusty machine
  type, currently the same as pc-i440fx-2.0, to put is in a better position
  to enable live migrations from trusty onward.  (LP: #1294823)
* debian/control: build-dep on libfdt >= 1.4.0  (LP: #1295072)
* Merge latest upstream git to commit dc9528f
* Debian/rules:
  - remove -enable-uname-release=2.6.32
  - don't make the aarch64 target Ubuntu-specific.
* Remove patches which are now upstream:
  - fix-smb-security-share.patch
  - slirp-smb-redirect-port-445-too.patch 
  - linux-user-Implement-sendmmsg-syscall.patch (better version is upstream)
  - signal-added-a-wrapper-for-sigprocmask-function.patch
  - ubuntu/signal-sigsegv-protection-on-do_sigprocmask.patch
  - ubuntu/Don-t-block-SIGSEGV-at-more-places.patch
  - ubuntu/ppc-force-cpu-threads-count-to-be-power-of-2.patch
* add link for /usr/share/qemu/bios-256k.bin
* Remove all linaro patches.
* Remove all arm64/ patches.  Many but not all are upstream.
* Remove CVE-2013-4377.patch which is upstream.
* debian/control-in: don't make qemu-system-aarch64 ubuntu-specific

Show diffs side-by-side

added added

removed removed

Lines of Context:
hw/block/xen_disk.c
483
483
    ioreq->status = ioreq->aio_errors ? BLKIF_RSP_ERROR : BLKIF_RSP_OKAY;
484
484
    ioreq_unmap(ioreq);
485
485
    ioreq_finish(ioreq);
486
 
    bdrv_acct_done(ioreq->blkdev->bs, &ioreq->acct);
 
486
    switch (ioreq->req.operation) {
 
487
    case BLKIF_OP_WRITE:
 
488
    case BLKIF_OP_FLUSH_DISKCACHE:
 
489
        if (!ioreq->req.nr_segments) {
 
490
            break;
 
491
        }
 
492
    case BLKIF_OP_READ:
 
493
        bdrv_acct_done(ioreq->blkdev->bs, &ioreq->acct);
 
494
        break;
 
495
    default:
 
496
        break;
 
497
    }
487
498
    qemu_bh_schedule(ioreq->blkdev->bh);
488
499
}
489
500
 
813
824
            Error *local_err = NULL;
814
825
            BlockDriver *drv = bdrv_find_whitelisted_format(blkdev->fileproto,
815
826
                                                           readonly);
816
 
            if (bdrv_open(blkdev->bs,
817
 
                          blkdev->filename, NULL, qflags, drv, &local_err) != 0)
 
827
            if (bdrv_open(&blkdev->bs, blkdev->filename, NULL, NULL, qflags,
 
828
                          drv, &local_err) != 0)
818
829
            {
819
830
                xen_be_printf(&blkdev->xendev, 0, "error: %s\n",
820
831
                              error_get_pretty(local_err));