From fe6c211781f80ef4fc246269cecbbc21981089f0 Mon Sep 17 00:00:00 2001 From: Andreas Färber Date: Mon, 15 Apr 2013 18:34:10 +0200 Subject: qdev: Fix QOM unrealize behavior Since commit 249d41720b7dfbb5951b430b9eefdbee7464f515 (qdev: Prepare "realized" property) setting realized = true would register the device's VMStateDescription, but realized = false would not unregister it. Fix that. Moving the code from unparenting also revealed that we were calling DeviceClass::init through DeviceClass::realize as interim solution but DeviceClass::exit still at unparenting time with a realized check. Make this symmetrical by implementing DeviceClass::unrealize to call it, while we're setting realized = false in the unparenting path. The only other unrealize user is mac_nvram, which can safely override it. Thus, mark DeviceClass::exit as obsolete, new devices should implement DeviceClass::unrealize instead. Cc: qemu-stable@nongnu.org Signed-off-by: Andreas Färber Signed-off-by: Andreas Färber Message-id: 1366043650-9719-1-git-send-email-afaerber@suse.de Signed-off-by: Anthony Liguori --- include/hw/qdev-core.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h index 547fbc7e0d..cf83d5471a 100644 --- a/include/hw/qdev-core.h +++ b/include/hw/qdev-core.h @@ -96,7 +96,7 @@ typedef struct DeviceClass { /* Private to qdev / bus. */ qdev_initfn init; /* TODO remove, once users are converted to realize */ qdev_event unplug; - qdev_event exit; + qdev_event exit; /* TODO remove, once users are converted to unrealize */ const char *bus_type; } DeviceClass; -- cgit v1.2.3-55-g7522