From commits-return-72302-archive-asf-public=cust-asf.ponee.io@cloudstack.apache.org Thu Feb 22 17:11:15 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id D423E18064E for ; Thu, 22 Feb 2018 17:11:14 +0100 (CET) Received: (qmail 36458 invoked by uid 500); 22 Feb 2018 16:11:13 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 36449 invoked by uid 99); 22 Feb 2018 16:11:13 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 22 Feb 2018 16:11:13 +0000 From: GitBox To: commits@cloudstack.apache.org Subject: [GitHub] wido commented on a change in pull request #2465: CLOUDSTACK-10232: SystemVMs and VR to run as HVM on XenServer Message-ID: <151931587334.11285.17926196031518751105.gitbox@gitbox.apache.org> wido commented on a change in pull request #2465: CLOUDSTACK-10232: SystemVMs and VR to run as HVM on XenServer URL: https://github.com/apache/cloudstack/pull/2465#discussion_r170009008 ########## File path: plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java ########## @@ -1368,12 +1368,23 @@ public VM createVmFromTemplate(final Connection conn, final VirtualMachineTO vmS final String bootArgs = vmSpec.getBootArgs(); if (bootArgs != null && bootArgs.length() > 0) { + // send boot args for PV instances String pvargs = vm.getPVArgs(conn); pvargs = pvargs + vmSpec.getBootArgs().replaceAll(" ", "%"); if (s_logger.isDebugEnabled()) { s_logger.debug("PV args are " + pvargs); } vm.setPVArgs(conn, pvargs); + + // send boot args into xenstore-data for HVM instances + Map xenstoreData = new HashMap<>(); + + xenstoreData.put("vm-data/cloudstack/init", bootArgs); + vm.setXenstoreData(conn, xenstoreData); + + if (s_logger.isDebugEnabled()) { + s_logger.debug("HVM args are " + bootArgs); Review comment: Is this if statement still required to check if debug is enabled? ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org With regards, Apache Git Services