From patchwork Sun Jun 25 22:15:31 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Waterman X-Patchwork-Id: 9808465 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 7A80E6038C for ; Sun, 25 Jun 2017 22:20:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 593EA281F9 for ; Sun, 25 Jun 2017 22:20:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4CC52283C5; 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 C5E09281F9 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 1dPFqI-0007Od-Ur; Sun, 25 Jun 2017 22:17:18 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dPFqH-0007O7-6P for xen-devel@lists.xen.org; Sun, 25 Jun 2017 22:17:17 +0000 Received: from [85.158.143.35] by server-2.bemta-6.messagelabs.com id 8E/3D-03058-C6630595; Sun, 25 Jun 2017 22:17:16 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrGIsWRWlGSWpSXmKPExsVyMbThoG62WUC kwZ8JRhZLPi5mcWD0OLr7N1MAYxRrZl5SfkUCa8aP5SoFK3gqOr/sZ29gPMvZxcjFISQwiVHi dV8fC4jDIvCSReLztDesII6EQD+rxMm9k9m7GDmBnDiJAz0vGSHsaol1j5eD2UICahINP/4wQ oyaxySx7OVUsASbgJ7E2ysXmUBsEQFpiWufL4PFmYEG9Wx5A2YLC/hKrP/cBbaARUBVYsnODW A2r4CrxNFpL9gglslJ3DzXyQxicwq4SdydfpUJYrGrRPftFUwTGAUWMDKsYtQoTi0qSy3SNTb WSyrKTM8oyU3MzNE1NDDTy00tLk5MT81JTCrWS87P3cQIDC0GINjBuHN94CFGSQ4mJVHeRn// SCG+pPyUyozE4oz4otKc1OJDjDIcHEoSvP6mAZFCgkWp6akVaZk5wCCHSUtw8CiJ8AarAKV5i wsSc4sz0yFSpxiNOa5cWfeFiWPKge1fmIRY8vLzUqXEeZNAJgmAlGaU5sENgkXfJUZZKWFeRq DThHgKUotyM0tQ5V8xinMwKgnzFhkCTeHJzCuB2/cK6BQmoFNmrPEBOaUkESEl1cDosj4lU0P u09QgjgKdM9ZLPbtCy4OLl0/dUPfR7fnGvsXfp64/fCW8MvVXu6F8Tvikd4L+s23mWmQ4bjHb /vSNpEh6uOH5NY/cnLbHSt7ZeOyL5PvUtrWbLJfu7A5V/Fx2cM6eUtEbSg0zdApVd1Vu8xX6P 7Fk+g+ZWhO1y1cKAm7oJfCHcR5RYinOSDTUYi4qTgQAd3kAtrkCAAA= X-Env-Sender: watermansrdev@gmail.com X-Msg-Ref: server-10.tower-21.messagelabs.com!1498429035!68939631!1 X-Originating-IP: [209.85.128.193] 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 49666 invoked from network); 25 Jun 2017 22:17:15 -0000 Received: from mail-wr0-f193.google.com (HELO mail-wr0-f193.google.com) (209.85.128.193) by server-10.tower-21.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 25 Jun 2017 22:17:15 -0000 Received: by mail-wr0-f193.google.com with SMTP id x23so26725535wrb.0 for ; Sun, 25 Jun 2017 15:17:15 -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=NeY1mBbXeQDR22B+lPwGVcT6sK1Z7pfLgcQ+6TbFtpc=; b=OBZNez6jdoWDaDOqhnwGIvDgRNWOopewudR8eVRzRmlpgZiLLRhhWaSYhAEa66IIde oZScDlKSEG1Kk+VTe9qkx26NGLCW+WTPGlTmHP4IrrqMvZJO/KVcFsE3P1bjxeZf4EFa t3iBx1nDQux6h/WVHCcSqvztzfbiZ7wJXBJoi+wvDzc6lG9WtIb9pgH2UjoDfs087gbE QPuD6820+iwdTwWpDrg6qXN8/vovQaT08dWo+3KAUrUYOGI458/SWua6M0vuduJp4gjM pT5JzIorStOuRwhwoqX+vjmgXLGO7rOtCKH4b1wd2gNA/MoxlHmBIMkDhF/rDJwKbb52 8z7w== 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=NeY1mBbXeQDR22B+lPwGVcT6sK1Z7pfLgcQ+6TbFtpc=; b=M/HtwgPjDVIfa+F3voiEFQiGwWl99Chqo/1keObpzd6AAVDL4NGvyYpx1nEUWXwhmI ZWEzSrEmwXZolsgd0ruox5b0sFiAZljZk5lpML7dttG+T+QwJ2PDMTJ6o7/rnxvssU95 kqj7XL6O4oC2NAZJ8BxObR+RUcKiWTFU8AtZ8NZJp23jwOv7WdXeYZQtu+lz4CuDriRT wQlUbgkFotAsbWeXpp2IM0w5wt/p3vEgbem9NXb9b79HphQHeQSwgLDZ2Gn2HqxzcgoY 11+c104kE089TgkO7irG1wXIMAzfYYRuNmoucR5okbnFnwlKWt5029styrl8rln+mKAf h2dQ== X-Gm-Message-State: AKS2vOxovu//cESVTxnnK+TyDVAfY3h7XOMiCKs4iMBnO5GZc7qpNssa O/ABDFYLvhLEhx5N X-Received: by 10.223.155.205 with SMTP id e13mr11522575wrc.33.1498429035304; Sun, 25 Jun 2017 15:17:15 -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.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 25 Jun 2017 15:17:14 -0700 (PDT) From: Simon Waterman To: xen-devel@lists.xen.org Date: Sun, 25 Jun 2017 23:15:31 +0100 Message-Id: <1498428931-465-4-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 3/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 Set the PV model version for the IOEMU stubdom from the new device_model_pv_version setting. Existing code sets up the command line and spawns the specified version correctly. In addition, the upstream QEMU doesn't allow the restore console to be undefined (it SEGV's) so if this is not a restore set it to "null" instead. This has the same affect on both upstream QEMU and qemu-xen-traditional. Signed-off-by: Simon Waterman --- tools/libxl/libxl_dm.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c index f8ba859..9e4a27a 100644 --- a/tools/libxl/libxl_dm.c +++ b/tools/libxl/libxl_dm.c @@ -1847,8 +1847,8 @@ void libxl__spawn_stub_dm(libxl__egc *egc, libxl__stub_dm_spawn_state *sdss) dm_config->b_info.u.pv.features = ""; - dm_config->b_info.device_model_version = - guest_config->b_info.device_model_version; + dm_config->b_info.device_model_version = + guest_config->b_info.device_model_pv_version; dm_config->b_info.device_model = guest_config->b_info.device_model; dm_config->b_info.extra = guest_config->b_info.extra; @@ -2014,6 +2014,8 @@ static void spawn_stub_launch_dm(libxl__egc *egc, if (d_state->saved_state) console[i].output = GCSPRINTF("pipe:%s", d_state->saved_state); + else + console[i].output = "null"; break; default: console[i].output = "pty";