xenbits.xensource.com Git - qemu-xen-3.4-testing.git/commit

]> xenbits.xensource.com Git - qemu-xen-3.4-testing.git/commit

projects / qemu-xen-3.4-testing.git / commit

author	Ian Jackson <ian.jackson@eu.citrix.com>
	Thu, 12 Mar 2009 17:29:18 +0000 (17:29 +0000)
committer	Ian Jackson <Ian.Jackson@eu.citrix.com>
	Thu, 12 Mar 2009 17:29:18 +0000 (17:29 +0000)
commit	149b4ff3ca594f66719d415bafec74f11d1a3051
tree	a15b074732ea2f393f83af69fe24f4a93f0a374e	tree
parent	46670677957c3d8a17e6e4a8d3e9919e5b21c4bc	commit \| diff
parent	635fe25273eeed178204702f422458973be2d3b3	commit \| diff

Merge branch 'qemu'

Conflicts:

.gitignore
Makefile
Makefile.target
block-raw-posix.c
bswap.h
console.c
hw/cirrus_vga.c
hw/ide.c
hw/iommu.c
hw/lsi53c895a.c
hw/ne2000.c
hw/pc.c
hw/pc.h
hw/pci.c
hw/ppc_chrp.c
hw/ppc_oldworld.c
hw/ppc_prep.c
hw/rtl8139.c
hw/scsi-disk.c
hw/usb-hid.c
hw/vga.c
hw/vga_int.h
sdl.c
sysemu.h
vl.c
vnc.c

54 files changed:

.gitignore	diff1 \|	diff2 \|	blob \| history
Makefile	diff1 \|	diff2 \|	blob \| history
Makefile.target	diff1 \|	diff2 \|	blob \| history
audio/mixeng.c	diff1 \|	diff2 \|	blob \| history
block-qcow.c	diff1 \|	diff2 \|	blob \| history
block-raw-posix.c	diff1 \|	diff2 \|	blob \| history
block.c	diff1 \|	diff2 \|	blob \| history
configure	diff1 \|	diff2 \|	blob \| history
console.c	diff1 \|	diff2 \|	blob \| history
console.h	diff1 \|	diff2 \|	blob \| history
cutils.c	diff1 \|	diff2 \|	blob \| history
exec-all.h	diff1 \|	diff2 \|	blob \| history
hw/boards.h	diff1 \|	diff2 \|	blob \| history
hw/cirrus_vga.c	diff1 \|	diff2 \|	blob \| history
hw/dma.c	diff1 \|	diff2 \|	blob \| history
hw/eepro100.c	diff1 \|	diff2 \|	blob \| history
hw/ide.c	diff1 \|	diff2 \|	blob \| history
hw/iommu.c	diff1 \|	diff2 \|	blob \| history
hw/lsi53c895a.c	diff1 \|	diff2 \|	blob \| history
hw/mips_mipssim.c	diff1 \|	diff2 \|	blob \| history
hw/mips_r4k.c	diff1 \|	diff2 \|	blob \| history
hw/ne2000.c	diff1 \|	diff2 \|	blob \| history
hw/pc.c	diff1 \|	diff2 \|	blob \| history
hw/pc.h	diff1 \|	diff2 \|	blob \| history
hw/pci.c	diff1 \|	diff2 \|	blob \| history
hw/pci.h	diff1 \|	diff2 \|	blob \| history
hw/pcnet.c	diff1 \|	diff2 \|	blob \| history
hw/piix_pci.c	diff1 \|	diff2 \|	blob \| history
hw/rtl8139.c	diff1 \|	diff2 \|	blob \| history
hw/scsi-disk.c	diff1 \|	diff2 \|	blob \| history
hw/serial.c	diff1 \|	diff2 \|	blob \| history
hw/sun4u.c	diff1 \|	diff2 \|	blob \| history
hw/usb-hid.c	diff1 \|	diff2 \|	blob \| history
hw/vga.c	diff1 \|	diff2 \|	blob \| history
hw/vga_int.h	diff1 \|	diff2 \|	blob \| history
hw/vmware_vga.c	diff1 \|	diff2 \|	blob \| history
loader.c	diff1 \|	diff2 \|	blob \| history
monitor.c	diff1 \|	diff2 \|	blob \| history
nbd.c	diff1 \|	diff2 \|	blob \| history
net.c	\|	diff2 \|	blob \| history
net.h	diff1 \|	diff2 \|	blob \| history
osdep.c	diff1 \|	diff2 \|	blob \| history
qemu-char.c	\|	diff2 \|	blob \| history
qemu-char.h	diff1 \|	diff2 \|	blob \| history
qemu-common.h	diff1 \|	diff2 \|	blob \| history
qemu-lock.h	diff1 \|	diff2 \|	blob \| history
savevm.c	\|	diff2 \|	blob \| history
sdl.c	diff1 \|	diff2 \|	blob \| history
sysemu.h	diff1 \|	diff2 \|	blob \| history
usb-linux.c	diff1 \|	diff2 \|	blob \| history
vl.c	diff1 \|	diff2 \|	blob \| history
vnc.c	diff1 \|	diff2 \|	blob \| history
vnchextile.h	diff1 \|	diff2 \|	blob \| history
xen-vl-extra.c	diff1 \|	\|	blob \| history

