summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'fd2f659ee3f6f991f4f194f3fde5c9f957fd663d' into upstream-mergeAvi Kivity2010-08-011-11/+18
|\
| * vnc: threaded VNC serverCorentin Chary2010-07-261-1/+6
| * vnc: tight: stop using qdict for palette stuffCorentin Chary2010-07-261-1/+1
| * vnc: rename vnc-encoding-* vnc-enc-*Corentin Chary2010-07-261-2/+2
| * ui: move all ui components in ui/Corentin Chary2010-07-261-10/+12
* | Merge commit '498238687fd3a2bf3efb32694732f88ceac72e99' into upstream-mergeMarcelo Tosatti2010-07-131-1/+1
|\|
| * block: add sheepdog driver for distributed storage supportMORITA Kazutaka2010-07-061-1/+1
* | Merge commit '08af49da7e3c3ed72cdffe3d43a6618165406f34' into upstream-mergeMarcelo Tosatti2010-07-041-0/+3
|\|
| * piix4: compile only onceBlue Swirl2010-07-031-0/+3
* | Merge commit 'a88790a14f60ac966a2103a958c3febf5a42836b' into upstream-mergeMarcelo Tosatti2010-07-041-0/+1
|\|
| * MIPS: Initial support of VIA IDE controller used by fulong mini pcHuacai Chen2010-06-291-0/+1
* | Merge commit '758e8e38eb582e3dc87fd55a1d234c25108a7b7f' into upstream-mergeMarcelo Tosatti2010-07-041-3/+3
|\|
| * virtio-9p: Make infrastructure for the new security model.Venkateswararao Jujjuri (JV)2010-06-221-3/+3
| * Merge remote branch 'kwolf/for-anthony' into stagingAnthony Liguori2010-06-141-1/+1
| |\
* | \ Merge commit '666daa68234b5b1758652633cab07d5ca6046a5b' into upstream-mergeAvi Kivity2010-06-211-1/+1
|\ \ \ | | |/ | |/|
| * | blockdev: Collect block device code in new blockdev.cMarkus Armbruster2010-06-041-1/+1
* | | Merge commit '27bb0b2d6f80f058bdb6fcc8fcdfa69b0c8a6d71' into upstream-mergeAvi Kivity2010-06-211-2/+2
|\ \ \ | | |/ | |/|
| * | Compile OS specific files only once for all targetsBlue Swirl2010-06-121-2/+2
* | | Merge commit '59a5264b994343f01d19faf95c0e5df70346ded8' into upstream-mergeAvi Kivity2010-06-211-2/+6
|\| |
| * | Introduce OS specific cmdline argument handling and move SMB arg to os-posix.cJes Sorensen2010-06-121-0/+2
| * | Rename qemu-options.h to qemu-options.defJes Sorensen2010-06-121-2/+2
| * | Introduce os-posix.c and create os_setup_signal_handling()Jes Sorensen2010-06-121-0/+1
| * | Introduce os-win32.c and move polling functions from vl.cJes Sorensen2010-06-121-0/+1
| |/
* | Merge commit '358c360feb346dff8f911e2d1dbcdd6319393f1d' into upstream-mergeMarcelo Tosatti2010-06-041-0/+1
|\|
| * vnc: add basic tight supportCorentin Chary2010-06-011-0/+1
* | Merge remote branch 'upstream' into upstream-mergeAvi Kivity2010-05-261-1/+2
|\|
| * cursor: add cursor functions.Gerd Hoffmann2010-05-241-1/+2
* | Merge commit '4556bd8b2514a55d48c15b1adb17537f49657744' into upstream-mergeAvi Kivity2010-05-261-0/+1
|\|
| * Compile dma only onceBlue Swirl2010-05-221-0/+1
* | Merge commit '956a3e6bb7386de48b642d4fee11f7f86a2fcf9a' into upstream-mergeAvi Kivity2010-05-261-0/+4
|\|
| * Compile pckbd only onceBlue Swirl2010-05-221-0/+1
* | Merge commit 'c69ea0dff27ccc6663f8ecb4a70f762f4559672c' into upstream-mergeAvi Kivity2010-05-261-0/+3
|\|
| * Compile acpi_piix4, apm and pm_smbus only onceBlue Swirl2010-05-171-1/+2
* | Merge commit 'fc0bdd995ca36a34cc576ee706df239dd5ff79a9' into upstream-mergeAvi Kivity2010-05-161-0/+2
|\|
| * Compile virtio-9p-debug and virtio-9p-local onceBlue Swirl2010-05-141-0/+2
* | Merge commit '74db920c32cea5b52a91b81f2bfd467fc070e942' into upstream-mergeMarcelo Tosatti2010-05-031-2/+6
|\|
| * virtio-9p: Create a commandline option -fsdevGautham R Shenoy2010-05-031-1/+4
| * vnc: split encoding in specific filesCorentin Chary2010-05-031-0/+1
| * block: separate raw images from the file protocolChristoph Hellwig2010-05-031-1/+1
* | Merge commit '9ed7b059ef776a3921cfd085e891f45076922542' into upstream-mergeMarcelo Tosatti2010-05-011-0/+1
|\|
| * iov: Introduce a new file for helpers around iovs, add iov_from_buf()Amit Shah2010-04-281-0/+1
* | Merge commit '0e8d2b5575938b8876a3c4bb66ee13c5d306fb6d' into upstream-mergeMarcelo Tosatti2010-05-011-4/+4
|\|
| * Make qemu-config available for toolsKevin Wolf2010-04-231-2/+2
| * blkdebug: Basic request passthroughKevin Wolf2010-04-231-1/+1
| * Compile event_notifier only onceBlue Swirl2010-04-191-1/+1
| * Compile vl.c onceBlue Swirl2010-04-191-1/+1
* | Merge commit '98c8573eb37bf5d7bb0c07225985a78537c73101' into upstream-mergeMarcelo Tosatti2010-05-011-0/+1
|\|
| * sparc32 use empty_slot for missing RAM v1Artyom Tarasenko2010-04-181-0/+1
* | Merge commit '61d3cf93e2676282ba1a8d568b2406257f208b26' into upstream-mergeMarcelo Tosatti2010-04-061-2/+2
|\|
| * OHCI qdev conversionPaul Brook2010-04-051-1/+1