Proxmox-Port/qemu
1
0
Fork 0
mirror of https://github.com/qemu/qemu.git synced 2025-08-15 13:47:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

qapi/machine: Drop temporary 'prefix'

Browse Source 
Recent commit "qapi: Smarter camel_to_upper() to reduce need for
'prefix'" added a temporary 'prefix' to delay changing the generated
code.

Revert it.  This improves HmatLBDataType's generated enumeration
constant prefix from HMATLB_DATA_TYPE to HMAT_LB_DATA_TYPE, and
HmatLBMemoryHierarchy's from HMATLB_MEMORY_HIERARCHY to
HMAT_LB_MEMORY_HIERARCHY.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Zhao Liu <zhao1.liu@intel.com>
Message-ID: <20240904111836.3273842-8-armbru@redhat.com>
This commit is contained in:
Markus Armbruster 2024-09-04 13:18:24 +02:00
parent 1396f2b144
commit 0aa4bd6aeb
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/core/numa.c
View File

@ -249,7 +249,7 @@ void parse_numa_hmat_lb(NumaState *numa_state, NumaHmatLBOptions *node,
lb_data.initiator = node->initiator; lb_data.initiator = node->initiator;
lb_data.target = node->target; lb_data.target = node->target;
if (node->data_type <= HMATLB_DATA_TYPE_WRITE_LATENCY) { if (node->data_type <= HMAT_LB_DATA_TYPE_WRITE_LATENCY) {
/* Input latency data */ /* Input latency data */
if (!node->has_latency) { if (!node->has_latency) {
@ -313,7 +313,7 @@ void parse_numa_hmat_lb(NumaState *numa_state, NumaHmatLBOptions *node,
numa_info[node->target].lb_info_provided |= BIT(0); numa_info[node->target].lb_info_provided |= BIT(0);
} }
lb_data.data = node->latency; lb_data.data = node->latency;
} else if (node->data_type >= HMATLB_DATA_TYPE_ACCESS_BANDWIDTH) { } else if (node->data_type >= HMAT_LB_DATA_TYPE_ACCESS_BANDWIDTH) {
/* Input bandwidth data */ /* Input bandwidth data */
if (!node->has_bandwidth) { if (!node->has_bandwidth) {
error_setg(errp, "Missing 'bandwidth' option"); error_setg(errp, "Missing 'bandwidth' option");

4
hw/pci-bridge/cxl_upstream.c
View File

@ -234,7 +234,7 @@ static int build_cdat_table(CDATSubHeader ***cdat_table, void *priv)
.type = CDAT_TYPE_SSLBIS, .type = CDAT_TYPE_SSLBIS,
.length = sslbis_size, .length = sslbis_size,
}, },
.data_type = HMATLB_DATA_TYPE_ACCESS_LATENCY, .data_type = HMAT_LB_DATA_TYPE_ACCESS_LATENCY,
.entry_base_unit = 10000, .entry_base_unit = 10000,
}, },
}; };
@ -254,7 +254,7 @@ static int build_cdat_table(CDATSubHeader ***cdat_table, void *priv)
.type = CDAT_TYPE_SSLBIS, .type = CDAT_TYPE_SSLBIS,
.length = sslbis_size, .length = sslbis_size,
}, },
.data_type = HMATLB_DATA_TYPE_ACCESS_BANDWIDTH, .data_type = HMAT_LB_DATA_TYPE_ACCESS_BANDWIDTH,
.entry_base_unit = 1024, .entry_base_unit = 1024,
}, },
}; };

2
qapi/machine.json
View File

@ -686,7 +686,6 @@
# Since: 5.0 # Since: 5.0
## ##
{ 'enum': 'HmatLBMemoryHierarchy', { 'enum': 'HmatLBMemoryHierarchy',
'prefix': 'HMATLB_MEMORY_HIERARCHY', # TODO drop
'data': [ 'memory', 'first-level', 'second-level', 'third-level' ] } 'data': [ 'memory', 'first-level', 'second-level', 'third-level' ] }
## ##
@ -713,7 +712,6 @@
# Since: 5.0 # Since: 5.0
## ##
{ 'enum': 'HmatLBDataType', { 'enum': 'HmatLBDataType',
'prefix': 'HMATLB_DATA_TYPE', # TODO drop
'data': [ 'access-latency', 'read-latency', 'write-latency', 'data': [ 'access-latency', 'read-latency', 'write-latency',
'access-bandwidth', 'read-bandwidth', 'write-bandwidth' ] } 'access-bandwidth', 'read-bandwidth', 'write-bandwidth' ] }