From bc412bc2ab8afacaab05e1e393b7a92c773a9f64 Mon Sep 17 00:00:00 2001
From: chenhuiying <chenhuiying4@huawei.com>
Date: Tue, 6 Dec 2022 18:47:30 +0800
Subject: [PATCH] tests: qemuxml2argvdata qtests switch to -accel

fix "qemu: Switch to -accel"

Signed-off-by: yezengruan <yezengruan@huawei.com>
---
 tests/qemuxml2argvdata/aarch64-gic-default-both.args           | 3 ++-
 tests/qemuxml2argvdata/aarch64-gic-default-v2.args             | 3 ++-
 tests/qemuxml2argvdata/aarch64-gic-default-v3.args             | 3 ++-
 tests/qemuxml2argvdata/aarch64-gic-default.args                | 3 ++-
 tests/qemuxml2argvdata/aarch64-gic-none-both.args              | 3 ++-
 tests/qemuxml2argvdata/aarch64-gic-none-v2.args                | 3 ++-
 tests/qemuxml2argvdata/aarch64-gic-none-v3.args                | 3 ++-
 tests/qemuxml2argvdata/aarch64-gic-none.args                   | 3 ++-
 tests/qemuxml2argvdata/cpu-check-full.args                     | 3 ++-
 tests/qemuxml2argvdata/cpu-check-partial.args                  | 3 ++-
 .../disk-backing-chains-index.x86_64-2.12.0.args               | 3 ++-
 .../disk-backing-chains-index.x86_64-latest.args               | 3 ++-
 tests/qemuxml2argvdata/mach-virt-console-native.args           | 3 ++-
 tests/qemuxml2argvdata/mach-virt-serial+console-native.args    | 3 ++-
 tests/qemuxml2argvdata/mach-virt-serial-compat.args            | 3 ++-
 tests/qemuxml2argvdata/pci-rom-disabled-invalid.args           | 3 ++-
 tests/qemuxml2argvdata/pseries-console-native.args             | 3 ++-
 tests/qemuxml2argvdata/pseries-serial+console-native.args      | 3 ++-
 tests/qemuxml2argvdata/pseries-serial-compat.args              | 3 ++-
 tests/qemuxml2argvdata/user-aliases2.args                      | 3 ++-
 20 files changed, 40 insertions(+), 20 deletions(-)

diff --git a/tests/qemuxml2argvdata/aarch64-gic-default-both.args b/tests/qemuxml2argvdata/aarch64-gic-default-both.args
index 2049250..9d28764 100644
--- a/tests/qemuxml2argvdata/aarch64-gic-default-both.args
+++ b/tests/qemuxml2argvdata/aarch64-gic-default-both.args
@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-aarch64 \
 -name aarch64test \
 -S \
--machine virt,accel=kvm,usb=off,dump-guest-core=off,gic-version=3 \
+-machine virt,usb=off,dump-guest-core=off,gic-version=3 \
+-accel kvm \
 -cpu host \
 -m 1024 \
 -realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/aarch64-gic-default-v2.args b/tests/qemuxml2argvdata/aarch64-gic-default-v2.args
index 6cf5839..9d6f2de 100644
--- a/tests/qemuxml2argvdata/aarch64-gic-default-v2.args
+++ b/tests/qemuxml2argvdata/aarch64-gic-default-v2.args
@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-aarch64 \
 -name aarch64test \
 -S \
--machine virt,accel=kvm,usb=off,dump-guest-core=off,gic-version=2 \
+-machine virt,usb=off,dump-guest-core=off,gic-version=2 \
+-accel kvm \
 -cpu host \
 -m 1024 \
 -realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/aarch64-gic-default-v3.args b/tests/qemuxml2argvdata/aarch64-gic-default-v3.args
index 2049250..9d28764 100644
--- a/tests/qemuxml2argvdata/aarch64-gic-default-v3.args
+++ b/tests/qemuxml2argvdata/aarch64-gic-default-v3.args
@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-aarch64 \
 -name aarch64test \
 -S \
--machine virt,accel=kvm,usb=off,dump-guest-core=off,gic-version=3 \
+-machine virt,usb=off,dump-guest-core=off,gic-version=3 \
+-accel kvm \
 -cpu host \
 -m 1024 \
 -realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/aarch64-gic-default.args b/tests/qemuxml2argvdata/aarch64-gic-default.args
index 6cf5839..9d6f2de 100644
--- a/tests/qemuxml2argvdata/aarch64-gic-default.args
+++ b/tests/qemuxml2argvdata/aarch64-gic-default.args
@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-aarch64 \
 -name aarch64test \
 -S \
--machine virt,accel=kvm,usb=off,dump-guest-core=off,gic-version=2 \
+-machine virt,usb=off,dump-guest-core=off,gic-version=2 \
+-accel kvm \
 -cpu host \
 -m 1024 \
 -realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/aarch64-gic-none-both.args b/tests/qemuxml2argvdata/aarch64-gic-none-both.args
index 2049250..9d28764 100644
--- a/tests/qemuxml2argvdata/aarch64-gic-none-both.args
+++ b/tests/qemuxml2argvdata/aarch64-gic-none-both.args
@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-aarch64 \
 -name aarch64test \
 -S \
