From patchwork Thu Sep 10 01:04:29 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 33244 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 bilbo.ozlabs.org (Postfix) with ESMTPS id EDA71B6F1E for ; Thu, 10 Sep 2009 11:18:44 +1000 (EST) Received: from localhost ([127.0.0.1]:39803 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MlYJ6-0000Dw-6R for incoming@patchwork.ozlabs.org; Wed, 09 Sep 2009 21:18:40 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MlY60-0004RO-6t for qemu-devel@nongnu.org; Wed, 09 Sep 2009 21:05:08 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MlY5w-0004N2-EW for qemu-devel@nongnu.org; Wed, 09 Sep 2009 21:05:07 -0400 Received: from [199.232.76.173] (port=48255 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MlY5u-0004Mv-W3 for qemu-devel@nongnu.org; Wed, 09 Sep 2009 21:05:03 -0400 Received: from mx1.redhat.com ([209.132.183.28]:15459) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MlY5u-0002lf-EA for qemu-devel@nongnu.org; Wed, 09 Sep 2009 21:05:02 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n8A151sc017146 for ; Wed, 9 Sep 2009 21:05:01 -0400 Received: from localhost.localdomain (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id n8A14oob020882; Wed, 9 Sep 2009 21:05:00 -0400 From: Juan Quintela To: qemu-devel@nongnu.org Date: Thu, 10 Sep 2009 03:04:29 +0200 Message-Id: <3ab3f99234233e92e9641af911c580386879b2ad.1252543872.git.quintela@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Subject: [Qemu-devel] [PATCH 08/26] vmstate: add sensible arguments to vmstate_unregister() 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 vmsd alone is not enugh, because we can have several structs saved with the same description (vmsd). Signed-off-by: Juan Quintela --- hw/hw.h | 2 +- savevm.c | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/hw/hw.h b/hw/hw.h index a0cb94e..c703975 100644 --- a/hw/hw.h +++ b/hw/hw.h @@ -509,5 +509,5 @@ extern void vmstate_save_state(QEMUFile *f, const VMStateDescription *vmsd, const void *opaque); extern int vmstate_register(int instance_id, const VMStateDescription *vmsd, void *base); -extern void vmstate_unregister(const char *idstr, void *opaque); +void vmstate_unregister(const VMStateDescription *vmsd, void *opaque); #endif diff --git a/savevm.c b/savevm.c index 0dcab79..7b0989f 100644 --- a/savevm.c +++ b/savevm.c @@ -1002,9 +1002,16 @@ int vmstate_register(int instance_id, const VMStateDescription *vmsd, return 0; } -void vmstate_unregister(const char *idstr, void *opaque) +void vmstate_unregister(const VMStateDescription *vmsd, void *opaque) { - unregister_savevm(idstr, opaque); + SaveStateEntry *se, *new_se; + + TAILQ_FOREACH_SAFE(se, &savevm_handlers, entry, new_se) { + if (se->vmsd == vmsd && se->opaque == opaque) { + TAILQ_REMOVE(&savevm_handlers, se, entry); + qemu_free(se); + } + } } int vmstate_load_state(QEMUFile *f, const VMStateDescription *vmsd,