From patchwork Sun Jun 25 22:15:30 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Waterman X-Patchwork-Id: 9808469 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 0304C6038C for ; Sun, 25 Jun 2017 22:20:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D7F5928372 for ; Sun, 25 Jun 2017 22:20:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CC55A2818A; Sun, 25 Jun 2017 22:20:40 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.6 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 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.wl.linuxfoundation.org (Postfix) with ESMTPS id C4DF32818A for ; Sun, 25 Jun 2017 22:20:39 +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 1dPFqA-0007NF-N6; Sun, 25 Jun 2017 22: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 1dPFq9-0007N6-JU for xen-devel@lists.xen.org; Sun, 25 Jun 2017 22:17:09 +0000 Received: from [85.158.137.68] by server-9.bemta-3.messagelabs.com id 77/F8-26749-46630595; Sun, 25 Jun 2017 22:17:08 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrBIsWRWlGSWpSXmKPExsVyMbThsG6KWUC kwYMtPBZLPi5mcWD0OLr7N1MAYxRrZl5SfkUCa8bTQ5tZCh7yVGz9Jt7AuIKzi5GLQ0hgEqPE i7MbmUAcFoGXLBKLdx1lBnEkBPpZJd5fuM/excgJ5MRJbD8xkRHCrpJo3XKdBcQWElCTaPjxh xFi1DwmiXvzN7OBJNgE9CTeXrnIBGKLCEhLXPt8GayZGWhQz5Y3QDYHh7CAr8Tn+1UgJouAqs ThRRUgJq+Aq8T2Z0UQm+Qkbp7rZAaxOQXcJO5Ov8oEsdVVovv2CqYJjAILGBlWMaoXpxaVpRb pWuglFWWmZ5TkJmbm6BoaGOvlphYXJ6an5iQmFesl5+duYgSGFAMQ7GC80O58iFGSg0lJlLfR 3z9SiC8pP6UyI7E4I76oNCe1+BCjDAeHkgSvv2lApJBgUWp6akVaZg4wuGHSEhw8SiK8wSpAa d7igsTc4sx0iNQpRkuOK1fWfWHi2LB6PZCccmD7FyYhlrz8vFQpcd4kkHkCIA0ZpXlw42AReI lRVkqYlxHoQCGegtSi3MwSVPlXjOIcjErCvD0gU3gy80rgtr4COogJ6KAZa3xADipJREhJNTC aK2f9NTjzSdxu3QqWr823r8fxLDxawGSxT++Z7urcxb1BE8/+N5/GzyD4uudDhuvk5xFHXz23 k0hkX6sf7/DdxYan2+3bkoR1X8+17zsWqPbhYLS22dSSgtsyMQ+vTA7R55wuUR2cv7/20rTK7 k0al7Q0ZvfESF54LKW8YWqxxO7ERic91hQlluKMREMt5qLiRABgebXeuwIAAA== X-Env-Sender: watermansrdev@gmail.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1498429028!103236209!1 X-Originating-IP: [209.85.128.195] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 9.4.19; banners=-,-,- X-VirusChecked: Checked Received: (qmail 41948 invoked from network); 25 Jun 2017 22:17:08 -0000 Received: from mail-wr0-f195.google.com (HELO mail-wr0-f195.google.com) (209.85.128.195) by server-15.tower-31.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 25 Jun 2017 22:17:08 -0000 Received: by mail-wr0-f195.google.com with SMTP id k67so26603809wrc.1 for ; Sun, 25 Jun 2017 15:17:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=r+XwA+oIvcMTPWT7y5D2wjU+ECN89kQWVDd/oDIPKyo=; b=tmUtJRRCbjY2dsVTdoAnJOoiNVuy7o54Xo5dokNX1FfgEiz3C+SdYhXayVpw2YPCcN k+9G7IqrBF1hem9AuGaIVXtHEPxy1hf4szvy33+F5M/1f0G7BjzVzhiadeJYp8dJMM9t QF+z2e6y7Mz7xxYPWZt0j+Me0z6/M7wvGI19OCoH3yD2JwS6inv64/MBWi5KqEBjAoGO j6o4pDTDSK64tVxmWG0LAJoQLA4cBYahb1ksvHQS2PfCFv23iwZY+YEaTmjmsnObCbOs XB6uxUOYUpR8hdVsDmaAxcSjMRQYHmOhHW895WW6sBppbVq7yn4HWxIBDCbD0iyiEvC/ E8BQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=r+XwA+oIvcMTPWT7y5D2wjU+ECN89kQWVDd/oDIPKyo=; b=Jd4kFKHisOig2NNA15i1TV36iLGDkeQzY2gk7Qt1WP+cjDUxS/5CHGq4Wse58ypx9Z XvZZWdx+Z1vRBug49IUxB0aHaweTBCAE6gjRcNtAasFuAlYP9bfdU96RcdbihQS1V4wY YmvbXuYyURIzvkvKS7i803fSqp6QoW0NdXohu8Ib2++XljsH6fsgSD+HDIRD9L305ASM hodU9bMZ+y+oZ/yT0Vvtdt13fyFFfamKxCHqQ4LkTNLPPsd7+Mb3jsE2Gl8+t/tFcT97 DfDD23nSzaONziVtdM7C1VCabqpumy4+KI4+uwVYyG/pWwQKGo66yjE7VxLIBnBARLGp +LCw== X-Gm-Message-State: AKS2vOymUBlxo/J5bi+2Flv4x1oWo9xU8fJDfcT6T3bwqw6XxpVGduZ3 VqnUfhs4H6GPkOLk X-Received: by 10.223.165.86 with SMTP id j22mr9815052wrb.147.1498429027625; Sun, 25 Jun 2017 15:17:07 -0700 (PDT) Received: from simon.home (host86-137-251-48.range86-137.btcentralplus.com. [86.137.251.48]) by smtp.gmail.com with ESMTPSA id m26sm15960371wrm.4.2017.06.25.15.17.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 25 Jun 2017 15:17:07 -0700 (PDT) From: Simon Waterman To: xen-devel@lists.xen.org Date: Sun, 25 Jun 2017 23:15:30 +0100 Message-Id: <1498428931-465-3-git-send-email-watermansrdev@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1498428931-465-1-git-send-email-watermansrdev@gmail.com> References: <1498428931-465-1-git-send-email-watermansrdev@gmail.com> Cc: ian.jackson@eu.citrix.com, wei.liu2@citrix.com, Simon Waterman Subject: [Xen-devel] [PATCH RFC 2/3] libxl: upstream Qemu as PV backend for IOEMU stubdom 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: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP Process xl.cfg file setting for PV device model version. Valid values are qemu-xen and qemu-xen-traditional. Signed-off-by: Simon Waterman --- tools/xl/xl_parse.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/tools/xl/xl_parse.c b/tools/xl/xl_parse.c index 856a304..48cbb18 100644 --- a/tools/xl/xl_parse.c +++ b/tools/xl/xl_parse.c @@ -1883,6 +1883,25 @@ skip_usbdev: xlu_cfg_replace_string(config, "device_model_user", &b_info->device_model_user, 0); + if (!xlu_cfg_get_string (config, "device_model_pv_version", &buf, 0)) { + if (!libxl_defbool_val(b_info->device_model_stubdomain)) { + fprintf(stderr, "WARNING: device_model_pv_version specified but no stub domain\n"); + } + if (!strcmp(buf, "qemu-xen-traditional")) { + b_info->device_model_pv_version + = LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL; + } else if (!strcmp(buf, "qemu-xen")) { + b_info->device_model_pv_version + = LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN; + } else { + fprintf(stderr, + "Unknown device_model_pv_version \"%s\" specified\n", buf); + exit(1); + } + } else + b_info->device_model_pv_version + = LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL; + #define parse_extra_args(type) \ e = xlu_cfg_get_list_as_string_list(config, "device_model_args"#type, \ &b_info->extra##type, 0); \