Skip to contentSkip to conversation

hw/ppc/spapr: Use the proper include that defines 'target_ulong'

PATCH In review Philippe Mathieu-Daudé 2 participants 2 messages Aug 19, 2019 – Aug 20, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 hw/ppc/spapr: Use the proper include that defines 'target_ulong'

As its name implies, the Option/Architecture Vector is not target (per cpu) specific but arch-related.
Use the proper arch-related header, allowing to use this header with non cpu-specific objects.

This fixes this error when using this header with $common-obj:

include/hw/ppc/spapr_ovec.h:76:44: error: unknown type name ‘target_ulong’; did you mean ‘gulong’?

     SpaprOptionVector *spapr_ovec_parse_vector(target_ulong table_addr, int vector);
                                                ^~~~~~~~~~~~
---
 include/hw/ppc/spapr_ovec.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
include/hw/ppc/spapr_ovec.h +1 -1
index 7891e9caac..b6b8811998 100644
@@ -37,7 +37,7 @@
 #ifndef SPAPR_OVEC_H
 #define SPAPR_OVEC_H
 
-#include "cpu.h"
+#include "exec/cpu-defs.h"
 
 typedef struct SpaprOptionVector SpaprOptionVector;
 
Signature · 1 line
2.20.1
#1 lore raw
Quoted 5 lines · Philippe Mathieu-Daudé

As its name implies, the Option/Architecture Vector is not target (per cpu) specific but arch-related.
Use the proper arch-related header, allowing to use this header with non cpu-specific objects.

Quoted 7 lines

This fixes this error when using this header with $common-obj:

include/hw/ppc/spapr_ovec.h:76:44: error: unknown type name ‘target_ulong’; did you mean ‘gulong’?

     SpaprOptionVector *spapr_ovec_parse_vector(target_ulong table_addr, int vector);
                                                ^~~~~~~~~~~~

So, the change here seems sane, but the commit message totally confuses me. Where does the term "Option/Architecture Vector" come from? What distinction are you drawing between per-target and per-arch? What's the symptom if this patch is not applied?

Quoted 17 lines
---
 include/hw/ppc/spapr_ovec.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
include/hw/ppc/spapr_ovec.h +1 -1
index 7891e9caac..b6b8811998 100644
@@ -37,7 +37,7 @@
 #ifndef SPAPR_OVEC_H
 #define SPAPR_OVEC_H
 
-#include "cpu.h"
+#include "exec/cpu-defs.h"
 
 typedef struct SpaprOptionVector SpaprOptionVector;
 
Signature · 4 lines
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