1. Patchew
  2. QEMU
  3. View series

[PATCH v3] mos6522: fix linking error when CONFIG_MOS6522 is not set

Murilo Opsfelder Araujo posted 1 patch 1 year, 11 months ago
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20220510235439.54775-1-muriloo@linux.ibm.com
Maintainers: "Dr. David Alan Gilbert" <dgilbert@redhat.com>, Markus Armbruster <armbru@redhat.com>
hmp-commands-info.hx | 2 +-
monitor/misc.c       | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
[PATCH v3] mos6522: fix linking error when CONFIG_MOS6522 is not set
Posted by Murilo Opsfelder Araujo 1 year, 11 months ago 
When CONFIG_MOS6522 is not set, building ppc64-softmmu target fails:

    /usr/bin/ld: libqemu-ppc64-softmmu.fa.p/monitor_misc.c.o:(.data+0x1158): undefined reference to `hmp_info_via'

Make devices configuration available in hmp-commands*.hx and check for
CONFIG_MOS6522.

Fixes: 409e9f7131e5 (mos6522: add "info via" HMP command for debugging)
Signed-off-by: Murilo Opsfelder Araujo <muriloo@linux.ibm.com>
Cc: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Cc: Fabiano Rosas <farosas@linux.ibm.com>
Cc: Thomas Huth <thuth@redhat.com>
---
v3:
- Removed TARGET_M68K and TARGET_PPC checks, as per Thomas Huth suggestion.

v2:
- https://lore.kernel.org/qemu-devel/20220506011632.183257-1-muriloo@linux.ibm.com/
- Included devices configuration in monitor/misc.c

v1:
- https://lore.kernel.org/qemu-devel/20220429233146.29662-1-muriloo@linux.ibm.com/

 hmp-commands-info.hx | 2 +-
 monitor/misc.c       | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/hmp-commands-info.hx b/hmp-commands-info.hx
index adfa085a9b..834bed089e 100644
--- a/hmp-commands-info.hx
+++ b/hmp-commands-info.hx
@@ -880,7 +880,7 @@ SRST
     Show intel SGX information.
 ERST
 
-#if defined(TARGET_M68K) || defined(TARGET_PPC)
+#if defined(CONFIG_MOS6522)
     {
         .name         = "via",
         .args_type    = "",
diff --git a/monitor/misc.c b/monitor/misc.c
index 6c5bb82d3b..3d2312ba8d 100644
--- a/monitor/misc.c
+++ b/monitor/misc.c
@@ -84,6 +84,9 @@
 #include "hw/s390x/storage-attributes.h"
 #endif
 
+/* Make devices configuration available for use in hmp-commands*.hx templates */
+#include CONFIG_DEVICES
+
 /* file descriptors passed via SCM_RIGHTS */
 typedef struct mon_fd_t mon_fd_t;
 struct mon_fd_t {
-- 
2.35.3
Re: [PATCH v3] mos6522: fix linking error when CONFIG_MOS6522 is not set
Posted by Daniel Henrique Barboza 1 year, 11 months ago 

On 5/10/22 20:54, Murilo Opsfelder Araujo wrote:
> When CONFIG_MOS6522 is not set, building ppc64-softmmu target fails:
> 
>      /usr/bin/ld: libqemu-ppc64-softmmu.fa.p/monitor_misc.c.o:(.data+0x1158): undefined reference to `hmp_info_via'
> 
> Make devices configuration available in hmp-commands*.hx and check for
> CONFIG_MOS6522.
> 
> Fixes: 409e9f7131e5 (mos6522: add "info via" HMP command for debugging)
> Signed-off-by: Murilo Opsfelder Araujo <muriloo@linux.ibm.com>
> Cc: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
> Cc: Fabiano Rosas <farosas@linux.ibm.com>
> Cc: Thomas Huth <thuth@redhat.com>
> ---

Thomas,


Are you going to pick this up via your misc patches tree? If not I can take it
via ppc64.



Thanks,


Daniel




