9 files changed, 10 insertions, 10 deletions
diff --git a/hw/eeprom93xx.c b/hw/eeprom93xx.c
index 43244e771e..30a35340ad 100644
--- a/hw/eeprom93xx.c
+++ b/hw/eeprom93xx.c
@@ -107,7 +107,7 @@ static void put_unused(QEMUFile *f, void *pv, size_t size)
     exit(0);
 }
 
-const VMStateInfo vmstate_hack_uint16_from_uint8 = {
+static const VMStateInfo vmstate_hack_uint16_from_uint8 = {
     .name = "uint16_from_uint8",
     .get  = get_uint16_from_uint8,
     .put  = put_unused,
diff --git a/hw/fw_cfg.c b/hw/fw_cfg.c
index b79d58f694..b25affff87 100644
--- a/hw/fw_cfg.c
+++ b/hw/fw_cfg.c
@@ -182,7 +182,7 @@ static void put_unused(QEMUFile *f, void *pv, size_t size)
     fprintf(stderr, "This functions shouldn't be called.\n");
 }
 
-const VMStateInfo vmstate_hack_uint32_as_uint16 = {
+static const VMStateInfo vmstate_hack_uint32_as_uint16 = {
     .name = "int32_as_uint16",
     .get  = get_uint32_as_uint16,
     .put  = put_unused,
diff --git a/hw/ide/microdrive.c b/hw/ide/microdrive.c
index 37087ca0ca..bfdb8c8b05 100644
--- a/hw/ide/microdrive.c
+++ b/hw/ide/microdrive.c
@@ -300,7 +300,7 @@ static void md_common_write(void *opaque, uint32_t at, uint16_t value)
     }
 }
 
-const VMStateDescription vmstate_microdrive = {
+static const VMStateDescription vmstate_microdrive = {
     .name = "microdrive",
     .version_id = 3,
     .minimum_version_id = 0,
diff --git a/hw/ne2000-isa.c b/hw/ne2000-isa.c
index d2e9283be3..03a5a1fbd5 100644
--- a/hw/ne2000-isa.c
+++ b/hw/ne2000-isa.c
@@ -50,7 +50,7 @@ static NetClientInfo net_ne2000_isa_info = {
     .cleanup = isa_ne2000_cleanup,
 };
 
-const VMStateDescription vmstate_isa_ne2000 = {
+static const VMStateDescription vmstate_isa_ne2000 = {
     .name = "ne2000",
     .version_id = 2,
     .minimum_version_id = 0,
diff --git a/hw/ne2000.c b/hw/ne2000.c
index e0655ffa4c..d1416cfb7f 100644
--- a/hw/ne2000.c
+++ b/hw/ne2000.c
@@ -663,7 +663,7 @@ const VMStateDescription vmstate_ne2000 = {
     }
 };
 
-const VMStateDescription vmstate_pci_ne2000 = {
+static const VMStateDescription vmstate_pci_ne2000 = {
     .name = "ne2000",
     .version_id = 3,
     .minimum_version_id = 3,
diff --git a/hw/pckbd.c b/hw/pckbd.c
index 7e0d68df2b..7998aa66b5 100644
--- a/hw/pckbd.c
+++ b/hw/pckbd.c
@@ -414,7 +414,7 @@ typedef struct ISAKBDState {
     KBDState  kbd;
 } ISAKBDState;
 
-const VMStateDescription vmstate_kbd_isa = {
+static const VMStateDescription vmstate_kbd_isa = {
     .name = "pckbd",
     .version_id = 3,
     .minimum_version_id = 3,
diff --git a/hw/realview.c b/hw/realview.c
index 3322c4fd5d..fd2d6be715 100644
--- a/hw/realview.c
+++ b/hw/realview.c
@@ -121,7 +121,7 @@ enum realview_board_type {
     BOARD_PBX_A9,
 };
 
-int realview_board_id[] = {
+static const int realview_board_id[] = {
     0x33b,
     0x33b,
     0x769,
diff --git a/hw/twl92230.c b/hw/twl92230.c
index b1b2ac9ce5..e61f17f0ad 100644
--- a/hw/twl92230.c
+++ b/hw/twl92230.c
@@ -756,7 +756,7 @@ static void put_int32_as_uint16(QEMUFile *f, void *pv, size_t size)
     qemu_put_be16(f, *v);
 }
 
-const VMStateInfo vmstate_hack_int32_as_uint16 = {
+static const VMStateInfo vmstate_hack_int32_as_uint16 = {
     .name = "int32_as_uint16",
     .get  = get_int32_as_uint16,
     .put  = put_int32_as_uint16,
diff --git a/hw/vmware_vga.c b/hw/vmware_vga.c
index 24ea6205b0..240731a1b2 100644
--- a/hw/vmware_vga.c
+++ b/hw/vmware_vga.c
@@ -1063,7 +1063,7 @@ static int vmsvga_post_load(void *opaque, int version_id)
     return 0;
 }
 
-const VMStateDescription vmstate_vmware_vga_internal = {
+static const VMStateDescription vmstate_vmware_vga_internal = {
     .name = "vmware_vga_internal",
     .version_id = 0,
     .minimum_version_id = 0,
@@ -1090,7 +1090,7 @@ const VMStateDescription vmstate_vmware_vga_internal = {
     }
 };
 
-const VMStateDescription vmstate_vmware_vga = {
+static const VMStateDescription vmstate_vmware_vga = {
     .name = "vmware_vga",
     .version_id = 0,
     .minimum_version_id = 0,