All of lore.kernel.org
 help / color / mirror / Atom feed
From: Stefano Stabellini <sstabellini@kernel.org>
To: george.dunlap@citrix.com
Cc: sstabellini@kernel.org, xen-devel@lists.xensource.com
Subject: [PATCH 2/3] raisin: check for invalid initrds
Date: Tue, 23 May 2017 14:43:02 -0700	[thread overview]
Message-ID: <1495575783-23675-2-git-send-email-sstabellini@kernel.org> (raw)
In-Reply-To: <1495575783-23675-1-git-send-email-sstabellini@kernel.org>

get_host_initrd can return an invalid or null initrd. Do not set the
ramdisk option in the VM config file to an invalid value.

Signed-off-by: Stefano Stabellini <sstabellini@kernel.org>
---
 tests/busybox-pv | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tests/busybox-pv b/tests/busybox-pv
index a7ae976..7ad4f7a 100755
--- a/tests/busybox-pv
+++ b/tests/busybox-pv
@@ -21,7 +21,6 @@ function busybox-pv-test() {
 
     cat >busybox-pv <<EOF
 kernel = "`get_host_kernel`"
-ramdisk = "`get_host_initrd`"
 extra = "root=/dev/xvda console=hvc0"
 memory = 512
 name = "raisin-test"
@@ -31,6 +30,10 @@ serial="pty"
 boot="c"
 vif=['bridge=xenbr1']
 EOF
+    if [[ -e "`get_host_initrd`" ]]
+    then
+        echo "ramdisk = \"`get_host_initrd`\"" >> busybox-pv
+    fi
 
     $SUDO xl create busybox-pv
     check_guest_alive
-- 
1.9.1


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel

  reply	other threads:[~2017-05-23 21:43 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-05-23 21:42 [PATCH 0/3] raisin test fixes Stefano Stabellini
2017-05-23 21:43 ` [PATCH 1/3] raisin: introduce TEST_KERNEL and TEST_INITRD Stefano Stabellini
2017-05-23 21:43   ` Stefano Stabellini [this message]
2017-05-23 21:43   ` [PATCH 3/3] raisin/arm: properly ignore tests that don't work on ARM Stefano Stabellini

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1495575783-23675-2-git-send-email-sstabellini@kernel.org \
    --to=sstabellini@kernel.org \
    --cc=george.dunlap@citrix.com \
    --cc=xen-devel@lists.xensource.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.