Skip to contentSkip to conversation

mos6522: fix linking error when CONFIG_MOS6522 is not set

PATCH In review Murilo Opsfelder Araujo 3 participants 5 messages May 10, 2022 – May 17, 2022

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 mos6522: fix linking error when CONFIG_MOS6522 is not set

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)
Cc Mark Cave-Ayland <[email protected]>
Cc Fabiano Rosas <[email protected]>
Cc Thomas Huth <[email protected]>

---
v3:
- Removed TARGET_M68K and TARGET_PPC checks, as per Thomas Huth suggestion.

v2:
- https://lore.kernel.org/qemu-devel/[email protected]/
- Included devices configuration in monitor/misc.c

v1:
- https://lore.kernel.org/qemu-devel/[email protected]/

 hmp-commands-info.hx | 2 +-
 monitor/misc.c       | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)
hmp-commands-info.hx +1 -1
index adfa085a9b..834bed089e 100644
@@ -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    = "",
monitor/misc.c +3 -0
index 6c5bb82d3b..3d2312ba8d 100644
@@ -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 {
Signature · 1 line
2.35.3
Reviewed-by on v3 1/1
#1 lore raw
Quoted 45 lines · Murilo Opsfelder Araujo

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)
Cc Mark Cave-Ayland <[email protected]>
Cc Fabiano Rosas <[email protected]>
Cc Thomas Huth <[email protected]>

---
v3:
- Removed TARGET_M68K and TARGET_PPC checks, as per Thomas Huth suggestion.

v2:
- https://lore.kernel.org/qemu-devel/[email protected]/
- Included devices configuration in monitor/misc.c

v1:
- https://lore.kernel.org/qemu-devel/[email protected]/

  hmp-commands-info.hx | 2 +-
  monitor/misc.c       | 3 +++
  2 files changed, 4 insertions(+), 1 deletion(-)
hmp-commands-info.hx +1 -1
index adfa085a9b..834bed089e 100644
@@ -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    = "",
monitor/misc.c +0 -0
index 6c5bb82d3b..3d2312ba8d 100644

monitor/misc.c line 92

Quoted 9 lines
monitor/misc.c +3 -0
@@ -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 lore raw
In reply to Murilo Opsfelder Araujo
Quoted 7 lines · Murilo Opsfelder Araujo

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.

Quoted 6 lines
Fixes 409e9f7131e5 (mos6522: add "info via" HMP command for debugging)
Cc Mark Cave-Ayland <[email protected]>
Cc Fabiano Rosas <[email protected]>
Cc Thomas Huth <[email protected]>

---

Thomas,

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

Thanks,

Daniel

Quoted 41 lines

v3:
- Removed TARGET_M68K and TARGET_PPC checks, as per Thomas Huth suggestion.

v2:
- https://lore.kernel.org/qemu-devel/[email protected]/
- Included devices configuration in monitor/misc.c

v1:
- https://lore.kernel.org/qemu-devel/[email protected]/

  hmp-commands-info.hx | 2 +-
  monitor/misc.c       | 3 +++
  2 files changed, 4 insertions(+), 1 deletion(-)
hmp-commands-info.hx +1 -1
index adfa085a9b..834bed089e 100644
@@ -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    = "",
monitor/misc.c +3 -0
index 6c5bb82d3b..3d2312ba8d 100644
@@ -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 {
#3 lore raw
Quoted 17 lines · Daniel Henrique Barboza
Quoted 7 lines · Murilo Opsfelder Araujo

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.

Quoted 6 lines
Fixes 409e9f7131e5 (mos6522: add "info via" HMP command for debugging)
Cc Mark Cave-Ayland <[email protected]>
Cc Fabiano Rosas <[email protected]>
Cc Thomas Huth <[email protected]>

---

Quoted 5 lines

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

#4 lore raw
Quoted 18 lines · Thomas Huth
Quoted 17 lines · Daniel Henrique Barboza
Quoted 13 lines · Murilo Opsfelder Araujo

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)
Cc Mark Cave-Ayland <[email protected]>
Cc Fabiano Rosas <[email protected]>
Cc Thomas Huth <[email protected]>

---

Quoted 7 lines
Quoted 5 lines

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

Quoted 3 lines

 Thomas