--machine virt,accel=kvm,usb=off,dump-guest-core=off,gic-version=3 \
+-machine virt,usb=off,dump-guest-core=off,gic-version=3 \
+-accel kvm \
 -cpu host \
 -m 1024 \
 -realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/aarch64-gic-none-v2.args b/tests/qemuxml2argvdata/aarch64-gic-none-v2.args
index 6cf5839..9d6f2de 100644
--- a/tests/qemuxml2argvdata/aarch64-gic-none-v2.args
+++ b/tests/qemuxml2argvdata/aarch64-gic-none-v2.args
@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-aarch64 \
 -name aarch64test \
 -S \
--machine virt,accel=kvm,usb=off,dump-guest-core=off,gic-version=2 \
+-machine virt,usb=off,dump-guest-core=off,gic-version=2 \
+-accel kvm \
 -cpu host \
 -m 1024 \
 -realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/aarch64-gic-none-v3.args b/tests/qemuxml2argvdata/aarch64-gic-none-v3.args
index 2049250..9d28764 100644
--- a/tests/qemuxml2argvdata/aarch64-gic-none-v3.args
+++ b/tests/qemuxml2argvdata/aarch64-gic-none-v3.args
@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-aarch64 \
 -name aarch64test \
 -S \
--machine virt,accel=kvm,usb=off,dump-guest-core=off,gic-version=3 \
+-machine virt,usb=off,dump-guest-core=off,gic-version=3 \
+-accel kvm \
 -cpu host \
 -m 1024 \
 -realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/aarch64-gic-none.args b/tests/qemuxml2argvdata/aarch64-gic-none.args
index 6cf5839..9d6f2de 100644
--- a/tests/qemuxml2argvdata/aarch64-gic-none.args
+++ b/tests/qemuxml2argvdata/aarch64-gic-none.args
@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-aarch64 \
 -name aarch64test \
 -S \
--machine virt,accel=kvm,usb=off,dump-guest-core=off,gic-version=2 \
+-machine virt,usb=off,dump-guest-core=off,gic-version=2 \
+-accel kvm \
 -cpu host \
 -m 1024 \
 -realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/cpu-check-full.args b/tests/qemuxml2argvdata/cpu-check-full.args
index 1e4af63..71891fd 100644
--- a/tests/qemuxml2argvdata/cpu-check-full.args
+++ b/tests/qemuxml2argvdata/cpu-check-full.args
@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-x86_64 \
 -name QEMUGuest1 \
 -S \
--machine pc,accel=kvm,usb=off,dump-guest-core=off \
+-machine pc,usb=off,dump-guest-core=off \
+-accel kvm \
 -cpu core2duo \
 -m 214 \
 -realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/cpu-check-partial.args b/tests/qemuxml2argvdata/cpu-check-partial.args
index 1e4af63..71891fd 100644
--- a/tests/qemuxml2argvdata/cpu-check-partial.args
+++ b/tests/qemuxml2argvdata/cpu-check-partial.args
@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-x86_64 \
 -name QEMUGuest1 \
 -S \
--machine pc,accel=kvm,usb=off,dump-guest-core=off \
+-machine pc,usb=off,dump-guest-core=off \
+-accel kvm \
 -cpu core2duo \
 -m 214 \
 -realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/disk-backing-chains-index.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-backing-chains-index.x86_64-2.12.0.args
index 4769133..bd87945 100644
--- a/tests/qemuxml2argvdata/disk-backing-chains-index.x86_64-2.12.0.args
+++ b/tests/qemuxml2argvdata/disk-backing-chains-index.x86_64-2.12.0.args
@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
 -S \
 -object secret,id=masterKey0,format=raw,\
 file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
--machine pc-i440fx-2.12,accel=tcg,usb=off,dump-guest-core=off \
+-machine pc-i440fx-2.12,usb=off,dump-guest-core=off \
+-accel tcg \
 -m 214 \
 -realtime mlock=off \
 -smp 1,sockets=1,cores=1,threads=1 \
diff --git a/tests/qemuxml2argvdata/disk-backing-chains-index.x86_64-latest.args b/tests/qemuxml2argvdata/disk-backing-chains-index.x86_64-latest.args
index 6c19da9..9148864 100644
--- a/tests/qemuxml2argvdata/disk-backing-chains-index.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/disk-backing-chains-index.x86_64-latest.args
@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
 -S \
 -object secret,id=masterKey0,format=raw,\
 file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
--machine pc,accel=tcg,usb=off,dump-guest-core=off \
+-machine pc,usb=off,dump-guest-core=off \
+-accel tcg \
 -cpu qemu64 \
 -m 214 \
 -overcommit mem-lock=off \
diff --git a/tests/qemuxml2argvdata/mach-virt-console-native.args b/tests/qemuxml2argvdata/mach-virt-console-native.args
index 8d25e49..cd27ffe 100644
--- a/tests/qemuxml2argvdata/mach-virt-console-native.args
+++ b/tests/qemuxml2argvdata/mach-virt-console-native.args
@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-aarch64 \
 -name guest \
 -S \
