| Message ID | 20190819082820.14817-1-sathnaga@linux.vnet.ibm.com |
|---|---|
| State | New |
| Headers | show |
| Series | Add support for powerpc acceptance test | expand |
On Mon, Aug 19, 2019 at 01:58:20PM +0530, sathnaga@linux.vnet.ibm.com wrote: > From: Satheesh Rajendran <sathnaga@linux.vnet.ibm.com> > > Current acceptance test will not run properly in powerpc > environment due qemu target is different from arch, this > usually matches, except with bi-endian architectures like ppc64. > uname would return `ppc64` or `ppc64le` based `big` or `little` > endian but qemu `target` is always `ppc64`. Let's handle it. > > Reviewed-by: Cédric Le Goater <clg@kaod.org> > Signed-off-by: Satheesh Rajendran <sathnaga@linux.vnet.ibm.com> Reviewed-by: David Gibson <david@gibson.dropbear.id.au> I sent a similar patch a little while back, but it seems it got lost. > --- > tests/acceptance/avocado_qemu/__init__.py | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/tests/acceptance/avocado_qemu/__init__.py b/tests/acceptance/avocado_qemu/__init__.py > index aee5d820ed..bd41e0443c 100644 > --- a/tests/acceptance/avocado_qemu/__init__.py > +++ b/tests/acceptance/avocado_qemu/__init__.py > @@ -39,6 +39,9 @@ def pick_default_qemu_bin(arch=None): > """ > if arch is None: > arch = os.uname()[4] > + # qemu binary path does not match arch for powerpc, handle it > + if 'ppc64le' in arch: > + arch = 'ppc64' > qemu_bin_relative_path = os.path.join("%s-softmmu" % arch, > "qemu-system-%s" % arch) > if is_readable_executable_file(qemu_bin_relative_path):
On Sat, Aug 24, 2019 at 07:32:55PM +1000, David Gibson wrote: > On Mon, Aug 19, 2019 at 01:58:20PM +0530, sathnaga@linux.vnet.ibm.com wrote: > > From: Satheesh Rajendran <sathnaga@linux.vnet.ibm.com> > > > > Current acceptance test will not run properly in powerpc > > environment due qemu target is different from arch, this > > usually matches, except with bi-endian architectures like ppc64. > > uname would return `ppc64` or `ppc64le` based `big` or `little` > > endian but qemu `target` is always `ppc64`. Let's handle it. > > > > Reviewed-by: Cédric Le Goater <clg@kaod.org> > > Signed-off-by: Satheesh Rajendran <sathnaga@linux.vnet.ibm.com> > > Reviewed-by: David Gibson <david@gibson.dropbear.id.au> > > I sent a similar patch a little while back, but it seems it got lost. > > > > --- > > tests/acceptance/avocado_qemu/__init__.py | 3 +++ > > 1 file changed, 3 insertions(+) > > > > diff --git a/tests/acceptance/avocado_qemu/__init__.py b/tests/acceptance/avocado_qemu/__init__.py > > index aee5d820ed..bd41e0443c 100644 > > --- a/tests/acceptance/avocado_qemu/__init__.py > > +++ b/tests/acceptance/avocado_qemu/__init__.py > > @@ -39,6 +39,9 @@ def pick_default_qemu_bin(arch=None): > > """ > > if arch is None: > > arch = os.uname()[4] > > + # qemu binary path does not match arch for powerpc, handle it > > + if 'ppc64le' in arch: > > + arch = 'ppc64' > > qemu_bin_relative_path = os.path.join("%s-softmmu" % arch, > > "qemu-system-%s" % arch) > > if is_readable_executable_file(qemu_bin_relative_path): > > -- > David Gibson | I'll have my music baroque, and my code > david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ > | _way_ _around_! > http://www.ozlabs.org/~dgibson Yes, I remember that. I have the feeling the discussion evolved into "let's do it for all other arch differences", because I found a patch here about that. Anyway, sorry about that. I've queued this one. - Cleber.
diff --git a/tests/acceptance/avocado_qemu/__init__.py b/tests/acceptance/avocado_qemu/__init__.py index aee5d820ed..bd41e0443c 100644 --- a/tests/acceptance/avocado_qemu/__init__.py +++ b/tests/acceptance/avocado_qemu/__init__.py @@ -39,6 +39,9 @@ def pick_default_qemu_bin(arch=None): """ if arch is None: arch = os.uname()[4] + # qemu binary path does not match arch for powerpc, handle it + if 'ppc64le' in arch: + arch = 'ppc64' qemu_bin_relative_path = os.path.join("%s-softmmu" % arch, "qemu-system-%s" % arch) if is_readable_executable_file(qemu_bin_relative_path):