summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge commit '6141dbfe0a595076310f690ec8db84ad5be2cde5' into upstream-mergeAvi Kivity2011-07-271-0/+8
|\
| * Merge remote-tracking branch 'qmp/for-anthony' into stagingAnthony Liguori2011-07-221-0/+8
| |\
| | * qapi: add QMP dispatch functionsMichael Roth2011-07-211-1/+1
| | * qapi: add QMP command registration/lookup functionsMichael Roth2011-07-211-0/+1
| | * qapi: add QAPI dealloc visitorMichael Roth2011-07-211-1/+1
| | * qapi: add QMP output visitorMichael Roth2011-07-211-1/+1
| | * qapi: add QMP input visitorMichael Roth2011-07-211-1/+1
| | * qapi: add QAPI visitor coreMichael Roth2011-07-211-0/+6
| * | USB: add usb network redirection supportHans de Goede2011-07-221-0/+1
* | | Merge commit 'e18df14185e817ba735bce57ecdef9a55fb3d093' into upstream-mergeAvi Kivity2011-07-271-0/+1
|\ \ \ | | |/ | |/|
| * | Add hard build dependency on glibAnthony Liguori2011-07-211-0/+1
| |/
* | Merge commit '21673cdecb9e9b5a22acaf0a44e47145beb1999e' into upstream-mergeAvi Kivity2011-07-271-1/+1
|\|
| * Avoid CPU endian memory accesses in devicesBlue Swirl2011-07-201-1/+1
* | Merge commit '03ff09580ef6cbc4a893b6e3e6bbff33180ec70a' into upstream-mergeMarcelo Tosatti2011-07-191-2/+2
|\|
| * xen: Clean up build systemJan Kiszka2011-07-171-2/+2
* | Merge commit 'eb47d7c5d96060040931c42773ee07e61e547af9' into upstream-mergeAvi Kivity2011-06-191-1/+9
|\|
| * Merge branch 'cocoa-for-upstream' of git://repo.or.cz/qemu/afaerberBlue Swirl2011-06-151-1/+1
| |\
| | * cocoa: Revert dependency on VNCAndreas Färber2011-06-141-1/+1
| * | libcacard: add libcacard.la targetAlon Levy2011-06-141-0/+8
| |/
* | Merge commit '924f766af9be3ff036a419fc85ed740aa01f8eac' into upstream-mergeAvi Kivity2011-06-091-6/+8
|\|
| * Merge remote-tracking branch 'jvrao/for-anthony' into stagingAnthony Liguori2011-06-081-5/+6
| |\
| | * virtio-9p: Use relative includes for files in hwStefan Weil2011-06-011-1/+0
| | * virtio-9p: Move device specific code to virtio-9p-deviceAneesh Kumar K.V2011-06-011-1/+1
| | * virtio-9p: Move 9p device registration into virtio-9p.cAneesh Kumar K.V2011-06-011-1/+1
| | * virtio-9p: Don't link to 9p if virtio is not enabledAneesh Kumar K.V2011-06-011-3/+5
| * | virtio: Move virtio-pci to hw libraryJan Kiszka2011-06-081-0/+1
| * | json-parser: propagate error from parserAnthony Liguori2011-06-071-2/+2
| * | Introduce the new error frameworkLuiz Capitulino2011-06-071-1/+1
| |/
* | Merge commit '578c7b2ca8ee9e97fa8693b1a83d517e8e3f962e' into upstream-mergeMarcelo Tosatti2011-06-021-0/+1
|\|
| * usb: add ehci adapterGerd Hoffmann2011-05-261-0/+1
* | Merge commit '6774e44ae3bfe074f59a16ffb0b52ae441b9c66d' into upstream-mergeAvi Kivity2011-05-151-4/+3
|\|
| * libcacard: add correct subdirectory dependenciesPaolo Bonzini2011-05-081-4/+3
* | Merge commit 'a1c7273b82dc084d85e2344e0562f5ee4e414d59' into upstream-mergeAvi Kivity2011-05-151-1/+1
|\|
| * Fix typos in comments (dependancy -> dependency)Stefan Weil2011-05-081-1/+1
* | Merge commit 'aa7f74d1199020a29c677bc80518df5267bfe73f' into upstream-mergeMarcelo Tosatti2011-05-031-4/+8
|\|
| * virtfs: fix build due from renameAnthony Liguori2011-04-281-2/+2
| * virtio-9p: move 9p files aroundAneesh Kumar K.V2011-04-271-3/+7
| * ide: Split atapi.c outKevin Wolf2011-04-271-1/+1
* | Merge commit '23910d3f669d46073b403876e30a7314599633af' into upstream-mergeMarcelo Tosatti2011-04-151-2/+41
|\|
| * NBD: Use qemu_socket functions to open TCP and UNIX socketsNick Thomas2011-04-071-2/+2
| * qemu-img: Initial progress printing supportJes Sorensen2011-04-071-1/+1
| * ccid: add ccid-card-emulated deviceAlon Levy2011-04-011-0/+1
| * libcacard: initial commitRobert Relyea2011-04-011-0/+5
| * ccid: add passthru card deviceAlon Levy2011-04-011-1/+1
| * usb-ccid: add CCID busAlon Levy2011-04-011-0/+1
| * trace: move trace objects from Makefile to Makefile.objsAlon Levy2011-04-011-0/+32
* | Merge commit '0298141998ea3e19fd86b5a7122aab2fd1ebad51' into upstream-mergeMarcelo Tosatti2011-04-141-10/+11
|\|
| * extract I/O handler lists to iohandler.cPaolo Bonzini2011-03-291-1/+1
| * Make VNC support optionalJes Sorensen2011-03-221-9/+10
* | Merge commit 'b784421ce4cc860315f4ec31bbc3d67e91984074' into upstream-mergeMarcelo Tosatti2011-04-141-2/+2
|\|