← Back to branch summary

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

« back to all changes in this revision

Viewing changes to hw/display/qxl-render.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/display/qxl-render.c
31
31
    if (is_buffer_shared(surface)) {
32
32
        return;
33
33
    }
34
 
    if (!qxl->guest_primary.data) {
35
 
        trace_qxl_render_blit_guest_primary_initialized();
36
 
        qxl->guest_primary.data = memory_region_get_ram_ptr(&qxl->vga.vram);
37
 
    }
38
34
    trace_qxl_render_blit(qxl->guest_primary.qxl_stride,
39
35
            rect->left, rect->right, rect->top, rect->bottom);
40
36
    src = qxl->guest_primary.data;
104
100
 
105
101
    if (qxl->guest_primary.resized) {
106
102
        qxl->guest_primary.resized = 0;
107
 
        qxl->guest_primary.data = memory_region_get_ram_ptr(&qxl->vga.vram);
 
103
        qxl->guest_primary.data = qxl_phys2virt(qxl,
 
104
                                                qxl->guest_primary.surface.mem,
 
105
                                                MEMSLOT_GROUP_GUEST);
 
106
        if (!qxl->guest_primary.data) {
 
107
            return;
 
108
        }
108
109
        qxl_set_rect_to_surface(qxl, &qxl->dirty[0]);
109
110
        qxl->num_dirty_rects = 1;
110
111
        trace_qxl_render_guest_primary_resized(
128
129
        }
129
130
        dpy_gfx_replace_surface(vga->con, surface);
130
131
    }
 
132
 
 
133
    if (!qxl->guest_primary.data) {
 
134
        return;
 
135
    }
131
136
    for (i = 0; i < qxl->num_dirty_rects; i++) {
132
137
        if (qemu_spice_rect_is_empty(qxl->dirty+i)) {
133
138
            break;
199
204
    c->hot_y = cursor->header.hot_spot_y;
200
205
    switch (cursor->header.type) {
201
206
    case SPICE_CURSOR_TYPE_ALPHA:
202
 
        size = cursor->header.width * cursor->header.height * sizeof(uint32_t);
 
207
        size = sizeof(uint32_t) * cursor->header.width * cursor->header.height;
203
208
        memcpy(c->data, cursor->chunk.data, size);
204
209
        if (qxl->debug > 2) {
205
210
            cursor_print_ascii_art(c, "qxl/alpha");