Skip to content

Commit 8425f15

Browse files
committed
run_qemu.sh: new function rootfs_loop_devs() to de-duplicate
Remove some duplication. No change. Signed-off-by: Marc Herbert <marc.herbert@intel.com>
1 parent 2638346 commit 8425f15

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

run_qemu.sh

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -225,9 +225,14 @@ guest_alive()
225225
[ -e "$qmp_sock" ]
226226
}
227227

228+
rootfs_loop_devs()
229+
{
230+
sudo losetup --list | grep "$_arg_rootfs" | awk '{ print $1 }'
231+
}
232+
228233
loop_teardown()
229234
{
230-
for loopdev in $(sudo losetup --list | grep "$_arg_rootfs" | awk '{ print $1 }'); do
235+
for loopdev in $(rootfs_loop_devs); do
231236
if [ -b "$loopdev" ]; then
232237
sudo umount "${loopdev}p1" || true
233238
sudo umount "${loopdev}p2" || true
@@ -709,7 +714,7 @@ get_loopdev()
709714
{
710715
local loopdev num_loopdev
711716

712-
loopdev="$(sudo losetup --list | grep "$_arg_rootfs" | awk '{ print $1 }')"
717+
loopdev=$(rootfs_loop_devs)
713718
# We cannot count newlines with `wc -l` because $( ) trims the trailing
714719
# newline which makes 0 and 1 loopback device give the same count.
715720
num_loopdev=$(grep -c dev/loop <<<"$loopdev")

0 commit comments

Comments
 (0)