From patchwork Mon Mar 21 18:16:56 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: George Dunlap X-Patchwork-Id: 8635051 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 BABFF9F372 for ; Mon, 21 Mar 2016 18:19:27 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id CFC0520109 for ; Mon, 21 Mar 2016 18:19:26 +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 DB28120204 for ; Mon, 21 Mar 2016 18:19:25 +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 1ai4O6-0008Qk-4q; Mon, 21 Mar 2016 18:17:10 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ai4O4-0008QA-NJ for xen-devel@lists.xen.org; Mon, 21 Mar 2016 18:17:08 +0000 Received: from [85.158.137.68] by server-4.bemta-3.messagelabs.com id 0A/18-03606-3AA30F65; Mon, 21 Mar 2016 18:17:07 +0000 X-Env-Sender: prvs=8817d27e1=George.Dunlap@citrix.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1458584225!4399327!1 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAyMDMwMDc=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 8.11; banners=-,-,- X-VirusChecked: Checked Received: (qmail 57224 invoked from network); 21 Mar 2016 18:17:07 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-6.tower-31.messagelabs.com with RC4-SHA encrypted SMTP; 21 Mar 2016 18:17:07 -0000 X-IronPort-AV: E=Sophos;i="5.24,372,1454976000"; d="scan'208";a="340804192" From: George Dunlap To: Date: Mon, 21 Mar 2016 18:16:56 +0000 Message-ID: <1458584221-24426-5-git-send-email-george.dunlap@citrix.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1458584221-24426-1-git-send-email-george.dunlap@citrix.com> References: <1458584221-24426-1-git-send-email-george.dunlap@citrix.com> MIME-Version: 1.0 X-DLP: MIA1 Cc: George Dunlap , Ian Jackson , Wei Liu , Roger Pau Monne Subject: [Xen-devel] [PATCH v2 4/9] libxl: Move check for local access to a funciton 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 From: George Dunlap Move pygrub checks for local access ability into a separate function. Also reorganize libxl__device_disk_local_initiate_attach so that we don't initialize dls->disk unless we actually end up doing a local attach. Signed-off-by: George Dunlap --- Changes since v1: - Stylistic updates - No space between * and function name in libxl__device_disk_find_local_path - { on start of newline for function - Long line now under 80 characters - Remove redundant check for pdev_path - Space between if and condition - Avoid if ((x=...)) construction CC: Ian Jackson CC: Wei Liu CC: Roger Pau Monne --- tools/libxl/libxl.c | 67 +++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 47 insertions(+), 20 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 93f50d3..2d7a154 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -3000,13 +3000,38 @@ static char * libxl__alloc_vdev(libxl__gc *gc, void *get_vdev_user, /* Callbacks */ +static char *libxl__device_disk_find_local_path(libxl__gc *gc, + const libxl_device_disk *disk) +{ + char *path = NULL; + + /* No local paths for driver domains */ + if (disk->backend_domname != NULL) { + LOG(DEBUG, "Non-local backend, can't access locally.\n"); + goto out; + } + + /* + * If this is in raw format, and we're not using a script or a + * driver domain, we can access the target path directly. + */ + if (disk->format == LIBXL_DISK_FORMAT_RAW + && disk->script == NULL) { + path = libxl__strdup(gc, disk->pdev_path); + LOG(DEBUG, "Directly accessing local RAW disk %s", path); + goto out; + } + + out: + return path; +} + static void local_device_attach_cb(libxl__egc *egc, libxl__ao_device *aodev); void libxl__device_disk_local_initiate_attach(libxl__egc *egc, libxl__disk_local_state *dls) { STATE_AO_GC(dls->ao); - char *dev = NULL; int rc; const libxl_device_disk *in_disk = dls->in_disk; libxl_device_disk *disk = &dls->disk; @@ -3014,34 +3039,36 @@ void libxl__device_disk_local_initiate_attach(libxl__egc *egc, assert(in_disk->pdev_path); - memcpy(disk, in_disk, sizeof(libxl_device_disk)); - disk->pdev_path = libxl__strdup(gc, in_disk->pdev_path); - if (in_disk->script != NULL) - disk->script = libxl__strdup(gc, in_disk->script); disk->vdev = NULL; - rc = libxl__device_disk_setdefault(gc, disk); - if (rc) goto out; + if (dls->diskpath) + LOG(DEBUG, "Strange, dls->diskpath already set: %s", dls->diskpath); - /* If this is in a driver domain, or it's not a raw format, or it involves - * running a script, we have to do a local attach. */ - if (disk->backend_domname != NULL - || disk->format != LIBXL_DISK_FORMAT_RAW - || disk->script != NULL) { + LOG(DEBUG, "Trying to find local path"); + + dls->diskpath = libxl__device_disk_find_local_path(gc, in_disk); + if (dls->diskpath) { + LOG(DEBUG, "Local path found, executing callback."); + dls->callback(egc, dls, 0); + } else { + LOG(DEBUG, "Local path not found, initiating attach."); + + memcpy(disk, in_disk, sizeof(libxl_device_disk)); + disk->pdev_path = libxl__strdup(gc, in_disk->pdev_path); + if (in_disk->script != NULL) + disk->script = libxl__strdup(gc, in_disk->script); + disk->vdev = NULL; + + rc = libxl__device_disk_setdefault(gc, disk); + if (rc) goto out; + + /* If we can't find a local path, attach it */ libxl__prepare_ao_device(ao, &dls->aodev); dls->aodev.callback = local_device_attach_cb; device_disk_add(egc, LIBXL_TOOLSTACK_DOMID, disk, &dls->aodev, libxl__alloc_vdev, (void *) blkdev_start); - return; } - LOG(DEBUG, "locally attaching RAW disk %s", disk->pdev_path); - dev = disk->pdev_path; - - if (dev != NULL) - dls->diskpath = libxl__strdup(gc, dev); - - dls->callback(egc, dls, 0); return; out: