From mboxrd@z Thu Jan 1 00:00:00 1970 From: Wen Congyang Subject: [RFC Patch v2 14/17] pass correct file to qemu if we use blktap2 Date: Fri, 8 Aug 2014 16:10:55 +0800 Message-ID: <1407485458-23213-21-git-send-email-wency@cn.fujitsu.com> References: <1407485458-23213-1-git-send-email-wency@cn.fujitsu.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1407485458-23213-1-git-send-email-wency@cn.fujitsu.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: xen devel Cc: Ian Campbell , Wen Congyang , Ian Jackson , Jiang Yunhong , Dong Eddie , Shriram Rajagopalan , Yang Hongyang , Lai Jiangshan List-Id: xen-devel@lists.xenproject.org If we use blktap2, the correct file should be blktap device not the pdev_path. Signed-off-by: Wen Congyang Cc: Shriram Rajagopalan --- tools/libxl/libxl_dm.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c index addacdb..d86ce15 100644 --- a/tools/libxl/libxl_dm.c +++ b/tools/libxl/libxl_dm.c @@ -680,6 +680,7 @@ static char ** libxl__build_device_model_args_new(libxl__gc *gc, libxl__device_disk_dev_number(disks[i].vdev, &disk, &part); const char *format = qemu_disk_format_string(disks[i].format); char *drive; + const char *pdev_path; if (dev_number == -1) { LIBXL__LOG(ctx, LIBXL__LOG_WARNING, "unable to determine" @@ -709,6 +710,12 @@ static char ** libxl__build_device_model_args_new(libxl__gc *gc, continue; } + if (disks[i].backend == LIBXL_DISK_BACKEND_TAP) + pdev_path = libxl__blktap_devpath(gc, disks[i].pdev_path, + disks[i].format); + else + pdev_path = disks[i].pdev_path; + /* * Explicit sd disks are passed through as is. * @@ -718,11 +725,11 @@ static char ** libxl__build_device_model_args_new(libxl__gc *gc, if (strncmp(disks[i].vdev, "sd", 2) == 0) drive = libxl__sprintf (gc, "file=%s,if=scsi,bus=0,unit=%d,format=%s,cache=writeback", - disks[i].pdev_path, disk, format); + pdev_path, disk, format); else if (disk < 4) drive = libxl__sprintf (gc, "file=%s,if=ide,index=%d,media=disk,format=%s,cache=writeback", - disks[i].pdev_path, disk, format); + pdev_path, disk, format); else continue; /* Do not emulate this disk */ } -- 1.9.3