From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59700) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XUYlP-0002Qj-Ih for qemu-devel@nongnu.org; Thu, 18 Sep 2014 06:16:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XUYlG-0006mi-VR for qemu-devel@nongnu.org; Thu, 18 Sep 2014 06:16:35 -0400 Received: from mx1.redhat.com ([209.132.183.28]:1867) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XUYlG-0006l3-Nt for qemu-devel@nongnu.org; Thu, 18 Sep 2014 06:16:26 -0400 Message-ID: <541AB0ED.3040909@redhat.com> Date: Thu, 18 Sep 2014 12:16:13 +0200 From: Paolo Bonzini MIME-Version: 1.0 References: <1411032780-10692-1-git-send-email-arei.gonglei@huawei.com> <1411032780-10692-17-git-send-email-arei.gonglei@huawei.com> In-Reply-To: <1411032780-10692-17-git-send-email-arei.gonglei@huawei.com> Content-Type: text/plain; charset=iso-8859-15 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 16/19] usb-audio: convert init to realize List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: arei.gonglei@huawei.com, qemu-devel@nongnu.org Cc: luonengjun@huawei.com, peter.huangpeng@huawei.com, weidong.huang@huawei.com, kraxel@redhat.com, armbru@redhat.com Il 18/09/2014 11:32, arei.gonglei@huawei.com ha scritto: > From: Gonglei > > Signed-off-by: Gonglei > --- > 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..83ebe83 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; > Reviewed-by: Paolo Bonzini