From patchwork Fri Oct 5 17:13:43 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcelo Tosatti X-Patchwork-Id: 189551 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 4A6A22C032D for ; Sat, 6 Oct 2012 03:56:15 +1000 (EST) Received: from localhost ([::1]:54457 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TKBVK-0005im-U4 for incoming@patchwork.ozlabs.org; Fri, 05 Oct 2012 13:16:02 -0400 Received: from eggs.gnu.org ([208.118.235.92]:34055) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TKBV4-0005GR-7N for qemu-devel@nongnu.org; Fri, 05 Oct 2012 13:15:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TKBV0-0001EI-1C for qemu-devel@nongnu.org; Fri, 05 Oct 2012 13:15:46 -0400 Received: from mx1.redhat.com ([209.132.183.28]:22311) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TKBUz-0001Da-Ns for qemu-devel@nongnu.org; Fri, 05 Oct 2012 13:15:41 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q95HFfTR011552 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 5 Oct 2012 13:15:41 -0400 Received: from amt.cnet (vpn1-7-183.gru2.redhat.com [10.97.7.183]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q95HFesh015978; Fri, 5 Oct 2012 13:15:40 -0400 Received: from amt.cnet (amt.cnet [127.0.0.1]) by amt.cnet (Postfix) with ESMTP id 5C1CC652033; Fri, 5 Oct 2012 14:15:25 -0300 (BRT) Received: (from marcelo@localhost) by amt.cnet (8.14.5/8.14.5/Submit) id q95HFPeS010809; Fri, 5 Oct 2012 14:15:25 -0300 Message-Id: <20121005171442.485802711@amt.cnet> User-Agent: quilt/0.48-1 Date: Fri, 05 Oct 2012 14:13:43 -0300 From: Marcelo Tosatti To: qemu-devel@nongnu.org References: <20121005171338.092840368@amt.cnet> Content-Disposition: inline; filename=05_qemukvm-commandline-boot-option X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 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 5/7] Emulate qemu-kvms drive parameter boot=on|off 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 drive boot option. From the qemu-kvm original commit message: We do not want to maintain this option forever. It will be removed after a grace period of a few releases. So warn the user that this option has no effect and will become invalid soon. Signed-off-by: Marcelo Tosatti Index: qemu-compat-kvm/blockdev.c =================================================================== --- qemu-compat-kvm.orig/blockdev.c +++ qemu-compat-kvm/blockdev.c @@ -432,6 +432,12 @@ DriveInfo *drive_init(QemuOpts *opts, in return NULL; } + if (qemu_opt_get(opts, "boot") != NULL) { + fprintf(stderr, "qemu-kvm: boot=on|off is deprecated and will be " + "ignored. Future versions will reject this parameter. Please " + "update your scripts.\n"); + } + on_write_error = BLOCK_ERR_STOP_ENOSPC; if ((buf = qemu_opt_get(opts, "werror")) != NULL) { if (type != IF_IDE && type != IF_SCSI && type != IF_VIRTIO && type != IF_NONE) { Index: qemu-compat-kvm/qemu-config.c =================================================================== --- qemu-compat-kvm.orig/qemu-config.c +++ qemu-compat-kvm/qemu-config.c @@ -114,6 +114,10 @@ static QemuOptsList qemu_drive_opts = { .name = "copy-on-read", .type = QEMU_OPT_BOOL, .help = "copy read data from backing file into image file", + },{ + .name = "boot", + .type = QEMU_OPT_BOOL, + .help = "(deprecated, ignored)", }, { /* end of list */ } },