diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-12-18 15:41:32 -0600 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-12-18 15:41:32 -0600 |
| commit | 5455a474d92e345df83212fd1b2f59d4a5d46ca9 (patch) | |
| tree | 7f5d7a7f97764c59a0760aeee15af76759c4ff5f /audio/ossaudio.c | |
| parent | 510981a097bf16ef4747c9a1dfe806edfc117177 (diff) | |
| parent | 91bdd1cf08f65b7a127c22d4d65ff9d16dcac870 (diff) | |
| download | qemu-5455a474d92e345df83212fd1b2f59d4a5d46ca9.tar.gz qemu-5455a474d92e345df83212fd1b2f59d4a5d46ca9.tar.bz2 qemu-5455a474d92e345df83212fd1b2f59d4a5d46ca9.zip | |
Merge remote-tracking branch 'amit/master' into staging
* amit/master:
virtio-serial-bus: assert port is non-null in remove_port()
virtio-serial-bus: send_control_msg() should not deal with cpkts
virtio-serial: delete timer if active during exit
virtio-serial: allocate post_load only at load-time
virtio-serial: move active ports loading to separate function
virtio-serial: use uint32_t to count ports
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'audio/ossaudio.c')
0 files changed, 0 insertions, 0 deletions