From patchwork Mon Dec 9 14:52:40 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 1206319 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="GNnV3LJH"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47WmQj6YBpz9sR0 for ; Tue, 10 Dec 2019 01:53:16 +1100 (AEDT) Received: from localhost ([::1]:41036 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ieKPR-0000Uc-BV for incoming@patchwork.ozlabs.org; Mon, 09 Dec 2019 09:53:13 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:44229) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ieKP5-0000Tm-As for qemu-devel@nongnu.org; Mon, 09 Dec 2019 09:52:52 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ieKP3-00035v-T0 for qemu-devel@nongnu.org; Mon, 09 Dec 2019 09:52:50 -0500 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:38505 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ieKP3-00035Z-PX for qemu-devel@nongnu.org; Mon, 09 Dec 2019 09:52:49 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1575903169; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iq86KGxLR6UTYXmMeKI1ArfzDy3UjI2qkFgCjrf2gXY=; b=GNnV3LJHlvcY+zLk0DvcJCGJ1GL+EfNxUJEuhy5PbEej3CTZhYNG9Q5IKEF+Tou5wnqegD FWzOtlJ7nzEbqSUwtu6IKE0uEoIj+hg1PipqwVJS72XNhtiNJNNR1uEGZwPB8u6TZHsdCV hwSmriGLTioyIgXYaKZ0Pyqn7fRHROU= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-280-MQfb8sPxN6yLSrYgTqbD9Q-1; Mon, 09 Dec 2019 09:52:45 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id CA285800D4E; Mon, 9 Dec 2019 14:52:44 +0000 (UTC) Received: from thuth.com (ovpn-116-121.ams2.redhat.com [10.36.116.121]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1D3EC10372C0; Mon, 9 Dec 2019 14:52:42 +0000 (UTC) From: Thomas Huth To: Greg Kurz , qemu-devel@nongnu.org Subject: [PATCH] virtfs: Remove the deprecated "-virtfs_synth" option Date: Mon, 9 Dec 2019 15:52:40 +0100 Message-Id: <20191209145240.9271-1-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-MC-Unique: MQfb8sPxN6yLSrYgTqbD9Q-1 X-Mimecast-Spam-Score: 0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.61 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-trivial@nongnu.org, Paolo Bonzini Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" It's been marked as deprecated since QEMU v4.1, time to remove it now. Signed-off-by: Thomas Huth --- qemu-deprecated.texi | 5 ----- qemu-options.hx | 10 ---------- vl.c | 23 ----------------------- 3 files changed, 38 deletions(-) diff --git a/qemu-deprecated.texi b/qemu-deprecated.texi index 2f9efb45ba..3745334e80 100644 --- a/qemu-deprecated.texi +++ b/qemu-deprecated.texi @@ -84,11 +84,6 @@ error in the future. The @code{-realtime mlock=on|off} argument has been replaced by the @code{-overcommit mem-lock=on|off} argument. -@subsection -virtfs_synth (since 4.1) - -The ``-virtfs_synth'' argument is now deprecated. Please use ``-fsdev synth'' -and ``-device virtio-9p-...'' instead. - @subsection -numa node,mem=@var{size} (since 4.1) The parameter @option{mem} of @option{-numa node} is used to assign a part of diff --git a/qemu-options.hx b/qemu-options.hx index 65c9473b73..4cf7751ade 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -1468,16 +1468,6 @@ would still return entries from other devices). @end table ETEXI -DEF("virtfs_synth", 0, QEMU_OPTION_virtfs_synth, - "-virtfs_synth Create synthetic file system image\n", - QEMU_ARCH_ALL) -STEXI -@item -virtfs_synth -@findex -virtfs_synth -Create synthetic file system image. Note that this option is now deprecated. -Please use @code{-fsdev synth} and @code{-device virtio-9p-...} instead. -ETEXI - DEF("iscsi", HAS_ARG, QEMU_OPTION_iscsi, "-iscsi [user=user][,password=password]\n" " [,header-digest=CRC32C|CR32C-NONE|NONE-CRC32C|NONE\n" diff --git a/vl.c b/vl.c index 6a65a64bfd..c0904b365b 100644 --- a/vl.c +++ b/vl.c @@ -3374,29 +3374,6 @@ int main(int argc, char **argv, char **envp) qemu_opt_get(opts, "mount_tag"), &error_abort); break; } - case QEMU_OPTION_virtfs_synth: { - QemuOpts *fsdev; - QemuOpts *device; - - warn_report("'-virtfs_synth' is deprecated, please use " - "'-fsdev synth' and '-device virtio-9p-...' " - "instead"); - - fsdev = qemu_opts_create(qemu_find_opts("fsdev"), "v_synth", - 1, NULL); - if (!fsdev) { - error_report("duplicate option: %s", "virtfs_synth"); - exit(1); - } - qemu_opt_set(fsdev, "fsdriver", "synth", &error_abort); - - device = qemu_opts_create(qemu_find_opts("device"), NULL, 0, - &error_abort); - qemu_opt_set(device, "driver", "virtio-9p-pci", &error_abort); - qemu_opt_set(device, "fsdev", "v_synth", &error_abort); - qemu_opt_set(device, "mount_tag", "v_synth", &error_abort); - break; - } case QEMU_OPTION_serial: add_device_config(DEV_SERIAL, optarg); default_serial = 0;