From: John Snow <jsnow@redhat.com>
To: qemu-devel@nongnu.org
Cc: peter.maydell@linaro.org, jsnow@redhat.com,
Li Qiang <liq3ea@gmail.com>, Li Qiang <liqiang6-s@360.cn>
Subject: [Qemu-devel] [PULL for-rc1 1/3] ide: qdev: register ide bus unrealize function
Date: Wed, 15 Mar 2017 20:52:57 -0400 [thread overview]
Message-ID: <20170316005259.21970-2-jsnow@redhat.com> (raw)
In-Reply-To: <20170316005259.21970-1-jsnow@redhat.com>
From: Li Qiang <liq3ea@gmail.com>
we have an idebus unrealize function, but it was being
registered as the unrealize function for the IDE Device,
so it was not getting invoked on device teardown because
nothing is "unrealizing" the IDE devices themselves.
Suggested-by: John Snow <jsnow@redhat.com>
Signed-off-by: Li Qiang <liqiang6-s@360.cn>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-id: 1488449293-80280-2-git-send-email-liqiang6-s@360.cn
Signed-off-by: John Snow <jsnow@redhat.com>
---
hw/ide/qdev.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/hw/ide/qdev.c b/hw/ide/qdev.c
index 4383cd1..299e592 100644
--- a/hw/ide/qdev.c
+++ b/hw/ide/qdev.c
@@ -31,7 +31,7 @@
/* --------------------------------- */
static char *idebus_get_fw_dev_path(DeviceState *dev);
-static void idebus_unrealize(DeviceState *qdev, Error **errp);
+static void idebus_unrealize(BusState *qdev, Error **errp);
static Property ide_props[] = {
DEFINE_PROP_UINT32("unit", IDEDevice, unit, -1),
@@ -43,14 +43,15 @@ static void ide_bus_class_init(ObjectClass *klass, void *data)
BusClass *k = BUS_CLASS(klass);
k->get_fw_dev_path = idebus_get_fw_dev_path;
+ k->unrealize = idebus_unrealize;
}
-static void idebus_unrealize(DeviceState *qdev, Error **errp)
+static void idebus_unrealize(BusState *bus, Error **errp)
{
- IDEBus *bus = DO_UPCAST(IDEBus, qbus, qdev->parent_bus);
+ IDEBus *ibus = IDE_BUS(bus);
- if (bus->vmstate) {
- qemu_del_vm_change_state_handler(bus->vmstate);
+ if (ibus->vmstate) {
+ qemu_del_vm_change_state_handler(ibus->vmstate);
}
}
@@ -370,7 +371,6 @@ static void ide_device_class_init(ObjectClass *klass, void *data)
k->init = ide_qdev_init;
set_bit(DEVICE_CATEGORY_STORAGE, k->categories);
k->bus_type = TYPE_IDE_BUS;
- k->unrealize = idebus_unrealize;
k->props = ide_props;
}
--
2.9.3
next prev parent reply other threads:[~2017-03-16 0:53 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-16 0:52 [Qemu-devel] [PULL for-rc1 0/3] Ide patches John Snow
2017-03-16 0:52 ` John Snow [this message]
2017-03-16 0:52 ` [Qemu-devel] [PULL for-rc1 2/3] ide: core: add cleanup function John Snow
2017-03-16 0:52 ` [Qemu-devel] [PULL for-rc1 3/3] ide: ahci: call cleanup function in ahci unit John Snow
2017-03-16 11:05 ` [Qemu-devel] [PULL for-rc1 0/3] Ide patches Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170316005259.21970-2-jsnow@redhat.com \
--to=jsnow@redhat.com \
--cc=liq3ea@gmail.com \
--cc=liqiang6-s@360.cn \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.