From patchwork Sat Feb 8 10:01:47 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 318396 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 5EBE32C00A4 for ; Sat, 8 Feb 2014 21:03:09 +1100 (EST) Received: from localhost ([::1]:45867 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WC4kc-000812-GD for incoming@patchwork.ozlabs.org; Sat, 08 Feb 2014 05:03:06 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49822) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WC4jw-0007ev-Oc for qemu-devel@nongnu.org; Sat, 08 Feb 2014 05:02:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WC4jo-0004Hh-Bg for qemu-devel@nongnu.org; Sat, 08 Feb 2014 05:02:24 -0500 Received: from mail-ea0-x22f.google.com ([2a00:1450:4013:c01::22f]:51224) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WC4jo-0004HX-5S for qemu-devel@nongnu.org; Sat, 08 Feb 2014 05:02:16 -0500 Received: by mail-ea0-f175.google.com with SMTP id z10so1989033ead.6 for ; Sat, 08 Feb 2014 02:02:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=+qQYhe2hw75i/55uGtMfK85R81p6NWLkLoLFbuh+Cj8=; b=xLe6dlA0PpLH0JcCXnCIH7TOQyz8PLeopSYr5ktWn1YF8R2mjaHSSWVsWISyDq55bp 4fHTG48vQhmfaOG5wuOYQhr9yHlu44F0m+yMRek6UkxJp+rC5rYe2qTCdanvflZ+Vyat et/pAj2Wsgl8tcBjgbM2HO9xqWqQd+MlnxiEtU441xPECppAZ9RTC4rVON5Nbydvymbq 2rvSjdUQQOks3PZJTjdjDS4DGQl0YhRbAZu1J8+/v/s8XXahLnTiXkvMWwlIcqisvIA9 A6BQ8jf1opraDDcOE5kywTwwQPS3SgsNRb80PJAvM/ke2cmHzxDHyRpLbxj0lUIkQBOE z7lw== X-Received: by 10.15.36.70 with SMTP id h46mr757781eev.96.1391853735353; Sat, 08 Feb 2014 02:02:15 -0800 (PST) Received: from yakj.usersys.redhat.com.cz (auth47-172.fi.muni.cz. [147.251.47.172]) by mx.google.com with ESMTPSA id k41sm27156087een.19.2014.02.08.02.02.13 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 08 Feb 2014 02:02:14 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Sat, 8 Feb 2014 11:01:47 +0100 Message-Id: <1391853717-3837-5-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.5.3 In-Reply-To: <1391853717-3837-1-git-send-email-pbonzini@redhat.com> References: <1391853717-3837-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:4013:c01::22f Subject: [Qemu-devel] [PULL 04/14] qdev: legacy properties are now read-only 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 Reviewed-by: Igor Mammedov Reviewed-by: Eric Blake Signed-off-by: Paolo Bonzini --- hw/core/qdev-properties.c | 10 +--------- hw/core/qdev.c | 30 ++---------------------------- include/hw/qdev-core.h | 1 - 3 files changed, 3 insertions(+), 38 deletions(-) diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c index e223ce1..a60a183 100644 --- a/hw/core/qdev-properties.c +++ b/hw/core/qdev-properties.c @@ -936,15 +936,7 @@ void error_set_from_qdev_prop_error(Error **errp, int ret, DeviceState *dev, void qdev_prop_parse(DeviceState *dev, const char *name, const char *value, Error **errp) { - char *legacy_name; - - legacy_name = g_strdup_printf("legacy-%s", name); - if (object_property_get_type(OBJECT(dev), legacy_name, NULL)) { - object_property_parse(OBJECT(dev), value, legacy_name, errp); - } else { - object_property_parse(OBJECT(dev), value, name, errp); - } - g_free(legacy_name); + object_property_parse(OBJECT(dev), value, name, errp); } void qdev_prop_set_bit(DeviceState *dev, const char *name, bool value) diff --git a/hw/core/qdev.c b/hw/core/qdev.c index 82a9123..7c1b732 100644 --- a/hw/core/qdev.c +++ b/hw/core/qdev.c @@ -578,31 +578,6 @@ static void qdev_get_legacy_property(Object *obj, Visitor *v, void *opaque, visit_type_str(v, &ptr, name, errp); } -static void qdev_set_legacy_property(Object *obj, Visitor *v, void *opaque, - const char *name, Error **errp) -{ - DeviceState *dev = DEVICE(obj); - Property *prop = opaque; - Error *local_err = NULL; - char *ptr = NULL; - int ret; - - if (dev->realized) { - qdev_prop_set_after_realize(dev, name, errp); - return; - } - - visit_type_str(v, &ptr, name, &local_err); - if (local_err) { - error_propagate(errp, local_err); - return; - } - - ret = prop->info->parse(dev, prop, ptr); - error_set_from_qdev_prop_error(errp, ret, dev, prop, ptr); - g_free(ptr); -} - /** * @qdev_add_legacy_property - adds a legacy property * @@ -618,8 +593,7 @@ void qdev_property_add_legacy(DeviceState *dev, Property *prop, gchar *name, *type; /* Register pointer properties as legacy properties */ - if (!prop->info->print && !prop->info->parse && - (prop->info->set || prop->info->get)) { + if (!prop->info->print && prop->info->get) { return; } @@ -629,7 +603,7 @@ void qdev_property_add_legacy(DeviceState *dev, Property *prop, object_property_add(OBJECT(dev), name, type, prop->info->print ? qdev_get_legacy_property : prop->info->get, - prop->info->parse ? qdev_set_legacy_property : prop->info->set, + NULL, NULL, prop, errp); diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h index 2c4f140..d0cda38 100644 --- a/include/hw/qdev-core.h +++ b/include/hw/qdev-core.h @@ -209,7 +209,6 @@ struct PropertyInfo { const char *name; const char *legacy_name; const char **enum_table; - int (*parse)(DeviceState *dev, Property *prop, const char *str); int (*print)(DeviceState *dev, Property *prop, char *dest, size_t len); ObjectPropertyAccessor *get; ObjectPropertyAccessor *set;