From mboxrd@z Thu Jan 1 00:00:00 1970 From: Wen Congyang Subject: [RFC Patch v2 07/17] blktap2: return the correct dev path Date: Fri, 8 Aug 2014 16:10:45 +0800 Message-ID: <1407485458-23213-11-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 The user uses TAPDISK_MESSAGE_OPEN to pass the devpath to tapdisk2, and will use TAPDISK_MESSAGE_LIST to query and get the pid of the tapdisk2. The devpath's format is: driver:params[|driver:params[...]]. The first vbd image only contains the first params, and we will return driver:params, not devpath. The devpath is stored in vbd->name, so return vbd->name instead of image->name. Signed-off-by: Wen Congyang Cc: Shriram Rajagopalan --- tools/blktap2/drivers/tapdisk-control.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/tools/blktap2/drivers/tapdisk-control.c b/tools/blktap2/drivers/tapdisk-control.c index 0b5cf3c..3a4ec8e 100644 --- a/tools/blktap2/drivers/tapdisk-control.c +++ b/tools/blktap2/drivers/tapdisk-control.c @@ -270,15 +270,10 @@ tapdisk_control_list(struct tapdisk_control_connection *connection, response.u.list.state = vbd->state; response.u.list.path[0] = 0; - if (!list_empty(&vbd->images)) { - td_image_t *image = list_entry(vbd->images.next, - td_image_t, next); + if (vbd->name) snprintf(response.u.list.path, sizeof(response.u.list.path), - "%s:%s", - tapdisk_disk_types[image->type]->name, - image->name); - } + "%s", vbd->name); tapdisk_control_write_message(connection->socket, &response, 2); } -- 1.9.3