@@ -486,7 +486,7 @@ Aml *build_crs(PCIHostState *host, CrsRangeSet *range_set, uint32_t io_offset,
void build_srat_memory(GArray *table_data, uint64_t base,
uint64_t len, int node, MemoryAffinityFlags flags);
-void build_srat_pci_generic_initiator(GArray *table_data, int node,
+void build_srat_pci_generic_initiator(GArray *table_data, uint32_t node,
uint16_t segment, uint8_t bus,
uint8_t devfn);
@@ -1973,7 +1973,7 @@ static void build_append_srat_acpi_device_handle(GArray *table_data,
* 5.2.16.6 Generic Initiator Affinity Structure
* With PCI Device Handle.
*/
-void build_srat_pci_generic_initiator(GArray *table_data, int node,
+void build_srat_pci_generic_initiator(GArray *table_data, uint32_t node,
uint16_t segment, uint8_t bus,
uint8_t devfn)
{
@@ -72,7 +72,7 @@ typedef struct AcpiGenericInitiator {
/* public */
char *pci_dev;
- uint16_t node;
+ uint32_t node;
} AcpiGenericInitiator;
typedef struct AcpiGenericInitiatorClass {
From review of generic port introduction. The value is handled as a uint32_t so store it in that type. The value cannot in reality exceed MAX_NODES which is currently 128 but if the types are matched there is no need to rely on that restriction. Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> --- v6: New patch bringing Generic Initiator handling inline with updated generic ports code following Igor's review. Kind of suggested-by Igor, indirectly... --- include/hw/acpi/aml-build.h | 2 +- hw/acpi/aml-build.c | 2 +- hw/acpi/pci.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)