From patchwork Fri Apr 8 16:13:39 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Roger Pau Monne X-Patchwork-Id: 8784651 Return-Path: X-Original-To: patchwork-xen-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 9E6299F659 for ; Fri, 8 Apr 2016 16:19:10 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7C3D9202DD for ; Fri, 8 Apr 2016 16:19:09 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6A2532027D for ; Fri, 8 Apr 2016 16:19:08 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1aoZ5h-0007QY-EK; Fri, 08 Apr 2016 16:17:01 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1aoZ5g-0007QF-E5 for xen-devel@lists.xenproject.org; Fri, 08 Apr 2016 16:17:00 +0000 Received: from [85.158.139.211] by server-3.bemta-5.messagelabs.com id 46/13-14148-B79D7075; Fri, 08 Apr 2016 16:16:59 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrOIsWRWlGSWpSXmKPExsXitHSDvW71TfZ wg9s9vBbft0xmcmD0OPzhCksAYxRrZl5SfkUCa8b+DffZChbwVUxdeoypgXEidxcjJ4eEgL9E x4cV7CA2m4COxMW5O9m6GDk4RARUJG7vNQAJMwsUS3xd1ccKYgsLxEhcb30MZrMAlcx/fpgFp JxXwEVi6z1PiIm6Eid3bwKbyCngKnGw9QFYuRBQyZnfl8BsXgFBiZMzn7BAjNeUaN3+mx3Clp do3jqbGaJeUaJ/3gM2iJncErdPT2WewMg/C0n7LCTts5C0L2BkXsWoUZxaVJZapGtooZdUlJm eUZKbmJmja2hgqpebWlycmJ6ak5hUrJecn7uJERiADECwg7Fpu+chRkkOJiVR3sAb7OFCfEn5 KZUZicUZ8UWlOanFhxhlODiUJHhrQXKCRanpqRVpmTnAWIBJS3DwKInwGoKkeYsLEnOLM9MhU qcYFaXEeZ1BEgIgiYzSPLg2WPxdYpSVEuZlBDpEiKcgtSg3swRV/hWjOAejkjDvNJApPJl5JX DTXwEtZgJafIGfDWRxSSJCSqqBcVaIQt370/qBPxfubY6fneVsW9j5j4FPetaDZVoO4WuM7wb s1F8le7tyR1j5wUbNUuHSWrnT/5VzM+/evOJ23mXnFp55Mzprd0y7NCk/ZafXxn9c2Q+C+Uxk /ggGnplzN37qUZWdmpf/yX2tZXzVeW+nRb7TC5Ozm34+q3Xq2rXzyiNho6oEbyWW4oxEQy3mo uJEAGPAAyK6AgAA X-Env-Sender: prvs=89920a859=roger.pau@citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1460132217!25363568!1 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAzMDYwNDg=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 8.28; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23713 invoked from network); 8 Apr 2016 16:16:58 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-15.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 8 Apr 2016 16:16:58 -0000 X-IronPort-AV: E=Sophos;i="5.24,454,1454976000"; d="scan'208";a="352537878" From: Roger Pau Monne To: Date: Fri, 8 Apr 2016 18:13:39 +0200 Message-ID: <1460132019-23719-5-git-send-email-roger.pau@citrix.com> X-Mailer: git-send-email 2.6.4 (Apple Git-63) In-Reply-To: <1460132019-23719-1-git-send-email-roger.pau@citrix.com> References: <1460132019-23719-1-git-send-email-roger.pau@citrix.com> MIME-Version: 1.0 X-DLP: MIA2 Cc: Wei Liu , Ian Jackson , Roger Pau Monne Subject: [Xen-devel] [PATCH v2 4/4] libxl: remove code added to use the 'phy' backend with CDROM devices X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, 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 This is a partial revert of 612f15, that allowed CDROM devices to use the 'phy' PV backend. Due to limitations in the current implementation of the libxl_cdrom_insert function, the PV backend used in conjunction with an emulated CDROM device must always be Qdisk at the moment. This is due to libxl_cdrom_insert not running disk hotplug scripts on plug and unplug of PV CDROM backends (and possibly other yet to be identified issues). Signed-off-by: Roger Pau Monné Acked-by: Wei Liu --- Cc: Ian Jackson Cc: Wei Liu --- Changes since v1: - Added a proper commit message. --- tools/libxl/libxl_device.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/tools/libxl/libxl_device.c b/tools/libxl/libxl_device.c index ce53520..82405a7 100644 --- a/tools/libxl/libxl_device.c +++ b/tools/libxl/libxl_device.c @@ -191,20 +191,13 @@ static int disk_try_backend(disk_try_backend_args *a, switch (backend) { case LIBXL_DISK_BACKEND_PHY: - if (!(a->disk->format == LIBXL_DISK_FORMAT_RAW || - a->disk->format == LIBXL_DISK_FORMAT_EMPTY)) { + if (a->disk->format != LIBXL_DISK_FORMAT_RAW) { goto bad_format; } if (libxl_defbool_val(a->disk->colo_enable)) goto bad_colo; - if (a->disk->format == LIBXL_DISK_FORMAT_EMPTY) { - LOG(DEBUG, "Disk vdev=%s is empty, skipping physical device check", - a->disk->vdev); - return backend; - } - if (a->disk->backend_domid != LIBXL_TOOLSTACK_DOMID) { LOG(DEBUG, "Disk vdev=%s, is using a storage driver domain, " "skipping physical device check", a->disk->vdev);