From patchwork Fri Jan 12 11:31:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 859805 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="R1bfwZ2M"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zJ1Jz179Zz9s74 for ; Fri, 12 Jan 2018 22:50:27 +1100 (AEDT) Received: from localhost ([::1]:35295 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eZxqr-0006zr-7y for incoming@patchwork.ozlabs.org; Fri, 12 Jan 2018 06:50:25 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42020) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eZxZD-0007sj-AV for qemu-devel@nongnu.org; Fri, 12 Jan 2018 06:32:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eZxZC-0005ux-HY for qemu-devel@nongnu.org; Fri, 12 Jan 2018 06:32:11 -0500 Received: from mail-wr0-x242.google.com ([2a00:1450:400c:c0c::242]:34932) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eZxZC-0005tl-Az for qemu-devel@nongnu.org; Fri, 12 Jan 2018 06:32:10 -0500 Received: by mail-wr0-x242.google.com with SMTP id g38so1843549wrd.2 for ; Fri, 12 Jan 2018 03:32:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=kXhOCEIQ7g8vCzHPIZYLXGSy5ed/YtVfytN4lUOHWN0=; b=R1bfwZ2Mgkz9fM3ZozKNaAVtYU0MBzZd6UEa9s3/B12A1ROXudn8B9HT8uGrII0PjM LHJOXANrbFyjS7CyeT2r1kTUOlTkJUenxu+AjnMT6onqcdaOIRDYam1ym3xTQpnkXDjR WTD1zpJ0B2nVIDOauDfS/3mA0pxrrYywB7gEJ5mtT1ZM7LNKGcfUy+Fm6x6cllPSJ7yo GbK2/b0kEgnupGW7nFZcX0/YUSoL3eJD5niQ5mZTb8MPCKFESgMvLcIx+8GFHwaAoL2s zcjv0lua5oYUl5Xv7RgChB3WoLCfBaf1xcQhcR31MsHZOs95GeRTD2FPmYvuum7JJplI zNmg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=kXhOCEIQ7g8vCzHPIZYLXGSy5ed/YtVfytN4lUOHWN0=; b=GlTr1x2hY9oHt3yRqXc4ATLNN15KRtoJR8aSqLkqatfNQlTNfc9pkequF+FX+8aZV+ 0zaDTnQgEtJotLk2jQBDNQMeNbQJoPM+ACBR8XzlA0FidGRo0zQzExw8WnacnGN/MT0y +RBfH2AEuT/tmpA/Yqj6v7f6aN+I5qoT/PTDOLjNHqFm3UhghsQH2+ZwAj+lsacxuLoF tgfyCKh8SgIhehunD0rAJOSnMu5B6VuVMHuZ6rBnHrv4GTYTdMkuveEYZZ5JA2uTdet4 vLnpxUEpfyU7bPV/knhhxzZOllwCaQ/TF8oRZW+iDcvdvgvn8lpvzljb8XgItyPJVst5 vNbQ== X-Gm-Message-State: AKwxytf3ArWwjXQaZsr/KP91z2t0Zmaow8nHVxq3zjav9YXRAz2Igc6q CXDkrTmO1ztI37trHmf/JdtJ3pVq X-Google-Smtp-Source: ACJfBov7CQEfHNPj8+pEnJukfG9zK9mP+Xh0KUCEFiLosGPKeX3nYoQ2q7PQrZXrjQWR5rRVFa8HGQ== X-Received: by 10.223.177.207 with SMTP id r15mr921327wra.32.1515756729014; Fri, 12 Jan 2018 03:32:09 -0800 (PST) Received: from 640k.lan (dynamic-adsl-78-12-229-84.clienti.tiscali.it. [78.12.229.84]) by smtp.gmail.com with ESMTPSA id l8sm2732271wmg.46.2018.01.12.03.32.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 12 Jan 2018 03:32:08 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 12 Jan 2018 12:31:07 +0100 Message-Id: <1515756676-3860-44-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1515756676-3860-1-git-send-email-pbonzini@redhat.com> References: <1515756676-3860-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::242 Subject: [Qemu-devel] [PULL 43/52] chardev: Clean up previous patch indentation X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Eric Blake The previous patch left in an extra scope layer for ease of review; time to remove it. No semantic change. Signed-off-by: Eric Blake Message-Id: <20171201232433.25193-5-eblake@redhat.com> Reviewed-by: Marc-André Lureau Signed-off-by: Paolo Bonzini --- chardev/char-serial.c | 66 +++++++++++++++++++++++++-------------------------- 1 file changed, 32 insertions(+), 34 deletions(-) diff --git a/chardev/char-serial.c b/chardev/char-serial.c index 10162f9..93392c5 100644 --- a/chardev/char-serial.c +++ b/chardev/char-serial.c @@ -71,66 +71,64 @@ static void tty_serial_init(int fd, int speed, } speed = speed * 10 / 11; - { - check_speed(50); - check_speed(75); - check_speed(110); - check_speed(134); - check_speed(150); - check_speed(200); - check_speed(300); - check_speed(600); - check_speed(1200); - check_speed(1800); - check_speed(2400); - check_speed(4800); - check_speed(9600); - check_speed(19200); - check_speed(38400); - /* Non-Posix values follow. They may be unsupported on some systems. */ - check_speed(57600); - check_speed(115200); + check_speed(50); + check_speed(75); + check_speed(110); + check_speed(134); + check_speed(150); + check_speed(200); + check_speed(300); + check_speed(600); + check_speed(1200); + check_speed(1800); + check_speed(2400); + check_speed(4800); + check_speed(9600); + check_speed(19200); + check_speed(38400); + /* Non-Posix values follow. They may be unsupported on some systems. */ + check_speed(57600); + check_speed(115200); #ifdef B230400 - check_speed(230400); + check_speed(230400); #endif #ifdef B460800 - check_speed(460800); + check_speed(460800); #endif #ifdef B500000 - check_speed(500000); + check_speed(500000); #endif #ifdef B576000 - check_speed(576000); + check_speed(576000); #endif #ifdef B921600 - check_speed(921600); + check_speed(921600); #endif #ifdef B1000000 - check_speed(1000000); + check_speed(1000000); #endif #ifdef B1152000 - check_speed(1152000); + check_speed(1152000); #endif #ifdef B1500000 - check_speed(1500000); + check_speed(1500000); #endif #ifdef B2000000 - check_speed(2000000); + check_speed(2000000); #endif #ifdef B2500000 - check_speed(2500000); + check_speed(2500000); #endif #ifdef B3000000 - check_speed(3000000); + check_speed(3000000); #endif #ifdef B3500000 - check_speed(3500000); + check_speed(3500000); #endif #ifdef B4000000 - check_speed(4000000); + check_speed(4000000); #endif - spd = B115200; - } + spd = B115200; #undef check_speed done: