From patchwork Fri Nov 25 09:26:59 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Dario Faggioli X-Patchwork-Id: 9447077 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id A087C6071B for ; Fri, 25 Nov 2016 09:29:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A5EF828047 for ; Fri, 25 Nov 2016 09:29:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9AA812808F; Fri, 25 Nov 2016 09:29:48 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id AD50928111 for ; Fri, 25 Nov 2016 09:29:43 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cACmg-0007xu-86; Fri, 25 Nov 2016 09:27:06 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cACmf-0007xl-4j for xen-devel@lists.xenproject.org; Fri, 25 Nov 2016 09:27:05 +0000 Received: from [193.109.254.147] by server-5.bemta-6.messagelabs.com id E1/6C-19272-7E308385; Fri, 25 Nov 2016 09:27:03 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrIIsWRWlGSWpSXmKPExsVyMfTSEd1nzBY RButvS1l83zKZyYHR4/CHKywBjFGsmXlJ+RUJrBnPt6xjK7ipWDGtYy5bA+MemS5GLg4hgRmM Epf2XmMBcVgEprJKTPg+ixnEkRDYyCpx6sdLti5GTiAnRuLI/feMEHaFRO+h7UwgtpCAisTN7 auYIEb9YpR4tPciM0hCWEBP4sjRH+wQdohE34fDYDabgIHEmx17WUFsEQEliXurJoMNYhb4zS TR/ccAxGYRUJV49PQG2DJeAR+J3XtPgs0UFZCTWHm5hRUiLihxcuYToLM5gHo1Jdbv0ocYIy/ RvHU28wRGoVlIqmYhVM1CUrWAkXkVo0ZxalFZapGusbFeUlFmekZJbmJmjq6hgZlebmpxcWJ6 ak5iUrFecn7uJkZgQDMAwQ7GnesDDzFKcjApifLq/TKPEOJLyk+pzEgszogvKs1JLT7EKMPBo STB+4PJIkJIsCg1PbUiLTMHGFswaQkOHiUR3iMMQGne4oLE3OLMdIjUKUZjjlcfXjxg4uj48O EBkxBLXn5eqpQ4xCQBkNKM0jy4QbCYv8QoKyXMywh0mhBPQWpRbmYJqvwrRnEORiVh3jqQKTy ZeSVw+14BncIEdIrzD3OQU0oSEVJSDYy2fffYSk5UfpeYWylYLralPzHHaFc2Y9S5Jw4traff Tw+OiU63Omis+aww6daaoFkC4iIr7n5eWTFz4gu2krhvy6I7UkS2tdrpFX4u+FHj8/phzK6TE i75WS5/P+3nux/LcEzoxOG7svLrxEv7pr7YMmVRlpeUhpGq+XxDxukLlq0XEgtlv6LEUpyRaK jFXFScCACS7SM19AIAAA== X-Env-Sender: raistlin.df@gmail.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1480066022!53852975!1 X-Originating-IP: [209.85.210.196] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 9.0.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 52620 invoked from network); 25 Nov 2016 09:27:02 -0000 Received: from mail-wj0-f196.google.com (HELO mail-wj0-f196.google.com) (209.85.210.196) by server-10.tower-27.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 25 Nov 2016 09:27:02 -0000 Received: by mail-wj0-f196.google.com with SMTP id xy5so4916423wjc.1 for ; Fri, 25 Nov 2016 01:27:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:subject:from:to:cc:date:message-id:user-agent:mime-version :content-transfer-encoding; bh=H4cXVEJhGvb/6VfMkLVL9AA3slyd8dvZXqJ2oyZFo/Y=; b=vITSjMysLn1bCb9bH+Q3+Y9IAoNmTodA/WGHkVnzyVwx/A0FKexe2oZGpQHbCwmoXm V85uRVAhH7Wti5Xc3mJkDByJeJZb72w0qOenWsmsOhCuCmFKSa+pp5xt++F2iAIpYv0C NYZ8BNEKL2EPgGhbDn45kIXI7ClQVHFuQWYoZp9UA+GUfHr1KXwM0Bh/oQsACJ+sOCSc Pxbj5fzORnb1IdJmmoTdlNcGetTJnYnTLYQstbBT8CmjvlozppmehgpY6Zg5iRuFPaYL WjcSwlzBLvYD+w/+DJF1mV1YVRMG/VQgZgkXgHZcT8ooyga9oi6t5OkJBkQAOnyVzZTH QteA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:subject:from:to:cc:date:message-id :user-agent:mime-version:content-transfer-encoding; bh=H4cXVEJhGvb/6VfMkLVL9AA3slyd8dvZXqJ2oyZFo/Y=; b=cBetNxTH+xP/nANpxRhM+M07tiMbvydbnprj+t9rneHeJdiblI6cbI4XPFG29gAz+Y raAZFqehDHqrVTO+XYySkMNfb+CTHvqLEoRInzYs3sdyoOK1px8dj6yInUclOkpBwHRE EzGvvUIy9wYTE+E7fHDW45N5uhBLbirqh8W6JRssGRnZ+bxwL+ffmsQfKGkRFmaH8mkX U0O88UFeCw6lepXx4aULVv68+Tjvyle2YNJTWHkzICtt1HhuvqUtKD0YqZQOZ24yLhNr oqrZSFIJw+QEi/88XaQ8k+o2I/wIOWbN4fcKXdWT9N2WjzG+wK0Ccloqa7upGQsQO7lm w5jA== X-Gm-Message-State: AKaTC03QAdnjzPZ3yMCyhQ1hNrUCnxKHStJs99LJQPLCL0ZpBuJMR+2JcF3srgqmC3fFAg== X-Received: by 10.194.18.196 with SMTP id y4mr6571928wjd.73.1480066022008; Fri, 25 Nov 2016 01:27:02 -0800 (PST) Received: from Solace.fritz.box ([80.66.223.24]) by smtp.gmail.com with ESMTPSA id t82sm12458693wmd.17.2016.11.25.01.27.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 25 Nov 2016 01:27:01 -0800 (PST) From: Dario Faggioli To: xen-devel@lists.xenproject.org Date: Fri, 25 Nov 2016 10:26:59 +0100 Message-ID: <148006601954.11351.18297485039703355259.stgit@Solace.fritz.box> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Cc: Stefano Stabellini , Wei Liu , George Dunlap , Andrew Cooper , Ian Jackson , Jan Beulich , Roger Pau =?utf-8?b?TW9ubsOp?= Subject: [Xen-devel] [for-4.8 PATCH] xen: blkif: kill some repetitions in protocol description. X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP The whole block describing multiqueue support was repeated two times. There also was some repetition in the description of the 'discard-enable' property. Signed-off-by: Dario Faggioli Acked-by: Jan Beulich Reviewed-by: Konrad Rzeszutek Will Acked-by: Roger Pau Monné --- Cc: Andrew Cooper Cc: George Dunlap Cc: Ian Jackson Cc: Jan Beulich Cc: Konrad Rzeszutek Wilk Cc: Stefano Stabellini Cc: Wei Liu Cc: Bob Liu Cc: Roger Pau Monné --- I'd say this should go in 4.8. It's an improvement, and it's harmless (it's documentation). --- xen/include/public/io/blkif.h | 55 ++--------------------------------------- 1 file changed, 3 insertions(+), 52 deletions(-) diff --git a/xen/include/public/io/blkif.h b/xen/include/public/io/blkif.h index ce0dbfe..15a71e3 100644 --- a/xen/include/public/io/blkif.h +++ b/xen/include/public/io/blkif.h @@ -216,10 +216,9 @@ * Default Value: 1 * * This optional property, set by the toolstack, instructs the backend - * to offer discard to the frontend. If the property is missing the - * backend should offer discard if the backing storage actually supports - * it. This optional property, set by the toolstack, requests that the - * backend offer, or not offer, discard to the frontend. + * to offer (or not to offer) discard to the frontend. If the property + * is missing the backend should offer discard if the backing storage + * actually supports it. * * discard-alignment * Values: @@ -451,54 +450,6 @@ */ /* - * Multiple hardware queues/rings: - * If supported, the backend will write the key "multi-queue-max-queues" to - * the directory for that vbd, and set its value to the maximum supported - * number of queues. - * Frontends that are aware of this feature and wish to use it can write the - * key "multi-queue-num-queues" with the number they wish to use, which must be - * greater than zero, and no more than the value reported by the backend in - * "multi-queue-max-queues". - * - * For frontends requesting just one queue, the usual event-channel and - * ring-ref keys are written as before, simplifying the backend processing - * to avoid distinguishing between a frontend that doesn't understand the - * multi-queue feature, and one that does, but requested only one queue. - * - * Frontends requesting two or more queues must not write the toplevel - * event-channel and ring-ref keys, instead writing those keys under sub-keys - * having the name "queue-N" where N is the integer ID of the queue/ring for - * which those keys belong. Queues are indexed from zero. - * For example, a frontend with two queues must write the following set of - * queue-related keys: - * - * /local/domain/1/device/vbd/0/multi-queue-num-queues = "2" - * /local/domain/1/device/vbd/0/queue-0 = "" - * /local/domain/1/device/vbd/0/queue-0/ring-ref = "" - * /local/domain/1/device/vbd/0/queue-0/event-channel = "" - * /local/domain/1/device/vbd/0/queue-1 = "" - * /local/domain/1/device/vbd/0/queue-1/ring-ref = "" - * /local/domain/1/device/vbd/0/queue-1/event-channel = "" - * - * It is also possible to use multiple queues/rings together with - * feature multi-page ring buffer. - * For example, a frontend requests two queues/rings and the size of each ring - * buffer is two pages must write the following set of related keys: - * - * /local/domain/1/device/vbd/0/multi-queue-num-queues = "2" - * /local/domain/1/device/vbd/0/ring-page-order = "1" - * /local/domain/1/device/vbd/0/queue-0 = "" - * /local/domain/1/device/vbd/0/queue-0/ring-ref0 = "" - * /local/domain/1/device/vbd/0/queue-0/ring-ref1 = "" - * /local/domain/1/device/vbd/0/queue-0/event-channel = "" - * /local/domain/1/device/vbd/0/queue-1 = "" - * /local/domain/1/device/vbd/0/queue-1/ring-ref0 = "" - * /local/domain/1/device/vbd/0/queue-1/ring-ref1 = "" - * /local/domain/1/device/vbd/0/queue-1/event-channel = "" - * - */ - -/* * STATE DIAGRAMS * *****************************************************************************