diff mbox series

[1/2] qtest: Fix rtas dependencies

Message ID 20200205204115.555212-2-lvivier@redhat.com (mailing list archive)
State New, archived
Headers show
Series ppc/pnv: fix build dependencies | expand

Commit Message

Laurent Vivier Feb. 5, 2020, 8:41 p.m. UTC
qtest "rtas" command is only available with pseries not all ppc64 targets,
so if I try to compile only powernv machine, the build fails with:

  /usr/bin/ld: qtest.o: in function `qtest_process_command':
  .../qtest.c:645: undefined reference to `qtest_rtas_call'

We fix this by enabling rtas command only with pseries machine.

Fixes: eeddd59f5962 ("tests: add RTAS command in the protocol")
Signed-off-by: Laurent Vivier <lvivier@redhat.com>
---
 qtest.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Comments

Thomas Huth Feb. 5, 2020, 8:46 p.m. UTC | #1
On 05/02/2020 21.41, Laurent Vivier wrote:
> qtest "rtas" command is only available with pseries not all ppc64 targets,
> so if I try to compile only powernv machine, the build fails with:
> 
>   /usr/bin/ld: qtest.o: in function `qtest_process_command':
>   .../qtest.c:645: undefined reference to `qtest_rtas_call'
> 
> We fix this by enabling rtas command only with pseries machine.
> 
> Fixes: eeddd59f5962 ("tests: add RTAS command in the protocol")

Well, at that point in time CONFIG_PSERIES was not available yet ... so
not sure if the "Fixes:" really makes sense here...

But apart from that:
Reviewed-by: Thomas Huth <thuth@redhat.com>

> Signed-off-by: Laurent Vivier <lvivier@redhat.com>
> ---
>  qtest.c | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/qtest.c b/qtest.c
> index 12432f99cf44..587dcbb4b515 100644
> --- a/qtest.c
> +++ b/qtest.c
> @@ -27,7 +27,8 @@
>  #include "qemu/error-report.h"
>  #include "qemu/module.h"
>  #include "qemu/cutils.h"
> -#ifdef TARGET_PPC64
> +#include "config-devices.h"
> +#ifdef CONFIG_PSERIES
>  #include "hw/ppc/spapr_rtas.h"
>  #endif
>  
> @@ -628,7 +629,7 @@ static void qtest_process_command(CharBackend *chr, gchar **words)
>  #else
>          qtest_sendf(chr, "OK little\n");
>  #endif
> -#ifdef TARGET_PPC64
> +#ifdef CONFIG_PSERIES
>      } else if (strcmp(words[0], "rtas") == 0) {
>          uint64_t res, args, ret;
>          unsigned long nargs, nret;
>
Laurent Vivier Feb. 5, 2020, 8:49 p.m. UTC | #2
On 05/02/2020 21:46, Thomas Huth wrote:
> On 05/02/2020 21.41, Laurent Vivier wrote:
>> qtest "rtas" command is only available with pseries not all ppc64 targets,
>> so if I try to compile only powernv machine, the build fails with:
>>
>>   /usr/bin/ld: qtest.o: in function `qtest_process_command':
>>   .../qtest.c:645: undefined reference to `qtest_rtas_call'
>>
>> We fix this by enabling rtas command only with pseries machine.
>>
>> Fixes: eeddd59f5962 ("tests: add RTAS command in the protocol")
> 
> Well, at that point in time CONFIG_PSERIES was not available yet ... so
> not sure if the "Fixes:" really makes sense here...

You are right, but I think it's interesting to show the dependency we
have between patches.

> But apart from that:
> Reviewed-by: Thomas Huth <thuth@redhat.com>
> 
Thank you!

Laurent
diff mbox series

Patch

diff --git a/qtest.c b/qtest.c
index 12432f99cf44..587dcbb4b515 100644
--- a/qtest.c
+++ b/qtest.c
@@ -27,7 +27,8 @@ 
 #include "qemu/error-report.h"
 #include "qemu/module.h"
 #include "qemu/cutils.h"
-#ifdef TARGET_PPC64
+#include "config-devices.h"
+#ifdef CONFIG_PSERIES
 #include "hw/ppc/spapr_rtas.h"
 #endif
 
@@ -628,7 +629,7 @@  static void qtest_process_command(CharBackend *chr, gchar **words)
 #else
         qtest_sendf(chr, "OK little\n");
 #endif
-#ifdef TARGET_PPC64
+#ifdef CONFIG_PSERIES
     } else if (strcmp(words[0], "rtas") == 0) {
         uint64_t res, args, ret;
         unsigned long nargs, nret;