From patchwork Fri Nov 21 14:32:53 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Campbell X-Patchwork-Id: 41324 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f71.google.com (mail-la0-f71.google.com [209.85.215.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id E3CE0244B0 for ; Fri, 21 Nov 2014 14:34:44 +0000 (UTC) Received: by mail-la0-f71.google.com with SMTP id s18sf3137150lam.2 for ; Fri, 21 Nov 2014 06:34:40 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:message-id:from:to:date:in-reply-to :references:organization:mime-version:cc:subject:precedence:list-id :list-unsubscribe:list-post:list-help:list-subscribe:content-type :content-transfer-encoding:sender:errors-to:x-original-sender :x-original-authentication-results:mailing-list:list-archive; bh=AJslgC9Nv7FWQIaF/kUsZkQ6jrX1YbFuvJkTvAWyt04=; b=BMLhzAtJ5dLF4RFaO/p/M8QkGY+/xQfB9tw9IRkwtT4ZyYGKT5j1Xajd/Tgt5QABKt rMhD9cPNXOvOrYJC+w5GgFvuj9IcNDRpv6cOh77UQ/3blduznAzTYOaTR/Tszn3kdffz VgBLA1exLVmryKDrumjiFlR/13qYJQ5rKpN/XbLzxgWL4gAlPAHCs1xpW1zlKNiKc5mJ ePLIOgodhIxViN1znjJrCX/y8BDQQ26Lup/+pVle6CTSeac5EsJjw5mSaEW8/un7SOJL SJ/s7TLBi5ojnUnSG5+DV9S69YFQQcfhvqiM70mKvaA/+yfKDI9VKs2r4m/CoijwhS0l suBQ== X-Gm-Message-State: ALoCoQmLrLdtjJ1Nh4U+xi4s/oo8bScQdDu2g5S9L9Lfc4IW6H3Z8UZWGpv3aSpdT2oRovxcZLJ/ X-Received: by 10.112.204.71 with SMTP id kw7mr1665480lbc.13.1416580480186; Fri, 21 Nov 2014 06:34:40 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.9.38 with SMTP id w6ls22424laa.49.gmail; Fri, 21 Nov 2014 06:34:39 -0800 (PST) X-Received: by 10.112.45.102 with SMTP id l6mr5144028lbm.46.1416580479740; Fri, 21 Nov 2014 06:34:39 -0800 (PST) Received: from mail-lb0-f180.google.com (mail-lb0-f180.google.com. [209.85.217.180]) by mx.google.com with ESMTPS id ug7si5752145lac.7.2014.11.21.06.34.39 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 21 Nov 2014 06:34:39 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.180 as permitted sender) client-ip=209.85.217.180; Received: by mail-lb0-f180.google.com with SMTP id z11so4169963lbi.11 for ; Fri, 21 Nov 2014 06:34:39 -0800 (PST) X-Received: by 10.112.189.10 with SMTP id ge10mr5009480lbc.23.1416580479427; Fri, 21 Nov 2014 06:34:39 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.184.201 with SMTP id ew9csp101554lbc; Fri, 21 Nov 2014 06:34:38 -0800 (PST) X-Received: by 10.52.27.193 with SMTP id v1mr3999542vdg.78.1416580477940; Fri, 21 Nov 2014 06:34:37 -0800 (PST) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id qg9si2452165vcb.68.2014.11.21.06.34.37 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 21 Nov 2014 06:34:37 -0800 (PST) Received-SPF: none (google.com: xen-devel-bounces@lists.xen.org does not designate permitted sender hosts) client-ip=50.57.142.19; Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XrpGf-0003Zj-5p; Fri, 21 Nov 2014 14:33:01 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XrpGd-0003ZI-Ix for xen-devel@lists.xen.org; Fri, 21 Nov 2014 14:33:00 +0000 Received: from [85.158.137.68] by server-11.bemta-3.messagelabs.com id E8/5E-25547-A1D4F645; Fri, 21 Nov 2014 14:32:58 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1416580376!12982257!1 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAyMDMwMDc=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25846 invoked from network); 21 Nov 2014 14:32:58 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-7.tower-31.messagelabs.com with RC4-SHA encrypted SMTP; 21 Nov 2014 14:32:58 -0000 X-IronPort-AV: E=Sophos;i="5.07,431,1413244800"; d="scan'208";a="193723194" Message-ID: <1416580373.17932.15.camel@citrix.com> From: Ian Campbell To: David Vrabel Date: Fri, 21 Nov 2014 14:32:53 +0000 In-Reply-To: <546F49CD.1020907@citrix.com> References: <54648EB3.8040703@citrix.com> <1415955718.31613.34.camel@citrix.com> <1416227964.5466.12.camel@citrix.com> <1416475824.14429.1.camel@citrix.com> <1416562126.26869.8.camel@citrix.com> <1416578732.17932.9.camel@citrix.com> <546F49CD.1020907@citrix.com> Organization: Citrix Systems, Inc. X-Mailer: Evolution 3.12.7-1 MIME-Version: 1.0 X-DLP: MIA1 Cc: libvir-list@redhat.com, Jim Fehlig , Roger Pau =?ISO-8859-1?Q?Monn=E9?= , xen-devel@lists.xen.org Subject: Re: [Xen-devel] dom0 kenrel crashes for openstack + libvirt + libxl X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Post: , List-Help: , List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: ian.campbell@citrix.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.180 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Archive: On Fri, 2014-11-21 at 14:18 +0000, David Vrabel wrote: > On 21/11/14 14:05, Ian Campbell wrote: > > On Fri, 2014-11-21 at 09:28 +0000, Ian Campbell wrote: > >> I think libvirt is wrong to specify an absolute path here, IMHO by > >> default it should just specify "pygrub" and let libxl figure out the > >> correct path. Jim, what do you think? > > > > e.g. something like the following untested (but pretty obvious[0]) > > patch. > [...] > > +# define "pygrub" > > I'm going to go with pretty obviously broken. You're missing the macro > name. Doh! Indeed... Lets try that again... 8<---------- >From 9f2d8da8264b426f54b92378e9e00973694193d4 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Fri, 21 Nov 2014 14:00:38 +0000 Subject: [PATCH] libxl: Allow libxl to find pygrub binary. Specifying an explicit path to pygrub (e.g. BINDIR "/pygrub") only works if Xen and libvirt happen to be installed to the same prefix. A more flexible approach is to simply specify "pygrub" which will cause libxl to use the correct path which it knows (since it is built with the same prefix as pygrub). This is particular problematic in the Debian packaging, since the Debian Xen package relocates pygrub into a libexec dir, however I think this change makes sense upstream. Signed-off-by: Ian Campbell --- .gnulib | 2 +- src/libxl/libxl_conf.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gnulib b/.gnulib index 9565c3b..2d28074 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit 9565c3be73eb6d76b7b42a21d68d2e00a62abb6d +Subproject commit 2d280742a9e30088aa169f53353765d5daafe4c0 diff --git a/src/libxl/libxl_conf.h b/src/libxl/libxl_conf.h index 25f77ea..d7a3971 100644 --- a/src/libxl/libxl_conf.h +++ b/src/libxl/libxl_conf.h @@ -53,7 +53,7 @@ # define LIBXL_LIB_DIR LOCALSTATEDIR "/lib/libvirt/libxl" # define LIBXL_SAVE_DIR LIBXL_LIB_DIR "/save" # define LIBXL_DUMP_DIR LIBXL_LIB_DIR "/dump" -# define LIBXL_BOOTLOADER_PATH BINDIR "/pygrub" +# define LIBXL_BOOTLOADER_PATH "pygrub" /* libxl interface for setting VCPU affinity changed in 4.5. In fact, a new * parameter has been added, representative of 'VCPU soft affinity'. If one