From patchwork Wed Apr 1 08:52:22 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lin Ma X-Patchwork-Id: 457148 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 5CCE8140187 for ; Wed, 1 Apr 2015 19:53:19 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="verification failed; unprotected key" header.d=gmail.com header.i=@gmail.com header.b=BDhIOP3Z; dkim-adsp=none (unprotected policy); dkim-atps=neutral Received: from localhost ([::1]:42274 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YdEOj-0005I4-Kj for incoming@patchwork.ozlabs.org; Wed, 01 Apr 2015 04:53:17 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55756) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YdEOM-0004bW-Mj for qemu-devel@nongnu.org; Wed, 01 Apr 2015 04:52:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YdEOJ-0000vv-6x for qemu-devel@nongnu.org; Wed, 01 Apr 2015 04:52:54 -0400 Received: from mail-pa0-x22b.google.com ([2607:f8b0:400e:c03::22b]:34812) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YdEOJ-0000vl-0h for qemu-devel@nongnu.org; Wed, 01 Apr 2015 04:52:51 -0400 Received: by pactp5 with SMTP id tp5so46103115pac.1 for ; Wed, 01 Apr 2015 01:52:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id; bh=nhqeB8d5U9ROFbB80OV8kVrfJXeZuxrx2+nf/aXNUoI=; b=BDhIOP3Zwacl0y7a4Xfc5wKUKEVJoud4jhwBjTJNN39uLUz0krkfg3dvE0KAgdwddd FpuyPa9qn3AwbuxwVZmbFs6GS1apxGwrQ8t06VTgKFnLo5szuU11ad3s90rTOgQUrSsN UnNXbGxdWcuWCac2KPF86b9r9iN7LzflKVKFxqbKXAjBt6QMocXLmQTUfMYaQv7ptqKC I/Yxx8ON949rtMs6cXDTBKmnFDJxtOX2Ekxu501dB8CYaWgcpND/XUsvU6k1Zt0Ib4c1 wihMs0nJGx35NTaNN+BZ6oLFN4MqXBed9N4iOB75p1RWJ8WopYKb0ASA9I1e7Bx234Tj /4YQ== X-Received: by 10.68.168.225 with SMTP id zz1mr75401822pbb.3.1427878369980; Wed, 01 Apr 2015 01:52:49 -0700 (PDT) Received: from linux-wc25.site.site ([203.192.156.9]) by mx.google.com with ESMTPSA id sw4sm1352949pbc.64.2015.04.01.01.52.46 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 01 Apr 2015 01:52:49 -0700 (PDT) From: Lin Ma To: imammedo@redhat.com, afaerber@suse.de, peter.crosthwaite@xilinx.com, pbonzini@redhat.com Date: Wed, 1 Apr 2015 16:52:22 +0800 Message-Id: <1427878342-19872-1-git-send-email-lma@suse.com> X-Mailer: git-send-email 2.1.4 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400e:c03::22b Cc: qemu-devel@nongnu.org, Lin Ma Subject: [Qemu-devel] [PATCH v2] qom: Change prototype of user_creatable_complete. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From void user_creatable_complete(Object *obj, Error **errp) to void user_creatable_complete(UserCreatable *uc, Error **errp) Signed-off-by: Lin Ma Reviewed-by: Paolo Bonzini Reviewed-by: Igor Mammedov --- hw/block/dataplane/virtio-blk.c | 3 ++- hw/virtio/virtio-rng.c | 2 +- include/qom/object_interfaces.h | 7 +++---- qmp.c | 2 +- qom/object_interfaces.c | 11 ++--------- 5 files changed, 9 insertions(+), 16 deletions(-) diff --git a/hw/block/dataplane/virtio-blk.c b/hw/block/dataplane/virtio-blk.c index cd41478..2941574 100644 --- a/hw/block/dataplane/virtio-blk.c +++ b/hw/block/dataplane/virtio-blk.c @@ -188,7 +188,8 @@ void virtio_blk_data_plane_create(VirtIODevice *vdev, VirtIOBlkConf *conf, object_initialize(&s->internal_iothread_obj, sizeof(s->internal_iothread_obj), TYPE_IOTHREAD); - user_creatable_complete(OBJECT(&s->internal_iothread_obj), &error_abort); + user_creatable_complete(USER_CREATABLE(&s->internal_iothread_obj), + &error_abort); s->iothread = &s->internal_iothread_obj; } s->ctx = iothread_get_aio_context(s->iothread); diff --git a/hw/virtio/virtio-rng.c b/hw/virtio/virtio-rng.c index 06e7178..65afc9e 100644 --- a/hw/virtio/virtio-rng.c +++ b/hw/virtio/virtio-rng.c @@ -165,7 +165,7 @@ static void virtio_rng_device_realize(DeviceState *dev, Error **errp) if (vrng->conf.rng == NULL) { vrng->conf.default_backend = RNG_RANDOM(object_new(TYPE_RNG_RANDOM)); - user_creatable_complete(OBJECT(vrng->conf.default_backend), + user_creatable_complete(USER_CREATABLE(vrng->conf.default_backend), &local_err); if (local_err) { error_propagate(errp, local_err); diff --git a/include/qom/object_interfaces.h b/include/qom/object_interfaces.h index b792283..5e7fcb3 100644 --- a/include/qom/object_interfaces.h +++ b/include/qom/object_interfaces.h @@ -51,12 +51,11 @@ typedef struct UserCreatableClass { /** * user_creatable_complete: - * @obj: the object whose complete() method is called if defined + * @uc: the object whose complete() method is called if defined * @errp: if an error occurs, a pointer to an area to store the error * * Wrapper to call complete() method if one of types it's inherited - * from implements USER_CREATABLE interface, otherwise the call does - * nothing. + * from implements USER_CREATABLE interface. */ -void user_creatable_complete(Object *obj, Error **errp); +void user_creatable_complete(UserCreatable *uc, Error **errp); #endif diff --git a/qmp.c b/qmp.c index c479e77..b944507 100644 --- a/qmp.c +++ b/qmp.c @@ -656,7 +656,7 @@ void object_add(const char *type, const char *id, const QDict *qdict, goto out; } - user_creatable_complete(obj, &local_err); + user_creatable_complete(USER_CREATABLE(obj), &local_err); if (local_err) { object_property_del(container_get(object_get_root(), "/objects"), id, &error_abort); diff --git a/qom/object_interfaces.c b/qom/object_interfaces.c index 6360818..3aa26c7 100644 --- a/qom/object_interfaces.c +++ b/qom/object_interfaces.c @@ -1,18 +1,11 @@ #include "qom/object_interfaces.h" #include "qemu/module.h" -void user_creatable_complete(Object *obj, Error **errp) +void user_creatable_complete(UserCreatable *uc, Error **errp) { - UserCreatableClass *ucc; - UserCreatable *uc = - (UserCreatable *)object_dynamic_cast(obj, TYPE_USER_CREATABLE); + UserCreatableClass *ucc = USER_CREATABLE_GET_CLASS(uc); - if (!uc) { - return; - } - - ucc = USER_CREATABLE_GET_CLASS(uc); if (ucc->complete) { ucc->complete(uc, errp); }