From patchwork Wed Sep 25 12:57:52 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Roth X-Patchwork-Id: 277844 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id A7EF52C00A4 for ; Wed, 25 Sep 2013 23:08:20 +1000 (EST) Received: from localhost ([::1]:52451 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VOopG-0000Nt-JZ for incoming@patchwork.ozlabs.org; Wed, 25 Sep 2013 09:08:18 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50741) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VOogF-0003ZJ-Nz for qemu-devel@nongnu.org; Wed, 25 Sep 2013 08:59:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VOog7-0000Ib-Uo for qemu-devel@nongnu.org; Wed, 25 Sep 2013 08:58:59 -0400 Received: from mail-qe0-x229.google.com ([2607:f8b0:400d:c02::229]:62564) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VOog7-0000II-Pj; Wed, 25 Sep 2013 08:58:51 -0400 Received: by mail-qe0-f41.google.com with SMTP id 1so4144621qee.14 for ; Wed, 25 Sep 2013 05:58:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=N6mxSMoABEpSgYJow667l/X+JaWx5/p33f/zieVd4Vw=; b=D0OSf5QwY8GMSJbLVcizacalZblyuR0vSXZrDjTEyF1ls6cq3CLMk/RV56LXN2ZTj7 ikvl77cpsp8dvhEu0znu9doxUawbbXwwwgoRFtbTRWIy54hYCmILh53KNGGcrBTaexV2 +TqXqkny0a8nql0AxtjxPr5qEphNzYfo8UN6siMRAlqXPa4f8PORJVRDkap7IhjufYUo rVsMp09gyMa7iyifVdzLcOQ9tQFv4z1kzZyVUlhp/eIDTr2iHitglFGswhsLEiAiFHuq w2lolFrJZOaScLRFDHeTTua4kwWQMjo+UUNdBiu3XZvA65BGHPie9YEV6YbLP/F5Tkbj q0fQ== X-Received: by 10.229.192.6 with SMTP id do6mr44656372qcb.3.1380113931343; Wed, 25 Sep 2013 05:58:51 -0700 (PDT) Received: from loki.morrigu.org ([70.114.130.150]) by mx.google.com with ESMTPSA id g2sm65250216qaf.12.1969.12.31.16.00.00 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 25 Sep 2013 05:58:51 -0700 (PDT) From: Michael Roth To: qemu-devel@nongnu.org Date: Wed, 25 Sep 2013 07:57:52 -0500 Message-Id: <1380113886-16845-25-git-send-email-mdroth@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1380113886-16845-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1380113886-16845-1-git-send-email-mdroth@linux.vnet.ibm.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400d:c02::229 Cc: qemu-stable@nongnu.org Subject: [Qemu-devel] [PATCH 24/38] exec: check offset_within_address_space for register subpage 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: Hu Tao If offset_within_address_space falls in a page, then we register a subpage. So check offset_within_address_space rather than offset_within_region. Cc: qemu-stable@nongnu.org Cc: Paolo Bonzini Cc: Richard Henderson Cc: "Andreas Färber" Cc: Peter Maydell Cc: Blue Swirl Signed-off-by: Hu Tao Signed-off-by: Paolo Bonzini (cherry picked from commit 88266249701032211c1d7449460d063fbc01bf12) Signed-off-by: Michael Roth --- exec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/exec.c b/exec.c index 08eecb3..f6674e5 100644 --- a/exec.c +++ b/exec.c @@ -869,7 +869,7 @@ static void mem_add(MemoryListener *listener, MemoryRegionSection *section) now = remain; if (int128_lt(remain.size, page_size)) { register_subpage(d, &now); - } else if (remain.offset_within_region & ~TARGET_PAGE_MASK) { + } else if (remain.offset_within_address_space & ~TARGET_PAGE_MASK) { now.size = page_size; register_subpage(d, &now); } else {