From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51636) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WsYZL-0007I8-Gh for qemu-devel@nongnu.org; Thu, 05 Jun 2014 10:23:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WsYZC-00007P-Fn for qemu-devel@nongnu.org; Thu, 05 Jun 2014 10:23:03 -0400 Received: from mail-wi0-x234.google.com ([2a00:1450:400c:c05::234]:63133) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WsYZC-00006y-A4 for qemu-devel@nongnu.org; Thu, 05 Jun 2014 10:22:54 -0400 Received: by mail-wi0-f180.google.com with SMTP id hi2so3603766wib.13 for ; Thu, 05 Jun 2014 07:22:53 -0700 (PDT) Received: from playground.station (net-37-117-132-7.cust.vodafonedsl.it. [37.117.132.7]) by mx.google.com with ESMTPSA id p9sm14884136eeg.32.2014.06.05.07.22.52 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 05 Jun 2014 07:22:52 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Thu, 5 Jun 2014 16:22:08 +0200 Message-Id: <1401978143-11896-19-git-send-email-pbonzini@redhat.com> In-Reply-To: <1401978143-11896-1-git-send-email-pbonzini@redhat.com> References: <1401978143-11896-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PULL 18/33] target-i386: fix coding standards in x86_cpu_handle_mmu_fault List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Signed-off-by: Paolo Bonzini --- target-i386/helper.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/target-i386/helper.c b/target-i386/helper.c index d10de26..7b3819b 100644 --- a/target-i386/helper.c +++ b/target-i386/helper.c @@ -670,8 +670,9 @@ int x86_cpu_handle_mmu_fault(CPUState *cs, vaddr addr, is_dirty = is_write && !(pde & PG_DIRTY_MASK); if (!(pde & PG_ACCESSED_MASK) || is_dirty) { pde |= PG_ACCESSED_MASK; - if (is_dirty) + if (is_dirty) { pde |= PG_DIRTY_MASK; + } stl_phys_notdirty(cs->as, pde_addr, pde); } /* align to page_size */ @@ -731,8 +732,9 @@ int x86_cpu_handle_mmu_fault(CPUState *cs, vaddr addr, is_dirty = is_write && !(pte & PG_DIRTY_MASK); if (!(pte & PG_ACCESSED_MASK) || is_dirty) { pte |= PG_ACCESSED_MASK; - if (is_dirty) + if (is_dirty) { pte |= PG_DIRTY_MASK; + } stl_phys_notdirty(cs->as, pte_addr, pte); } page_size = 4096; @@ -785,12 +787,13 @@ int x86_cpu_handle_mmu_fault(CPUState *cs, vaddr addr, is_dirty = is_write && !(pde & PG_DIRTY_MASK); if (!(pde & PG_ACCESSED_MASK) || is_dirty) { pde |= PG_ACCESSED_MASK; - if (is_dirty) + if (is_dirty) { pde |= PG_DIRTY_MASK; + } stl_phys_notdirty(cs->as, pde_addr, pde); } - pte = pde & ~( (page_size - 1) & ~0xfff); /* align to page_size */ + pte = pde & ~((page_size - 1) & ~0xfff); /* align to page_size */ ptep = pte; virt_addr = addr & ~(page_size - 1); } else { @@ -841,8 +844,9 @@ int x86_cpu_handle_mmu_fault(CPUState *cs, vaddr addr, is_dirty = is_write && !(pte & PG_DIRTY_MASK); if (!(pte & PG_ACCESSED_MASK) || is_dirty) { pte |= PG_ACCESSED_MASK; - if (is_dirty) + if (is_dirty) { pte |= PG_DIRTY_MASK; + } stl_phys_notdirty(cs->as, pte_addr, pte); } page_size = 4096; -- 1.8.3.1