From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:40173) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RumgG-0003DM-Hr for qemu-devel@nongnu.org; Tue, 07 Feb 2012 10:10:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RumgC-0004AD-90 for qemu-devel@nongnu.org; Tue, 07 Feb 2012 10:10:04 -0500 Received: from e32.co.us.ibm.com ([32.97.110.150]:51111) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RumgC-00049y-2d for qemu-devel@nongnu.org; Tue, 07 Feb 2012 10:10:00 -0500 Received: from /spool/local by e32.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 7 Feb 2012 08:09:56 -0700 Received: from d03relay04.boulder.ibm.com (d03relay04.boulder.ibm.com [9.17.195.106]) by d03dlp02.boulder.ibm.com (Postfix) with ESMTP id 558753E40049 for ; Tue, 7 Feb 2012 08:08:43 -0700 (MST) Received: from d03av05.boulder.ibm.com (d03av05.boulder.ibm.com [9.17.195.85]) by d03relay04.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q17F8XHh109178 for ; Tue, 7 Feb 2012 08:08:34 -0700 Received: from d03av05.boulder.ibm.com (loopback [127.0.0.1]) by d03av05.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q17F8Nbt022723 for ; Tue, 7 Feb 2012 08:08:23 -0700 Message-ID: <4F313E35.9090307@us.ibm.com> Date: Tue, 07 Feb 2012 09:07:33 -0600 From: Anthony Liguori MIME-Version: 1.0 References: <1328623766-12287-1-git-send-email-armbru@redhat.com> <1328623766-12287-4-git-send-email-armbru@redhat.com> In-Reply-To: <1328623766-12287-4-git-send-email-armbru@redhat.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 03/19] qemu-char: Re-apply style fixes from just reverted aad04cd0 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Markus Armbruster Cc: kwolf@redhat.com, qemu-devel@nongnu.org On 02/07/2012 08:09 AM, Markus Armbruster wrote: > Signed-off-by: Markus Armbruster Reviewed-by: Anthony Liguori Regards, Anthony Liguori > --- > qemu-char.c | 21 ++++++++++++++------- > 1 files changed, 14 insertions(+), 7 deletions(-) > > diff --git a/qemu-char.c b/qemu-char.c > index 368df2e..c25863a 100644 > --- a/qemu-char.c > +++ b/qemu-char.c > @@ -640,8 +640,9 @@ static CharDriverState *qemu_chr_open_file_out(QemuOpts *opts) > > TFR(fd_out = qemu_open(qemu_opt_get(opts, "path"), > O_WRONLY | O_TRUNC | O_CREAT | O_BINARY, 0666)); > - if (fd_out< 0) > + if (fd_out< 0) { > return NULL; > + } > return qemu_chr_open_fd(-1, fd_out); > } > > @@ -666,8 +667,9 @@ static CharDriverState *qemu_chr_open_pipe(QemuOpts *opts) > if (fd_out>= 0) > close(fd_out); > TFR(fd_in = fd_out = qemu_open(filename, O_RDWR | O_BINARY)); > - if (fd_in< 0) > + if (fd_in< 0) { > return NULL; > + } > } > return qemu_chr_open_fd(fd_in, fd_out); > } > @@ -764,8 +766,9 @@ static CharDriverState *qemu_chr_open_stdio(QemuOpts *opts) > { > CharDriverState *chr; > > - if (stdio_nb_clients>= STDIO_MAX_CLIENTS) > + if (stdio_nb_clients>= STDIO_MAX_CLIENTS) { > return NULL; > + } > if (stdio_nb_clients == 0) { > old_fd0_flags = fcntl(0, F_GETFL); > tcgetattr (0,&oldtty); > @@ -1356,8 +1359,9 @@ static CharDriverState *qemu_chr_open_pp(QemuOpts *opts) > int fd; > > TFR(fd = qemu_open(filename, O_RDWR)); > - if (fd< 0) > + if (fd< 0) { > return NULL; > + } > > if (ioctl(fd, PPCLAIM)< 0) { > close(fd); > @@ -1425,8 +1429,9 @@ static CharDriverState *qemu_chr_open_pp(QemuOpts *opts) > int fd; > > fd = qemu_open(filename, O_RDWR); > - if (fd< 0) > + if (fd< 0) { > return NULL; > + } > > chr = g_malloc0(sizeof(CharDriverState)); > chr->opaque = (void *)(intptr_t)fd; > @@ -1795,8 +1800,9 @@ static CharDriverState *qemu_chr_open_win_file_out(QemuOpts *opts) > > fd_out = CreateFile(file_out, GENERIC_WRITE, FILE_SHARE_READ, NULL, > OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); > - if (fd_out == INVALID_HANDLE_VALUE) > + if (fd_out == INVALID_HANDLE_VALUE) { > return NULL; > + } > > return qemu_chr_open_win_file(fd_out); > } > @@ -2444,8 +2450,9 @@ static CharDriverState *qemu_chr_open_socket(QemuOpts *opts) > fd = inet_connect_opts(opts); > } > } > - if (fd< 0) > + if (fd< 0) { > goto fail; > + } > > if (!is_waitconnect) > socket_set_nonblock(fd);