[Xen-changelog] [qemu-upstream-unstable] qdev: relax bus type check in qdev_device_add() (v2)

[patchbot@xxxxxxx]

commit e912c96f7d2e5ccd8a6352ee74f5beee2a7d9976
Author: Anthony Liguori <aliguori@xxxxxxxxxx>
Date:   Thu Nov 29 07:46:23 2012 -0600

    qdev: relax bus type check in qdev_device_add() (v2)
    
    We are currently checking for an exact type match.  Use QOM dynamic_cast to
    check for a compatible type instead.
    
    Cc: Konrad Frederic <fred.konrad@xxxxxxxxxxxxx>
    Cc: Peter Maydell <peter.maydell@xxxxxxxxxx>
    Signed-off-by: Anthony Liguori <aliguori@xxxxxxxxxx>
    ---
    v1 -> v2:
     - also add cast to qbus_find_recursive (Peter)
     - simplify by doing object_dynamic_cast instead of messing with classes
---
 hw/qdev-monitor.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/hw/qdev-monitor.c b/hw/qdev-monitor.c
index 479eecd..a1b4d6a 100644
--- a/hw/qdev-monitor.c
+++ b/hw/qdev-monitor.c
@@ -289,8 +289,7 @@ static BusState *qbus_find_recursive(BusState *bus, const 
char *name,
     if (name && (strcmp(bus->name, name) != 0)) {
         match = 0;
     }
-    if (bus_typename &&
-        (strcmp(object_get_typename(OBJECT(bus)), bus_typename) != 0)) {
+    if (bus_typename && !object_dynamic_cast(OBJECT(bus), bus_typename)) {
         match = 0;
     }
     if (match) {
@@ -435,7 +434,7 @@ DeviceState *qdev_device_add(QemuOpts *opts)
         if (!bus) {
             return NULL;
         }
-        if (strcmp(object_get_typename(OBJECT(bus)), k->bus_type) != 0) {
+        if (!object_dynamic_cast(OBJECT(bus), k->bus_type)) {
             qerror_report(QERR_BAD_BUS_FOR_DEVICE,
                           driver, object_get_typename(OBJECT(bus)));
             return NULL;
--
generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog