summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | ui/cocoa.m: eliminate normalWindow warningJohn Arbuckle2015-10-131-1/+1
| |/ /
* | | Merge remote-tracking branch 'remotes/armbru/tags/pull-qapi-2015-10-15' into ...Peter Maydell2015-10-1629-171/+162
|\ \ \
| * | | qapi: Track location that created an implicit typeEric Blake2015-10-151-27/+47
| * | | qapi: Create simple union type member earlierEric Blake2015-10-151-17/+18
| * | | qapi: Lazy creation of array typesEric Blake2015-10-154-5/+24
| * | | qapi: Don't use info as witness of implicit object typeEric Blake2015-10-153-6/+14
| * | | qapi: Drop redundant args-member-array testEric Blake2015-10-155-15/+0
| * | | qapi: Drop redundant flat-union-reverse-define testEric Blake2015-10-156-36/+7
| * | | qapi: Drop redundant returns-int testEric Blake2015-10-159-20/+10
| * | | qapi: Move empty-enum to compile-time testEric Blake2015-10-157-6/+7
| * | | qapi: Drop redundant alternate-good testEric Blake2015-10-155-21/+0
| * | | qapi: Prepare for errors during check()Eric Blake2015-10-151-4/+6
| * | | qapi: Use predicate callback to determine visit filteringEric Blake2015-10-154-20/+33
| * | | qapi: Fix regression with '-netdev help'Eric Blake2015-10-151-1/+3
| |/ /
* | | Merge remote-tracking branch 'remotes/juanquintela/tags/migration/20151015' i...Peter Maydell2015-10-162-19/+40
|\ \ \ | |/ / |/| |
| * | migration: fix deadlockDenis V. Lunev2015-10-151-17/+27
| * | migration: announce VM's new home just before VM is runnableAmit Shah2015-10-151-1/+6
| * | Migration: Generate the completed event only when we completeDr. David Alan Gilbert2015-10-151-1/+7
|/ /
* | Merge remote-tracking branch 'remotes/armbru/tags/pull-qapi-2015-10-12' into ...Peter Maydell2015-10-1382-424/+821
|\ \ | |/ |/|
| * qapi: Simplify gen_visit_fields() error handlingEric Blake2015-10-122-13/+11
| * qapi: Share gen_visit_fields()Eric Blake2015-10-124-77/+46
| * qapi: Share gen_err_check()Eric Blake2015-10-124-33/+20
| * qapi: Consistent generated code: minimize push_indent() usageEric Blake2015-10-122-45/+33
| * qapi: Consistent generated code: prefer common indentationEric Blake2015-10-121-26/+27
| * qapi: Consistent generated code: prefer common labelsEric Blake2015-10-122-6/+6
| * qapi: Consistent generated code: prefer visitor 'v'Eric Blake2015-10-126-109/+109
| * qapi: Consistent generated code: prefer error 'err'Eric Blake2015-10-123-34/+34
| * qapi: Reuse code for flat union base validationEric Blake2015-10-128-14/+13
| * qapi: Test use of 'number' within alternatesEric Blake2015-10-123-3/+160
| * qapi: Add tests for empty unionsEric Blake2015-10-1215-2/+30
| * qapi: Avoid assertion failure on union 'type' collisionEric Blake2015-10-125-44/+17
| * qapi: Test for various name collisionsEric Blake2015-10-1246-15/+182
| * qapi: Clean up qapi.py per pep8Eric Blake2015-10-122-58/+106
| * qapi: Invoke exception superclass initializerEric Blake2015-10-121-0/+2
| * qapi: Improve 'include' error messageEric Blake2015-10-123-4/+3
| * qapi: Sort qapi-schema testsEric Blake2015-10-121-46/+114
| * MAINTAINERS: Specify QAPI include and test filesMarkus Armbruster2015-10-121-0/+5
| * MAINTAINERS: Specify QObject include and test filesMarkus Armbruster2015-10-121-0/+8
| * docs: Move files from docs/qmp/ to docs/Markus Armbruster2015-10-124-1/+1
|/
* Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into ...Peter Maydell2015-10-1210-41/+108
|\
| * sdhci.c: Limit the maximum block sizeAlistair Francis2015-10-121-0/+10
| * block: switch from g_slice allocator to mallocPaolo Bonzini2015-10-125-12/+12
| * virtio dataplane: adapt dataplane for virtio Version 1Pierre Morel2015-10-122-15/+58
| * virtio-blk: use blk_io_plug/unplug for Linux AIO batchingStefan Hajnoczi2015-10-121-0/+4
| * sdhci: Pass drive parameter to sdhci-pci via qdev propertyKevin O'Connor2015-10-123-14/+24
* | Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into st...Peter Maydell2015-10-1220-65/+917
|\ \
| * | tests: add test cases for netfilter objectYang Hongyang2015-10-123-0/+203
| * | netfilter: add a netbuffer filterYang Hongyang2015-10-124-1/+209
| * | net/queue: export qemu_net_queue_append_iovYang Hongyang2015-10-122-6/+13
| * | netfilter: print filter info associate with the netdevYang Hongyang2015-10-123-0/+32
OpenPOWER on IntegriCloud