aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge commit '382f074371f7dc32a34c944c845b1698e83d8c36' into upstream-mergeAvi Kivity2009-08-301-5/+5
|\
| * ide: move code to hw/ide/Gerd Hoffmann2009-08-271-5/+5
| * ide: split away ide-microdrive.cGerd Hoffmann2009-08-271-1/+1
| * ide: split away ide-mmio.cGerd Hoffmann2009-08-271-1/+1
* | Merge commit '977e1244e8eeb22640143a8885eb672296f93210' into upstream-mergeAvi Kivity2009-08-301-4/+5
|\|
| * ide: split away ide-pci.cGerd Hoffmann2009-08-271-4/+5
* | Merge commit 'ec82026c97975e1e327aab76653ff7edeeb27967' into upstream-mergeAvi Kivity2009-08-301-3/+4
|\|
| * ide: split away ide-isa.cGerd Hoffmann2009-08-271-3/+4
* | Merge commit '09aaa1602f9381c0e0fb539390b1793e51bdfc7b' into upstream-mergeAvi Kivity2009-08-301-3/+3
|\|
| * qdev: convert watchdogsMarkus Armbruster2009-08-271-3/+3
* | Merge commit '3a38d437ca60ce19ee92dbabbe6e672e9ba3c529' into upstream-mergeAvi Kivity2009-08-291-2/+2
|\|
| * Add isa_reserve_irq().Jes Sorensen2009-08-271-2/+2
* | Merge commit 'e2d52ad32abb158f272f120dc1ba06c74abe4824' into upstream-mergeAvi Kivity2009-08-291-4/+0
|\|
| * Remove a hack introduced by d19076faca944c31bb051b95d285e75ec67902f7malc2009-08-271-4/+0
* | Merge commit '4dd75c702c96ec84db4efe24fcc80a4d7bb32df2' into upstream-mergeAvi Kivity2009-08-241-2/+2
|\|
| * qemu: move virtio-pci.o to near pci.oMichael S. Tsirkin2009-08-241-1/+1
| * Only build osdep onceAnthony Liguori2009-08-241-1/+1
* | Merge commit '4a1418e07bdcfaa3177739e04707ecaec75d89e1' into upstream-mergeAvi Kivity2009-08-241-1/+0
|\|
| * Unbreak large mem support by removing kqemuAnthony Liguori2009-08-241-1/+0
* | Merge commit '1452411b25fb207e7f442e5a5128f34b4939d31c' into upstream-mergeAvi Kivity2009-08-241-1/+1
|\|
| * Extract the Marvell 88w8618 audio device from musicpal.cAndrzej Zaborowski2009-08-231-1/+1
| * Extract musicpal.c I2C bitbanging code and make it gpio awareAndrzej Zaborowski2009-08-231-1/+1
* | Merge commit 'facd2857783d58387885ad7cb1e4a8386f241738' into upstream-mergeAvi Kivity2009-08-241-10/+4
|\|
| * user: compile host-utils.c only onceBlue Swirl2009-08-161-1/+1
| * Simplify 5ba6531956b9b6486560cbd13604c2238a3542ddBlue Swirl2009-08-161-9/+3
* | Merge branch 'master' of git://git.sv.gnu.org/qemuAvi Kivity2009-08-161-7/+18
|\|
| * linux-user: compile envlist.c only onceBlue Swirl2009-08-151-1/+1
| * user: compile ioport-user.c only for x86Blue Swirl2009-08-151-5/+16
| * user: compile path.c only onceBlue Swirl2009-08-151-2/+2
* | Merge commit '562593aa8a7513308477710a59cc383bba056752' into upstream-mergeAvi Kivity2009-08-111-0/+2
|\|
| * Add emacs header to Makefile.targetAnthony Liguori2009-08-101-0/+2
* | Merge commit '72c61d0bf4f1e014ce662f70b459c5a8abd7190d' into upstream-mergeAvi Kivity2009-08-111-7/+0
|\|
| * Move libsunpath to use the same style than everything elseJuan Quintela2009-08-101-7/+0
* | Merge commit 'f622d8a33dfbd83468d71e48624925c950b4010e' into upstream-mergeAvi Kivity2009-08-111-9/+2
|\|
| * convert gprof flags to style of rest of MakefileJuan Quintela2009-08-101-4/+1
| * Add cocoa libs at Darwin selection timeJuan Quintela2009-08-101-5/+0
| * CURL libs are used both by tools and softmmuJuan Quintela2009-08-101-1/+1
| * VDE libs are used both by tools and softmmuJuan Quintela2009-08-101-1/+1
* | Merge commit 'e18ea868d2d16640081a404d533a57e3372428a5' into upstream-mergeAvi Kivity2009-08-111-19/+3
|\|
| * use TARGET_<arch name> for selectionJuan Quintela2009-08-101-11/+3
* | Merge commit '55d9c04bc3418ae7bd49a8f66a070f0a4c466c69' into upstream-mergeAvi Kivity2009-08-111-28/+5
|\|
| * Consolidate audio flags in configureJuan Quintela2009-08-101-17/+0
| * remove last 3 uses of :=, everywhere else uses += or =Juan Quintela2009-08-101-3/+3
| * Make slirp include dir globlal in cflagsJuan Quintela2009-08-101-3/+0
| * Use one less HELPER_CFLAGSJuan Quintela2009-08-101-3/+1
| * Use only one KVM_CFLAGSJuan Quintela2009-08-101-2/+1
* | Merge commit '646560247ce8c4c8184c49f877d80ac82a07c2e5' into upstream-mergeAvi Kivity2009-08-111-50/+13
|\|
| * Move dis-* selection to configureJuan Quintela2009-08-101-41/+12
| * Added CONFIG_NEED_MMU for microblaze and crisJuan Quintela2009-08-101-3/+1
* | Merge commit '57ddfbf7f93a888501097878a8c3b58444a947d8' into upstream-mergeAvi Kivity2009-08-111-28/+0
|\|