summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* target-arm: Break the TB after ISB to execute self-modified code correctlySergey Sorokin2015-10-163-4/+27
* target-arm: Add missing 'static' attributeStefan Weil2015-10-161-1/+1
* 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/+11Star
| * qapi: Share gen_visit_fields()Eric Blake2015-10-124-77/+46Star
| * qapi: Share gen_err_check()Eric Blake2015-10-124-33/+20Star
| * qapi: Consistent generated code: minimize push_indent() usageEric Blake2015-10-122-45/+33Star
| * 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/+13Star
| * 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/+17Star
| * 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/+3Star
| * 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
| * | netfilter: add an API to pass the packet to next filterYang Hongyang2015-10-122-0/+65
| * | net/queue: introduce NetQueueDeliverFuncYang Hongyang2015-10-123-5/+18
| * | net: merge qemu_deliver_packet and qemu_deliver_packet_iovYang Hongyang2015-10-123-41/+21Star
| * | netfilter: hook packets before net queue sendYang Hongyang2015-10-123-0/+91
| * | init/cleanup of netfilter objectYang Hongyang2015-10-127-0/+229
| * | vl.c: init delayed object after net_init_clientsYang Hongyang2015-10-121-7/+8
| * | vmxnet3: Add support for VMXNET3_CMD_GET_ADAPTIVE_RING_INFO commandShmulik Ladkani2015-10-122-1/+14
| * | e1000: use alias for default modelJason Wang2015-10-122-7/+2Star
| * | vmxnet3: Support reading IMR registers on bar0Shmulik Ladkani2015-10-121-1/+5
| * | net/vmxnet3: Refine l2 header validationDana Rubin2015-10-122-6/+17
* | | Merge remote-tracking branch 'remotes/armbru/tags/pull-monitor-2015-10-09' in...Peter Maydell2015-10-1246-62/+463
|\ \ \
| * | | Revert "qdev: Use qdev_get_device_class() for -device <type>,help"Markus Armbruster2015-10-091-3/+6
| * | | qdev: Protect device-list-properties against broken devicesMarkus Armbruster2015-10-0927-27/+185
| * | | qmp: Fix device-list-properties not to crash for abstract deviceMarkus Armbruster2015-10-092-11/+10Star
| * | | device-introspect-test: New, covering device introspectionMarkus Armbruster2015-10-092-3/+163
| * | | libqtest: New hmp() & friendsMarkus Armbruster2015-10-094-22/+78