From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:41837) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UKxjY-0000n7-KF for qemu-devel@nongnu.org; Wed, 27 Mar 2013 17:18:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UKxjX-00035L-5D for qemu-devel@nongnu.org; Wed, 27 Mar 2013 17:18:12 -0400 Received: from mail-qe0-f41.google.com ([209.85.128.41]:53250) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UKxjX-00035F-1c for qemu-devel@nongnu.org; Wed, 27 Mar 2013 17:18:11 -0400 Received: by mail-qe0-f41.google.com with SMTP id 7so4896544qeb.28 for ; Wed, 27 Mar 2013 14:18:10 -0700 (PDT) From: Anthony Liguori In-Reply-To: <1364412581-3672-4-git-send-email-hdegoede@redhat.com> References: <1364412581-3672-1-git-send-email-hdegoede@redhat.com> <1364412581-3672-4-git-send-email-hdegoede@redhat.com> Date: Wed, 27 Mar 2013 16:18:08 -0500 Message-ID: <87li98pmnj.fsf@codemonkey.ws> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Subject: Re: [Qemu-devel] [PATCH 3/3] ipoctal232: Convert to use chardev properties directly List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Hans de Goede , qemu-devel@nongnu.org Cc: Paolo Bonzini , Alberto Garcia Hans de Goede writes: > Signed-off-by: Hans de Goede > Cc: Alberto Garcia I don't think this is a show stopper, but this is a compatibility breaker, no? We should be more up front about that and include release notes as appropriate. Signed-off-by: Anthony Liguori > --- > hw/ipoctal232.c | 43 ++++++++++++++----------------------------- > 1 file changed, 14 insertions(+), 29 deletions(-) > > diff --git a/hw/ipoctal232.c b/hw/ipoctal232.c > index 345efae..685fee2 100644 > --- a/hw/ipoctal232.c > +++ b/hw/ipoctal232.c > @@ -93,7 +93,6 @@ typedef struct SCC2698Block SCC2698Block; > struct SCC2698Channel { > IPOctalState *ipoctal; > CharDriverState *dev; > - char *devpath; > bool rx_enabled; > uint8_t mr[2]; > uint8_t mr_idx; > @@ -545,26 +544,12 @@ static int ipoctal_init(IPackDevice *ip) > ch->ipoctal = s; > > /* Redirect IP-Octal channels to host character devices */ > - if (ch->devpath) { > - const char chr_name[] = "ipoctal"; > - char label[ARRAY_SIZE(chr_name) + 2]; > - static int index; > - > - snprintf(label, sizeof(label), "%s%d", chr_name, index); > - > - ch->dev = qemu_chr_new(label, ch->devpath, NULL); > - > - if (ch->dev) { > - index++; > - qemu_chr_fe_claim_no_fail(ch->dev); > - qemu_chr_add_handlers(ch->dev, hostdev_can_receive, > - hostdev_receive, hostdev_event, ch); > - DPRINTF("Redirecting channel %u to %s (%s)\n", > - i, ch->devpath, label); > - } else { > - DPRINTF("Could not redirect channel %u to %s\n", > - i, ch->devpath); > - } > + if (ch->dev) { > + qemu_chr_add_handlers(ch->dev, hostdev_can_receive, > + hostdev_receive, hostdev_event, ch); > + DPRINTF("Redirecting channel %u to %s\n", i, ch->dev->label); > + } else { > + DPRINTF("Could not redirect channel %u, no chardev set\n", i); > } > } > > @@ -572,14 +557,14 @@ static int ipoctal_init(IPackDevice *ip) > } > > static Property ipoctal_properties[] = { > - DEFINE_PROP_STRING("serial0", IPOctalState, ch[0].devpath), > - DEFINE_PROP_STRING("serial1", IPOctalState, ch[1].devpath), > - DEFINE_PROP_STRING("serial2", IPOctalState, ch[2].devpath), > - DEFINE_PROP_STRING("serial3", IPOctalState, ch[3].devpath), > - DEFINE_PROP_STRING("serial4", IPOctalState, ch[4].devpath), > - DEFINE_PROP_STRING("serial5", IPOctalState, ch[5].devpath), > - DEFINE_PROP_STRING("serial6", IPOctalState, ch[6].devpath), > - DEFINE_PROP_STRING("serial7", IPOctalState, ch[7].devpath), > + DEFINE_PROP_CHR("chardev0", IPOctalState, ch[0].dev), > + DEFINE_PROP_CHR("chardev1", IPOctalState, ch[1].dev), > + DEFINE_PROP_CHR("chardev2", IPOctalState, ch[2].dev), > + DEFINE_PROP_CHR("chardev3", IPOctalState, ch[3].dev), > + DEFINE_PROP_CHR("chardev4", IPOctalState, ch[4].dev), > + DEFINE_PROP_CHR("chardev5", IPOctalState, ch[5].dev), > + DEFINE_PROP_CHR("chardev6", IPOctalState, ch[6].dev), > + DEFINE_PROP_CHR("chardev7", IPOctalState, ch[7].dev), > DEFINE_PROP_END_OF_LIST(), > }; > > -- > 1.8.1.4