From patchwork Tue Aug 22 09:49:15 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Roger_Pau_Monn=C3=A9?= X-Patchwork-Id: 9914653 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 3E8E1600C5 for ; Tue, 22 Aug 2017 09:51:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4FBA32885D for ; Tue, 22 Aug 2017 09:51:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 449342885E; Tue, 22 Aug 2017 09:51:55 +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=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED 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 6918C28865 for ; Tue, 22 Aug 2017 09:51:53 +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 1dk5oc-0005Le-HT; Tue, 22 Aug 2017 09:49:42 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dk5ob-0005Jp-As for xen-devel@lists.xenproject.org; Tue, 22 Aug 2017 09:49:41 +0000 Received: from [193.109.254.147] by server-5.bemta-6.messagelabs.com id F7/6F-03368-43EFB995; Tue, 22 Aug 2017 09:49:40 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprNIsWRWlGSWpSXmKPExsXitHSDva7Jv9m RBtMaeCy+b5nM5MDocfjDFZYAxijWzLyk/IoE1oyzh86wFfziqniz4gtTA2MPRxcjJ4eEgL/E 9TPdzCA2m4COxMW5O9m6GDk4RARUJG7vNehi5OJgFljDKHF+zh92kBphAROJ72unsoPUsAioS txvMwEJ8wpYSSydd4UFYqSexNuJLxhBbE6g+OG9T8BsIQFLiY0ff7JC1AtKnJz5BKyeWUBTon X7b3YIW16ieetsZoh6RYn+eQ/YJjDyzULSMgtJyywkLQsYmVcxqhenFpWlFuma6CUVZaZnlOQ mZuboGhqY6eWmFhcnpqfmJCYV6yXn525iBAYaAxDsYOy+7H+IUZKDSUmUd/L32ZFCfEn5KZUZ icUZ8UWlOanFhxhlODiUJHjZ/gLlBItS01Mr0jJzgCEPk5bg4FES4V3xByjNW1yQmFucmQ6RO sWoKCXO+wMkIQCSyCjNg2uDxdklRlkpYV5GoEOEeApSi3IzS1DlXzGKczAqCfOuBpnCk5lXAj f9FdBiJqDFhq3TQBaXJCKkpBoYVXIWBti9UuZ8o/jD6fnG8pk8m3t+fpFjuWMXc70uyuqWxG/ dGvNn/q4m90w0l20+fm6Bqm/n6b8a6WWrzHrsbn1a0LlOLXD+CU+uT8d+hSiaFiz03GE45VyU 4z8Zy8wNGvxBB7i4nParrZTRK9jjK6Gp+c9HacXsP1ND7besd8vgey00dcUWJZbijERDLeai4 kQAtxKPS64CAAA= X-Env-Sender: prvs=400f1e73e=roger.pau@citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1503395366!112535527!7 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAzMDYwNDg=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 9.4.45; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10730 invoked from network); 22 Aug 2017 09:49:39 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-16.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 22 Aug 2017 09:49:39 -0000 X-IronPort-AV: E=Sophos;i="5.41,411,1498521600"; d="scan'208";a="444642870" From: Roger Pau Monne To: Date: Tue, 22 Aug 2017 10:49:15 +0100 Message-ID: <20170822094920.70151-15-roger.pau@citrix.com> X-Mailer: git-send-email 2.11.0 (Apple Git-81) In-Reply-To: <20170822094920.70151-1-roger.pau@citrix.com> References: <20170822094920.70151-1-roger.pau@citrix.com> MIME-Version: 1.0 Cc: Wei Liu , boris.ostrovsky@oracle.com, Roger Pau Monne , Ian Jackson Subject: [Xen-devel] [PATCH 14/19] libxl: PVH guests use PV nics 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-Virus-Scanned: ClamAV using ClamSMTP Remove device model "none" support from the nic functions. Signed-off-by: Roger Pau Monné --- Cc: Ian Jackson Cc: Wei Liu --- tools/libxl/libxl_nic.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/tools/libxl/libxl_nic.c b/tools/libxl/libxl_nic.c index 4b6e8c0cb1..78afba2971 100644 --- a/tools/libxl/libxl_nic.c +++ b/tools/libxl/libxl_nic.c @@ -91,18 +91,17 @@ int libxl__device_nic_setdefault(libxl__gc *gc, libxl_device_nic *nic, switch (libxl__domain_type(gc, domid)) { case LIBXL_DOMAIN_TYPE_HVM: if (!nic->nictype) { - if (hotplug || - (libxl__device_model_version_running(gc, domid) == - LIBXL_DEVICE_MODEL_VERSION_NONE)) + if (hotplug) nic->nictype = LIBXL_NIC_TYPE_VIF; else nic->nictype = LIBXL_NIC_TYPE_VIF_IOEMU; } break; + case LIBXL_DOMAIN_TYPE_PVH: case LIBXL_DOMAIN_TYPE_PV: if (nic->nictype == LIBXL_NIC_TYPE_VIF_IOEMU) { LOGD(ERROR, domid, - "trying to create PV guest with an emulated interface"); + "trying to create PV or PVH guest with an emulated interface"); return ERROR_INVAL; } nic->nictype = LIBXL_NIC_TYPE_VIF;