[{"id":1775502,"web_url":"http://patchwork.ozlabs.org/comment/1775502/","msgid":"<1788278d-9437-34a0-4a17-d7914d459f77@redhat.com>","list_archive_url":null,"date":"2017-09-26T13:32:09","subject":"Re: [Qemu-devel] [PATCH v1 1/8] Replace all occurances of\n\t__FUNCTION__ with __func__","submitter":{"id":6591,"url":"http://patchwork.ozlabs.org/api/people/6591/","name":"Eric Blake","email":"eblake@redhat.com"},"content":"On 09/25/2017 07:08 PM, Alistair Francis wrote:\n> Replace all occurs of __FUNCTION__ except for the check in checkpatch\n> with the non GCC specific __func__.\n> \n> One line in hcd-musb.c was manually tweaked to pass checkpatch.\n> \n> Signed-off-by: Alistair Francis <alistair.francis@xilinx.com>\n> Cc: Gerd Hoffmann <kraxel@redhat.com>\n> Cc: Andrzej Zaborowski <balrogg@gmail.com>\n> Cc: Stefano Stabellini <sstabellini@kernel.org>\n> Cc: Anthony Perard <anthony.perard@citrix.com>\n> Cc: John Snow <jsnow@redhat.com>\n> Cc: Aurelien Jarno <aurelien@aurel32.net>\n> Cc: Yongbok Kim <yongbok.kim@imgtec.com>\n> Cc: Peter Crosthwaite <crosthwaite.peter@gmail.com>\n> Cc: Stefan Hajnoczi <stefanha@redhat.com> (supporter:Block\n> Cc: Fam Zheng <famz@redhat.com> (supporter:Block\n\nThat looks funny, with no closing ).  Something's breaking down between\nget_maintainers.pl and your eventual email, although it's not fatal.\n\n> Cc: Juan Quintela <quintela@redhat.com>\n> Cc: \"Dr. David Alan Gilbert\" <dgilbert@redhat.com>\n> Cc: qemu-arm@nongnu.org\n> Cc: qemu-block@nongnu.org\n> Cc: xen-devel@lists.xenproject.org\n> ---\n> \n\n>  65 files changed, 273 insertions(+), 273 deletions(-)\n\nBig but mechanical, so I'm okay without splitting it further.\n\n> \n> diff --git a/audio/audio_int.h b/audio/audio_int.h\n> index 5bcb1c60e1..543b1bd8d5 100644\n> --- a/audio/audio_int.h\n> +++ b/audio/audio_int.h\n> @@ -253,7 +253,7 @@ static inline int audio_ring_dist (int dst, int src, int len)\n>  #define AUDIO_STRINGIFY(n) AUDIO_STRINGIFY_(n)\n>  \n>  #if defined _MSC_VER || defined __GNUC__\n> -#define AUDIO_FUNC __FUNCTION__\n> +#define AUDIO_FUNC __func__\n>  #else\n>  #define AUDIO_FUNC __FILE__ \":\" AUDIO_STRINGIFY (__LINE__)\n>  #endif\n\nThis can be further simplified.  We really aren't using _MSC_VER as our\ncompiler (can anyone prove me wrong?), and we DO require a C99 compiler\n(per C99 6.4.2.2, __func__ support is mandatory), so we don't really\nneed the #else branch (or, for that matter, we probably don't even need\nAUDIO_FUNC).  But to keep this patch mechanical, that can be a separate\nfollowup.\n\n> diff --git a/hw/arm/nseries.c b/hw/arm/nseries.c\n> index 58005b6619..32687afced 100644\n> --- a/hw/arm/nseries.c\n> +++ b/hw/arm/nseries.c\n> @@ -463,7 +463,7 @@ static uint32_t mipid_txrx(void *opaque, uint32_t cmd, int len)\n>      uint8_t ret;\n>  \n>      if (len > 9) {\n> -        hw_error(\"%s: FIXME: bad SPI word width %i\\n\", __FUNCTION__, len);\n> +        hw_error(\"%s: FIXME: bad SPI word width %i\\n\", __func__, len);\n\nNot this patch's problem, but it would probably be simpler if hw_error()\nwere a macro that automatically prefixed __func__, rather than making\nevery caller have to supply it themselves.\n\n> +++ b/hw/arm/omap1.c\n\n> @@ -1716,7 +1716,7 @@ static void omap_clkm_write(void *opaque, hwaddr addr,\n>      case 0x18:\t/* ARM_SYSST */\n>          if ((s->clkm.clocking_scheme ^ (value >> 11)) & 7) {\n>              s->clkm.clocking_scheme = (value >> 11) & 7;\n> -            printf(\"%s: clocking scheme set to %s\\n\", __FUNCTION__,\n> +            printf(\"%s: clocking scheme set to %s\\n\", __func__,\n>                              clkschemename[s->clkm.clocking_scheme]);\n\nWorth fixing the indentation while you are here?\n\n> @@ -2473,7 +2473,7 @@ static void omap_pwt_write(void *opaque, hwaddr addr,\n>      case 0x04:\t/* VRC */\n>          if ((value ^ s->vrc) & 1) {\n>              if (value & 1)\n> -                printf(\"%s: %iHz buzz on\\n\", __FUNCTION__, (int)\n> +                printf(\"%s: %iHz buzz on\\n\", __func__, (int)\n>                                  /* 1.5 MHz from a 12-MHz or 13-MHz PWT_CLK */\n>                                  ((omap_clk_getrate(s->clk) >> 3) /\n>                                   /* Pre-multiplexer divider */\n\nLikewise?\n\n> @@ -3330,13 +3330,13 @@ static void omap_mcbsp_writeh(void *opaque, hwaddr addr,\n>          s->mcr[1] = value & 0x03e3;\n>          if (value & 3)\t\t\t\t\t/* XMCM */\n>              printf(\"%s: Tx channel selection mode enable attempt\\n\",\n> -                            __FUNCTION__);\n> +                            __func__);\n>          return;\n>      case 0x1a:\t/* MCR1 */\n>          s->mcr[0] = value & 0x03e1;\n>          if (value & 1)\t\t\t\t\t/* RMCM */\n>              printf(\"%s: Rx channel selection mode enable attempt\\n\",\n> -                            __FUNCTION__);\n> +                            __func__);\n\nand again\n\n\n> +++ b/hw/arm/omap2.c\n> @@ -1312,7 +1312,7 @@ static void omap_prcm_apll_update(struct omap_prcm_s *s)\n>  \n>      if (mode[0] == 1 || mode[0] == 2 || mode[1] == 1 || mode[1] == 2)\n>          fprintf(stderr, \"%s: bad EN_54M_PLL or bad EN_96M_PLL\\n\",\n> -                        __FUNCTION__);\n> +                        __func__);\n\nMore of the same. I'll quit pointing it out.\n\n\n> +++ b/hw/block/onenand.c\n> @@ -661,12 +661,12 @@ static uint64_t onenand_read(void *opaque, hwaddr addr,\n>      case 0xff02:\t/* ECC Result of spare area data */\n>      case 0xff03:\t/* ECC Result of main area data */\n>      case 0xff04:\t/* ECC Result of spare area data */\n> -        hw_error(\"%s: imeplement ECC\\n\", __FUNCTION__);\n> +        hw_error(\"%s: imeplement ECC\\n\", __func__);\n\nShould we fix the typo while here? s/imeplement/implement/\n\n> +++ b/hw/isa/vt82c686.c\n> @@ -30,7 +30,7 @@\n>  //#define DEBUG_VT82C686B\n>  \n>  #ifdef DEBUG_VT82C686B\n> -#define DPRINTF(fmt, ...) fprintf(stderr, \"%s: \" fmt, __FUNCTION__, ##__VA_ARGS__)\n> +#define DPRINTF(fmt, ...) fprintf(stderr, \"%s: \" fmt, __func__, ##__VA_ARGS__)\n>  #else\n>  #define DPRINTF(fmt, ...)\n>  #endif\n\nNot this patch's problem, but I hate bit-rottable statements.  This\nshould be fixed separately into a form that always evaluates under\n-Wformat (guarded by an if(0) in normal builds).\n\n> diff --git a/hw/mips/gt64xxx_pci.c b/hw/mips/gt64xxx_pci.c\n> index e8b2eef688..41a7690560 100644\n> --- a/hw/mips/gt64xxx_pci.c\n> +++ b/hw/mips/gt64xxx_pci.c\n> @@ -33,7 +33,7 @@\n>  //#define DEBUG\n>  \n>  #ifdef DEBUG\n> -#define DPRINTF(fmt, ...) fprintf(stderr, \"%s: \" fmt, __FUNCTION__, ##__VA_ARGS__)\n> +#define DPRINTF(fmt, ...) fprintf(stderr, \"%s: \" fmt, __func__, ##__VA_ARGS__)\n>  #else\n>  #define DPRINTF(fmt, ...)\n>  #endif\n\nDitto.\n\n\n> +++ b/hw/usb/hcd-musb.c\n> @@ -253,8 +253,8 @@\n>  /* #define MUSB_DEBUG */\n>  \n>  #ifdef MUSB_DEBUG\n> -#define TRACE(fmt,...) fprintf(stderr, \"%s@%d: \" fmt \"\\n\", __FUNCTION__, \\\n> -                               __LINE__, ##__VA_ARGS__)\n> +#define TRACE(fmt, ...) fprintf(stderr, \"%s@%d: \" fmt \"\\n\", __func__, \\\n> +                                __LINE__, ##__VA_ARGS__)\n>  #else\n>  #define TRACE(...)\n>  #endif\n\nand again\n\nMy comments were either about things for separate patches, or things\nthat are trivial if you choose to touch them up, so:\n\nReviewed-by: Eric Blake <eblake@redhat.com>","headers":{"Return-Path":"<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=<UNKNOWN>)","ext-mx07.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx07.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=eblake@redhat.com"],"Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3y1hjm5XcYz9tXq\n\tfor <incoming@patchwork.ozlabs.org>;\n\tTue, 26 Sep 2017 23:33:32 +1000 (AEST)","from localhost ([::1]:47576 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>)\n\tid 1dwpzO-0003Y9-Bv\n\tfor incoming@patchwork.ozlabs.org; Tue, 26 Sep 2017 09:33:30 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:47801)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from <eblake@redhat.com>) id 1dwpyg-0003V7-3Z\n\tfor qemu-devel@nongnu.org; Tue, 26 Sep 2017 09:32:49 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from <eblake@redhat.com>) id 1dwpyZ-0004mM-GS\n\tfor qemu-devel@nongnu.org; Tue, 26 Sep 2017 09:32:46 -0400","from mx1.redhat.com ([209.132.183.28]:42604)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from <eblake@redhat.com>)\n\tid 1dwpyL-0004ch-5Z; Tue, 26 Sep 2017 09:32:25 -0400","from smtp.corp.redhat.com\n\t(int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id 10879C047B8C;\n\tTue, 26 Sep 2017 13:32:24 +0000 (UTC)","from [10.10.124.97] (ovpn-124-97.rdu2.redhat.com [10.10.124.97])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id CA9A2757CD;\n\tTue, 26 Sep 2017 13:32:10 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 10879C047B8C","To":"Alistair Francis <alistair.francis@xilinx.com>, qemu-devel@nongnu.org","References":"<cover.1506384414.git.alistair.francis@xilinx.com>\n\t<e9eb34b7a508fbe3b89bb8b8aa8141f018871081.1506384414.git.alistair.francis@xilinx.com>","From":"Eric Blake <eblake@redhat.com>","Openpgp":"url=http://people.redhat.com/eblake/eblake.gpg","Organization":"Red Hat, Inc.","Message-ID":"<1788278d-9437-34a0-4a17-d7914d459f77@redhat.com>","Date":"Tue, 26 Sep 2017 08:32:09 -0500","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101\n\tThunderbird/52.3.0","MIME-Version":"1.0","In-Reply-To":"<e9eb34b7a508fbe3b89bb8b8aa8141f018871081.1506384414.git.alistair.francis@xilinx.com>","Content-Type":"multipart/signed; micalg=pgp-sha256;\n\tprotocol=\"application/pgp-signature\";\n\tboundary=\"jvVlmhcp7cUHL8p1XvQEu8e63pbwj1G79\"","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.14","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.31]);\n\tTue, 26 Sep 2017 13:32:24 +0000 (UTC)","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]\n\t[fuzzy]","X-Received-From":"209.132.183.28","X-Content-Filtered-By":"Mailman/MimeDel 2.1.21","Subject":"Re: [Qemu-devel] [PATCH v1 1/8] Replace all occurances of\n\t__FUNCTION__ with __func__","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"<qemu-devel.nongnu.org>","List-Unsubscribe":"<https://lists.nongnu.org/mailman/options/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>","List-Archive":"<http://lists.nongnu.org/archive/html/qemu-devel/>","List-Post":"<mailto:qemu-devel@nongnu.org>","List-Help":"<mailto:qemu-devel-request@nongnu.org?subject=help>","List-Subscribe":"<https://lists.nongnu.org/mailman/listinfo/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=subscribe>","Cc":"Stefano Stabellini <sstabellini@kernel.org>, Fam Zheng <famz@redhat.com>,\n\tqemu-block@nongnu.org, Peter Crosthwaite <crosthwaite.peter@gmail.com>,\n\tJuan Quintela <quintela@redhat.com>,\n\t\"Dr. David Alan Gilbert\" <dgilbert@redhat.com>,\n\tarmbru@redhat.com, Anthony Perard <anthony.perard@citrix.com>,\n\tqemu-arm@nongnu.org, Gerd Hoffmann <kraxel@redhat.com>,\n\tStefan Hajnoczi <stefanha@redhat.com>, alistair23@gmail.com,\n\tYongbok Kim <yongbok.kim@imgtec.com>,\n\txen-devel@lists.xenproject.org, John Snow <jsnow@redhat.com>,\n\tAurelien Jarno <aurelien@aurel32.net>","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>"}},{"id":1776678,"web_url":"http://patchwork.ozlabs.org/comment/1776678/","msgid":"<CAKmqyKMzdmNJ=+pHNa8fq7MPq+KCn_BtKEzoD99qw9=KE2ZqVw@mail.gmail.com>","list_archive_url":null,"date":"2017-09-27T22:59:04","subject":"Re: [Qemu-devel] [PATCH v1 1/8] Replace all occurances of\n\t__FUNCTION__ with __func__","submitter":{"id":47878,"url":"http://patchwork.ozlabs.org/api/people/47878/","name":"Alistair Francis","email":"alistair.francis@xilinx.com"},"content":"On Tue, Sep 26, 2017 at 6:32 AM, Eric Blake <eblake@redhat.com> wrote:\n> On 09/25/2017 07:08 PM, Alistair Francis wrote:\n>> Replace all occurs of __FUNCTION__ except for the check in checkpatch\n>> with the non GCC specific __func__.\n>>\n>> One line in hcd-musb.c was manually tweaked to pass checkpatch.\n>>\n>> Signed-off-by: Alistair Francis <alistair.francis@xilinx.com>\n>> Cc: Gerd Hoffmann <kraxel@redhat.com>\n>> Cc: Andrzej Zaborowski <balrogg@gmail.com>\n>> Cc: Stefano Stabellini <sstabellini@kernel.org>\n>> Cc: Anthony Perard <anthony.perard@citrix.com>\n>> Cc: John Snow <jsnow@redhat.com>\n>> Cc: Aurelien Jarno <aurelien@aurel32.net>\n>> Cc: Yongbok Kim <yongbok.kim@imgtec.com>\n>> Cc: Peter Crosthwaite <crosthwaite.peter@gmail.com>\n>> Cc: Stefan Hajnoczi <stefanha@redhat.com> (supporter:Block\n>> Cc: Fam Zheng <famz@redhat.com> (supporter:Block\n>\n> That looks funny, with no closing ).  Something's breaking down between\n> get_maintainers.pl and your eventual email, although it's not fatal.\n\nYeah, that's a copy and paste error, will fix.\n\n>\n>> Cc: Juan Quintela <quintela@redhat.com>\n>> Cc: \"Dr. David Alan Gilbert\" <dgilbert@redhat.com>\n>> Cc: qemu-arm@nongnu.org\n>> Cc: qemu-block@nongnu.org\n>> Cc: xen-devel@lists.xenproject.org\n>> ---\n>>\n>\n>>  65 files changed, 273 insertions(+), 273 deletions(-)\n>\n> Big but mechanical, so I'm okay without splitting it further.\n\nPhew! I did not want to split it.\n\n>\n>>\n>> diff --git a/audio/audio_int.h b/audio/audio_int.h\n>> index 5bcb1c60e1..543b1bd8d5 100644\n>> --- a/audio/audio_int.h\n>> +++ b/audio/audio_int.h\n>> @@ -253,7 +253,7 @@ static inline int audio_ring_dist (int dst, int src, int len)\n>>  #define AUDIO_STRINGIFY(n) AUDIO_STRINGIFY_(n)\n>>\n>>  #if defined _MSC_VER || defined __GNUC__\n>> -#define AUDIO_FUNC __FUNCTION__\n>> +#define AUDIO_FUNC __func__\n>>  #else\n>>  #define AUDIO_FUNC __FILE__ \":\" AUDIO_STRINGIFY (__LINE__)\n>>  #endif\n>\n> This can be further simplified.  We really aren't using _MSC_VER as our\n> compiler (can anyone prove me wrong?), and we DO require a C99 compiler\n> (per C99 6.4.2.2, __func__ support is mandatory), so we don't really\n> need the #else branch (or, for that matter, we probably don't even need\n> AUDIO_FUNC).  But to keep this patch mechanical, that can be a separate\n> followup.\n\nI have a second patch that removes AUDIO_FUNC\n\n>\n>> diff --git a/hw/arm/nseries.c b/hw/arm/nseries.c\n>> index 58005b6619..32687afced 100644\n>> --- a/hw/arm/nseries.c\n>> +++ b/hw/arm/nseries.c\n>> @@ -463,7 +463,7 @@ static uint32_t mipid_txrx(void *opaque, uint32_t cmd, int len)\n>>      uint8_t ret;\n>>\n>>      if (len > 9) {\n>> -        hw_error(\"%s: FIXME: bad SPI word width %i\\n\", __FUNCTION__, len);\n>> +        hw_error(\"%s: FIXME: bad SPI word width %i\\n\", __func__, len);\n>\n> Not this patch's problem, but it would probably be simpler if hw_error()\n> were a macro that automatically prefixed __func__, rather than making\n> every caller have to supply it themselves.\n\nI'm going to leave this for another day, but I think you are right.\n\n>\n>> +++ b/hw/arm/omap1.c\n>\n>> @@ -1716,7 +1716,7 @@ static void omap_clkm_write(void *opaque, hwaddr addr,\n>>      case 0x18:       /* ARM_SYSST */\n>>          if ((s->clkm.clocking_scheme ^ (value >> 11)) & 7) {\n>>              s->clkm.clocking_scheme = (value >> 11) & 7;\n>> -            printf(\"%s: clocking scheme set to %s\\n\", __FUNCTION__,\n>> +            printf(\"%s: clocking scheme set to %s\\n\", __func__,\n>>                              clkschemename[s->clkm.clocking_scheme]);\n>\n> Worth fixing the indentation while you are here?\n\nFixed\n\n>\n>> @@ -2473,7 +2473,7 @@ static void omap_pwt_write(void *opaque, hwaddr addr,\n>>      case 0x04:       /* VRC */\n>>          if ((value ^ s->vrc) & 1) {\n>>              if (value & 1)\n>> -                printf(\"%s: %iHz buzz on\\n\", __FUNCTION__, (int)\n>> +                printf(\"%s: %iHz buzz on\\n\", __func__, (int)\n>>                                  /* 1.5 MHz from a 12-MHz or 13-MHz PWT_CLK */\n>>                                  ((omap_clk_getrate(s->clk) >> 3) /\n>>                                   /* Pre-multiplexer divider */\n>\n> Likewise?\n\nThis doesn't actually change the indention. It's all one argument to a function.\n\n>\n>> @@ -3330,13 +3330,13 @@ static void omap_mcbsp_writeh(void *opaque, hwaddr addr,\n>>          s->mcr[1] = value & 0x03e3;\n>>          if (value & 3)                                       /* XMCM */\n>>              printf(\"%s: Tx channel selection mode enable attempt\\n\",\n>> -                            __FUNCTION__);\n>> +                            __func__);\n>>          return;\n>>      case 0x1a:       /* MCR1 */\n>>          s->mcr[0] = value & 0x03e1;\n>>          if (value & 1)                                       /* RMCM */\n>>              printf(\"%s: Rx channel selection mode enable attempt\\n\",\n>> -                            __FUNCTION__);\n>> +                            __func__);\n>\n> and again\n\nFixed.\n\n>\n>\n>> +++ b/hw/arm/omap2.c\n>> @@ -1312,7 +1312,7 @@ static void omap_prcm_apll_update(struct omap_prcm_s *s)\n>>\n>>      if (mode[0] == 1 || mode[0] == 2 || mode[1] == 1 || mode[1] == 2)\n>>          fprintf(stderr, \"%s: bad EN_54M_PLL or bad EN_96M_PLL\\n\",\n>> -                        __FUNCTION__);\n>> +                        __func__);\n>\n> More of the same. I'll quit pointing it out.\n\nFixed\n\n>\n>\n>> +++ b/hw/block/onenand.c\n>> @@ -661,12 +661,12 @@ static uint64_t onenand_read(void *opaque, hwaddr addr,\n>>      case 0xff02:     /* ECC Result of spare area data */\n>>      case 0xff03:     /* ECC Result of main area data */\n>>      case 0xff04:     /* ECC Result of spare area data */\n>> -        hw_error(\"%s: imeplement ECC\\n\", __FUNCTION__);\n>> +        hw_error(\"%s: imeplement ECC\\n\", __func__);\n>\n> Should we fix the typo while here? s/imeplement/implement/\n\nFixed\n\n>\n>> +++ b/hw/isa/vt82c686.c\n>> @@ -30,7 +30,7 @@\n>>  //#define DEBUG_VT82C686B\n>>\n>>  #ifdef DEBUG_VT82C686B\n>> -#define DPRINTF(fmt, ...) fprintf(stderr, \"%s: \" fmt, __FUNCTION__, ##__VA_ARGS__)\n>> +#define DPRINTF(fmt, ...) fprintf(stderr, \"%s: \" fmt, __func__, ##__VA_ARGS__)\n>>  #else\n>>  #define DPRINTF(fmt, ...)\n>>  #endif\n>\n> Not this patch's problem, but I hate bit-rottable statements.  This\n> should be fixed separately into a form that always evaluates under\n> -Wformat (guarded by an if(0) in normal builds).\n\nAh, I really don't want to go down that rabbit hole right now either.\nI might leave this as is.\n\n>\n>> diff --git a/hw/mips/gt64xxx_pci.c b/hw/mips/gt64xxx_pci.c\n>> index e8b2eef688..41a7690560 100644\n>> --- a/hw/mips/gt64xxx_pci.c\n>> +++ b/hw/mips/gt64xxx_pci.c\n>> @@ -33,7 +33,7 @@\n>>  //#define DEBUG\n>>\n>>  #ifdef DEBUG\n>> -#define DPRINTF(fmt, ...) fprintf(stderr, \"%s: \" fmt, __FUNCTION__, ##__VA_ARGS__)\n>> +#define DPRINTF(fmt, ...) fprintf(stderr, \"%s: \" fmt, __func__, ##__VA_ARGS__)\n>>  #else\n>>  #define DPRINTF(fmt, ...)\n>>  #endif\n>\n> Ditto.\n>\n>\n>> +++ b/hw/usb/hcd-musb.c\n>> @@ -253,8 +253,8 @@\n>>  /* #define MUSB_DEBUG */\n>>\n>>  #ifdef MUSB_DEBUG\n>> -#define TRACE(fmt,...) fprintf(stderr, \"%s@%d: \" fmt \"\\n\", __FUNCTION__, \\\n>> -                               __LINE__, ##__VA_ARGS__)\n>> +#define TRACE(fmt, ...) fprintf(stderr, \"%s@%d: \" fmt \"\\n\", __func__, \\\n>> +                                __LINE__, ##__VA_ARGS__)\n>>  #else\n>>  #define TRACE(...)\n>>  #endif\n>\n> and again\n>\n> My comments were either about things for separate patches, or things\n> that are trivial if you choose to touch them up, so:\n>\n> Reviewed-by: Eric Blake <eblake@redhat.com>\n\nThanks!\n\nAlistair\n\n>\n> --\n> Eric Blake, Principal Software Engineer\n> Red Hat, Inc.           +1-919-301-3266\n> Virtualization:  qemu.org | libvirt.org\n>","headers":{"Return-Path":"<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=<UNKNOWN>)","ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=gmail.com header.i=@gmail.com\n\theader.b=\"OX2u8JH8\"; dkim-atps=neutral"],"Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3y2YF04HLJz9sPt\n\tfor <incoming@patchwork.ozlabs.org>;\n\tThu, 28 Sep 2017 09:00:04 +1000 (AEST)","from localhost ([::1]:56629 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>)\n\tid 1dxLJC-0007dP-Oq\n\tfor incoming@patchwork.ozlabs.org; Wed, 27 Sep 2017 19:00:02 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:35037)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from <alistair23@gmail.com>) id 1dxLIn-0007dI-Th\n\tfor qemu-devel@nongnu.org; Wed, 27 Sep 2017 18:59:39 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from <alistair23@gmail.com>) id 1dxLIm-0007WQ-G5\n\tfor qemu-devel@nongnu.org; Wed, 27 Sep 2017 18:59:38 -0400","from mail-wm0-x22f.google.com ([2a00:1450:400c:c09::22f]:49440)\n\tby eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16)\n\t(Exim 4.71) (envelope-from <alistair23@gmail.com>)\n\tid 1dxLIm-0007Vw-5s; Wed, 27 Sep 2017 18:59:36 -0400","by mail-wm0-x22f.google.com with SMTP id r74so136923wme.4;\n\tWed, 27 Sep 2017 15:59:35 -0700 (PDT)","by 10.28.135.139 with HTTP; Wed, 27 Sep 2017 15:59:04 -0700 (PDT)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;\n\th=mime-version:sender:in-reply-to:references:from:date:message-id\n\t:subject:to:cc;\n\tbh=90fC2/2weE4V4ynyIWTlVwfAVihaIEOLgpWt7gI5CjQ=;\n\tb=OX2u8JH8PecN7QWBu3kSjwdsaP+wYPlJYWl2y3ZC1YUbD8HGsRWft0bowV21mLcBn8\n\txKKGvW64prgzqWk8Lf4GS8dOAzh1x4Ab6ldKL914XUGdutUXPBoaV5cbDSJL3xZWEazK\n\tLT4/ka22V5t1U3gxtvNIbC0ueCtIkbDYK+pv+EZ9wOXckDwEgdRFjdtzQm5okbOkNNWo\n\tyYy2NOzlx4mo3E0ZHZVOcXvBotBLxpGehluBf1LgqauwBx8x7TRHL4+rUSfW40eoDBY4\n\trSh2brDHxAsIwkR+pEzCDAo6j1eXZ0yuFoIle1WHKcWTolgEAr4euGaUjBEsDJEtSRSg\n\tMjeQ==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:mime-version:sender:in-reply-to:references:from\n\t:date:message-id:subject:to:cc;\n\tbh=90fC2/2weE4V4ynyIWTlVwfAVihaIEOLgpWt7gI5CjQ=;\n\tb=di6HVgV23+BUml7YgGAg9nRqtqyGwDNzq23OiDNUfDAPQvYTUF8HpBWuWj0h7YqbU0\n\ta32+vPZ/Hw0LC9jOiafzIdLCX0hwJcdGpiSo5ArvrnOmFtJgs83rQZeSn2XaLfnbv62E\n\tWknW+5l+gNBBWFYewvfyKkp1/pE4jHj8zu9kF/BahuvUxwGwb/ldLW/Cv7IzwvtcCyei\n\tdJ+MBEowZUwlJmx+ilycF2nVnai2a4JGvpU+GtzceKeEzl5als+8AXlDxWga6a1gVp5X\n\t/yUA3YThU+1Ls6AcnSNZQhfkqAj31q+HtvI+vWphh1Iua+mwyTl0dr4iQZ6i5qWL13Bh\n\tMI5A==","X-Gm-Message-State":"AHPjjUgu38cGJ4WF3W1V3Ng6yb8Oo8iELfyOFOlZJunrs4stMEp9TNV0\n\tCGVwBmMXd9A28GPl65KOsqY4AsTlX5cg4s7Fydo=","X-Google-Smtp-Source":"AOwi7QD0hLFiBNxW6hvBeDxiYt/HTmhgc4ujHzMMt5fkws9wXfVEeOgEWkgruhILjBVbmcbQILh6BSYcLodlVdZM714=","X-Received":"by 10.28.104.7 with SMTP id d7mr1349877wmc.6.1506553174878; Wed,\n\t27 Sep 2017 15:59:34 -0700 (PDT)","MIME-Version":"1.0","In-Reply-To":"<1788278d-9437-34a0-4a17-d7914d459f77@redhat.com>","References":"<cover.1506384414.git.alistair.francis@xilinx.com>\n\t<e9eb34b7a508fbe3b89bb8b8aa8141f018871081.1506384414.git.alistair.francis@xilinx.com>\n\t<1788278d-9437-34a0-4a17-d7914d459f77@redhat.com>","From":"Alistair Francis <alistair.francis@xilinx.com>","Date":"Wed, 27 Sep 2017 15:59:04 -0700","X-Google-Sender-Auth":"BbtVS_jUPp1ZnK5OCaE2OeYTRlw","Message-ID":"<CAKmqyKMzdmNJ=+pHNa8fq7MPq+KCn_BtKEzoD99qw9=KE2ZqVw@mail.gmail.com>","To":"Eric Blake <eblake@redhat.com>","Content-Type":"text/plain; charset=\"UTF-8\"","X-detected-operating-system":"by eggs.gnu.org: Genre and OS details not\n\trecognized.","X-Received-From":"2a00:1450:400c:c09::22f","Subject":"Re: [Qemu-devel] [PATCH v1 1/8] Replace all occurances of\n\t__FUNCTION__ with __func__","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"<qemu-devel.nongnu.org>","List-Unsubscribe":"<https://lists.nongnu.org/mailman/options/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>","List-Archive":"<http://lists.nongnu.org/archive/html/qemu-devel/>","List-Post":"<mailto:qemu-devel@nongnu.org>","List-Help":"<mailto:qemu-devel-request@nongnu.org?subject=help>","List-Subscribe":"<https://lists.nongnu.org/mailman/listinfo/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=subscribe>","Cc":"Stefano Stabellini <sstabellini@kernel.org>, Fam Zheng <famz@redhat.com>,\n\tqemu-block@nongnu.org, Peter Crosthwaite <crosthwaite.peter@gmail.com>,\n\tMarkus Armbruster <armbru@redhat.com>,\n\tJuan Quintela <quintela@redhat.com>, \n\t\"qemu-devel@nongnu.org Developers\" <qemu-devel@nongnu.org>,\n\t\"Dr. David Alan Gilbert\" <dgilbert@redhat.com>,\n\tAnthony Perard <anthony.perard@citrix.com>,\n\tqemu-arm <qemu-arm@nongnu.org>, Gerd Hoffmann <kraxel@redhat.com>,\n\tStefan Hajnoczi <stefanha@redhat.com>, \n\tYongbok Kim <yongbok.kim@imgtec.com>,\n\t\"open list:X86\" <xen-devel@lists.xenproject.org>,\n\tAlistair Francis <alistair.francis@xilinx.com>,\n\tJohn Snow <jsnow@redhat.com>, Aurelien Jarno <aurelien@aurel32.net>","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>"}},{"id":1776702,"web_url":"http://patchwork.ozlabs.org/comment/1776702/","msgid":"<CAFEAcA_G8Md3k6EAqoN1=GCcXoCq_8vAUZ_qjOZp5GbnnfmcrA@mail.gmail.com>","list_archive_url":null,"date":"2017-09-27T23:47:42","subject":"Re: [Qemu-devel] [Qemu-arm] [PATCH v1 1/8] Replace all occurances\n\tof __FUNCTION__ with __func__","submitter":{"id":5111,"url":"http://patchwork.ozlabs.org/api/people/5111/","name":"Peter Maydell","email":"peter.maydell@linaro.org"},"content":"On 26 September 2017 at 06:32, Eric Blake <eblake@redhat.com> wrote:\n> On 09/25/2017 07:08 PM, Alistair Francis wrote:\n>> diff --git a/hw/arm/nseries.c b/hw/arm/nseries.c\n>> index 58005b6619..32687afced 100644\n>> --- a/hw/arm/nseries.c\n>> +++ b/hw/arm/nseries.c\n>> @@ -463,7 +463,7 @@ static uint32_t mipid_txrx(void *opaque, uint32_t cmd, int len)\n>>      uint8_t ret;\n>>\n>>      if (len > 9) {\n>> -        hw_error(\"%s: FIXME: bad SPI word width %i\\n\", __FUNCTION__, len);\n>> +        hw_error(\"%s: FIXME: bad SPI word width %i\\n\", __func__, len);\n>\n> Not this patch's problem, but it would probably be simpler if hw_error()\n> were a macro that automatically prefixed __func__, rather than making\n> every caller have to supply it themselves.\n\nI'm not sure there's a great deal of benefit to that change, because\nuse of hw_error() in new code is rarely correct (it does an abort()\nso it should never be used for guest-triggered conditions, which is\nabout the only time that you might be interested in a guest register\ndump rather than just asserting). Most of its existing uses are in\ncrufty old device models.\n\nthanks\n-- PMM","headers":{"Return-Path":"<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=<UNKNOWN>)","ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=linaro.org header.i=@linaro.org\n\theader.b=\"g0Hok6CJ\"; dkim-atps=neutral"],"Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3y2ZK45h0bz9t6C\n\tfor <incoming@patchwork.ozlabs.org>;\n\tThu, 28 Sep 2017 09:48:38 +1000 (AEST)","from localhost ([::1]:56748 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>)\n\tid 1dxM4B-0000a8-Co\n\tfor incoming@patchwork.ozlabs.org; Wed, 27 Sep 2017 19:48:35 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:44488)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from <peter.maydell@linaro.org>) id 1dxM3i-0000Zq-Bn\n\tfor qemu-devel@nongnu.org; Wed, 27 Sep 2017 19:48:07 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from <peter.maydell@linaro.org>) id 1dxM3g-00033g-Gw\n\tfor qemu-devel@nongnu.org; Wed, 27 Sep 2017 19:48:05 -0400","from mail-wr0-x22b.google.com ([2a00:1450:400c:c0c::22b]:43512)\n\tby eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16)\n\t(Exim 4.71) (envelope-from <peter.maydell@linaro.org>)\n\tid 1dxM3g-000333-8Y\n\tfor qemu-devel@nongnu.org; Wed, 27 Sep 2017 19:48:04 -0400","by mail-wr0-x22b.google.com with SMTP id a43so19127695wrc.0\n\tfor <qemu-devel@nongnu.org>; Wed, 27 Sep 2017 16:48:03 -0700 (PDT)","by 10.223.139.215 with HTTP; Wed, 27 Sep 2017 16:47:42 -0700 (PDT)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google;\n\th=mime-version:in-reply-to:references:from:date:message-id:subject:to\n\t:cc; bh=JfFruNdqjcXQwJE5IXQQ0w79xVVSGc5e46fhDbdcIQY=;\n\tb=g0Hok6CJHDJ+GLy/s+Hud8kdflUBcoqO9yFurtuumTiHdZ2VvbkB9zvwByy9kNfi/+\n\tMsHaKkzxUzC/YWsb04NjZkpIboYCvUVF60OfHLSs2y8HqNsda2iSE86lPVZlb0BlZNvS\n\tBusF4cSVWOzTSshNpoXEkZgDRXGD+oyUdWoxA=","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:mime-version:in-reply-to:references:from:date\n\t:message-id:subject:to:cc;\n\tbh=JfFruNdqjcXQwJE5IXQQ0w79xVVSGc5e46fhDbdcIQY=;\n\tb=ZNm3Xd+GDim1vM5j3PxiuKwd7ZejACkgZo1VHRQgv8gDAa7f9f5SwAGtltDiFFh5av\n\txFIN7A4baC57yrZNRdiRWPClwDQk/fZhE0Ob8Bh6J9uLtRQDLeWNJVSYQ4AWFMhA6YZu\n\txFgwlQ9qP29QpVYz58lAC8S8/RSiG2ODUpo17Dlpmr+wgXnkFD0WL0z0cydR6NQnc1L0\n\tMWdrTsryr26aEp4Ne/3OXZ+eSYSLoY2g/ip3n0QaeUkpIEJKF4l9te2IVY2Ua1mbDyGT\n\t706uMgMBm2XekxAh1RRW/8ZnKXBYXaf3UxJDfpKRhq8L/c18ITkSWqUNA+tJXxcRxQIY\n\tZtag==","X-Gm-Message-State":"AHPjjUiRNeH6wR4MIxZhjVBQWtCAY3QYSOKBnrXjweHL7nBMqdB2yLQp\n\tQ5Hrz1fdyJV6UFwSZASGeTYnk/Q+94dhQdpqQtkgVg==","X-Google-Smtp-Source":"AOwi7QDQoeo8MNBry+M5XHN/YJYZsvihDK4ddFnOkOyhzVq57xIrUOTeHKmY8TjmBDjuK8wWdc9LflhrKFGjnwJVGxI=","X-Received":"by 10.223.175.100 with SMTP id z91mr3139468wrc.177.1506556082912;\n\tWed, 27 Sep 2017 16:48:02 -0700 (PDT)","MIME-Version":"1.0","In-Reply-To":"<1788278d-9437-34a0-4a17-d7914d459f77@redhat.com>","References":"<cover.1506384414.git.alistair.francis@xilinx.com>\n\t<e9eb34b7a508fbe3b89bb8b8aa8141f018871081.1506384414.git.alistair.francis@xilinx.com>\n\t<1788278d-9437-34a0-4a17-d7914d459f77@redhat.com>","From":"Peter Maydell <peter.maydell@linaro.org>","Date":"Wed, 27 Sep 2017 16:47:42 -0700","Message-ID":"<CAFEAcA_G8Md3k6EAqoN1=GCcXoCq_8vAUZ_qjOZp5GbnnfmcrA@mail.gmail.com>","To":"Eric Blake <eblake@redhat.com>","Content-Type":"text/plain; charset=\"UTF-8\"","X-detected-operating-system":"by eggs.gnu.org: Genre and OS details not\n\trecognized.","X-Received-From":"2a00:1450:400c:c0c::22b","Subject":"Re: [Qemu-devel] [Qemu-arm] [PATCH v1 1/8] Replace all occurances\n\tof __FUNCTION__ with __func__","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"<qemu-devel.nongnu.org>","List-Unsubscribe":"<https://lists.nongnu.org/mailman/options/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>","List-Archive":"<http://lists.nongnu.org/archive/html/qemu-devel/>","List-Post":"<mailto:qemu-devel@nongnu.org>","List-Help":"<mailto:qemu-devel-request@nongnu.org?subject=help>","List-Subscribe":"<https://lists.nongnu.org/mailman/listinfo/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=subscribe>","Cc":"Stefano Stabellini <sstabellini@kernel.org>, Fam Zheng <famz@redhat.com>,\n\tQemu-block <qemu-block@nongnu.org>, Juan Quintela <quintela@redhat.com>, \n\tMarkus Armbruster <armbru@redhat.com>,\n\tAurelien Jarno <aurelien@aurel32.net>,\n\tQEMU Developers <qemu-devel@nongnu.org>,\n\tAlistair Francis <alistair.francis@xilinx.com>,\n\tYongbok Kim <yongbok.kim@imgtec.com>, qemu-arm <qemu-arm@nongnu.org>, \n\tGerd Hoffmann <kraxel@redhat.com>,\n\tStefan Hajnoczi <stefanha@redhat.com>, \n\t\"open list:X86\" <xen-devel@lists.xenproject.org>,\n\tAnthony Perard <anthony.perard@citrix.com>,\n\tAlistair Francis <alistair23@gmail.com>, John Snow <jsnow@redhat.com>,\n\t\"Dr. David Alan Gilbert\" <dgilbert@redhat.com>","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>"}}]