From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39053) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xlhvx-000715-0s for qemu-devel@nongnu.org; Tue, 04 Nov 2014 12:30:27 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xlhvn-0004mJ-0D for qemu-devel@nongnu.org; Tue, 04 Nov 2014 12:30:20 -0500 Received: from cantor2.suse.de ([195.135.220.15]:54240 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xlhvm-0004lm-QB for qemu-devel@nongnu.org; Tue, 04 Nov 2014 12:30:10 -0500 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Tue, 4 Nov 2014 18:30:07 +0100 Message-Id: <1415122209-29164-2-git-send-email-afaerber@suse.de> In-Reply-To: <1415122209-29164-1-git-send-email-afaerber@suse.de> References: <1415122209-29164-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 1/3] qdev: Create qdev_get_device_class() function List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Eduardo Habkost , =?UTF-8?q?Andreas=20F=C3=A4rber?= From: Eduardo Habkost Extract the DeviceClass lookup from qdev_device_add() to a separate function. Signed-off-by: Eduardo Habkost Signed-off-by: Andreas F=C3=A4rber --- qdev-monitor.c | 70 +++++++++++++++++++++++++++++++++++-----------------= ------ 1 file changed, 42 insertions(+), 28 deletions(-) diff --git a/qdev-monitor.c b/qdev-monitor.c index fac7d17..982f3f4 100644 --- a/qdev-monitor.c +++ b/qdev-monitor.c @@ -180,6 +180,44 @@ static const char *find_typename_by_alias(const char= *alias) return NULL; } =20 +static DeviceClass *qdev_get_device_class(const char **driver, Error **e= rrp) +{ + ObjectClass *oc; + DeviceClass *dc; + + oc =3D object_class_by_name(*driver); + if (!oc) { + const char *typename =3D find_typename_by_alias(*driver); + + if (typename) { + *driver =3D typename; + oc =3D object_class_by_name(*driver); + } + } + + if (!object_class_dynamic_cast(oc, TYPE_DEVICE)) { + error_setg(errp, "'%s' is not a valid device model name", *drive= r); + return NULL; + } + + if (object_class_is_abstract(oc)) { + error_set(errp, QERR_INVALID_PARAMETER_VALUE, "driver", + "non-abstract device type"); + return NULL; + } + + dc =3D DEVICE_CLASS(oc); + if (dc->cannot_instantiate_with_device_add_yet || + (qdev_hotplug && !dc->hotpluggable)) { + error_set(errp, QERR_INVALID_PARAMETER_VALUE, "driver", + "pluggable device type"); + return NULL; + } + + return dc; +} + + int qdev_device_help(QemuOpts *opts) { Error *local_err =3D NULL; @@ -455,7 +493,6 @@ static BusState *qbus_find(const char *path) =20 DeviceState *qdev_device_add(QemuOpts *opts) { - ObjectClass *oc; DeviceClass *dc; const char *driver, *path, *id; DeviceState *dev; @@ -469,33 +506,10 @@ DeviceState *qdev_device_add(QemuOpts *opts) } =20 /* find driver */ - oc =3D object_class_by_name(driver); - if (!oc) { - const char *typename =3D find_typename_by_alias(driver); - - if (typename) { - driver =3D typename; - oc =3D object_class_by_name(driver); - } - } - - if (!object_class_dynamic_cast(oc, TYPE_DEVICE)) { - qerror_report(ERROR_CLASS_GENERIC_ERROR, - "'%s' is not a valid device model name", driver); - return NULL; - } - - if (object_class_is_abstract(oc)) { - qerror_report(QERR_INVALID_PARAMETER_VALUE, "driver", - "non-abstract device type"); - return NULL; - } - - dc =3D DEVICE_CLASS(oc); - if (dc->cannot_instantiate_with_device_add_yet || - (qdev_hotplug && !dc->hotpluggable)) { - qerror_report(QERR_INVALID_PARAMETER_VALUE, "driver", - "pluggable device type"); + dc =3D qdev_get_device_class(&driver, &err); + if (err) { + qerror_report_err(err); + error_free(err); return NULL; } =20 --=20 1.8.4.5