98 lines
3.1 KiB
Diff
98 lines
3.1 KiB
Diff
|
From 7bad515189482d289d3efe4133c8af9f184662e4 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Prasad J Pandit <pjp@fedoraproject.org>
|
||
|
|
Date: Thu, 14 May 2020 00:55:40 +0530
|
||
|
|
Subject: [PATCH 6/9] megasas: use unsigned type for positive numeric fields
|
||
|
|
|
||
|
|
Use unsigned type for the MegasasState fields which hold positive
|
||
|
|
numeric values.
|
||
|
|
|
||
|
|
Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org>
|
||
|
|
Reviewed-by: Darren Kenny <darren.kenny@oracle.com>
|
||
|
|
Message-Id: <20200513192540.1583887-4-ppandit@redhat.com>
|
||
|
|
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
||
|
|
---
|
||
|
|
hw/scsi/megasas.c | 38 +++++++++++++++++++-------------------
|
||
|
|
1 file changed, 19 insertions(+), 19 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/hw/scsi/megasas.c b/hw/scsi/megasas.c
|
||
|
|
index 5923ffbd22..94469e8169 100644
|
||
|
|
--- a/hw/scsi/megasas.c
|
||
|
|
+++ b/hw/scsi/megasas.c
|
||
|
|
@@ -85,34 +85,34 @@ typedef struct MegasasState {
|
||
|
|
MemoryRegion queue_io;
|
||
|
|
uint32_t frame_hi;
|
||
|
|
|
||
|
|
- int fw_state;
|
||
|
|
+ uint32_t fw_state;
|
||
|
|
uint32_t fw_sge;
|
||
|
|
uint32_t fw_cmds;
|
||
|
|
uint32_t flags;
|
||
|
|
- int fw_luns;
|
||
|
|
- int intr_mask;
|
||
|
|
- int doorbell;
|
||
|
|
- int busy;
|
||
|
|
- int diag;
|
||
|
|
- int adp_reset;
|
||
|
|
+ uint32_t fw_luns;
|
||
|
|
+ uint32_t intr_mask;
|
||
|
|
+ uint32_t doorbell;
|
||
|
|
+ uint32_t busy;
|
||
|
|
+ uint32_t diag;
|
||
|
|
+ uint32_t adp_reset;
|
||
|
|
OnOffAuto msi;
|
||
|
|
OnOffAuto msix;
|
||
|
|
|
||
|
|
MegasasCmd *event_cmd;
|
||
|
|
- int event_locale;
|
||
|
|
+ uint16_t event_locale;
|
||
|
|
int event_class;
|
||
|
|
- int event_count;
|
||
|
|
- int shutdown_event;
|
||
|
|
- int boot_event;
|
||
|
|
+ uint32_t event_count;
|
||
|
|
+ uint32_t shutdown_event;
|
||
|
|
+ uint32_t boot_event;
|
||
|
|
|
||
|
|
uint64_t sas_addr;
|
||
|
|
char *hba_serial;
|
||
|
|
|
||
|
|
uint64_t reply_queue_pa;
|
||
|
|
void *reply_queue;
|
||
|
|
- int reply_queue_len;
|
||
|
|
+ uint16_t reply_queue_len;
|
||
|
|
uint16_t reply_queue_head;
|
||
|
|
- int reply_queue_tail;
|
||
|
|
+ uint16_t reply_queue_tail;
|
||
|
|
uint64_t consumer_pa;
|
||
|
|
uint64_t producer_pa;
|
||
|
|
|
||
|
|
@@ -2258,9 +2258,9 @@ static const VMStateDescription vmstate_megasas_gen1 = {
|
||
|
|
VMSTATE_PCI_DEVICE(parent_obj, MegasasState),
|
||
|
|
VMSTATE_MSIX(parent_obj, MegasasState),
|
||
|
|
|
||
|
|
- VMSTATE_INT32(fw_state, MegasasState),
|
||
|
|
- VMSTATE_INT32(intr_mask, MegasasState),
|
||
|
|
- VMSTATE_INT32(doorbell, MegasasState),
|
||
|
|
+ VMSTATE_UINT32(fw_state, MegasasState),
|
||
|
|
+ VMSTATE_UINT32(intr_mask, MegasasState),
|
||
|
|
+ VMSTATE_UINT32(doorbell, MegasasState),
|
||
|
|
VMSTATE_UINT64(reply_queue_pa, MegasasState),
|
||
|
|
VMSTATE_UINT64(consumer_pa, MegasasState),
|
||
|
|
VMSTATE_UINT64(producer_pa, MegasasState),
|
||
|
|
@@ -2277,9 +2277,9 @@ static const VMStateDescription vmstate_megasas_gen2 = {
|
||
|
|
VMSTATE_PCI_DEVICE(parent_obj, MegasasState),
|
||
|
|
VMSTATE_MSIX(parent_obj, MegasasState),
|
||
|
|
|
||
|
|
- VMSTATE_INT32(fw_state, MegasasState),
|
||
|
|
- VMSTATE_INT32(intr_mask, MegasasState),
|
||
|
|
- VMSTATE_INT32(doorbell, MegasasState),
|
||
|
|
+ VMSTATE_UINT32(fw_state, MegasasState),
|
||
|
|
+ VMSTATE_UINT32(intr_mask, MegasasState),
|
||
|
|
+ VMSTATE_UINT32(doorbell, MegasasState),
|
||
|
|
VMSTATE_UINT64(reply_queue_pa, MegasasState),
|
||
|
|
VMSTATE_UINT64(consumer_pa, MegasasState),
|
||
|
|
VMSTATE_UINT64(producer_pa, MegasasState),
|
||
|
|
--
|
||
|
|
2.25.1
|
||
|
|
|