← Back to branch summary

~ubuntu-branches/ubuntu/trusty/qemu/trusty

« back to all changes in this revision

Viewing changes to hw/virtio/vhost.c

  • Committer: Package Import Robot
  • Author(s): Serge Hallyn
  • Date: 2013-10-22 22:47:07 UTC
  • mfrom: (1.8.3) (10.1.42 sid)
  • Revision ID: package-import@ubuntu.com-20131022224707-1lya34fw3k3f24tv
Tags: 1.6.0+dfsg-2ubuntu1
http://bugs.debian.org/709241
* Merge 1.6.0~rc0+dfsg-2exp from debian experimental.  Remaining changes:
  - debian/control
    * update maintainer
    * remove libiscsi, usb-redir, vde, vnc-jpeg, and libssh2-1-dev
      from build-deps
    * enable rbd
    * add qemu-system and qemu-common B/R to qemu-keymaps
    * add D:udev, R:qemu, R:qemu-common and B:qemu-common to
      qemu-system-common
    * qemu-system-arm, qemu-system-ppc, qemu-system-sparc:
      - add qemu-kvm to Provides
      - add qemu-common, qemu-kvm, kvm to B/R
      - remove openbios-sparc from qemu-system-sparc D
      - drop openbios-ppc and openhackware Depends to Suggests (for now)
    * qemu-system-x86:
      - add qemu-common to Breaks/Replaces.
      - add cpu-checker to Recommends.
    * qemu-user: add B/R:qemu-kvm
    * qemu-kvm:
      - add armhf armel powerpc sparc to Architecture
      - C/R/P: qemu-kvm-spice
    * add qemu-common package
    * drop qemu-slof which is not packaged in ubuntu
  - add qemu-system-common.links for tap ifup/down scripts and OVMF link.
  - qemu-system-x86.links:
    * remove pxe rom links which are in kvm-ipxe
    * add symlink for kvm.1 manpage
  - debian/rules
    * add kvm-spice symlink to qemu-kvm
    * call dh_installmodules for qemu-system-x86
    * update dh_installinit to install upstart script
    * run dh_installman (Closes: #709241) (cherrypicked from 1.5.0+dfsg-2)
  - Add qemu-utils.links for kvm-* symlinks.
  - Add qemu-system-x86.qemu-kvm.upstart and .default
  - Add qemu-system-x86.modprobe to set nesting=1
  - Add qemu-system-common.preinst to add kvm group
  - qemu-system-common.postinst: remove bad group acl if there, then have
    udev relabel /dev/kvm.
  - New linaro patches from qemu-linaro rebasing branch
  - Dropped patches:
    * xen-simplify-xen_enabled.patch
    * sparc-linux-user-fix-missing-symbols-in-.rel-.rela.plt-sections.patch
    * main_loop-do-not-set-nonblocking-if-xen_enabled.patch
    * xen_machine_pv-do-not-create-a-dummy-CPU-in-machine-.patch
    * virtio-rng-fix-crash
  - Kept patches:
    * expose_vms_qemu64cpu.patch - updated
    * linaro arm patches from qemu-linaro rebasing branch
  - New patches:
    * fix-pci-add: change CONFIG variable in ifdef to make sure that
      pci_add is defined.
* Add linaro patches
* Add experimental mach-virt patches for arm virtualization.
* qemu-system-common.install: add debian/tmp/usr/lib to install the
  qemu-bridge-helper

Show diffs side-by-side

added added

removed removed

Lines of Context:
hw/virtio/vhost.c
16
16
#include <sys/ioctl.h>
17
17
#include "hw/virtio/vhost.h"
18
18
#include "hw/hw.h"
 
19
#include "qemu/atomic.h"
19
20
#include "qemu/range.h"
20
21
#include <linux/vhost.h>
21
22
#include "exec/address-spaces.h"
47
48
            addr += VHOST_LOG_CHUNK;
48
49
            continue;
49
50
        }
50
 
        /* Data must be read atomically. We don't really
51
 
         * need the barrier semantics of __sync
52
 
         * builtins, but it's easier to use them than
53
 
         * roll our own. */
54
 
        log = __sync_fetch_and_and(from, 0);
 
51
        /* Data must be read atomically. We don't really need barrier semantics
 
52
         * but it's easier to use atomic_* than roll our own. */
 
53
        log = atomic_xchg(from, 0);
55
54
        while ((bit = sizeof(log) > sizeof(int) ?
56
55
                ffsll(log) : ffs(log))) {
57
56
            hwaddr page_addr;
81
80
        return 0;
82
81
    }
83
82
    start_addr = section->offset_within_address_space;
84
 
    end_addr = range_get_last(start_addr, section->size);
 
83
    end_addr = range_get_last(start_addr, int128_get64(section->size));
85
84
    start_addr = MAX(first, start_addr);
86
85
    end_addr = MIN(last, end_addr);
87
86
 
379
378
    struct vhost_dev *dev = container_of(listener, struct vhost_dev,
380
379
                                         memory_listener);
381
380
    hwaddr start_addr = section->offset_within_address_space;
382
 
    ram_addr_t size = section->size;
 
381
    ram_addr_t size = int128_get64(section->size);
383
382
    bool log_dirty = memory_region_is_logging(section->mr);
384
383
    int s = offsetof(struct vhost_memory, regions) +
385
384
        (dev->mem->nregions + 1) * sizeof dev->mem->regions[0];
497
496
    dev->mem_sections = g_renew(MemoryRegionSection, dev->mem_sections,
498
497
                                dev->n_mem_sections);
499
498
    dev->mem_sections[dev->n_mem_sections - 1] = *section;
 
499
    memory_region_ref(section->mr);
500
500
    vhost_set_memory(listener, section, true);
501
501
}
502
502
 
512
512
    }
513
513
 
514
514
    vhost_set_memory(listener, section, false);
 
515
    memory_region_unref(section->mr);
515
516
    for (i = 0; i < dev->n_mem_sections; ++i) {
516
517
        if (dev->mem_sections[i].offset_within_address_space
517
518
            == section->offset_within_address_space) {
761
762
        fflush(stderr);
762
763
    }
763
764
    virtio_queue_set_last_avail_idx(vdev, idx, state.num);
 
765
    virtio_queue_invalidate_signalled_used(vdev, idx);
764
766
    assert (r >= 0);
765
767
    cpu_physical_memory_unmap(vq->ring, virtio_queue_get_ring_size(vdev, idx),
766
768
                              0, virtio_queue_get_ring_size(vdev, idx));