From patchwork Mon Sep 5 20:41:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 602758 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:4388:0:0:0:0 with SMTP id w8csp3964625mae; Mon, 5 Sep 2022 13:42:28 -0700 (PDT) X-Google-Smtp-Source: AA6agR60ajbPqIHkLWHz62/x2l1u4suk3tT/uMzjswj3QbRlwyfTldXsA1DoTUL+myZj8e5wIGFu X-Received: by 2002:a05:620a:1b83:b0:6bb:43ad:f864 with SMTP id dv3-20020a05620a1b8300b006bb43adf864mr31827446qkb.360.1662410547983; Mon, 05 Sep 2022 13:42:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1662410547; cv=none; d=google.com; s=arc-20160816; b=rnufwndRaPdy9NvLyvwTECJWiMN7FFYJAAaY7JyjJ5+xZY39Cr1Qv7jrO2ZTyQcMTf D9Mks55dJ2kBIm0cELzWM7ldFEaArnh8t6Ks4mVUTJxiHJEXhSWUmydpqskP8dpU/aFd Mx8r/VM6ZtBU9hdEsCW/au0XX2n1hSrQ5+jxdrcHLVnogk40N56kcKELRdMkFdG3kSMw +jBVgk1Wp4fpN2Q4Q568mz/in019LEWl4Olcch8hmz/EqgSKq3uStKDq/8a1NPGnPgwu RA6xIwtjXpj7djQdXrtCsgQ2c4CTr2JDedQD2zaqQ9XR/V1zGtua3ElTJnR7/RkKi9SN 0VgQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:message-id:date:subject:cc:to:from:dkim-signature; bh=1gXEqNp97BJqTtNSKLnfDY+sn5nP3z0fCG4nvT0whvw=; b=mA/IxGY03vodFAFAZztTIrByxK13Km1FPgFnfgCic7hbSINJ1KjSukdVdJo7fcJngL OUAqGbbnpjfGkr0wFASIn6llxD0ZIDBEhovD6f0AKqPOVDOlbGMJ+t6Pf+HwS9Selp37 HdDm9wOzrqDFFIp92MELEbfn0GQ4NQ3Qh0nwxaAhhAO3EEwtO5S6R7/GufeOTd/7fU1x FS94pBqx+MOmi/0NGVTdepSVg/jzjaaCBS/O0+h9qnIln7bdhXYO7fSi5p8KA+1ZBsPh B+JT6Vzf38Ax69U3C4fHsSeWTWKo/ave1YSekslT0QUtdA8FjdtHV1uaVBBdcZVqWLpz /xUw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=xstHJyrm; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id b130-20020ae9eb88000000b006b57606b10dsi5239647qkg.226.2022.09.05.13.42.27 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 05 Sep 2022 13:42:27 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=xstHJyrm; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:50216 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oVIvL-00064O-GF for patch@linaro.org; Mon, 05 Sep 2022 16:42:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34540) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oVIuG-00060f-TP for qemu-devel@nongnu.org; Mon, 05 Sep 2022 16:41:21 -0400 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]:42887) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oVIuF-0007Ij-7b for qemu-devel@nongnu.org; Mon, 05 Sep 2022 16:41:20 -0400 Received: by mail-wr1-x433.google.com with SMTP id bp20so12196351wrb.9 for ; Mon, 05 Sep 2022 13:41:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date; bh=1gXEqNp97BJqTtNSKLnfDY+sn5nP3z0fCG4nvT0whvw=; b=xstHJyrmgryigyAlhIeUxfp+IrwmnPKakbtgJefRx2u0D6v5KrmxoHGkmAPuCj93nj 6bc82kEG1rbaM7EPzUjBeuMtRETzuKGiyBYaPcQmMXshGOIJ/p9+U3Zy94w/n5oEzL3C NXAfK0NDXXiGIuF9sy6YKEiOM5a/9P8QijEWECSCDtPWdJm/J1+KwZS48/muw9RP3Y3D GBfeW8pbjVsdIFqmmwxfP3BGreVLY5eO0ND+JzNKjjEWGchsB30I8+qgfibMYqygW2Xb kxkSqFdrH2OV8sMoYhoRycLd/DGlz2NNtEI8HvY9r2+zLFUlCs8m6YFcUmyT7/+i99Rt 6I3A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date; bh=1gXEqNp97BJqTtNSKLnfDY+sn5nP3z0fCG4nvT0whvw=; b=ZDUzMaAlGeYftBRxQIoMMT4PUscEp6rOU7wWnvktt5nPTPwmquLy8Zs6rjrJaqCnmt zrWFf59duK6u2yfF7LtddeyJtBNZ+nnmo/xYAvuOnysOB3wqPd+t/oAZgyhcpI6xzbkg QPq8Nhf9WdfcBxKtQHfHCNfE+t8g43dZlaKmRpq68WQeFG5ce6ZeQvyJpipFcQzER78d 6JmFpK1LeyEpgkN58Z/CvHKESnUDsHgtmT5L0ABPPzLSO8qjNzuxmoOhbPNKQr2nPJZI MohTbkW2pcku8UD0je66ItSrdlakFuyl/9+gpa3J2AXDIg84LQ6B2G7gyiI8CWyD59qe 8sNA== X-Gm-Message-State: ACgBeo0q0ZOHopkcRv3w4oyesj5Vdnjl+pIeS5nSzpB4JfzG5A9v1Ejo CkKMoEO82usIyDUICb7rdsTlCsElqe9Bc1Nc X-Received: by 2002:a5d:64ab:0:b0:226:d997:ad5c with SMTP id m11-20020a5d64ab000000b00226d997ad5cmr21754584wrp.602.1662410477261; Mon, 05 Sep 2022 13:41:17 -0700 (PDT) Received: from localhost.localdomain ([2a02:8084:a5c0:5a80:d0ad:82b5:d7a4:c0a9]) by smtp.gmail.com with ESMTPSA id o5-20020a05600c510500b003a31fd05e0fsm36667023wms.2.2022.09.05.13.41.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Sep 2022 13:41:16 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: xieyongji@bytedance.com, pbonzini@redhat.com, stefanha@redhat.com Subject: [PATCH] build: Regenerate meson-buildoptions.sh Date: Mon, 5 Sep 2022 21:41:14 +0100 Message-Id: <20220905204114.208969-1-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::433; envelope-from=richard.henderson@linaro.org; helo=mail-wr1-x433.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Regeneration was missed by the previous update. Fixes: 2a2359b84407 ("vduse-blk: Implement vduse-blk export") Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé --- scripts/meson-buildoptions.sh | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/scripts/meson-buildoptions.sh b/scripts/meson-buildoptions.sh index 359b04e0e6..300ba8b212 100644 --- a/scripts/meson-buildoptions.sh +++ b/scripts/meson-buildoptions.sh @@ -42,12 +42,13 @@ meson_options_help() { printf "%s\n" ' --enable-trace-backends=CHOICES' printf "%s\n" ' Set available tracing backends [log] (choices:' printf "%s\n" ' dtrace/ftrace/log/nop/simple/syslog/ust)' - printf "%s\n" ' --firmwarepath=VALUES search PATH for firmware files [share/qemu-firmware]' + printf "%s\n" ' --firmwarepath=VALUES search PATH for firmware files [share/qemu-' + printf "%s\n" ' firmware]' printf "%s\n" ' --iasl=VALUE Path to ACPI disassembler' printf "%s\n" ' --includedir=VALUE Header file directory [include]' printf "%s\n" ' --interp-prefix=VALUE where to find shared libraries etc., use %M for' printf "%s\n" ' cpu name [/usr/gnemul/qemu-%M]' - printf "%s\n" ' --libdir=VALUE Library directory [lib64]' + printf "%s\n" ' --libdir=VALUE Library directory [lib/x86_64-linux-gnu]' printf "%s\n" ' --libexecdir=VALUE Library executable directory [libexec]' printf "%s\n" ' --localedir=VALUE Locale data directory [share/locale]' printf "%s\n" ' --localstatedir=VALUE Localstate data directory [/var/local]' @@ -154,6 +155,8 @@ meson_options_help() { printf "%s\n" ' usb-redir libusbredir support' printf "%s\n" ' vde vde network backend support' printf "%s\n" ' vdi vdi image format support' + printf "%s\n" ' vduse-blk-export' + printf "%s\n" ' VDUSE block export support' printf "%s\n" ' vfio-user-server' printf "%s\n" ' vfio-user server support' printf "%s\n" ' vhost-crypto vhost-user crypto backend support' @@ -162,8 +165,6 @@ meson_options_help() { printf "%s\n" ' vhost-user vhost-user backend support' printf "%s\n" ' vhost-user-blk-server' printf "%s\n" ' build vhost-user-blk server' - printf "%s\n" ' vduse-blk-export' - printf "%s\n" ' VDUSE block export support' printf "%s\n" ' vhost-vdpa vhost-vdpa kernel backend support' printf "%s\n" ' virglrenderer virgl rendering support' printf "%s\n" ' virtfs virtio-9p support' @@ -422,6 +423,8 @@ _meson_option_parse() { --disable-vde) printf "%s" -Dvde=disabled ;; --enable-vdi) printf "%s" -Dvdi=enabled ;; --disable-vdi) printf "%s" -Dvdi=disabled ;; + --enable-vduse-blk-export) printf "%s" -Dvduse_blk_export=enabled ;; + --disable-vduse-blk-export) printf "%s" -Dvduse_blk_export=disabled ;; --enable-vfio-user-server) printf "%s" -Dvfio_user_server=enabled ;; --disable-vfio-user-server) printf "%s" -Dvfio_user_server=disabled ;; --enable-vhost-crypto) printf "%s" -Dvhost_crypto=enabled ;; @@ -434,8 +437,6 @@ _meson_option_parse() { --disable-vhost-user) printf "%s" -Dvhost_user=disabled ;; --enable-vhost-user-blk-server) printf "%s" -Dvhost_user_blk_server=enabled ;; --disable-vhost-user-blk-server) printf "%s" -Dvhost_user_blk_server=disabled ;; - --enable-vduse-blk-export) printf "%s" -Dvduse_blk_export=enabled ;; - --disable-vduse-blk-export) printf "%s" -Dvduse_blk_export=disabled ;; --enable-vhost-vdpa) printf "%s" -Dvhost_vdpa=enabled ;; --disable-vhost-vdpa) printf "%s" -Dvhost_vdpa=disabled ;; --enable-virglrenderer) printf "%s" -Dvirglrenderer=enabled ;;