Obsolete Qemu-dm 3.4 stable branch

RSS Atom

.gitignore	diff1 \|	diff2 \|	blob \| history
Makefile	diff1 \|	diff2 \|	blob \| history
Makefile.target	diff1 \|	diff2 \|	blob \| history
audio/mixeng.c	diff1 \|	diff2 \|	blob \| history
block-qcow.c	diff1 \|	diff2 \|	blob \| history
block-raw-posix.c	diff1 \|	diff2 \|	blob \| history
block.c	diff1 \|	diff2 \|	blob \| history
configure	diff1 \|	diff2 \|	blob \| history
console.c	diff1 \|	diff2 \|	blob \| history
console.h	diff1 \|	diff2 \|	blob \| history
cutils.c	diff1 \|	diff2 \|	blob \| history
exec-all.h	diff1 \|	diff2 \|	blob \| history
hw/boards.h	diff1 \|	diff2 \|	blob \| history
hw/cirrus_vga.c	diff1 \|	diff2 \|	blob \| history
hw/dma.c	diff1 \|	diff2 \|	blob \| history
hw/eepro100.c	diff1 \|	diff2 \|	blob \| history
hw/ide.c	diff1 \|	diff2 \|	blob \| history
hw/iommu.c	diff1 \|	diff2 \|	blob \| history
hw/lsi53c895a.c	diff1 \|	diff2 \|	blob \| history
hw/mips_mipssim.c	diff1 \|	diff2 \|	blob \| history
hw/mips_r4k.c	diff1 \|	diff2 \|	blob \| history
hw/ne2000.c	diff1 \|	diff2 \|	blob \| history
hw/pc.c	diff1 \|	diff2 \|	blob \| history
hw/pc.h	diff1 \|	diff2 \|	blob \| history
hw/pci.c	diff1 \|	diff2 \|	blob \| history
hw/pci.h	diff1 \|	diff2 \|	blob \| history
hw/pcnet.c	diff1 \|	diff2 \|	blob \| history
hw/piix_pci.c	diff1 \|	diff2 \|	blob \| history
hw/rtl8139.c	diff1 \|	diff2 \|	blob \| history
hw/scsi-disk.c	diff1 \|	diff2 \|	blob \| history
hw/serial.c	diff1 \|	diff2 \|	blob \| history
hw/sun4u.c	diff1 \|	diff2 \|	blob \| history
hw/usb-hid.c	diff1 \|	diff2 \|	blob \| history
hw/vga.c	diff1 \|	diff2 \|	blob \| history
hw/vga_int.h	diff1 \|	diff2 \|	blob \| history
hw/vmware_vga.c	diff1 \|	diff2 \|	blob \| history
loader.c	diff1 \|	diff2 \|	blob \| history
monitor.c	diff1 \|	diff2 \|	blob \| history
nbd.c	diff1 \|	diff2 \|	blob \| history
net.c	\|	diff2 \|	blob \| history
net.h	diff1 \|	diff2 \|	blob \| history
osdep.c	diff1 \|	diff2 \|	blob \| history
qemu-char.c	\|	diff2 \|	blob \| history
qemu-char.h	diff1 \|	diff2 \|	blob \| history
qemu-common.h	diff1 \|	diff2 \|	blob \| history
qemu-lock.h	diff1 \|	diff2 \|	blob \| history
savevm.c	\|	diff2 \|	blob \| history
sdl.c	diff1 \|	diff2 \|	blob \| history
sysemu.h	diff1 \|	diff2 \|	blob \| history
usb-linux.c	diff1 \|	diff2 \|	blob \| history
vl.c	diff1 \|	diff2 \|	blob \| history
vnc.c	diff1 \|	diff2 \|	blob \| history
vnchextile.h	diff1 \|	diff2 \|	blob \| history
xen-vl-extra.c	diff1 \|	\|	blob \| history