From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45792) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YN599-0004da-6B for qemu-devel@nongnu.org; Sun, 15 Feb 2015 14:46:31 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YN593-0000Yd-2l for qemu-devel@nongnu.org; Sun, 15 Feb 2015 14:46:27 -0500 Received: from mx1.redhat.com ([209.132.183.28]:35115) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YN592-0000YQ-R6 for qemu-devel@nongnu.org; Sun, 15 Feb 2015 14:46:21 -0500 Date: Sun, 15 Feb 2015 20:46:16 +0100 From: "Michael S. Tsirkin" Message-ID: <1424029474-22474-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Subject: [Qemu-devel] [PATCH] acpi-build: dirty memory on RSDP/linker update List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Igor Mammedov , Richard Henderson , Paolo Bonzini This is required to make sure they are migrated correctly. Signed-off-by: Michael S. Tsirkin --- hw/i386/acpi-build.c | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index 1dfdf35..fd6ef78 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -1271,6 +1271,8 @@ struct AcpiBuildState { uint8_t patched; PcGuestInfo *guest_info; void *rsdp; + ram_addr_t rsdp_ram; + uint32_t rsdp_size; ram_addr_t linker_ram; uint32_t linker_size; } AcpiBuildState; @@ -1478,13 +1480,22 @@ static void acpi_build_update(void *build_opaque, uint32_t offset) memcpy(qemu_get_ram_ptr(build_state->table_ram), tables.table_data->data, build_state->table_size); - memcpy(build_state->rsdp, tables.rsdp->data, acpi_data_len(tables.rsdp)); - memcpy(qemu_get_ram_ptr(build_state->linker_ram), tables.linker->data, - build_state->linker_size); - cpu_physical_memory_set_dirty_range_nocode(build_state->table_ram, build_state->table_size); + if (build_state->rsdp) { + memcpy(build_state->rsdp, tables.rsdp->data, acpi_data_len(tables.rsdp)); + } else { + memcpy(qemu_get_ram_ptr(build_state->rsdp_ram), tables.linker->data, + build_state->rsdp_size); + cpu_physical_memory_set_dirty_range_nocode(build_state->rsdp_ram, + build_state->rsdp_size); + } + memcpy(qemu_get_ram_ptr(build_state->linker_ram), tables.linker->data, + build_state->linker_size); + cpu_physical_memory_set_dirty_range_nocode(build_state->linker_ram, + build_state->linker_size); + acpi_build_tables_cleanup(&tables, true); } @@ -1564,10 +1575,13 @@ void acpi_setup(PcGuestInfo *guest_info) acpi_build_update, build_state, tables.rsdp->data, acpi_data_len(tables.rsdp)); build_state->rsdp = tables.rsdp->data; + build_state->rsdp_ram = (ram_addr_t)-1; + build_state->rsdp_size = 0; } else { - build_state->rsdp = qemu_get_ram_ptr( - acpi_add_rom_blob(build_state, tables.rsdp, ACPI_BUILD_RSDP_FILE, 0) - ); + build_state->rsdp = NULL; + build_state->rsdp_ram = acpi_add_rom_blob(build_state, tables.rsdp, + ACPI_BUILD_RSDP_FILE, 0); + build_state->rsdp_size = acpi_data_len(tables.rsdp); } qemu_register_reset(acpi_build_reset, build_state); -- MST