> v3:
> - Removed TARGET_M68K and TARGET_PPC checks, as per Thomas Huth suggestion.
> 
> v2:
> - https://lore.kernel.org/qemu-devel/20220506011632.183257-1-muriloo@linux.ibm.com/
> - Included devices configuration in monitor/misc.c
> 
> v1:
> - https://lore.kernel.org/qemu-devel/20220429233146.29662-1-muriloo@linux.ibm.com/
> 
>   hmp-commands-info.hx | 2 +-
>   monitor/misc.c       | 3 +++
>   2 files changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/hmp-commands-info.hx b/hmp-commands-info.hx
> index adfa085a9b..834bed089e 100644
> --- a/hmp-commands-info.hx
> +++ b/hmp-commands-info.hx
> @@ -880,7 +880,7 @@ SRST
>       Show intel SGX information.
>   ERST
>   
> -#if defined(TARGET_M68K) || defined(TARGET_PPC)
> +#if defined(CONFIG_MOS6522)
>       {
>           .name         = "via",
>           .args_type    = "",
> diff --git a/monitor/misc.c b/monitor/misc.c
> index 6c5bb82d3b..3d2312ba8d 100644
> --- a/monitor/misc.c
> +++ b/monitor/misc.c
> @@ -84,6 +84,9 @@
>   #include "hw/s390x/storage-attributes.h"
>   #endif
>   
> +/* Make devices configuration available for use in hmp-commands*.hx templates */
> +#include CONFIG_DEVICES
> +
>   /* file descriptors passed via SCM_RIGHTS */
>   typedef struct mon_fd_t mon_fd_t;
>   struct mon_fd_t {
Re: [PATCH v3] mos6522: fix linking error when CONFIG_MOS6522 is not set
Posted by Thomas Huth 1 year, 11 months ago 
On 16/05/2022 16.14, Daniel Henrique Barboza wrote:
> 
> 
> On 5/10/22 20:54, Murilo Opsfelder Araujo wrote:
>> When CONFIG_MOS6522 is not set, building ppc64-softmmu target fails:
>>
>>      /usr/bin/ld: 
>> libqemu-ppc64-softmmu.fa.p/monitor_misc.c.o:(.data+0x1158): undefined 
>> reference to `hmp_info_via'
>>
>> Make devices configuration available in hmp-commands*.hx and check for
>> CONFIG_MOS6522.
>>
>> Fixes: 409e9f7131e5 (mos6522: add "info via" HMP command for debugging)
>> Signed-off-by: Murilo Opsfelder Araujo <muriloo@linux.ibm.com>
>> Cc: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
>> Cc: Fabiano Rosas <farosas@linux.ibm.com>
>> Cc: Thomas Huth <thuth@redhat.com>
>> ---
> 
> Thomas,
> 
> 
> Are you going to pick this up via your misc patches tree? If not I can take it
> via ppc64.

I didn't queue it yet, so please take through your ppc branch.

  Thomas
Re: [PATCH v3] mos6522: fix linking error when CONFIG_MOS6522 is not set
Posted by Daniel Henrique Barboza 1 year, 11 months ago 

On 5/16/22 11:33, Thomas Huth wrote:
> On 16/05/2022 16.14, Daniel Henrique Barboza wrote:
>>
>>
>> On 5/10/22 20:54, Murilo Opsfelder Araujo wrote:
>>> When CONFIG_MOS6522 is not set, building ppc64-softmmu target fails:
>>>
>>>      /usr/bin/ld: libqemu-ppc64-softmmu.fa.p/monitor_misc.c.o:(.data+0x1158): undefined reference to `hmp_info_via'
>>>
>>> Make devices configuration available in hmp-commands*.hx and check for
>>> CONFIG_MOS6522.
>>>
>>> Fixes: 409e9f7131e5 (mos6522: add "info via" HMP command for debugging)
>>> Signed-off-by: Murilo Opsfelder Araujo <muriloo@linux.ibm.com>
>>> Cc: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
>>> Cc: Fabiano Rosas <farosas@linux.ibm.com>
>>> Cc: Thomas Huth <thuth@redhat.com>
>>> ---
>>
>> Thomas,
>>
>>
>> Are you going to pick this up via your misc patches tree? If not I can take it
>> via ppc64.
> 
> I didn't queue it yet, so please take through your ppc branch.


Done. Thanks,


Daniel

> 
>   Thomas
>
Re: [PATCH v3] mos6522: fix linking error when CONFIG_MOS6522 is not set
Posted by Thomas Huth 1 year, 11 months ago 
On 11/05/2022 01.54, Murilo Opsfelder Araujo wrote:
> When CONFIG_MOS6522 is not set, building ppc64-softmmu target fails:
> 
>      /usr/bin/ld: libqemu-ppc64-softmmu.fa.p/monitor_misc.c.o:(.data+0x1158): undefined reference to `hmp_info_via'
> 
> Make devices configuration available in hmp-commands*.hx and check for
> CONFIG_MOS6522.
> 
> Fixes: 409e9f7131e5 (mos6522: add "info via" HMP command for debugging)
> Signed-off-by: Murilo Opsfelder Araujo <muriloo@linux.ibm.com>
> Cc: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
> Cc: Fabiano Rosas <farosas@linux.ibm.com>
> Cc: Thomas Huth <thuth@redhat.com>
> ---
> v3:
> - Removed TARGET_M68K and TARGET_PPC checks, as per Thomas Huth suggestion.
> 
> v2:
> - https://lore.kernel.org/qemu-devel/20220506011632.183257-1-muriloo@linux.ibm.com/
> - Included devices configuration in monitor/misc.c
> 
> v1:
> - https://lore.kernel.org/qemu-devel/20220429233146.29662-1-muriloo@linux.ibm.com/
> 
>   hmp-commands-info.hx | 2 +-
>   monitor/misc.c       | 3 +++
>   2 files changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/hmp-commands-info.hx b/hmp-commands-info.hx
> index adfa085a9b..834bed089e 100644
> --- a/hmp-commands-info.hx
> +++ b/hmp-commands-info.hx
> @@ -880,7 +880,7 @@ SRST
>       Show intel SGX information.
>   ERST
>   
> -#if defined(TARGET_M68K) || defined(TARGET_PPC)
> +#if defined(CONFIG_MOS6522)
>       {
>           .name         = "via",
>           .args_type    = "",
> diff --git a/monitor/misc.c b/monitor/misc.c
> index 6c5bb82d3b..3d2312ba8d 100644
> --- a/monitor/misc.c
> +++ b/monitor/misc.c
> @@ -84,6 +84,9 @@
>   #include "hw/s390x/storage-attributes.h"
>   #endif
>   
> +/* Make devices configuration available for use in hmp-commands*.hx templates */
> +#include CONFIG_DEVICES
> +
>   /* file descriptors passed via SCM_RIGHTS */
>   typedef struct mon_fd_t mon_fd_t;
>   struct mon_fd_t {

Reviewed-by: Thomas Huth <thuth@redhat.com>

Patchew 2.1-devel-0870f84

© 2016 - 2024 Red Hat, Inc.