← Back to branch summary

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

« back to all changes in this revision

Viewing changes to hw/display/vga-pci.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/vga-pci.c
147
147
    VGACommonState *s = &d->vga;
148
148
 
149
149
    /* vga + console init */
150
 
    vga_common_init(s);
151
 
    vga_init(s, pci_address_space(dev), pci_address_space_io(dev), true);
 
150
    vga_common_init(s, OBJECT(dev));
 
151
    vga_init(s, OBJECT(dev), pci_address_space(dev), pci_address_space_io(dev),
 
152
             true);
152
153
 
153
154
    s->con = graphic_console_init(DEVICE(dev), s->hw_ops, s);
154
155
 
157
158
 
158
159
    /* mmio bar for vga register access */
159
160
    if (d->flags & (1 << PCI_VGA_FLAG_ENABLE_MMIO)) {
160
 
        memory_region_init(&d->mmio, "vga.mmio", 4096);
161
 
        memory_region_init_io(&d->ioport, &pci_vga_ioport_ops, d,
 
161
        memory_region_init(&d->mmio, NULL, "vga.mmio", 4096);
 
162
        memory_region_init_io(&d->ioport, NULL, &pci_vga_ioport_ops, d,
162
163
                              "vga ioports remapped", PCI_VGA_IOPORT_SIZE);
163
 
        memory_region_init_io(&d->bochs, &pci_vga_bochs_ops, d,
 
164
        memory_region_init_io(&d->bochs, NULL, &pci_vga_bochs_ops, d,
164
165
                              "bochs dispi interface", PCI_VGA_BOCHS_SIZE);
165
166
 
166
167
        memory_region_add_subregion(&d->mmio, PCI_VGA_IOPORT_OFFSET,
172
173
 
173
174
    if (!dev->rom_bar) {
174
175
        /* compatibility with pc-0.13 and older */
175
 
        vga_init_vbe(s, pci_address_space(dev));
 
176
        vga_init_vbe(s, OBJECT(dev), pci_address_space(dev));
176
177
    }
177
178
 
178
179
    return 0;
197
198
    k->class_id = PCI_CLASS_DISPLAY_VGA;
198
199
    dc->vmsd = &vmstate_vga_pci;
199
200
    dc->props = vga_pci_properties;
 
201
    set_bit(DEVICE_CATEGORY_DISPLAY, dc->categories);
200
202
}
201
203
 
202
204
static const TypeInfo vga_info = {