← Back to branch summary

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

« back to all changes in this revision

Viewing changes to hw/display/tcx.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/tcx.c
34
34
#define TCX_THC_NREGS_24 0x1000
35
35
#define TCX_TEC_NREGS    0x1000
36
36
 
 
37
#define TYPE_TCX "SUNW,tcx"
 
38
#define TCX(obj) OBJECT_CHECK(TCXState, (obj), TYPE_TCX)
 
39
 
37
40
typedef struct TCXState {
38
 
    SysBusDevice busdev;
 
41
    SysBusDevice parent_obj;
 
42
 
39
43
    QemuConsole *con;
40
44
    uint8_t *vram;
41
45
    uint32_t *vram24, *cplane;
193
197
                              ram_addr_t cpage)
194
198
{
195
199
    memory_region_reset_dirty(&ts->vram_mem,
196
 
                              page_min, page_max + TARGET_PAGE_SIZE,
 
200
                              page_min,
 
201
                              (page_max - page_min) + TARGET_PAGE_SIZE,
197
202
                              DIRTY_MEMORY_VGA);
198
203
    memory_region_reset_dirty(&ts->vram_mem,
199
204
                              page24 + page_min * 4,
200
 
                              page24 + page_max * 4 + TARGET_PAGE_SIZE,
 
205
                              (page_max - page_min) * 4 + TARGET_PAGE_SIZE,
201
206
                              DIRTY_MEMORY_VGA);
202
207
    memory_region_reset_dirty(&ts->vram_mem,
203
208
                              cpage + page_min * 4,
204
 
                              cpage + page_max * 4 + TARGET_PAGE_SIZE,
 
209
                              (page_max - page_min) * 4 + TARGET_PAGE_SIZE,
205
210
                              DIRTY_MEMORY_VGA);
206
211
}
207
212
 
285
290
    /* reset modified pages */
286
291
    if (page_max >= page_min) {
287
292
        memory_region_reset_dirty(&ts->vram_mem,
288
 
                                  page_min, page_max + TARGET_PAGE_SIZE,
 
293
                                  page_min,
 
294
                                  (page_max - page_min) + TARGET_PAGE_SIZE,
289
295
                                  DIRTY_MEMORY_VGA);
290
296
    }
291
297
}
421
427
 
422
428
static void tcx_reset(DeviceState *d)
423
429
{
424
 
    TCXState *s = container_of(d, TCXState, busdev.qdev);
 
430
    TCXState *s = TCX(d);
425
431
 
426
432
    /* Initialize palette */
427
433
    memset(s->r, 0, 256);
521
527
 
522
528
static int tcx_init1(SysBusDevice *dev)
523
529
{
524
 
    TCXState *s = FROM_SYSBUS(TCXState, dev);
 
530
    TCXState *s = TCX(dev);
525
531
    ram_addr_t vram_offset = 0;
526
532
    int size;
527
533
    uint8_t *vram_base;
528
534
 
529
 
    memory_region_init_ram(&s->vram_mem, "tcx.vram",
 
535
    memory_region_init_ram(&s->vram_mem, OBJECT(s), "tcx.vram",
530
536
                           s->vram_size * (1 + 4 + 4));
531
537
    vmstate_register_ram_global(&s->vram_mem);
532
538
    vram_base = memory_region_get_ram_ptr(&s->vram_mem);
534
540
    /* 8-bit plane */
535
541
    s->vram = vram_base;
536
542
    size = s->vram_size;
537
 
    memory_region_init_alias(&s->vram_8bit, "tcx.vram.8bit",
 
543
    memory_region_init_alias(&s->vram_8bit, OBJECT(s), "tcx.vram.8bit",
538
544
                             &s->vram_mem, vram_offset, size);
539
545
    sysbus_init_mmio(dev, &s->vram_8bit);
540
546
    vram_offset += size;
541
547
    vram_base += size;
542
548
 
543
549
    /* DAC */
544
 
    memory_region_init_io(&s->dac, &tcx_dac_ops, s, "tcx.dac", TCX_DAC_NREGS);
 
550
    memory_region_init_io(&s->dac, OBJECT(s), &tcx_dac_ops, s,
 
551
                          "tcx.dac", TCX_DAC_NREGS);
545
552
    sysbus_init_mmio(dev, &s->dac);
546
553
 
547
554
    /* TEC (dummy) */
548
 
    memory_region_init_io(&s->tec, &dummy_ops, s, "tcx.tec", TCX_TEC_NREGS);
 
555
    memory_region_init_io(&s->tec, OBJECT(s), &dummy_ops, s,
 
556
                          "tcx.tec", TCX_TEC_NREGS);
549
557
    sysbus_init_mmio(dev, &s->tec);
550
558
    /* THC: NetBSD writes here even with 8-bit display: dummy */
551
 
    memory_region_init_io(&s->thc24, &dummy_ops, s, "tcx.thc24",
 
559
    memory_region_init_io(&s->thc24, OBJECT(s), &dummy_ops, s, "tcx.thc24",
552
560
                          TCX_THC_NREGS_24);
553
561
    sysbus_init_mmio(dev, &s->thc24);
554
562
 
557
565
        size = s->vram_size * 4;
558
566
        s->vram24 = (uint32_t *)vram_base;
559
567
        s->vram24_offset = vram_offset;
560
 
        memory_region_init_alias(&s->vram_24bit, "tcx.vram.24bit",
 
568
        memory_region_init_alias(&s->vram_24bit, OBJECT(s), "tcx.vram.24bit",
561
569
                                 &s->vram_mem, vram_offset, size);
562
570
        sysbus_init_mmio(dev, &s->vram_24bit);
563
571
        vram_offset += size;
567
575
        size = s->vram_size * 4;
568
576
        s->cplane = (uint32_t *)vram_base;
569
577
        s->cplane_offset = vram_offset;
570
 
        memory_region_init_alias(&s->vram_cplane, "tcx.vram.cplane",
 
578
        memory_region_init_alias(&s->vram_cplane, OBJECT(s), "tcx.vram.cplane",
571
579
                                 &s->vram_mem, vram_offset, size);
572
580
        sysbus_init_mmio(dev, &s->vram_cplane);
573
581
 
574
582
        s->con = graphic_console_init(DEVICE(dev), &tcx24_ops, s);
575
583
    } else {
576
584
        /* THC 8 bit (dummy) */
577
 
        memory_region_init_io(&s->thc8, &dummy_ops, s, "tcx.thc8",
 
585
        memory_region_init_io(&s->thc8, OBJECT(s), &dummy_ops, s, "tcx.thc8",
578
586
                              TCX_THC_NREGS_8);
579
587
        sysbus_init_mmio(dev, &s->thc8);
580
588
 
605
613
}
606
614
 
607
615
static const TypeInfo tcx_info = {
608
 
    .name          = "SUNW,tcx",
 
616
    .name          = TYPE_TCX,
609
617
    .parent        = TYPE_SYS_BUS_DEVICE,
610
618
    .instance_size = sizeof(TCXState),
611
619
    .class_init    = tcx_class_init,