From patchwork Thu Aug 6 18:28:14 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?UTF-8?B?Wm9sdMOhbiBLxZF2w6Fnw7M=?= X-Patchwork-Id: 504795 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 21E2E1402AB for ; Fri, 7 Aug 2015 06:18:15 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=mHVYnlv1; dkim-atps=neutral Received: from localhost ([::1]:46165 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZNPuM-00082S-HT for incoming@patchwork.ozlabs.org; Thu, 06 Aug 2015 14:28:50 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48743) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZNPtt-0007nU-WA for qemu-devel@nongnu.org; Thu, 06 Aug 2015 14:28:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZNPts-0000vB-Fh for qemu-devel@nongnu.org; Thu, 06 Aug 2015 14:28:21 -0400 Received: from mail-wi0-x231.google.com ([2a00:1450:400c:c05::231]:35339) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZNPts-0000u7-8n for qemu-devel@nongnu.org; Thu, 06 Aug 2015 14:28:20 -0400 Received: by wibxm9 with SMTP id xm9so33373642wib.0 for ; Thu, 06 Aug 2015 11:28:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=65ff/QSAT4JG/wYAdJn2IMNhjyTdLQn8GGIuo5ejgiE=; b=mHVYnlv1d/NckxZ4WNpSpbQnUeRxJlU/38ZQSjFOAuN2Ig6BJO8AC2uu6DN7FWDSik Gm1zViVvOszLCq+d1halv/w6HEGDuwNSbgFxMp7XTD65dZxeSY2mgTA1y0FLjsrSrv3S rx4YkaIg/GFPOv9xd1UCQ7a172j/erlb2tNc4pWkbk9IicrTy/lE0o+UQ7Tu4Bun4BAR kOHevJmdlL6QJyEYD8mAUYD1FyAG/rFZvcSa2Hk13Qogm+KWYjobkRq5xoLBINOVmXC+ eDHnRWcPmb9RLFji3fx7/kvc0MPvVSxWf8PkpOuacXiy4Uvkd6QK6gpqhZZAQBkcWGr4 5tQQ== X-Received: by 10.180.72.35 with SMTP id a3mr8455517wiv.21.1438885699729; Thu, 06 Aug 2015 11:28:19 -0700 (PDT) Received: from nullptr.home.dirty-ice.org (84-236-21-48.pool.digikabel.hu. [84.236.21.48]) by smtp.gmail.com with ESMTPSA id i6sm10726509wje.33.2015.08.06.11.28.18 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 06 Aug 2015 11:28:18 -0700 (PDT) From: "=?UTF-8?q?K=C5=91v=C3=A1g=C3=B3=2C=20Zolt=C3=A1n?=" X-Google-Original-From: =?UTF-8?q?K=C5=91v=C3=A1g=C3=B3=2C=20Zolt=C3=A1n?= To: qemu-devel@nongnu.org Date: Thu, 6 Aug 2015 20:28:14 +0200 Message-Id: <69af423d6df31f011edbcbbde11f0b2b1f105070.1438884611.git.DirtY.iCE.hu@gmail.com> X-Mailer: git-send-email 2.4.5 In-Reply-To: References: MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:400c:c05::231 Cc: Markus Armbruster , Gerd Hoffmann , Eduardo Habkost Subject: [Qemu-devel] [PATCH 02/25] qapi: convert NumaOptions into a flat union 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 Signed-off-by: Kővágó, Zoltán --- numa.c | 2 +- qapi-schema.json | 47 ++++++++++++++++++++++++++++++++++++----------- 2 files changed, 37 insertions(+), 12 deletions(-) diff --git a/numa.c b/numa.c index 402804b..376f990 100644 --- a/numa.c +++ b/numa.c @@ -227,7 +227,7 @@ static int parse_numa(void *opaque, QemuOpts *opts, Error **errp) } switch (object->kind) { - case NUMA_OPTIONS_KIND_NODE: + case NUMA_DRIVER_NODE: numa_node_parse(object->node, opts, &err); if (err) { goto error; diff --git a/qapi-schema.json b/qapi-schema.json index 4342a08..999faa3 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -3536,17 +3536,6 @@ 'data': { '*console':'int', 'events': [ 'InputEvent' ] } } ## -# @NumaOptions -# -# A discriminated record of NUMA options. (for OptsVisitor) -# -# Since 2.1 -## -{ 'union': 'NumaOptions', - 'data': { - 'node': 'NumaNodeOptions' }} - -## # @NumaNodeOptions # # Create a guest NUMA node. (for OptsVisitor) @@ -3573,6 +3562,42 @@ '*memdev': 'str' }} ## +# @NumaDriver +# +# List of possible numa drivers. +# +# Since: 2.5 +## +{ 'enum': 'NumaDriver', + 'data': [ 'node' ] } + +## +# @NumaCommonOptions +# +# Common set of numa options. +# +# @type: the numa driver to use +# +# Since: 2.5 +## +{ 'struct': 'NumaCommonOptions', + 'data': { + 'type': 'NumaDriver' } } + +## +# @NumaOptions +# +# A discriminated record of NUMA options. (for OptsVisitor) +# +# Since 2.1 +## +{ 'union': 'NumaOptions', + 'base': 'NumaCommonOptions', + 'discriminator': 'type', + 'data': { + 'node': 'NumaNodeOptions' }} + +## # @HostMemPolicy # # Host memory policy types