From patchwork Tue Feb 2 12:57:42 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= X-Patchwork-Id: 8190081 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 66B56BEEE5 for ; Tue, 2 Feb 2016 13:00:43 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B98A6202F2 for ; Tue, 2 Feb 2016 13:00:42 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0A56C202EB for ; Tue, 2 Feb 2016 13:00:42 +0000 (UTC) Received: from localhost ([::1]:56756 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aQaZV-0003he-ET for patchwork-qemu-devel@patchwork.kernel.org; Tue, 02 Feb 2016 08:00:41 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58921) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aQaX8-0008MO-Va for qemu-devel@nongnu.org; Tue, 02 Feb 2016 07:58:19 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aQaX5-0005Dp-1l for qemu-devel@nongnu.org; Tue, 02 Feb 2016 07:58:14 -0500 Received: from mx1.redhat.com ([209.132.183.28]:36752) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aQaX1-0005CS-BE; Tue, 02 Feb 2016 07:58:07 -0500 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (Postfix) with ESMTPS id E09A48E257; Tue, 2 Feb 2016 12:58:06 +0000 (UTC) Received: from t530wlan.home.berrange.com.com (vpn1-5-164.ams2.redhat.com [10.36.5.164]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u12Cvmvk006553; Tue, 2 Feb 2016 07:58:04 -0500 From: "Daniel P. Berrange" To: qemu-devel@nongnu.org Date: Tue, 2 Feb 2016 12:57:42 +0000 Message-Id: <1454417864-18774-9-git-send-email-berrange@redhat.com> In-Reply-To: <1454417864-18774-1-git-send-email-berrange@redhat.com> References: <1454417864-18774-1-git-send-email-berrange@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Kevin Wolf , qemu-block@nongnu.org, Markus Armbruster , Paolo Bonzini , =?UTF-8?q?Andreas=20F=C3=A4rber?= Subject: [Qemu-devel] [PATCH v5 08/10] qemu-nbd: don't overlap long option values with short options 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP When defining values for long options, the normal practice is to start numbering from 256, to avoid overlap with the range of valid values for short options. Reviewed-by: Eric Blake Signed-off-by: Daniel P. Berrange --- qemu-nbd.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/qemu-nbd.c b/qemu-nbd.c index ee91e47..026cf86 100644 --- a/qemu-nbd.c +++ b/qemu-nbd.c @@ -42,12 +42,12 @@ #include #define SOCKET_PATH "/var/lock/qemu-nbd-%s" -#define QEMU_NBD_OPT_CACHE 1 -#define QEMU_NBD_OPT_AIO 2 -#define QEMU_NBD_OPT_DISCARD 3 -#define QEMU_NBD_OPT_DETECT_ZEROES 4 -#define QEMU_NBD_OPT_OBJECT 5 -#define QEMU_NBD_OPT_IMAGE_OPTS 6 +#define QEMU_NBD_OPT_CACHE 256 +#define QEMU_NBD_OPT_AIO 257 +#define QEMU_NBD_OPT_DISCARD 258 +#define QEMU_NBD_OPT_DETECT_ZEROES 259 +#define QEMU_NBD_OPT_OBJECT 260 +#define QEMU_NBD_OPT_IMAGE_OPTS 261 static NBDExport *exp; static int verbose;