--machine virt,accel=tcg,usb=off,dump-guest-core=off \
+-machine virt,usb=off,dump-guest-core=off \
+-accel tcg \
 -m 512 \
 -realtime mlock=off \
 -smp 1,sockets=1,cores=1,threads=1 \
diff --git a/tests/qemuxml2argvdata/mach-virt-serial+console-native.args b/tests/qemuxml2argvdata/mach-virt-serial+console-native.args
index 8d25e49..cd27ffe 100644
--- a/tests/qemuxml2argvdata/mach-virt-serial+console-native.args
+++ b/tests/qemuxml2argvdata/mach-virt-serial+console-native.args
@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-aarch64 \
 -name guest \
 -S \
--machine virt,accel=tcg,usb=off,dump-guest-core=off \
+-machine virt,usb=off,dump-guest-core=off \
+-accel tcg \
 -m 512 \
 -realtime mlock=off \
 -smp 1,sockets=1,cores=1,threads=1 \
diff --git a/tests/qemuxml2argvdata/mach-virt-serial-compat.args b/tests/qemuxml2argvdata/mach-virt-serial-compat.args
index 8d25e49..cd27ffe 100644
--- a/tests/qemuxml2argvdata/mach-virt-serial-compat.args
+++ b/tests/qemuxml2argvdata/mach-virt-serial-compat.args
@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-aarch64 \
 -name guest \
 -S \
--machine virt,accel=tcg,usb=off,dump-guest-core=off \
+-machine virt,usb=off,dump-guest-core=off \
+-accel tcg \
 -m 512 \
 -realtime mlock=off \
 -smp 1,sockets=1,cores=1,threads=1 \
diff --git a/tests/qemuxml2argvdata/pci-rom-disabled-invalid.args b/tests/qemuxml2argvdata/pci-rom-disabled-invalid.args
index 1dd1695..b812421 100644
--- a/tests/qemuxml2argvdata/pci-rom-disabled-invalid.args
+++ b/tests/qemuxml2argvdata/pci-rom-disabled-invalid.args
@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-x86_64 \
 -name guest \
 -S \
--machine pc,accel=tcg,usb=off,dump-guest-core=off \
+-machine pc,usb=off,dump-guest-core=off \
+-accel tcg \
 -m 214 \
 -realtime mlock=off \
 -smp 1,sockets=1,cores=1,threads=1 \
diff --git a/tests/qemuxml2argvdata/pseries-console-native.args b/tests/qemuxml2argvdata/pseries-console-native.args
index 9a5f8c8..c8295f7 100644
--- a/tests/qemuxml2argvdata/pseries-console-native.args
+++ b/tests/qemuxml2argvdata/pseries-console-native.args
@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-ppc64 \
 -name guest \
 -S \
--machine pseries,accel=tcg,usb=off,dump-guest-core=off \
+-machine pseries,usb=off,dump-guest-core=off \
+-accel tcg \
 -m 512 \
 -realtime mlock=off \
 -smp 1,sockets=1,cores=1,threads=1 \
diff --git a/tests/qemuxml2argvdata/pseries-serial+console-native.args b/tests/qemuxml2argvdata/pseries-serial+console-native.args
index 9a5f8c8..c8295f7 100644
--- a/tests/qemuxml2argvdata/pseries-serial+console-native.args
+++ b/tests/qemuxml2argvdata/pseries-serial+console-native.args
@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-ppc64 \
 -name guest \
 -S \
--machine pseries,accel=tcg,usb=off,dump-guest-core=off \
+-machine pseries,usb=off,dump-guest-core=off \
+-accel tcg \
 -m 512 \
 -realtime mlock=off \
 -smp 1,sockets=1,cores=1,threads=1 \
diff --git a/tests/qemuxml2argvdata/pseries-serial-compat.args b/tests/qemuxml2argvdata/pseries-serial-compat.args
index 9a5f8c8..c8295f7 100644
--- a/tests/qemuxml2argvdata/pseries-serial-compat.args
+++ b/tests/qemuxml2argvdata/pseries-serial-compat.args
@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-ppc64 \
 -name guest \
 -S \
--machine pseries,accel=tcg,usb=off,dump-guest-core=off \
+-machine pseries,usb=off,dump-guest-core=off \
+-accel tcg \
 -m 512 \
 -realtime mlock=off \
 -smp 1,sockets=1,cores=1,threads=1 \
diff --git a/tests/qemuxml2argvdata/user-aliases2.args b/tests/qemuxml2argvdata/user-aliases2.args
index cfc396c..aecaa24 100644
--- a/tests/qemuxml2argvdata/user-aliases2.args
+++ b/tests/qemuxml2argvdata/user-aliases2.args
@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-x86_64 \
 -name QEMUGuest1 \
 -S \
--machine pc-q35-2.4,accel=tcg,usb=off,dump-guest-core=off \
+-machine pc-q35-2.4,usb=off,dump-guest-core=off \
+-accel tcg \
 -m 214 \
 -realtime mlock=off \
 -smp 1,sockets=1,cores=1,threads=1 \
-- 
2.27.0