[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 01/32] hw/cxl: Fix local variable shadowing of cap_hdrs
From: |
Markus Armbruster |
Subject: |
[PULL 01/32] hw/cxl: Fix local variable shadowing of cap_hdrs |
Date: |
Fri, 6 Oct 2023 13:36:26 +0200 |
From: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Rename the version not burried in the macro to cap_h.
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Message-ID: <20230925152258.5444-1-Jonathan.Cameron@huawei.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Fan Ni <fan.ni@samsung.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
hw/cxl/cxl-device-utils.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/hw/cxl/cxl-device-utils.c b/hw/cxl/cxl-device-utils.c
index 517f06d869..bd68328032 100644
--- a/hw/cxl/cxl-device-utils.c
+++ b/hw/cxl/cxl-device-utils.c
@@ -283,13 +283,13 @@ static void memdev_reg_init_common(CXLDeviceState
*cxl_dstate) { }
void cxl_device_register_init_common(CXLDeviceState *cxl_dstate)
{
- uint64_t *cap_hdrs = cxl_dstate->caps_reg_state64;
+ uint64_t *cap_h = cxl_dstate->caps_reg_state64;
const int cap_count = 3;
/* CXL Device Capabilities Array Register */
- ARRAY_FIELD_DP64(cap_hdrs, CXL_DEV_CAP_ARRAY, CAP_ID, 0);
- ARRAY_FIELD_DP64(cap_hdrs, CXL_DEV_CAP_ARRAY, CAP_VERSION, 1);
- ARRAY_FIELD_DP64(cap_hdrs, CXL_DEV_CAP_ARRAY, CAP_COUNT, cap_count);
+ ARRAY_FIELD_DP64(cap_h, CXL_DEV_CAP_ARRAY, CAP_ID, 0);
+ ARRAY_FIELD_DP64(cap_h, CXL_DEV_CAP_ARRAY, CAP_VERSION, 1);
+ ARRAY_FIELD_DP64(cap_h, CXL_DEV_CAP_ARRAY, CAP_COUNT, cap_count);
cxl_device_cap_init(cxl_dstate, DEVICE_STATUS, 1, 2);
device_reg_init_common(cxl_dstate);
--
2.41.0
- [PULL 00/32] -Wshadow=local patches patches for 2023-10-06, Markus Armbruster, 2023/10/06
- [PULL 10/32] hw/audio/soundhw: Clean up global variable shadowing, Markus Armbruster, 2023/10/06
- [PULL 27/32] hw/usb: Silence compiler warnings in USB code when compiling with -Wshadow, Markus Armbruster, 2023/10/06
- [PULL 26/32] target/ppc: Clean up local variable shadowing in kvm_arch_*_registers(), Markus Armbruster, 2023/10/06
- [PULL 06/32] hw/net/vhost_net: Silence compiler warning when compiling with -Wshadow, Markus Armbruster, 2023/10/06
- [PULL 21/32] util/guest-random: Clean up global variable shadowing, Markus Armbruster, 2023/10/06
- [PULL 09/32] dump: Silence compiler warning in dump code when compiling with -Wshadow, Markus Armbruster, 2023/10/06
- [PULL 05/32] audio/ossaudio: Fix compiler warning with -Wshadow, Markus Armbruster, 2023/10/06
- [PULL 01/32] hw/cxl: Fix local variable shadowing of cap_hdrs,
Markus Armbruster <=
- [PULL 07/32] hw/virtio/virtio-pci: Avoid compiler warning with -Wshadow, Markus Armbruster, 2023/10/06
- [PULL 31/32] linux-user/syscall.c: clean up local variable shadowing in TARGET_NR_getcpu, Markus Armbruster, 2023/10/06
- [PULL 18/32] semihosting: Clean up global variable shadowing, Markus Armbruster, 2023/10/06
- [PULL 13/32] os-posix: Clean up global variable shadowing, Markus Armbruster, 2023/10/06
- [PULL 32/32] linux-user/syscall.c: clean up local variable shadowing in xattr syscalls, Markus Armbruster, 2023/10/06
- [PULL 29/32] linux-user/mmap.c: clean up local variable shadowing, Markus Armbruster, 2023/10/06
- [PULL 12/32] net/net: Clean up global variable shadowing, Markus Armbruster, 2023/10/06
- [PULL 14/32] plugins/loader: Clean up global variable shadowing, Markus Armbruster, 2023/10/06
- [PULL 16/32] qemu-io: Clean up global variable shadowing, Markus Armbruster, 2023/10/06
- [PULL 03/32] target/ppc: Rename variables to avoid local variable shadowing in VUPKPX, Markus Armbruster, 2023/10/06