]> xenbits.xensource.com Git - qemu-xen-3.4-testing.git/commit
Import VGA files from xen-unstable tip 17647:f12724194ec6
authorIan Jackson <iwj@mariner.uk.xensource.com>
Fri, 23 May 2008 16:38:40 +0000 (17:38 +0100)
committerIan Jackson <Ian.Jackson@eu.citrix.com>
Fri, 23 May 2008 16:38:40 +0000 (17:38 +0100)
commit1e739cf909a8449e26b89ac304efb2dcbf576eca
tree8bc81d9c3fa37ff4178c5d1e66dcc93b626858a7
parent1bd523709877f2e0e2c0bdbc5b610b21c4d4b1aa
Import VGA files from xen-unstable tip 17647:f12724194ec6

The following files
   console.c
   hw/cirrus_vga.c
   hw/cirrus_vga_rop.h
   hw/cirrus_vga_rop2.h
   hw/vga.c
   hw/vga_int.h
   hw/vga_template.h
are hereby transplated verbatim from xen-unstable.  This represents
all of the changes on xen-unstable since qemu 0.9.0, which is the last
merged version.  We will now cherry-pick commits from the master qemu
branch, and then merge-choosing-ours, which will result in a history
which claims to be a merge between qemu and xen but which has only the
cherrypicked changes from qemu.
console.c
hw/cirrus_vga.c
hw/cirrus_vga_rop.h
hw/cirrus_vga_rop2.h
hw/vga.c
hw/vga_int.h