From patchwork Tue Apr 28 16:34:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 1278587 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=d2BQ+Az7; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 49BS603dLdz9sSl for ; Wed, 29 Apr 2020 02:39:18 +1000 (AEST) Received: from localhost ([::1]:38530 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jTTGO-0007AR-3x for incoming@patchwork.ozlabs.org; Tue, 28 Apr 2020 12:39:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34300) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jTTF6-0006Qu-5Q for qemu-devel@nongnu.org; Tue, 28 Apr 2020 12:38:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jTTBi-0000rI-Mq for qemu-devel@nongnu.org; Tue, 28 Apr 2020 12:37:55 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:41627 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jTTBi-0000qP-1z for qemu-devel@nongnu.org; Tue, 28 Apr 2020 12:34:26 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1588091664; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Q57vFmnq8vysdyK3hyJSd0l6biSyZOiDdtWz9F5CtFI=; b=d2BQ+Az7W9uU0d6U6pG9rZiQYUUM1XHLRYCkzXygymdt4TGK9MCeMx6/lx3cQBjQsPxOpO +MYqmZz5E14utSsKn29iAWaGKzf0iCNOa+sUugGe4TkctjqgGFKcRpzc0u5j7h3Sk+NtoH jKJ4p65SeQoEMJgU6hrlQWpRN3bCZz4= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-142-IL1afLM9NsyAlR9Got2T0A-1; Tue, 28 Apr 2020 12:34:22 -0400 X-MC-Unique: IL1afLM9NsyAlR9Got2T0A-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E78E6189581A for ; Tue, 28 Apr 2020 16:34:21 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-113-6.ams2.redhat.com [10.36.113.6]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9FC225E021; Tue, 28 Apr 2020 16:34:21 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 0A2BE11358C0; Tue, 28 Apr 2020 18:34:20 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PATCH 04/17] qom: Change object_property_get_uint16List() to match its doc Date: Tue, 28 Apr 2020 18:34:06 +0200 Message-Id: <20200428163419.4483-5-armbru@redhat.com> In-Reply-To: <20200428163419.4483-1-armbru@redhat.com> References: <20200428163419.4483-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=205.139.110.61; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/04/28 02:06:42 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] X-Received-From: 205.139.110.61 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: pbonzini@redhat.com, berrange@redhat.com, ehabkost@redhat.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake --- include/qom/object.h | 4 ++-- hw/core/machine-qmp-cmds.c | 6 +++--- qom/object.c | 9 +++++---- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/include/qom/object.h b/include/qom/object.h index ccfa82e33d..5d1ed672c3 100644 --- a/include/qom/object.h +++ b/include/qom/object.h @@ -1331,8 +1331,8 @@ int object_property_get_enum(Object *obj, const char *name, * undefined if an error occurs (including when the property value is not * an list of integers). */ -void object_property_get_uint16List(Object *obj, const char *name, - uint16List **list, Error **errp); +uint16List *object_property_get_uint16List(Object *obj, const char *name, + Error **errp); /** * object_property_set: diff --git a/hw/core/machine-qmp-cmds.c b/hw/core/machine-qmp-cmds.c index eed5aeb2f7..f3a28035fc 100644 --- a/hw/core/machine-qmp-cmds.c +++ b/hw/core/machine-qmp-cmds.c @@ -325,9 +325,9 @@ static int query_memdev(Object *obj, void *opaque) "policy", "HostMemPolicy", &error_abort); - object_property_get_uint16List(obj, "host-nodes", - &m->value->host_nodes, - &error_abort); + m->value->host_nodes = object_property_get_uint16List(obj, + "host-nodes", + &error_abort); m->next = *list; *list = m; diff --git a/qom/object.c b/qom/object.c index 9c74749193..ddb021db21 100644 --- a/qom/object.c +++ b/qom/object.c @@ -1559,10 +1559,11 @@ int object_property_get_enum(Object *obj, const char *name, return ret; } -void object_property_get_uint16List(Object *obj, const char *name, - uint16List **list, Error **errp) +uint16List *object_property_get_uint16List(Object *obj, const char *name, + Error **errp) { Error *err = NULL; + uint16List *list = NULL; Visitor *v; char *str; @@ -1575,11 +1576,11 @@ void object_property_get_uint16List(Object *obj, const char *name, visit_complete(v, &str); visit_free(v); v = string_input_visitor_new(str); - visit_type_uint16List(v, NULL, list, errp); - + visit_type_uint16List(v, NULL, &list, errp); g_free(str); out: visit_free(v); + return list; } void object_property_parse(Object *obj, const char *string,