[PATCH 0/4] Few random tweaks for xfstests-bld

[PATCH 0/4] Few random tweaks for xfstests-bld

[Kirill A. Shutemov]

These patches made xfstests-bld more usable for me. Maybe they can be helpful
for others.

Kirill A. Shutemov (4):
  kvm-xfstests: qemu: prefer KVM over TCG
  kvm-xfstests: do not try to insert modules
  kvm-xfstests: do not assume /sbin/ in PATH
  kvm-xfstests: create test disks in proper directory

 kvm-xfstests/kvm-xfstests |  4 ++--
 kvm-xfstests/setup        | 20 ++++++++++----------
 2 files changed, 12 insertions(+), 12 deletions(-)

-- 
2.8.1

[PATCH 1/4] kvm-xfstests: qemu: prefer KVM over TCG

[Kirill A. Shutemov]

QEmu by default uses Tiny Code Generator. Let's prefer KVM over it.

Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
---
 kvm-xfstests/kvm-xfstests | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kvm-xfstests/kvm-xfstests b/kvm-xfstests/kvm-xfstests
index 7b50103f91fa..1f239976412c 100755
--- a/kvm-xfstests/kvm-xfstests
+++ b/kvm-xfstests/kvm-xfstests
@@ -72,6 +72,7 @@ fi
 chmod 400 "$VDH"
 
 $NO_ACTION $IONICE $QEMU -boot order=c $NET \
+	-machine type=pc,accel=kvm:tcg \
 	-drive file=$ROOT_FS,if=virtio$SNAPSHOT \
 	-drive file=$VDB,cache=none,if=virtio,format=raw \
 	-drive file=$VDC,cache=none,if=virtio,format=raw \
-- 
2.8.1

[PATCH 2/4] kvm-xfstests: do not try to insert modules

[Kirill A. Shutemov]

modprobe in the script is harful:

  - it can be run under normal user (with proper access to /dev/kvm);

  - it's not adequate for non-Intel HW;

Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
---
 kvm-xfstests/kvm-xfstests | 2 --
 1 file changed, 2 deletions(-)

diff --git a/kvm-xfstests/kvm-xfstests b/kvm-xfstests/kvm-xfstests
index 1f239976412c..b781902ef6d5 100755
--- a/kvm-xfstests/kvm-xfstests
+++ b/kvm-xfstests/kvm-xfstests
@@ -34,8 +34,6 @@ else
     LOGFILE=$DIR/log.$(date +%Y%m%d%H%M)
 fi
 
-modprobe kvm-intel
-
 if ! test -e $VDB -a -e $VDC -a -e $VDD -a -e $VDE -a -e $VDF -a -e $VDG
 then
 	echo "Test disks don't exist, running setup..."
-- 
2.8.1

[PATCH 3/4] kvm-xfstests: do not assume /sbin/ in PATH

[Kirill A. Shutemov]

When kvm-xfstests run from non-root, PATH usually doesn't contain /sbin
and /usr/sbin.

Let's call '/sbin/mke2fs' insetead of 'mke2fs'

Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
---
 kvm-xfstests/setup | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/kvm-xfstests/setup b/kvm-xfstests/setup
index 6d78df60e784..1d61099ca399 100755
--- a/kvm-xfstests/setup
+++ b/kvm-xfstests/setup
@@ -5,8 +5,8 @@ qemu-img create -f raw vdd 5g
 qemu-img create -f raw vde 20g
 qemu-img create -f raw vdf 20g
 qemu-img create -f raw vdg 5g
-mke2fs -t ext4 -F vdb
-mke2fs -t ext4 -b 1024 -F vdd
-mke2fs -t ext4 -F vdg
+/sbin/mke2fs -t ext4 -F vdb
+/sbin/mke2fs -t ext4 -b 1024 -F vdd
+/sbin/mke2fs -t ext4 -F vdg
 
 
-- 
2.8.1

[PATCH 4/4] kvm-xfstests: create test disks in proper directory

[Kirill A. Shutemov]

