From patchwork Fri Jun 24 16:56:48 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 101875 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 2D876B6F86 for ; Sat, 25 Jun 2011 05:13:02 +1000 (EST) Received: from localhost ([::1]:43217 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QaBoI-0005Vj-Pd for incoming@patchwork.ozlabs.org; Fri, 24 Jun 2011 15:12:58 -0400 Received: from eggs.gnu.org ([140.186.70.92]:46624) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qa9hW-0004Ye-2S for qemu-devel@nongnu.org; Fri, 24 Jun 2011 12:57:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Qa9hU-0001Yq-1I for qemu-devel@nongnu.org; Fri, 24 Jun 2011 12:57:49 -0400 Received: from mail-fx0-f45.google.com ([209.85.161.45]:64284) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qa9hT-0001QQ-I1 for qemu-devel@nongnu.org; Fri, 24 Jun 2011 12:57:47 -0400 Received: by mail-fx0-f45.google.com with SMTP id 12so94133fxg.4 for ; Fri, 24 Jun 2011 09:57:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references; bh=/qZt48OipGqau4Cq1P11cvHTJw77SQNrdfRH9sGtpGs=; b=phX+x4iw9fRBonAQsG36FvFP35YDYe/WImYr6yLOl/MHGWcyMcLrIvDYYwUyw3U3bJ D5EEKeUFH4dOjNb9dYZ7zwt/PUGDZW9KEyqvRk5II+Yd/1VzDaLQn0/IlQS5ca/SWZwY 9T9jRgqnOu5CMQOTIEAkzd/nwITjot0rg8ORs= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=QPzeCOUiPBDkn0r9DzrD2yR+zzgDOm0pG9OXO4gFWvF/2oKs2CiZxvw3xFDDtj/o+M yQepH/hC6FOauDSLqTT9Bn3W7wQktbgOuKrGs0A/5HJx+HWJr+eGlPlxTovoJow7sx/6 N+L4oySz+QOpC/1KuMW8o92fv/EfLPipoyJO4= Received: by 10.223.51.4 with SMTP id b4mr4664001fag.93.1308934666953; Fri, 24 Jun 2011 09:57:46 -0700 (PDT) Received: from localhost.localdomain (gbibp9ph1--blueice3n2.emea.ibm.com [195.212.29.84]) by mx.google.com with ESMTPS id h28sm1763884faj.5.2011.06.24.09.57.45 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 24 Jun 2011 09:57:46 -0700 (PDT) From: Stefan Hajnoczi To: Date: Fri, 24 Jun 2011 17:56:48 +0100 Message-Id: <1308934609-20824-13-git-send-email-stefanha@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1308934609-20824-1-git-send-email-stefanha@linux.vnet.ibm.com> References: <1308934609-20824-1-git-send-email-stefanha@linux.vnet.ibm.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 209.85.161.45 Cc: Anthony Liguori , Stefan Hajnoczi , Juan Quintela Subject: [Qemu-devel] [PATCH 12/13] exec: last_first_tb was only used in !ONLY_USER case 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 From: Juan Quintela Once there, use a better variable name. Signed-off-by: Juan Quintela Reviewed-by: Peter Maydell Signed-off-by: Stefan Hajnoczi --- exec.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/exec.c b/exec.c index b03b5be..7236281 100644 --- a/exec.c +++ b/exec.c @@ -1208,12 +1208,16 @@ static inline void tb_alloc_page(TranslationBlock *tb, unsigned int n, tb_page_addr_t page_addr) { PageDesc *p; - TranslationBlock *last_first_tb; +#ifndef CONFIG_USER_ONLY + bool page_already_protected; +#endif tb->page_addr[n] = page_addr; p = page_find_alloc(page_addr >> TARGET_PAGE_BITS, 1); tb->page_next[n] = p->first_tb; - last_first_tb = p->first_tb; +#ifndef CONFIG_USER_ONLY + page_already_protected = p->first_tb != NULL; +#endif p->first_tb = (TranslationBlock *)((long)tb | n); invalidate_page_bitmap(p); @@ -1249,7 +1253,7 @@ static inline void tb_alloc_page(TranslationBlock *tb, /* if some code is already present, then the pages are already protected. So we handle the case where only the first TB is allocated in a physical page */ - if (!last_first_tb) { + if (!page_already_protected) { tlb_protect_code(page_addr); } #endif