From patchwork Wed Mar 20 23:23:13 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laszlo Ersek X-Patchwork-Id: 229511 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 5CB822C00BD for ; Thu, 21 Mar 2013 10:22:08 +1100 (EST) Received: from localhost ([::1]:41243 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UISKc-0002jy-He for incoming@patchwork.ozlabs.org; Wed, 20 Mar 2013 19:22:06 -0400 Received: from eggs.gnu.org ([208.118.235.92]:47337) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UISJt-0002Ob-HR for qemu-devel@nongnu.org; Wed, 20 Mar 2013 19:21:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UISJq-0003Pl-QW for qemu-devel@nongnu.org; Wed, 20 Mar 2013 19:21:21 -0400 Received: from mx1.redhat.com ([209.132.183.28]:64229) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UISJq-0003Pb-I6 for qemu-devel@nongnu.org; Wed, 20 Mar 2013 19:21:18 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r2KNLH8D022895 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 20 Mar 2013 19:21:17 -0400 Received: from lacos-laptop.usersys.redhat.com (vpn1-7-176.ams2.redhat.com [10.36.7.176]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id r2KNLDcG018608; Wed, 20 Mar 2013 19:21:16 -0400 From: Laszlo Ersek To: qemu-devel@nongnu.org, mst@redhat.com, aliguori@us.ibm.com, kraxel@redhat.com Date: Thu, 21 Mar 2013 00:23:13 +0100 Message-Id: <1363821803-3380-2-git-send-email-lersek@redhat.com> In-Reply-To: <1363821803-3380-1-git-send-email-lersek@redhat.com> References: <1363821803-3380-1-git-send-email-lersek@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 01/11] strip some whitespace X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 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-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Laszlo Ersek --- target-i386/cpu.h | 2 +- arch_init.c | 2 +- vl.c | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/target-i386/cpu.h b/target-i386/cpu.h index 48f41ca..5284ebc 100644 --- a/target-i386/cpu.h +++ b/target-i386/cpu.h @@ -185,7 +185,7 @@ #define HF2_VINTR_SHIFT 3 /* value of V_INTR_MASKING bit */ #define HF2_GIF_MASK (1 << HF2_GIF_SHIFT) -#define HF2_HIF_MASK (1 << HF2_HIF_SHIFT) +#define HF2_HIF_MASK (1 << HF2_HIF_SHIFT) #define HF2_NMI_MASK (1 << HF2_NMI_SHIFT) #define HF2_VINTR_MASK (1 << HF2_VINTR_SHIFT) diff --git a/arch_init.c b/arch_init.c index 98e2bc6..761051b 100644 --- a/arch_init.c +++ b/arch_init.c @@ -160,7 +160,7 @@ int qemu_read_default_config_files(bool userconfig) return ret; } } - + return 0; } diff --git a/vl.c b/vl.c index ce51e65..f2bd893 100644 --- a/vl.c +++ b/vl.c @@ -2530,7 +2530,7 @@ static int virtcon_parse(const char *devname) qemu_opt_set(bus_opts, "driver", "virtio-serial-s390"); } else { qemu_opt_set(bus_opts, "driver", "virtio-serial-pci"); - } + } dev_opts = qemu_opts_create_nofail(device); qemu_opt_set(dev_opts, "driver", "virtconsole"); @@ -2582,7 +2582,7 @@ static int sclp_parse(const char *devname) } static int debugcon_parse(const char *devname) -{ +{ QemuOpts *opts; if (!qemu_chr_new("debugcon", devname, NULL)) { @@ -3704,8 +3704,8 @@ int main(int argc, char **argv, char **envp) } p += 8; os_set_proc_name(p); - } - } + } + } break; case QEMU_OPTION_prom_env: if (nb_prom_envs >= MAX_PROM_ENVS) {