Message ID | 1534870966-9287-13-git-send-email-pbonzini@redhat.com |
---|---|
State | New |
Headers | show
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; 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=<UNKNOWN>) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="gVb2EBxM"; 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 41vxsT53SBz9s4v for <incoming@patchwork.ozlabs.org>; Wed, 22 Aug 2018 03:06:20 +1000 (AEST) Received: from localhost ([::1]:54955 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>) id 1fsA6j-0004YJ-Go for incoming@patchwork.ozlabs.org; Tue, 21 Aug 2018 13:06:17 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:32778) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <paolo.bonzini@gmail.com>) id 1fsA42-0001HL-CP for qemu-devel@nongnu.org; Tue, 21 Aug 2018 13:03:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <paolo.bonzini@gmail.com>) id 1fsA3s-0005oY-Dw for qemu-devel@nongnu.org; Tue, 21 Aug 2018 13:03:23 -0400 Received: from mail-wm0-x22d.google.com ([2a00:1450:400c:c09::22d]:33121) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from <paolo.bonzini@gmail.com>) id 1fsA3p-0005h6-MN for qemu-devel@nongnu.org; Tue, 21 Aug 2018 13:03:18 -0400 Received: by mail-wm0-x22d.google.com with SMTP id i134-v6so10056636wmf.0 for <qemu-devel@nongnu.org>; Tue, 21 Aug 2018 10:03:17 -0700 (PDT) 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; bh=x89HnEVWJPT7YjpQKNJYKJi7PBxccqgljI0+8tOM8Q8=; b=gVb2EBxMwOQ8HL1n1MmnaHnGjlt25YsHuavNe/zgwfJ4EeWCpwm/EcW9ULud55ChI/ yB7N/c78+ggzSV7z9qxsm1+dU/1M6hGleGeBc5d2LCQ+ZBqGgjOCD14r3/7c/OJ6L7xu 7ztULjCXEftz1AcepLvf7vflxN0OVHcp3CL9BtfROf1XZ8uJaan7oBhOGYkNkz0NjqZY gsiodAJbI7itb6kUXjsVohY785M+4IzqoAnmJNPFkXINrkX8bGKLgHIGPcD0ipuCLWYF Q/XNXgZ4W+PiNYdGqLubsuvuNk6fyJ/dSFOPJErodFU/LD2lVI3cdQ0ZslNnGpbjSLOd gvtA== 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; bh=x89HnEVWJPT7YjpQKNJYKJi7PBxccqgljI0+8tOM8Q8=; b=l2Sy2KXjxQG2z+XucUNjRVe324uscYITpF4SqN4hwW9COprym/6Z4wADGEXmHsz7is 6BKzJ5BhlE/gVnQRaOZhJ7kRSXYEZp63Lo0lOqjhmUlEFxdghCcRSc+expxN1VDjgZal lqwjJbDZK42Ai3ZK5S0DIYO9kLg/4x+RQ/A8qiqO/WdUeACW6OYRtYloK8i96BggnWZo 2dBt3LEi4e7aV+F3MLsAI2ovKj/+ttFDS3jXU/MdeUEBZvpFswFTFjpdOcv9iritsarH JIGMVs4720kij542TB2kLqIR2EJ5qtN46GNSZPJsc/XChCKYyA1kSFs+LnxUG6jg5bv1 LLsQ== X-Gm-Message-State: APzg51Dj+1+6AYxgGaHabA+2NOURno7RhBIclO3sOrpJQBGMTmhrdDHR pct30yWGZLRVAgJiupxpHwTuQLdu X-Google-Smtp-Source: ANB0Vdbqufsda9CBOhS9G9ko7JEo0YT4NnND7uyoFNmjzJkXhSECBg8XPg0DpEzINd2cQRjvdahPHA== X-Received: by 2002:a1c:3f08:: with SMTP id m8-v6mr160416wma.88.1534870996086; Tue, 21 Aug 2018 10:03:16 -0700 (PDT) Received: from 640k.lan (dynamic-adsl-78-12-184-244.clienti.tiscali.it. [78.12.184.244]) by smtp.gmail.com with ESMTPSA id v6-v6sm2608955wmc.43.2018.08.21.10.03.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 21 Aug 2018 10:03:15 -0700 (PDT) From: Paolo Bonzini <pbonzini@redhat.com> To: qemu-devel@nongnu.org Date: Tue, 21 Aug 2018 19:01:44 +0200 Message-Id: <1534870966-9287-13-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1534870966-9287-1-git-send-email-pbonzini@redhat.com> References: <1534870966-9287-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::22d Subject: [Qemu-devel] [PULL 12/74] hw/timer/mc146818rtc: White space clean-up 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>, <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>, <mailto:qemu-devel-request@nongnu.org?subject=subscribe> Cc: Thomas Huth <thuth@redhat.com> Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> |
Series |
[PULL,01/74] tests: virtio: separate ccw tests from libqos
|
expand
|
diff --git a/hw/timer/mc146818rtc.c b/hw/timer/mc146818rtc.c index 6f1f723..3a14075 100644 --- a/hw/timer/mc146818rtc.c +++ b/hw/timer/mc146818rtc.c @@ -120,7 +120,7 @@ static void rtc_coalesced_timer_update(RTCState *s) timer_del(s->coalesced_timer); } else { /* divide each RTC interval to 2 - 8 smaller intervals */ - int c = MIN(s->irq_coalesced, 7) + 1; + int c = MIN(s->irq_coalesced, 7) + 1; int64_t next_clock = qemu_clock_get_ns(rtc_clock) + periodic_clock_to_ns(s->period / c); timer_mod(s->coalesced_timer, next_clock); @@ -485,7 +485,7 @@ static void cmos_ioport_write(void *opaque, hwaddr addr, s->cmos_data[s->cmos_index] = data; check_update_timer(s); break; - case RTC_IBM_PS2_CENTURY_BYTE: + case RTC_IBM_PS2_CENTURY_BYTE: s->cmos_index = RTC_CENTURY; /* fall through */ case RTC_CENTURY: @@ -713,7 +713,7 @@ static uint64_t cmos_ioport_read(void *opaque, hwaddr addr, return 0xff; } else { switch(s->cmos_index) { - case RTC_IBM_PS2_CENTURY_BYTE: + case RTC_IBM_PS2_CENTURY_BYTE: s->cmos_index = RTC_CENTURY; /* fall through */ case RTC_CENTURY: @@ -915,7 +915,7 @@ static void rtc_reset(void *opaque) if (s->lost_tick_policy == LOST_TICK_POLICY_SLEW) { s->irq_coalesced = 0; - s->irq_reinject_on_ack_count = 0; + s->irq_reinject_on_ack_count = 0; } }