From patchwork Fri Oct 5 17:51:44 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcelo Tosatti X-Patchwork-Id: 189554 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 4499F2C00D8 for ; Sat, 6 Oct 2012 04:06:16 +1000 (EST) Received: from localhost ([::1]:38599 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TKC5P-0004Xl-5X for incoming@patchwork.ozlabs.org; Fri, 05 Oct 2012 13:53:19 -0400 Received: from eggs.gnu.org ([208.118.235.92]:52756) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TKC4Z-00021j-Ar for qemu-devel@nongnu.org; Fri, 05 Oct 2012 13:52:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TKC4X-0006Me-Bf for qemu-devel@nongnu.org; Fri, 05 Oct 2012 13:52:27 -0400 Received: from mx1.redhat.com ([209.132.183.28]:14429) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TKC4X-0006LM-2i for qemu-devel@nongnu.org; Fri, 05 Oct 2012 13:52:25 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q95HqM62004128 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 5 Oct 2012 13:52:23 -0400 Received: from amt.cnet (vpn1-7-198.gru2.redhat.com [10.97.7.198]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id q95HqMdS002419; Fri, 5 Oct 2012 13:52:22 -0400 Received: from amt.cnet (amt.cnet [127.0.0.1]) by amt.cnet (Postfix) with ESMTP id 1F40E652035; Fri, 5 Oct 2012 14:52:19 -0300 (BRT) Received: (from marcelo@localhost) by amt.cnet (8.14.5/8.14.5/Submit) id q95HqIvW016789; Fri, 5 Oct 2012 14:52:18 -0300 Message-Id: <20121005175203.761668007@amt.cnet> User-Agent: quilt/0.48-1 Date: Fri, 05 Oct 2012 14:51:44 -0300 From: Marcelo Tosatti To: qemu-devel@nongnu.org References: <20121005175138.079692291@amt.cnet> Content-Disposition: inline; filename=06_qemukvm-commandline-opt-tdf X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: Anthony Liguori , Marcelo Tosatti , Jan Kiszka , Gerd Hoffmann Subject: [Qemu-devel] [patch 6/7] Issue warning when deprecated -tdf option is used 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 From: Jan Kiszka Releases of qemu-kvm will be interrupted at qemu 1.3.0. Users should switch to plain qemu releases. To avoid breaking scenarios which are setup with command line options specific to qemu-kvm, port these switches from qemu-kvm to qemu.git. Port -tdf option. Signed-off-by: Marcelo Tosatti Index: qemu-compat-kvm/vl.c =================================================================== --- qemu-compat-kvm.orig/vl.c +++ qemu-compat-kvm/vl.c @@ -3169,6 +3169,10 @@ int main(int argc, char **argv, char **e case QEMU_OPTION_semihosting: semihosting_enabled = 1; break; + case QEMU_OPTION_tdf: + fprintf(stderr, "Warning: user space PIT time drift fix " + "is no longer supported.\n"); + break; case QEMU_OPTION_name: qemu_name = g_strdup(optarg); { Index: qemu-compat-kvm/qemu-options.hx =================================================================== --- qemu-compat-kvm.orig/qemu-options.hx +++ qemu-compat-kvm/qemu-options.hx @@ -2848,6 +2848,9 @@ DEF("no-kvm-pit", HAS_ARG, QEMU_OPTION_n HXCOMM Deprecated by -machine kernel_irqchip=on|off property DEF("no-kvm-irqchip", HAS_ARG, QEMU_OPTION_no_kvm_irqchip, "", QEMU_ARCH_I386) +HXCOMM Deprecated (ignored) +DEF("tdf", 0, QEMU_OPTION_tdf,"", QEMU_ARCH_ALL) + HXCOMM This is the last statement. Insert new options before this line! STEXI @end table