summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'remotes/qmp-unstable/queue/qmp' into stagingPeter Maydell2014-06-2475-1316/+2050
|\
| * monitor: protect event emissionPaolo Bonzini2014-06-231-0/+16
| * monitor: protect outbuf and mux_out with mutexPaolo Bonzini2014-06-231-9/+36
| * qemu-char: make writes thread-safePaolo Bonzini2014-06-232-16/+53
| * qemu-char: move pty_chr_update_read_handler aroundPaolo Bonzini2014-06-231-16/+16
| * qemu-char: do not call chr_write directlyPaolo Bonzini2014-06-231-7/+7
| * qemu-char: introduce qemu_chr_allocPaolo Bonzini2014-06-236-17/+32
| * qapi event: clean upWenchao Xia2014-06-234-263/+4
| * qapi event: convert QUORUM eventsWenchao Xia2014-06-234-61/+49
| * qapi event: convert GUEST_PANICKEDWenchao Xia2014-06-235-31/+29
| * qapi event: convert BALLOON_CHANGEWenchao Xia2014-06-236-36/+18
| * qmp: convert ACPI_DEVICE_OST eventIgor Mammedov2014-06-235-40/+18
| * qapi event: convert SPICE eventsWenchao Xia2014-06-235-107/+91
| * qapi event: convert VNC eventsWenchao Xia2014-06-234-146/+108
| * qapi event: convert NIC_RX_FILTER_CHANGEDWenchao Xia2014-06-233-27/+18
| * qapi event: convert other BLOCK_JOB eventsWenchao Xia2014-06-236-99/+110
| * qapi event: convert BLOCK_IMAGE_CORRUPTEDWenchao Xia2014-06-233-28/+32
| * qapi event: convert BLOCK_IO_ERROR and BLOCK_JOB_ERRORWenchao Xia2014-06-236-84/+66
| * qapi event: convert DEVICE_TRAY_MOVEDWenchao Xia2014-06-233-32/+21
| * qapi event: convert DEVICE_DELETEDWenchao Xia2014-06-233-28/+18
| * qapi event: convert WATCHDOGWenchao Xia2014-06-235-36/+47
| * qapi event: convert RTC_CHANGEWenchao Xia2014-06-237-30/+20
| * qapi event: convert WAKEUPWenchao Xia2014-06-233-13/+10
| * qapi event: convert SUSPEND_DISKWenchao Xia2014-06-233-16/+14
| * qapi event: convert SUSPENDWenchao Xia2014-06-233-13/+11
| * qapi event: convert RESUMEWenchao Xia2014-06-233-14/+11
| * qapi event: convert STOPWenchao Xia2014-06-233-13/+12
| * qapi event: convert RESETWenchao Xia2014-06-233-13/+10
| * qapi event: convert POWERDOWNWenchao Xia2014-06-232-1/+11
| * qapi event: convert SHUTDOWNWenchao Xia2014-06-233-16/+15
| * qapi: add new schema file qapi-event.jsonWenchao Xia2014-06-233-1/+4
| * monitor: add an implemention of qapi event emit methodWenchao Xia2014-06-231-1/+127
| * qapi: adjust existing definesWenchao Xia2014-06-2316-66/+156
| * test: add test cases for qapi eventWenchao Xia2014-06-234-5/+298
| * qapi script: add event supportWenchao Xia2014-06-2310-5/+413
| * qapi: add event helper functionsWenchao Xia2014-06-233-0/+102
| * qapi: Add includes from qapi/ as dependenciesMax Reitz2014-06-231-3/+6
| * os-posix: include sys/time.hWenchao Xia2014-06-231-0/+2
| * json-lexer: fix escaped backslash in single-quoted stringPaolo Bonzini2014-06-232-2/+9
| * qapi: Suppress unwanted space between type and identifierAmos Kong2014-06-232-8/+19
| * qapi: add const prefix to 'char *' insider c_type()Amos Kong2014-06-232-4/+4
| * qapi: fix coding style in parameters listAmos Kong2014-06-231-10/+10
| * audio: fmopl: drop INLINE macroLuiz Capitulino2014-06-231-16/+15
| * fpu: softfloat: drop INLINE macroLuiz Capitulino2014-06-233-93/+92
* | Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into stagingPeter Maydell2014-06-2428-121/+469
|\ \
| * | xen-hvm: Handle machine opt max-ram-below-4gDon Slutz2014-06-231-12/+23
| * | pc & q35: Add new machine opt max-ram-below-4gDon Slutz2014-06-235-2/+96
| * | xen-hvm: Fix xen_hvm_init() to adjust pc memory layoutDon Slutz2014-06-235-41/+49
| * | pcie: coding style tweakMichael S. Tsirkin2014-06-231-5/+3
| * | hw/pcie: better hotplug/hotunplug supportMarcel Apfelbaum2014-06-231-5/+24
OpenPOWER on IntegriCloud