diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2011-09-20 15:16:00 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-09-20 15:16:00 -0500 |
| commit | 7f67d8922e2da59c02852de39f888d7873e8645c (patch) | |
| tree | fde41774a54f63bce66a739332c3dbd27365af91 /audio | |
| parent | 27acf660aa1678ff3e7291fa81f4d5d4020b20f8 (diff) | |
| parent | 6e0ca8820dddd04056c43327f3b3699f572d03d4 (diff) | |
| download | qemu-7f67d8922e2da59c02852de39f888d7873e8645c.zip qemu-7f67d8922e2da59c02852de39f888d7873e8645c.tar.gz qemu-7f67d8922e2da59c02852de39f888d7873e8645c.tar.bz2 | |
Merge remote-tracking branch 'qmp/queue/qmp' into staging
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/audio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/audio/audio.c b/audio/audio.c index 5649075..50d0d71 100644 --- a/audio/audio.c +++ b/audio/audio.c @@ -1743,7 +1743,7 @@ static int audio_driver_init (AudioState *s, struct audio_driver *drv) } static void audio_vm_change_state_handler (void *opaque, int running, - int reason) + RunState state) { AudioState *s = opaque; HWVoiceOut *hwo = NULL; |