-
Committer:
Avi Kivity
-
Date:
2009-08-24 15:39:19 UTC
-
mfrom:
(2980.1.6)
-
Revision ID:
git-v1:f3600c589a9ee5ea4c0fec74ed4e06a15b461d52
Merge branch 'upstream-merge'
* upstream-merge: (54 commits)
Make the e1000 the default network adapter for the pc target.
eliminate errors about unused results in block/vpc.c
virtio-blk: add msi support.
qdev/prop: convert isa-bus to helper macros.
make pthreads mandatory
qemu: move virtio-pci.o to near pci.o
char: Emit 'CLOSED' events on char device close
cleanup cpu-exec.c, part 0/N: consolidate handle_cpu_signal
Unbreak large mem support by removing kqemu
unify popen/fopen qemu wrappers
Only build osdep once
Route IOAPIC interrupts via ISA bus
Add a configure switch to enable / disable all user targets. I felt compelled to do it for symmetry, mostly it is useful to disable user targets when you don't want to build them.
Migration via unix sockets.
Route PC irqs to ISA bus instead of i8259 directly
Makefile: fixed rule TAGS
QEMU set irq0override in fw_cfg
SMART ATA Functionality
Add missing linefeed in error message
Clean up VGA type selection; far too many variables being used to track one state leads to confusion if new variables are added.
...
Signed-off-by: Avi Kivity <avi@redhat.com>