From patchwork Fri Aug 15 05:32:05 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Crosthwaite X-Patchwork-Id: 380081 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 48482140090 for ; Fri, 15 Aug 2014 15:33:19 +1000 (EST) Received: from localhost ([::1]:57568 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XIA8b-0007Ci-DR for incoming@patchwork.ozlabs.org; Fri, 15 Aug 2014 01:33:17 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49959) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XIA87-0006UE-0M for qemu-devel@nongnu.org; Fri, 15 Aug 2014 01:32:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XIA7y-0003qr-5H for qemu-devel@nongnu.org; Fri, 15 Aug 2014 01:32:46 -0400 Received: from mail-pa0-f52.google.com ([209.85.220.52]:42277) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XIA7y-0003qj-0d for qemu-devel@nongnu.org; Fri, 15 Aug 2014 01:32:38 -0400 Received: by mail-pa0-f52.google.com with SMTP id bj1so2897717pad.25 for ; Thu, 14 Aug 2014 22:32:37 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=wgoCJTPnKSUs49IibJAV9Yw/rjmpCymDF7QJiJUgq9U=; b=eE9S7mY2z1gOf0h8JeOLt8md+I4mxz5tIpQPjs6HCWrvmkBuw3AOe2lxZz57CGSHrx WiHpw3UC5opS5j/4IMs9VKoGpDclI36Vghx4++CwnqoeMXu5FabwL/MOLlCT6pAEBASe 3dY9M9yOVc4VX+oICw4S0VsjD2dSdiwYCUL0I01iAulNVS96zFu6QwapOWP46vea/cS4 lYg473toSz7/M46FGr5O3Rv3BVABtl/TMTl6K5/oKCiiXilLKBYk8wJGcn0TyJmN02So vYxFD8D9JOvs6DyBWooTg7aDigEegFds5t2BoPQk+5HQCIMHAZL7eVm0vOaa3En550AS BT7w== X-Gm-Message-State: ALoCoQkmsH4MF4JPESrBkdohWNVhPswDd3GbbBHEYkVS8Ip+vweNrBRLbITGR+KAkxQHqoUjMTjY X-Received: by 10.66.174.107 with SMTP id br11mr9456488pac.105.1408080757356; Thu, 14 Aug 2014 22:32:37 -0700 (PDT) Received: from localhost ([149.199.62.254]) by mx.google.com with ESMTPSA id xq3sm24352137pab.0.2014.08.14.22.32.36 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 14 Aug 2014 22:32:36 -0700 (PDT) From: Peter Crosthwaite To: qemu-devel@nongnu.org Date: Thu, 14 Aug 2014 22:32:05 -0700 Message-Id: <13fbf0339036dfe2a84c980ebf71033dd407fe73.1408080397.git.peter.crosthwaite@xilinx.com> X-Mailer: git-send-email 2.0.1.1.gfbfc394 In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.85.220.52 Cc: peter.maydell@linaro.org, pbonzini@redhat.com, agraf@suse.de, afaerber@suse.de Subject: [Qemu-devel] [PATCH v2 05/14] qom: Allow clearing of a Link property 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 By passing in NULL to object_property_set_link. The lead user of this is the QDEV GPIO framework which will implement GPIO disconnects via an "unlink". Signed-off-by: Peter Crosthwaite --- qom/object.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qom/object.c b/qom/object.c index c869e8e..8821e23 100644 --- a/qom/object.c +++ b/qom/object.c @@ -881,7 +881,7 @@ char *object_property_get_str(Object *obj, const char *name, void object_property_set_link(Object *obj, Object *value, const char *name, Error **errp) { - gchar *path = object_get_canonical_path(value); + gchar *path = value ? object_get_canonical_path(value) : NULL; object_property_set_str(obj, path, name, errp); g_free(path); } @@ -1172,7 +1172,7 @@ static void object_set_link_property(Object *obj, Visitor *v, void *opaque, visit_type_str(v, &path, name, &local_err); - if (!local_err && strcmp(path, "") != 0) { + if (!local_err && path && strcmp(path, "") != 0) { new_target = object_resolve_link(obj, name, path, &local_err); }