| Message ID | 20241203092153.60590-5-philmd@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | cli: Remove mentions of legacy '-machine foo, accel=bar' command line | expand |
On Tue, Dec 03, 2024 at 10:21:50AM +0100, Philippe Mathieu-Daudé wrote: > Since commit 6f6e1698a68 ("vl: configure accelerators from -accel > options") we prefer the '-accel bar' command line option. > > Replace '-machine foo,accel=bar' -> '-machine foo -accel bar' in > the device-crash-test script. > > Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> > --- > scripts/device-crash-test | 9 +++++++-- > 1 file changed, 7 insertions(+), 2 deletions(-) > > diff --git a/scripts/device-crash-test b/scripts/device-crash-test > index da8b56edd99..2b139e29ba0 100755 > --- a/scripts/device-crash-test > +++ b/scripts/device-crash-test > @@ -295,7 +295,10 @@ class QemuBinaryInfo(object): > self._machine_info = {} > > dbg("devtype: %r", devtype) > - args = ['-S', '-machine', 'none,accel=kvm:tcg'] > + args = ['-S', > + '-machine', 'none', > + '-accel', 'kvm:tcg', -accel doesn't work this way - that is legacy syntax sugar from -machine You need multiple args: -accel kvm -accel tcg > + ] > dbg("querying info for QEMU binary: %s", binary) > vm = QEMUMachine(binary=binary, args=args) > vm.launch() > @@ -358,7 +361,9 @@ def checkOneCase(args, testcase): > > dbg("will test: %r", testcase) > > - args = ['-S', '-machine', '%s,accel=%s' % (machine, accel), > + args = ['-S', > + '-machine', machine, > + '-accel', accel, I've not checked what 'accel' value is - if that's another compound value like 'kvm:tcg', it'll need to be turned into an array, and expanded to multiple '-accel' args. > '-device', qemuOptsEscape(device)] > cmdline = ' '.join([binary] + args) > dbg("will launch QEMU: %s", cmdline) > -- > 2.45.2 > With regards, Daniel
diff --git a/scripts/device-crash-test b/scripts/device-crash-test index da8b56edd99..2b139e29ba0 100755 --- a/scripts/device-crash-test +++ b/scripts/device-crash-test @@ -295,7 +295,10 @@ class QemuBinaryInfo(object): self._machine_info = {} dbg("devtype: %r", devtype) - args = ['-S', '-machine', 'none,accel=kvm:tcg'] + args = ['-S', + '-machine', 'none', + '-accel', 'kvm:tcg', + ] dbg("querying info for QEMU binary: %s", binary) vm = QEMUMachine(binary=binary, args=args) vm.launch() @@ -358,7 +361,9 @@ def checkOneCase(args, testcase): dbg("will test: %r", testcase) - args = ['-S', '-machine', '%s,accel=%s' % (machine, accel), + args = ['-S', + '-machine', machine, + '-accel', accel, '-device', qemuOptsEscape(device)] cmdline = ' '.join([binary] + args) dbg("will launch QEMU: %s", cmdline)
Since commit 6f6e1698a68 ("vl: configure accelerators from -accel options") we prefer the '-accel bar' command line option. Replace '-machine foo,accel=bar' -> '-machine foo -accel bar' in the device-crash-test script. Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> --- scripts/device-crash-test | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)