Merge remote-tracking branch 'qmp/queue/qmp' into staging

This commit is contained in:
Anthony Liguori 2011-09-20 15:16:00 -05:00
commit 7f67d8922e
30 changed files with 292 additions and 111 deletions

View file

@ -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;