From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1FACAC43331 for ; Sun, 10 Nov 2019 19:06:50 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E726320818 for ; Sun, 10 Nov 2019 19:06:49 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E726320818 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=virtuozzo.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:44702 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iTsXx-0003GP-5d for qemu-devel@archiver.kernel.org; Sun, 10 Nov 2019 14:06:49 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:34937) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iTsV3-0000Fb-G0 for qemu-devel@nongnu.org; Sun, 10 Nov 2019 14:03:50 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iTsV2-00037D-C3 for qemu-devel@nongnu.org; Sun, 10 Nov 2019 14:03:49 -0500 Received: from relay.sw.ru ([185.231.240.75]:42178) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iTsUz-00033h-7m; Sun, 10 Nov 2019 14:03:45 -0500 Received: from [10.94.4.71] (helo=dptest2.qa.sw.ru) by relay.sw.ru with esmtp (Exim 4.92.3) (envelope-from ) id 1iTsUv-00076X-Qt; Sun, 10 Nov 2019 22:03:41 +0300 From: Denis Plotnikov To: qemu-block@nongnu.org Subject: [PATCH v0 1/2] qdev-properties-system: extend set_pionter for unrealized devices Date: Sun, 10 Nov 2019 22:03:09 +0300 Message-Id: <20191110190310.19799-2-dplotnikov@virtuozzo.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20191110190310.19799-1-dplotnikov@virtuozzo.com> References: <20191110190310.19799-1-dplotnikov@virtuozzo.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 185.231.240.75 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, vsementsov@virtuozzo.com, berrange@redhat.com, ehabkost@redhat.com, qemu-devel@nongnu.org, mreitz@redhat.com, pbonzini@redhat.com, den@virtuozzo.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Some device's property can be changed if the device has been already realized. For example, it could be "drive" property of a scsi disk device. So far, set_pointer could operate only on a relized device. The patch extends its interface for operation on an unrealized device. Signed-off-by: Denis Plotnikov --- hw/core/qdev-properties-system.c | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/hw/core/qdev-properties-system.c b/hw/core/qdev-properties-system.c index ba412dd2ca..c534590dcd 100644 --- a/hw/core/qdev-properties-system.c +++ b/hw/core/qdev-properties-system.c @@ -38,9 +38,14 @@ static void get_pointer(Object *obj, Visitor *v, Property *prop, } static void set_pointer(Object *obj, Visitor *v, Property *prop, - void (*parse)(DeviceState *dev, const char *str, - void **ptr, const char *propname, - Error **errp), + void (*parse_realized)(DeviceState *dev, + const char *str, void **ptr, + const char *propname, + Error **errp), + void (*parse_unrealized)(DeviceState *dev, + const char *str, void **ptr, + const char *propname, + Error **errp), const char *name, Error **errp) { DeviceState *dev = DEVICE(obj); @@ -48,11 +53,6 @@ static void set_pointer(Object *obj, Visitor *v, Property *prop, void **ptr = qdev_get_prop_ptr(dev, prop); char *str; - if (dev->realized) { - qdev_prop_set_after_realize(dev, name, errp); - return; - } - visit_type_str(v, name, &str, &local_err); if (local_err) { error_propagate(errp, local_err); @@ -63,7 +63,17 @@ static void set_pointer(Object *obj, Visitor *v, Property *prop, *ptr = NULL; return; } - parse(dev, str, ptr, prop->name, errp); + + if (dev->realized) { + if (parse_realized) { + parse_realized(dev, str, ptr, prop->name, errp); + } else { + qdev_prop_set_after_realize(dev, name, errp); + } + } else { + parse_unrealized(dev, str, ptr, prop->name, errp); + } + g_free(str); } @@ -178,13 +188,13 @@ static void get_drive(Object *obj, Visitor *v, const char *name, void *opaque, static void set_drive(Object *obj, Visitor *v, const char *name, void *opaque, Error **errp) { - set_pointer(obj, v, opaque, parse_drive, name, errp); + set_pointer(obj, v, opaque, NULL, parse_drive, name, errp); } static void set_drive_iothread(Object *obj, Visitor *v, const char *name, void *opaque, Error **errp) { - set_pointer(obj, v, opaque, parse_drive_iothread, name, errp); + set_pointer(obj, v, opaque, NULL, parse_drive_iothread, name, errp); } const PropertyInfo qdev_prop_drive = { -- 2.17.0