From patchwork Tue Nov 30 21:03:59 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cam Macdonell X-Patchwork-Id: 73763 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 1A8DAB70CC for ; Wed, 1 Dec 2010 19:49:58 +1100 (EST) Received: from localhost ([127.0.0.1]:47943 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PNiNu-0004xJ-7h for incoming@patchwork.ozlabs.org; Wed, 01 Dec 2010 03:49:54 -0500 Received: from [140.186.70.92] (port=43428 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PNddF-0006TP-6i for qemu-devel@nongnu.org; Tue, 30 Nov 2010 22:45:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PNXNQ-0004oS-V9 for qemu-devel@nongnu.org; Tue, 30 Nov 2010 16:04:41 -0500 Received: from smtp.srv.ualberta.ca ([129.128.5.19]:61101 helo=mail10.srv.ualberta.ca) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PNXNQ-0003QC-OH for qemu-devel@nongnu.org; Tue, 30 Nov 2010 16:04:40 -0500 Received: from localhost.localdomain (st-brides.cs.ualberta.ca [129.128.23.21]) (authenticated bits=0) by mail10.srv.ualberta.ca (8.14.3/8.13.8) with ESMTP id oAUL41tG025644 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT); Tue, 30 Nov 2010 14:04:17 -0700 (MST) From: Cam Macdonell To: qemu-devel@nongnu.org Date: Tue, 30 Nov 2010 14:03:59 -0700 Message-Id: <1291151039-10966-3-git-send-email-cam@cs.ualberta.ca> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1291151039-10966-1-git-send-email-cam@cs.ualberta.ca> References: <1291151039-10966-1-git-send-email-cam@cs.ualberta.ca> X-detected-operating-system: by eggs.gnu.org: OpenBSD 3.0-3.9 Cc: Cam Macdonell , kvm@vger.kernel.org Subject: [Qemu-devel] [PATCH 2/2] Unregister shared memory on unplug. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org This allows 'peer' ivshmem guests to detach from shared memory before migration and re-attach after migration is complete. Signed-off-by: Cam Macdonell --- hw/ivshmem.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/hw/ivshmem.c b/hw/ivshmem.c index 06dce70..9254fad 100644 --- a/hw/ivshmem.c +++ b/hw/ivshmem.c @@ -68,6 +68,7 @@ typedef struct IVShmemState { int nb_peers; /* how many guests we have space for */ int max_peer; /* maximum numbered peer */ + void *shm_ptr; int vm_id; uint32_t vectors; uint32_t features; @@ -365,14 +366,13 @@ static int check_shm_size(IVShmemState *s, int fd) { * create the BAR and map the memory immediately */ static void create_shared_memory_BAR(IVShmemState *s, int fd) { - void * ptr; - s->shm_fd = fd; - ptr = mmap(0, s->ivshmem_size, PROT_READ|PROT_WRITE, MAP_SHARED, fd, 0); + s->shm_ptr = mmap(0, s->ivshmem_size, PROT_READ|PROT_WRITE, + MAP_SHARED, fd, 0); s->ivshmem_offset = qemu_ram_alloc_from_ptr(&s->dev.qdev, "ivshmem.bar2", - s->ivshmem_size, ptr); + s->ivshmem_size, s->shm_ptr); /* region for shared memory */ pci_register_bar(&s->dev, 2, s->ivshmem_size, @@ -797,6 +797,10 @@ static int pci_ivshmem_uninit(PCIDevice *dev) { IVShmemState *s = DO_UPCAST(IVShmemState, dev, dev); + cpu_register_physical_memory(s->shm_pci_addr, s->ivshmem_size, + IO_MEM_UNASSIGNED); + qemu_ram_free_from_ptr(s->ivshmem_offset); + munmap(s->shm_ptr, s->ivshmem_size); cpu_unregister_io_memory(s->ivshmem_mmio_io_addr); unregister_savevm(&dev->qdev, "ivshmem", s);