kvm-xfstests/setup creates disks in current directory instead of place
we are expect them to be.

Let's fix that.

Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
---
 kvm-xfstests/kvm-xfstests |  1 +
 kvm-xfstests/setup        | 20 ++++++++++----------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/kvm-xfstests/kvm-xfstests b/kvm-xfstests/kvm-xfstests
index b781902ef6d5..ac1eabe0a9ae 100755
--- a/kvm-xfstests/kvm-xfstests
+++ b/kvm-xfstests/kvm-xfstests
@@ -37,6 +37,7 @@ fi
 if ! test -e $VDB -a -e $VDC -a -e $VDD -a -e $VDE -a -e $VDF -a -e $VDG
 then
 	echo "Test disks don't exist, running setup..."
+	export VDB VDC VDD VDE VDF VDG
 	$DIR/setup
 fi
 
diff --git a/kvm-xfstests/setup b/kvm-xfstests/setup
index 1d61099ca399..25d0789cf276 100755
--- a/kvm-xfstests/setup
+++ b/kvm-xfstests/setup
@@ -1,12 +1,12 @@
-#!/bin/sh
-qemu-img create -f raw vdb 5g
-qemu-img create -f raw vdc 5g
-qemu-img create -f raw vdd 5g
-qemu-img create -f raw vde 20g
-qemu-img create -f raw vdf 20g
-qemu-img create -f raw vdg 5g
-/sbin/mke2fs -t ext4 -F vdb
-/sbin/mke2fs -t ext4 -b 1024 -F vdd
-/sbin/mke2fs -t ext4 -F vdg
+#!/bin/sh -efu
+qemu-img create -f raw $VDB 5g
+qemu-img create -f raw $VDC 5g
+qemu-img create -f raw $VDD 5g
+qemu-img create -f raw $VDE 20g
+qemu-img create -f raw $VDF 20g
+qemu-img create -f raw $VDG 5g
+/sbin/mke2fs -t ext4 -F $VDB
+/sbin/mke2fs -t ext4 -b 1024 -F $VDD
+/sbin/mke2fs -t ext4 -F $VDG
 
 
-- 
2.8.1

Re: [PATCH 1/4] kvm-xfstests: qemu: prefer KVM over TCG

[Theodore Ts'o]

On Thu, Aug 04, 2016 at 01:58:10AM +0300, Kirill A. Shutemov wrote:
> QEmu by default uses Tiny Code Generator. Let's prefer KVM over it.
> 
> Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>

Applied, thanks.

We use /usr/bin/kvm by default which uses kvm by default, but if you
are building your own qemu and specify the use of qemu-system-x86_64,
this would be needed.

						- Ted

Re: [PATCH 2/4] kvm-xfstests: do not try to insert modules

[Theodore Ts'o]

On Thu, Aug 04, 2016 at 01:58:11AM +0300, Kirill A. Shutemov wrote:
> modprobe in the script is harful:
> 
>   - it can be run under normal user (with proper access to /dev/kvm);
> 
>   - it's not adequate for non-Intel HW;
>
> Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>

Applied, thanks.

						- Ted

Re: [PATCH 3/4] kvm-xfstests: do not assume /sbin/ in PATH

[Theodore Ts'o]

On Thu, Aug 04, 2016 at 01:58:12AM +0300, Kirill A. Shutemov wrote:
> When kvm-xfstests run from non-root, PATH usually doesn't contain /sbin
> and /usr/sbin.
> 
> Let's call '/sbin/mke2fs' insetead of 'mke2fs'
> 
> Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>

Thanks, applied.

					- Ted

Re: [PATCH 4/4] kvm-xfstests: create test disks in proper directory

[Theodore Ts'o]

On Thu, Aug 04, 2016 at 01:58:13AM +0300, Kirill A. Shutemov wrote:
> kvm-xfstests/setup creates disks in current directory instead of place
> we are expect them to be.
> 
> Let's fix that.
> 
> Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>

This has already been fixed in my tree, thanks.

							- Ted