From patchwork Fri Jul 3 13:45:47 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: 491086 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 1D50714076B for ; Fri, 3 Jul 2015 23:46:24 +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=iosy8eT1; dkim-atps=neutral Received: from localhost ([::1]:41310 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZB1IK-0007DM-P2 for incoming@patchwork.ozlabs.org; Fri, 03 Jul 2015 09:46:20 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42526) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZB1Hl-0006C3-GB for qemu-devel@nongnu.org; Fri, 03 Jul 2015 09:45:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZB1Hh-0007Jy-3w for qemu-devel@nongnu.org; Fri, 03 Jul 2015 09:45:45 -0400 Received: from mail-wg0-x232.google.com ([2a00:1450:400c:c00::232]:33724) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZB1Hg-0007Jr-RU for qemu-devel@nongnu.org; Fri, 03 Jul 2015 09:45:40 -0400 Received: by wgck11 with SMTP id k11so89003756wgc.0 for ; Fri, 03 Jul 2015 06:45:40 -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=wXH56G4UjQL+PkogOxJwt5WMfb4Do7DUP3q5hDQzzuQ=; b=iosy8eT1dKOTsouiqD9tppwQd8aI8p5iyVUm1KdI50w4FCquN18enSsCHg4tCU3o7b 0B4beS3rd8Nh4jdh0WQGAyjfAjgPxE7MccXpi9n0plcg1J2zfUshuHXXlAZSienMxaNE y8g4vV8Oy6uS45tf6tphIy0Z5gBadkMf2YKJ96e3T9FiHC0NSSbxU+UJxrCsYunjS9Uq g8YjdYpFgZIDfToIa+Scysfc70fVfe4f3RAoWpSMneGmMw3NHEU3TMMdNQjwF4JCtJRr 0Q6SQoajqVSFHeJlDnkopkDDCRs0ZQ5LEpHxk2ZIKhM3ZIvgMoAcpT/42z34/t76qfAO TATQ== X-Received: by 10.194.234.65 with SMTP id uc1mr58512288wjc.112.1435931140171; Fri, 03 Jul 2015 06:45:40 -0700 (PDT) Received: from nullptr.home.dirty-ice.org (94-21-30-178.pool.digikabel.hu. [94.21.30.178]) by mx.google.com with ESMTPSA id ej5sm13451036wjd.22.2015.07.03.06.45.38 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 03 Jul 2015 06:45:39 -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: Fri, 3 Jul 2015 15:45:47 +0200 Message-Id: <9cd303978950cd1231b4db1d681d86caaaef8478.1435930020.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:c00::232 Cc: Markus Armbruster , Gerd Hoffmann , Eduardo Habkost Subject: [Qemu-devel] [PATCH v2 2/6] 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 91fc6c1..8b0755d 100644 --- a/numa.c +++ b/numa.c @@ -140,7 +140,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 106008c..7ebf99e 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -3537,17 +3537,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) @@ -3574,6 +3563,42 @@ '*memdev': 'str' }} ## +# @NumaDriver +# +# List of possible numa drivers. +# +# Since: 2.4 +## +{ 'enum': 'NumaDriver', + 'data': [ 'node' ] } + +## +# @NumaCommonOptions +# +# Common set of numa options. +# +# @type: the numa driver to use +# +# Since: 2.4 +## +{ '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