[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-trivial] [PULL 12/22] hw: Add missing 'static' attributes
From: |
Michael Tokarev |
Subject: |
[Qemu-trivial] [PULL 12/22] hw: Add missing 'static' attributes |
Date: |
Mon, 5 May 2014 22:01:53 +0400 |
From: Stefan Weil <address@hidden>
This fixes warnings from the static code analysis (smatch).
Signed-off-by: Stefan Weil <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>
---
hw/net/cadence_gem.c | 2 +-
hw/net/vmxnet3.c | 6 +++---
hw/net/xgmac.c | 2 +-
hw/ppc/spapr_iommu.c | 2 +-
hw/ppc/spapr_rtas.c | 2 +-
hw/scsi/scsi-bus.c | 2 +-
6 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/hw/net/cadence_gem.c b/hw/net/cadence_gem.c
index e34b25e..cdb1825 100644
--- a/hw/net/cadence_gem.c
+++ b/hw/net/cadence_gem.c
@@ -388,7 +388,7 @@ typedef struct GemState {
} GemState;
/* The broadcast MAC address: 0xFFFFFFFFFFFF */
-const uint8_t broadcast_addr[] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF };
+static const uint8_t broadcast_addr[] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF };
/*
* gem_init_register_masks:
diff --git a/hw/net/vmxnet3.c b/hw/net/vmxnet3.c
index ddcee4b..1bb9259 100644
--- a/hw/net/vmxnet3.c
+++ b/hw/net/vmxnet3.c
@@ -2305,7 +2305,7 @@ static void vmxnet3_put_txq_descr(QEMUFile *f, void *pv,
size_t size)
vmxnet3_put_tx_stats_to_file(f, &r->txq_stats);
}
-const VMStateInfo txq_descr_info = {
+static const VMStateInfo txq_descr_info = {
.name = "txq_descr",
.get = vmxnet3_get_txq_descr,
.put = vmxnet3_put_txq_descr
@@ -2397,7 +2397,7 @@ static int vmxnet3_post_load(void *opaque, int version_id)
return 0;
}
-const VMStateInfo rxq_descr_info = {
+static const VMStateInfo rxq_descr_info = {
.name = "rxq_descr",
.get = vmxnet3_get_rxq_descr,
.put = vmxnet3_put_rxq_descr
@@ -2423,7 +2423,7 @@ static void vmxnet3_put_int_state(QEMUFile *f, void *pv,
size_t size)
qemu_put_byte(f, r->is_asserted);
}
-const VMStateInfo int_state_info = {
+static const VMStateInfo int_state_info = {
.name = "int_state",
.get = vmxnet3_get_int_state,
.put = vmxnet3_put_int_state
diff --git a/hw/net/xgmac.c b/hw/net/xgmac.c
index 9384fa0..88349ac 100644
--- a/hw/net/xgmac.c
+++ b/hw/net/xgmac.c
@@ -152,7 +152,7 @@ typedef struct XgmacState {
uint32_t regs[R_MAX];
} XgmacState;
-const VMStateDescription vmstate_rxtx_stats = {
+static const VMStateDescription vmstate_rxtx_stats = {
.name = "xgmac_stats",
.version_id = 1,
.minimum_version_id = 1,
diff --git a/hw/ppc/spapr_iommu.c b/hw/ppc/spapr_iommu.c
index d9fe946..72493d8 100644
--- a/hw/ppc/spapr_iommu.c
+++ b/hw/ppc/spapr_iommu.c
@@ -35,7 +35,7 @@ enum sPAPRTCEAccess {
SPAPR_TCE_RW = 3,
};
-QLIST_HEAD(spapr_tce_tables, sPAPRTCETable) spapr_tce_tables;
+static QLIST_HEAD(spapr_tce_tables, sPAPRTCETable) spapr_tce_tables;
static sPAPRTCETable *spapr_tce_find_by_liobn(uint32_t liobn)
{
diff --git a/hw/ppc/spapr_rtas.c b/hw/ppc/spapr_rtas.c
index 73860d0..ea4a2b2 100644
--- a/hw/ppc/spapr_rtas.c
+++ b/hw/ppc/spapr_rtas.c
@@ -272,7 +272,7 @@ static struct rtas_call {
spapr_rtas_fn fn;
} rtas_table[TOKEN_MAX];
-struct rtas_call *rtas_next = rtas_table;
+static struct rtas_call *rtas_next = rtas_table;
target_ulong spapr_rtas_call(PowerPCCPU *cpu, sPAPREnvironment *spapr,
uint32_t token, uint32_t nargs, target_ulong args,
diff --git a/hw/scsi/scsi-bus.c b/hw/scsi/scsi-bus.c
index ae921a6..abe7302 100644
--- a/hw/scsi/scsi-bus.c
+++ b/hw/scsi/scsi-bus.c
@@ -1179,7 +1179,7 @@ static uint64_t scsi_cmd_lba(SCSICommand *cmd)
return lba;
}
-int scsi_req_parse(SCSICommand *cmd, SCSIDevice *dev, uint8_t *buf)
+static int scsi_req_parse(SCSICommand *cmd, SCSIDevice *dev, uint8_t *buf)
{
int rc;
--
1.7.10.4
- [Qemu-trivial] [PULL 14/22] hw/9pfs: Add include file for exported symbol, (continued)
- [Qemu-trivial] [PULL 14/22] hw/9pfs: Add include file for exported symbol, Michael Tokarev, 2014/05/05
- [Qemu-trivial] [PULL 16/22] glib: move g_poll() replacement into glib-compat.h, Michael Tokarev, 2014/05/05
- [Qemu-trivial] [PULL 10/22] ui: Add missing 'static' attribute, Michael Tokarev, 2014/05/05
- [Qemu-trivial] [PULL 09/22] monitor: Add missing 'static' attribute, Michael Tokarev, 2014/05/05
- [Qemu-trivial] [PULL 20/22] readline: Sort completions before printing them., Michael Tokarev, 2014/05/05
- [Qemu-trivial] [PULL 17/22] libcacard: replace pstrcpy() with memcpy(), Michael Tokarev, 2014/05/05
- [Qemu-trivial] [PULL 13/22] xen: remove unused global, xen_xcg, Michael Tokarev, 2014/05/05
- [Qemu-trivial] [PULL 19/22] readline: use g_strndup instead of open-coding it, Michael Tokarev, 2014/05/05
- [Qemu-trivial] [PULL 08/22] hw/s390x: Add missing 'static' attribute, Michael Tokarev, 2014/05/05
- [Qemu-trivial] [PULL 15/22] do not call g_thread_init() for glib >= 2.31, Michael Tokarev, 2014/05/05
- [Qemu-trivial] [PULL 12/22] hw: Add missing 'static' attributes,
Michael Tokarev <=
- Re: [Qemu-trivial] [Qemu-devel] [PULL 00/22] Trivial patches for 2014-05-05, Peter Maydell, 2014/05/07