aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge commit '6141dbfe0a595076310f690ec8db84ad5be2cde5' into upstream-mergeAvi Kivity2011-07-271-17/+22
|\
| * slirp: Canonicalize restrict syntaxJan Kiszka2011-07-231-2/+2
| * Deprecate -M command line optionsJan Kiszka2011-07-231-25/+20
| * Generalize -machine command line optionJan Kiszka2011-07-231-5/+15
* | Merge commit 'ae73e5919a75622d2c029d5a0e240115990fb735' into upstream-mergeAvi Kivity2011-07-271-0/+8
|\|
| * qemu-options.hx: Document missing -drive optionsLuiz Capitulino2011-07-191-0/+8
* | Merge commit '03ff09580ef6cbc4a893b6e3e6bbff33180ec70a' into upstream-mergeMarcelo Tosatti2011-07-191-0/+9
|\|
| * pxa2xx_lcd: add proper rotation supportVasily Khoruzhick2011-07-041-0/+9
* | qemu-kvm: Drop -enable-nesting command line switchJan Kiszka2011-06-281-2/+0
* | Merge commit 'eb47d7c5d96060040931c42773ee07e61e547af9' into upstream-mergeAvi Kivity2011-06-191-2/+11
|\|
| * Command line support for altering the log file locationMatthew Fernandez2011-06-151-0/+9
| * doc: Minor typo fix.Brad Hards2011-06-101-2/+2
* | Merge commit '924f766af9be3ff036a419fc85ed740aa01f8eac' into upstream-mergeAvi Kivity2011-06-091-0/+16
|\|
| * spice: add SASL supportMarc-André Lureau2011-06-061-0/+13
| * spice: add option for disabling copy paste supportHans de Goede2011-06-061-0/+3
* | Merge commit '60e0df25e415b00cf35c4d214eaba9dc19aaa9e6' into upstream-mergeAvi Kivity2011-05-151-2/+4
|\|
| * doc: Add explanation that -alt-grab and -ctrl-grab affect special keysBrad Hards2011-05-151-2/+4
* | Merge commit '303d4e865b74402b49f52e975c396c952f063e58' into upstream-mergeAvi Kivity2011-05-151-0/+10
|\|
| * Introduce -machine command option.Anthony PERARD2011-05-081-0/+10
* | Merge commit 'aa7f74d1199020a29c677bc80518df5267bfe73f' into upstream-mergeMarcelo Tosatti2011-05-031-2/+2
|\|
| * doc: fix slirp descriptionBrad Hards2011-04-251-2/+2
* | Merge commit '3110e2925489c571901e945e315942ce84fe696f' into upstream-mergeMarcelo Tosatti2011-05-031-2/+2
|\|
| * Fix some typos in comments and documentationStefan Weil2011-04-161-2/+2
* | Merge commit '0298141998ea3e19fd86b5a7122aab2fd1ebad51' into upstream-mergeMarcelo Tosatti2011-04-141-12/+31
|\|
| * error message if user specifies curses on cmd line when curses is disabledJes Sorensen2011-03-221-2/+0
| * error message if user specifies SDL cmd line option when SDL is disabledJes Sorensen2011-03-221-10/+0
| * Add support for -display vncJes Sorensen2011-03-221-1/+4
| * Introduce -display noneJes Sorensen2011-03-221-1/+7
| * Introduce -display argumentJes Sorensen2011-03-221-0/+22
* | Merge commit '9257d46d55f1fe4e8209be9a6870e339ac3266fe' into upstream-mergeMarcelo Tosatti2011-03-141-0/+9
|\|
| * vnc: add a non-adaptive optionCorentin Chary2011-02-231-0/+9
* | Merge commit 'f487d6278f75f84378833b8c3a67443346d639dc' into upstream-mergeMarcelo Tosatti2011-02-021-3/+19
|\|
| * vhost: force vhost off for non-MSI guestsmst@redhat.com2011-02-011-1/+3
| * tap: safe sndbuf defaultMichael S. Tsirkin2011-02-011-1/+1
| * spice: add chardev (v5)Alon Levy2011-01-241-1/+15
| * Merge branch 'spice.v23.pull' of git://anongit.freedesktop.org/spice/qemuAurelien Jarno2010-12-271-1/+5
| |\
* | \ Merge commit 'a19cbfb346425cc760ed19b4e746417df636b761' into upstream-mergeMarcelo Tosatti2011-01-061-1/+5
|\ \ \ | | |/ | |/|
| * | spice: add qxl deviceGerd Hoffmann2010-12-091-1/+5
* | | Merge commit '4a9dd6658268a942a8ea230f950a951229355cbb' into upstream-mergeMarcelo Tosatti2011-01-061-2/+9
|\ \ \ | | |/ | |/|
| * | net/sock: option to specify local addressMike Ryan2010-12-091-2/+9
| |/
* | Merge remote branch 'upstream' into upstream-mergeAvi Kivity2010-11-141-1/+51
|\|
| * intel-hda: documentation updateGerd Hoffmann2010-11-021-0/+1
| * spice: add misc config optionsGerd Hoffmann2010-10-081-0/+9
| * spice: add config options for the listening addressGerd Hoffmann2010-10-081-0/+7
| * spice: add config options for channel security.Gerd Hoffmann2010-10-081-0/+8
| * spice: make compression configurable.Yonit Halperin2010-10-081-0/+9
| * spice: tls supportGerd Hoffmann2010-10-081-1/+17
* | pci-assign: Remove broken -pcidevice and pci_add hostJan Kiszka2010-11-031-5/+0
* | Merge commit '38cc9b607f85017b095793cab6c129bc9844f441' into upstream-mergeMarcelo Tosatti2010-10-181-0/+21
|\|
| * spice: core bitsGerd Hoffmann2010-09-211-0/+21