From patchwork Mon Dec 19 14:13:33 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Avi Kivity X-Patchwork-Id: 132253 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 AE390B704F for ; Tue, 20 Dec 2011 02:13:58 +1100 (EST) Received: from localhost ([::1]:52793 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rcdzl-0005aP-2u for incoming@patchwork.ozlabs.org; Mon, 19 Dec 2011 09:15:13 -0500 Received: from eggs.gnu.org ([140.186.70.92]:48584) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rcdym-0002wY-2I for qemu-devel@nongnu.org; Mon, 19 Dec 2011 09:14:20 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Rcdyh-0001ur-Vy for qemu-devel@nongnu.org; Mon, 19 Dec 2011 09:14:12 -0500 Received: from mx1.redhat.com ([209.132.183.28]:11874) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rcdyh-0001uB-JG for qemu-devel@nongnu.org; Mon, 19 Dec 2011 09:14:07 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id pBJEE3rT004316 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 19 Dec 2011 09:14:03 -0500 Received: from cleopatra.tlv.redhat.com (cleopatra.tlv.redhat.com [10.35.255.11]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id pBJEE1GA015710; Mon, 19 Dec 2011 09:14:03 -0500 Received: from s01.tlv.redhat.com (s01.tlv.redhat.com [10.35.255.8]) by cleopatra.tlv.redhat.com (Postfix) with ESMTP id B124D250BAB; Mon, 19 Dec 2011 16:13:54 +0200 (IST) From: Avi Kivity To: Stefano Stabellini , qemu-devel@nongnu.org, "Michael S. Tsirkin" Date: Mon, 19 Dec 2011 16:13:33 +0200 Message-Id: <1324304024-11220-13-git-send-email-avi@redhat.com> In-Reply-To: <1324304024-11220-1-git-send-email-avi@redhat.com> References: <1324304024-11220-1-git-send-email-avi@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 209.132.183.28 Cc: xen-devel@lists.xensource.com, kvm@vger.kernel.org Subject: [Qemu-devel] [PATCH 12/23] fixup: listener fixes 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 --- memory.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/memory.c b/memory.c index c08186d..2dcbf80 100644 --- a/memory.c +++ b/memory.c @@ -708,13 +708,13 @@ static void memory_listener_update_region(FlatRange *fr, AddressSpace *as, .address_space = as->root, .offset_within_region = fr->offset_in_region, .size = int128_get64(fr->addr.size), - .offset_within_region = int128_get64(fr->addr.start), + .offset_within_address_space = int128_get64(fr->addr.start), }; MemoryListener *listener; QLIST_FOREACH(listener, &memory_listeners, link) { ListenerCallback *callback - = *(ListenerCallback *)((void *)listener + callback_offset); + = *(ListenerCallback **)((void *)listener + callback_offset); callback(listener, §ion); } } @@ -1149,6 +1149,7 @@ void memory_region_sync_dirty_bitmap(MemoryRegion *mr) FOR_EACH_FLAT_RANGE(fr, &address_space_memory.current_map) { if (fr->mr == mr) { + MEMORY_LISTENER_UPDATE_REGION(fr, &address_space_memory, log_sync); cpu_physical_sync_dirty_bitmap(int128_get64(fr->addr.start), int128_get64(addrrange_end(fr->addr))); } @@ -1467,7 +1468,7 @@ static void listener_add_address_space(MemoryListener *listener, .address_space = as->root, .offset_within_region = fr->offset_in_region, .size = int128_get64(fr->addr.size), - .offset_within_region = int128_get64(fr->addr.start), + .offset_within_address_space = int128_get64(fr->addr.start), }; listener->region_add(listener, §ion); }