[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 6/9] hw/ide/ahci: Convert AHCIState::ports to unsigned
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH 6/9] hw/ide/ahci: Convert AHCIState::ports to unsigned |
Date: |
Tue, 13 Feb 2024 09:11:57 +0100 |
AHCIState::ports should be unsigned. Besides, we never
check it for negative value. It is unlikely it was ever
used with more than INT32_MAX ports, so it is safe to
convert it to unsigned.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
include/hw/ide/ahci.h | 2 +-
hw/ide/ahci.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/include/hw/ide/ahci.h b/include/hw/ide/ahci.h
index 8cd55b1333..604d3a0994 100644
--- a/include/hw/ide/ahci.h
+++ b/include/hw/ide/ahci.h
@@ -46,7 +46,7 @@ typedef struct AHCIState {
MemoryRegion idp; /* Index-Data Pair I/O port space */
unsigned idp_offset; /* Offset of index in I/O port space */
uint32_t idp_index; /* Current IDP index */
- int32_t ports;
+ uint32_t ports;
qemu_irq irq;
AddressSpace *as;
} AHCIState;
diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c
index bac1871a31..2c3306dae4 100644
--- a/hw/ide/ahci.c
+++ b/hw/ide/ahci.c
@@ -1819,7 +1819,7 @@ const VMStateDescription vmstate_ahci = {
.version_id = 1,
.post_load = ahci_state_post_load,
.fields = (const VMStateField[]) {
- VMSTATE_STRUCT_VARRAY_POINTER_INT32(dev, AHCIState, ports,
+ VMSTATE_STRUCT_VARRAY_POINTER_UINT32(dev, AHCIState, ports,
vmstate_ahci_device, AHCIDevice),
VMSTATE_UINT32(control_regs.cap, AHCIState),
VMSTATE_UINT32(control_regs.ghc, AHCIState),
@@ -1827,7 +1827,7 @@ const VMStateDescription vmstate_ahci = {
VMSTATE_UINT32(control_regs.impl, AHCIState),
VMSTATE_UINT32(control_regs.version, AHCIState),
VMSTATE_UINT32(idp_index, AHCIState),
- VMSTATE_INT32_EQUAL(ports, AHCIState, NULL),
+ VMSTATE_UINT32_EQUAL(ports, AHCIState, NULL),
VMSTATE_END_OF_LIST()
},
};
--
2.41.0
- [PATCH 0/9] hw/ide/ahci: Housekeeping, Philippe Mathieu-Daudé, 2024/02/13
- [PATCH 1/9] hw/i386/q35: Use DEVICE() cast macro with PCIDevice object, Philippe Mathieu-Daudé, 2024/02/13
- [PATCH 2/9] hw/ide/ahci: Expose AHCIPCIState structure, Philippe Mathieu-Daudé, 2024/02/13
- [PATCH 3/9] hw/ide/ahci: Rename AHCI PCI function as 'pdev', Philippe Mathieu-Daudé, 2024/02/13
- [PATCH 4/9] hw/ide/ahci: Inline ahci_get_num_ports(), Philippe Mathieu-Daudé, 2024/02/13
- [PATCH 5/9] hw/ide/ahci: Pass AHCI context to ahci_ide_create_devs(), Philippe Mathieu-Daudé, 2024/02/13
- [PATCH 6/9] hw/ide/ahci: Convert AHCIState::ports to unsigned,
Philippe Mathieu-Daudé <=
- [PATCH 7/9] hw/ide/ahci: Do not pass 'ports' argument to ahci_realize(), Philippe Mathieu-Daudé, 2024/02/13
- [PATCH 8/9] hw/ide/ahci: Remove SysbusAHCIState::num_ports field, Philippe Mathieu-Daudé, 2024/02/13
- [PATCH 9/9] hw/ide/ahci: Move SysBus definitions to 'ahci-sysbus.h', Philippe Mathieu-Daudé, 2024/02/13
- Re: [PATCH 0/9] hw/ide/ahci: Housekeeping, Michael S. Tsirkin, 2024/02/13
- Re: [PATCH 0/9] hw/ide/ahci: Housekeeping, Philippe Mathieu-Daudé, 2024/02/15