[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 18/26] usb-audio: convert init to realize
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PULL 18/26] usb-audio: convert init to realize |
Date: |
Tue, 23 Sep 2014 14:13:29 +0200 |
From: Gonglei <address@hidden>
Signed-off-by: Gonglei <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/usb/dev-audio.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/hw/usb/dev-audio.c b/hw/usb/dev-audio.c
index 7b9957b..67deffe 100644
--- a/hw/usb/dev-audio.c
+++ b/hw/usb/dev-audio.c
@@ -628,7 +628,7 @@ static void usb_audio_handle_destroy(USBDevice *dev)
streambuf_fini(&s->out.buf);
}
-static int usb_audio_initfn(USBDevice *dev)
+static void usb_audio_realize(USBDevice *dev, Error **errp)
{
USBAudioState *s = DO_UPCAST(USBAudioState, dev, dev);
@@ -651,7 +651,6 @@ static int usb_audio_initfn(USBDevice *dev)
s, output_callback, &s->out.as);
AUD_set_volume_out(s->out.voice, s->out.mute, s->out.vol[0],
s->out.vol[1]);
AUD_set_active_out(s->out.voice, 0);
- return 0;
}
static const VMStateDescription vmstate_usb_audio = {
@@ -676,7 +675,7 @@ static void usb_audio_class_init(ObjectClass *klass, void
*data)
set_bit(DEVICE_CATEGORY_SOUND, dc->categories);
k->product_desc = "QEMU USB Audio Interface";
k->usb_desc = &desc_audio;
- k->init = usb_audio_initfn;
+ k->realize = usb_audio_realize;
k->handle_reset = usb_audio_handle_reset;
k->handle_control = usb_audio_handle_control;
k->handle_data = usb_audio_handle_data;
--
1.8.3.1
- [Qemu-devel] [PULL 00/26] usb patch queue, Gerd Hoffmann, 2014/09/23
- [Qemu-devel] [PULL 07/26] libusb: using error_report instead of fprintf, Gerd Hoffmann, 2014/09/23
- [Qemu-devel] [PULL 12/26] dev-uas: using error_report instead of fprintf, Gerd Hoffmann, 2014/09/23
- [Qemu-devel] [PULL 23/26] usb-serial: only check speed once at realize time, Gerd Hoffmann, 2014/09/23
- [Qemu-devel] [PULL 19/26] usb-redir: convert init to realize, Gerd Hoffmann, 2014/09/23
- [Qemu-devel] [PULL 21/26] usb-bus: remove "init" from USBDeviceClass struct, Gerd Hoffmann, 2014/09/23
- [Qemu-devel] [PULL 22/26] usb-bus: introduce a wrapper function to check speed, Gerd Hoffmann, 2014/09/23
- [Qemu-devel] [PULL 18/26] usb-audio: convert init to realize,
Gerd Hoffmann <=
- [Qemu-devel] [PULL 13/26] dev-bluetooth: convert init to realize, Gerd Hoffmann, 2014/09/23
- [Qemu-devel] [PULL 15/26] usb-ccid: convert init to realize, Gerd Hoffmann, 2014/09/23
- [Qemu-devel] [PULL 14/26] dev-serial: convert init to realize, Gerd Hoffmann, 2014/09/23
- [Qemu-devel] [PULL 16/26] dev-hid: convert init to realize, Gerd Hoffmann, 2014/09/23
- [Qemu-devel] [PULL 20/26] usb-mtp: convert init to realize, Gerd Hoffmann, 2014/09/23
- [Qemu-devel] [PULL 04/26] usb-bus: convert USBDeviceClass init to realize, Gerd Hoffmann, 2014/09/23
- [Qemu-devel] [PULL 17/26] dev-wacom: convert init to realize, Gerd Hoffmann, 2014/09/23
- [Qemu-devel] [PULL 08/26] usb-hub: convert init to realize, Gerd Hoffmann, 2014/09/23
- [Qemu-devel] [PULL 03/26] ohci: Convert fprint/DPRINTF/print to traces, Gerd Hoffmann, 2014/09/23
- [Qemu-devel] [PULL 01/26] usb-storage: Fix how legacy init handles option ID clash, Gerd Hoffmann, 2014/09/23