From patchwork Tue Jun 8 19:16:12 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Williamson X-Patchwork-Id: 105018 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o58JMRgr026213 for ; Tue, 8 Jun 2010 19:22:28 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755832Ab0FHTWT (ORCPT ); Tue, 8 Jun 2010 15:22:19 -0400 Received: from qmta06.westchester.pa.mail.comcast.net ([76.96.62.56]:43111 "EHLO qmta06.westchester.pa.mail.comcast.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755744Ab0FHTWS (ORCPT ); Tue, 8 Jun 2010 15:22:18 -0400 Received: from omta17.westchester.pa.mail.comcast.net ([76.96.62.89]) by qmta06.westchester.pa.mail.comcast.net with comcast id TUVj1e0051vXlb856XGVJZ; Tue, 08 Jun 2010 19:16:29 +0000 Received: from localhost.localdomain ([75.71.122.219]) by omta17.westchester.pa.mail.comcast.net with comcast id TXGU1e00M4k7Kz73dXGUj4; Tue, 08 Jun 2010 19:16:29 +0000 From: Alex Williamson Subject: [RFC PATCH 4/6] Remove uses of ram.last_offset (aka last_ram_offset) To: qemu-devel@nongnu.org, anthony@codemonkey.ws Cc: kvm@vger.kernel.org, quintela@redhat.com, chrisw@redhat.com, alex.williamson@redhat.com Date: Tue, 08 Jun 2010 13:16:12 -0600 Message-ID: <20100608191612.4451.38595.stgit@localhost.localdomain> In-Reply-To: <20100608191447.4451.47795.stgit@localhost.localdomain> References: <20100608191447.4451.47795.stgit@localhost.localdomain> User-Agent: StGIT/0.14.3 MIME-Version: 1.0 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Tue, 08 Jun 2010 19:22:28 +0000 (UTC) diff --git a/arch_init.c b/arch_init.c index 43e42ba..6103461 100644 --- a/arch_init.c +++ b/arch_init.c @@ -108,9 +108,10 @@ static int ram_save_block(QEMUFile *f) static ram_addr_t current_addr = 0; ram_addr_t saved_addr = current_addr; ram_addr_t addr = 0; + uint64_t total_ram = ram_bytes_total(); int bytes_sent = 0; - while (addr < ram.last_offset) { + while (addr < total_ram) { if (cpu_physical_memory_get_dirty(current_addr, MIGRATION_DIRTY_FLAG)) { uint8_t *p; @@ -133,7 +134,7 @@ static int ram_save_block(QEMUFile *f) break; } addr += TARGET_PAGE_SIZE; - current_addr = (saved_addr + addr) % ram.last_offset; + current_addr = (saved_addr + addr) % total_ram; } return bytes_sent; @@ -145,8 +146,9 @@ static ram_addr_t ram_save_remaining(void) { ram_addr_t addr; ram_addr_t count = 0; + uint64_t total_ram = ram_bytes_total(); - for (addr = 0; addr < ram.last_offset; addr += TARGET_PAGE_SIZE) { + for (addr = 0; addr < total_ram; addr += TARGET_PAGE_SIZE) { if (cpu_physical_memory_get_dirty(addr, MIGRATION_DIRTY_FLAG)) { count++; } @@ -167,7 +169,13 @@ uint64_t ram_bytes_transferred(void) uint64_t ram_bytes_total(void) { - return ram.last_offset; + RAMBlock *block; + uint64_t total = 0; + + QLIST_FOREACH(block, &ram.blocks, next) + total += block->length; + + return total; } int ram_save_live(Monitor *mon, QEMUFile *f, int stage, void *opaque) @@ -188,10 +196,11 @@ int ram_save_live(Monitor *mon, QEMUFile *f, int stage, void *opaque) } if (stage == 1) { + uint64_t total_ram = ram_bytes_total(); bytes_transferred = 0; /* Make sure all dirty bits are set */ - for (addr = 0; addr < ram.last_offset; addr += TARGET_PAGE_SIZE) { + for (addr = 0; addr < total_ram; addr += TARGET_PAGE_SIZE) { if (!cpu_physical_memory_get_dirty(addr, MIGRATION_DIRTY_FLAG)) { cpu_physical_memory_set_dirty(addr); } @@ -200,7 +209,7 @@ int ram_save_live(Monitor *mon, QEMUFile *f, int stage, void *opaque) /* Enable dirty memory tracking */ cpu_physical_memory_set_dirty_tracking(1); - qemu_put_be64(f, ram.last_offset | RAM_SAVE_FLAG_MEM_SIZE); + qemu_put_be64(f, total_ram | RAM_SAVE_FLAG_MEM_SIZE); } bytes_transferred_last = bytes_transferred; @@ -259,7 +268,7 @@ int ram_load(QEMUFile *f, void *opaque, int version_id) addr &= TARGET_PAGE_MASK; if (flags & RAM_SAVE_FLAG_MEM_SIZE) { - if (addr != ram.last_offset) { + if (addr != ram_bytes_total()) { return -EINVAL; } } diff --git a/cpu-all.h b/cpu-all.h index a5b886a..23b1d1d 100644 --- a/cpu-all.h +++ b/cpu-all.h @@ -871,7 +871,6 @@ typedef struct RAMBlock { typedef struct RAMList { uint8_t *phys_dirty; - ram_addr_t last_offset; QLIST_HEAD(ram, RAMBlock) blocks; } RAMList; extern RAMList ram; diff --git a/exec.c b/exec.c index dd57515..13c0ca0 100644 --- a/exec.c +++ b/exec.c @@ -2774,6 +2774,17 @@ static void *file_ram_alloc(ram_addr_t memory, const char *path) } #endif +static ram_addr_t find_ram_offset(ram_addr_t size) +{ + RAMBlock *block; + ram_addr_t last = 0; + + QLIST_FOREACH(block, &ram.blocks, next) + last = MAX(last, block->offset + block->length); + + return last; +} + ram_addr_t qemu_ram_map(const char *name, ram_addr_t size, void *host) { RAMBlock *new_block; @@ -2785,18 +2796,16 @@ ram_addr_t qemu_ram_map(const char *name, ram_addr_t size, void *host) snprintf(new_block->name, sizeof(new_block->name), "%s", strdup(name)); new_block->host = host; - new_block->offset = ram.last_offset; + new_block->offset = find_ram_offset(size); new_block->length = size; QLIST_INSERT_HEAD(&ram.blocks, new_block, next); ram.phys_dirty = qemu_realloc(ram.phys_dirty, - (ram.last_offset + size) >> TARGET_PAGE_BITS); - memset(ram.phys_dirty + (ram.last_offset >> TARGET_PAGE_BITS), + (new_block->offset + size) >> TARGET_PAGE_BITS); + memset(ram.phys_dirty + (new_block->offset >> TARGET_PAGE_BITS), 0xff, size >> TARGET_PAGE_BITS); - ram.last_offset += size; - if (kvm_enabled()) kvm_setup_guest_memory(new_block->host, size);