[Qemu-devel] [PATCH 0/9] convert many more globals to "static"

[Qemu-devel] [PATCH 0/9] convert many more globals to "static"

[Jim Meyering]

From: Jim Meyering <meyering@redhat.com>

Following up on discussion here,

  http://marc.info/?t=133759487600008&r=1&w=2

here are patches to limit the scope of the remaining global variables.
Most changes simply added a preceding "static".  However, in some cases,
I've made minor additional changes, e.g., to make a static
table "const" as well (which sometimes required making an iterator
pointer const, too), and to move or remove declarations of variables
that the compiler then was able to identify as unused.

Initially I put the changes to each file in a separate commit, but that
got old quickly, and I lumped all of the remaining changes into the
9th commit.  If that's a problem, let me know and I'll separate it.


Jim Meyering (9):
  ccid: declare DEFAULT_ATR table to be "static const"
  tcg: declare __jit_debug_descriptor to be static
  alpha-dis: remove unused global; declare others to be static
  linux-user: arg_table need not have global scope
  ccid: make backend_enum_table "static const" and adjust users
  sheepdog: declare bdrv_sheepdog to be static
  mips-dis: declare four globals to be "static"
  bonito: declare bonito_state to be static
  convert many more globals to static

 alpha-dis.c               | 26 ++++++----------
 arm-dis.c                 |  8 ++---
 block/sheepdog.c          |  2 +-
 cpus.c                    |  4 +--
 cris-dis.c                |  2 +-
 hw/9pfs/virtio-9p-synth.c |  2 +-
 hw/bonito.c               |  2 +-
 hw/ccid-card-emulated.c   |  6 ++--
 hw/ccid-card-passthru.c   |  2 +-
 hw/ide/pci.c              |  2 +-
 hw/leon3.c                |  2 +-
 hw/mips_fulong2e.c        |  2 +-
 hw/s390-virtio-bus.c      |  2 +-
 hw/spapr_rtas.c           |  2 +-
 hw/xen_platform.c         |  2 +-
 hw/xgmac.c                |  2 +-
 linux-user/main.c         |  6 ++--
 m68k-dis.c                | 79 ++++++++++++++++++++++++-----------------------
 memory.c                  |  2 +-
 microblaze-dis.c          |  6 ++--
 mips-dis.c                | 15 +++++----
 ppc-dis.c                 | 26 ++++++++--------
 sh4-dis.c                 |  2 +-
 target-cris/translate.c   |  2 +-
 target-i386/cpu.c         |  4 +--
 target-i386/kvm.c         |  2 +-
 tcg/tcg.c                 |  2 +-
 tests/fdc-test.c          |  2 +-
 vl.c                      | 12 ++++---
 29 files changed, 110 insertions(+), 118 deletions(-)

--
1.7.10.2.552.gaa3bb87

[Qemu-devel] [PATCH 1/9] ccid: declare DEFAULT_ATR table to be "static const"

[Jim Meyering]

From: Jim Meyering <meyering@redhat.com>


Signed-off-by: Jim Meyering <meyering@redhat.com>
---
 hw/ccid-card-passthru.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/ccid-card-passthru.c b/hw/ccid-card-passthru.c
index bd6c777..1caaa45 100644
--- a/hw/ccid-card-passthru.c
+++ b/hw/ccid-card-passthru.c
@@ -27,7 +27,7 @@ do {                                                    \
 #define D_VERBOSE 4

 /* TODO: do we still need this? */
-uint8_t DEFAULT_ATR[] = {
+static const uint8_t DEFAULT_ATR[] = {
 /*
  * From some example somewhere
  * 0x3B, 0xB0, 0x18, 0x00, 0xD1, 0x81, 0x05, 0xB1, 0x40, 0x38, 0x1F, 0x03, 0x28
-- 
1.7.10.2.552.gaa3bb87

[Qemu-devel] [PATCH 1/9] ccid: declare DEFAULT_ATR table to be "static const"

[Jim Meyering]

From: Jim Meyering <meyering@redhat.com>


Signed-off-by: Jim Meyering <meyering@redhat.com>
---
 hw/ccid-card-passthru.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/ccid-card-passthru.c b/hw/ccid-card-passthru.c
index bd6c777..1caaa45 100644
--- a/hw/ccid-card-passthru.c
+++ b/hw/ccid-card-passthru.c
@@ -27,7 +27,7 @@ do {                                                    \
 #define D_VERBOSE 4

 /* TODO: do we still need this? */
-uint8_t DEFAULT_ATR[] = {
+static const uint8_t DEFAULT_ATR[] = {
 /*
  * From some example somewhere
  * 0x3B, 0xB0, 0x18, 0x00, 0xD1, 0x81, 0x05, 0xB1, 0x40, 0x38, 0x1F, 0x03, 0x28
-- 
1.7.10.2.552.gaa3bb87

[Qemu-devel] [PATCH 2/9] tcg: declare __jit_debug_descriptor to be static

[Jim Meyering]

From: Jim Meyering <meyering@redhat.com>


Signed-off-by: Jim Meyering <meyering@redhat.com>
---
 tcg/tcg.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tcg/tcg.c b/tcg/tcg.c
index ab589c7..350fdad 100644
--- a/tcg/tcg.c
+++ b/tcg/tcg.c
@@ -2293,7 +2293,7 @@ void __jit_debug_register_code(void)

 /* Must statically initialize the version, because GDB may check
    the version before we can set it.  */
-struct jit_descriptor __jit_debug_descriptor = { 1, 0, 0, 0 };
+static struct jit_descriptor __jit_debug_descriptor = { 1, 0, 0, 0 };

 /* End GDB interface.  */

-- 
1.7.10.2.552.gaa3bb87

[Qemu-devel] [PATCH 2/9] tcg: declare __jit_debug_descriptor to be static

[Jim Meyering]

From: Jim Meyering <meyering@redhat.com>


Signed-off-by: Jim Meyering <meyering@redhat.com>
---
 tcg/tcg.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tcg/tcg.c b/tcg/tcg.c
index ab589c7..350fdad 100644
--- a/tcg/tcg.c
+++ b/tcg/tcg.c
@@ -2293,7 +2293,7 @@ void __jit_debug_register_code(void)

 /* Must statically initialize the version, because GDB may check
    the version before we can set it.  */
-struct jit_descriptor __jit_debug_descriptor = { 1, 0, 0, 0 };
+static struct jit_descriptor __jit_debug_descriptor = { 1, 0, 0, 0 };

 /* End GDB interface.  */

-- 
1.7.10.2.552.gaa3bb87

[Qemu-devel] [PATCH 3/9] alpha-dis: remove unused global; declare others to be static

[Jim Meyering]

From: Jim Meyering <meyering@redhat.com>

alpha_num_operands: Remove both declarations of this unused global.
alpha_opcodes: Declare static to limit scope. Remove duplicate decl.
alpha_num_opcodes: Likewise.
alpha_operands: Likewise.

Signed-off-by: Jim Meyering <meyering@redhat.com>
---
 alpha-dis.c | 26 +++++++++-----------------
 1 file changed, 9 insertions(+), 17 deletions(-)

diff --git a/alpha-dis.c b/alpha-dis.c
index ae331b3..f39b56d 100644
--- a/alpha-dis.c
+++ b/alpha-dis.c
@@ -53,12 +53,6 @@ struct alpha_opcode
   unsigned char operands[4];
 };

-/* The table itself is sorted by major opcode number, and is otherwise
-   in the order in which the disassembler should consider
-   instructions.  */
-extern const struct alpha_opcode alpha_opcodes[];
-extern const unsigned alpha_num_opcodes;
-
 /* Values defined for the flags field of a struct alpha_opcode.  */

 /* CPU Availability */
@@ -134,12 +128,6 @@ struct alpha_operand
   int (*extract) (unsigned instruction, int *invalid);
 };

-/* Elements in the table are retrieved by indexing with values from
-   the operands field of the alpha_opcodes table.  */
-
-extern const struct alpha_operand alpha_operands[];
-extern const unsigned alpha_num_operands;
-
 /* Values defined for the flags field of a struct alpha_operand.  */

 /* Mask for selecting the type for typecheck purposes */
@@ -292,8 +280,10 @@ static int extract_ev6hwjhint (unsigned, int *);

 \f

 /* The operands table  */
+/* Elements are retrieved by indexing with values from
+   the operands field of the alpha_opcodes table.  */

-const struct alpha_operand alpha_operands[] =
+static const struct alpha_operand alpha_operands[] =
 {
   /* The fields are bits, shift, insert, extract, flags */
   /* The zero index is used to indicate end-of-list */
@@ -424,8 +414,6 @@ const struct alpha_operand alpha_operands[] =
     insert_ev6hwjhint, extract_ev6hwjhint }
 };

-const unsigned alpha_num_operands = sizeof(alpha_operands)/sizeof(*alpha_operands);
-
 /* The RB field when it is the same as the RA field in the same insn.
    This operand is marked fake.  The insertion function just copies
    the RA field into the RB field, and the extraction function just
@@ -662,6 +650,9 @@ extract_ev6hwjhint(unsigned insn, int *invalid ATTRIBUTE_UNUSED)
 #define ARG_EV6HWMEM		{ RA, EV6HWDISP, PRB }
 \f

 /* The opcode table.
+   The table itself is sorted by major opcode number, and is otherwise
+   in the order in which the disassembler should consider
+   instructions.

    The format of the opcode table is:

@@ -706,7 +697,7 @@ extract_ev6hwjhint(unsigned insn, int *invalid ATTRIBUTE_UNUSED)
 		that were not assigned to a particular extension.
 */

-const struct alpha_opcode alpha_opcodes[] = {
+static const struct alpha_opcode alpha_opcodes[] = {
   { "halt",		SPCD(0x00,0x0000), BASE, ARG_NONE },
   { "draina",		SPCD(0x00,0x0002), BASE, ARG_NONE },
   { "bpt",		SPCD(0x00,0x0080), BASE, ARG_NONE },
@@ -1732,7 +1723,8 @@ const struct alpha_opcode alpha_opcodes[] = {
   { "bgt",		BRA(0x3F), BASE, ARG_BRA },
 };

-const unsigned alpha_num_opcodes = sizeof(alpha_opcodes)/sizeof(*alpha_opcodes);
+static const unsigned alpha_num_opcodes =
+  sizeof(alpha_opcodes)/sizeof(*alpha_opcodes);

 /* OSF register names.  */

-- 
1.7.10.2.552.gaa3bb87

[Qemu-devel] [PATCH 3/9] alpha-dis: remove unused global; declare others to be static

[Jim Meyering]

From: Jim Meyering <meyering@redhat.com>

alpha_num_operands: Remove both declarations of this unused global.
alpha_opcodes: Declare static to limit scope. Remove duplicate decl.
alpha_num_opcodes: Likewise.
alpha_operands: Likewise.

Signed-off-by: Jim Meyering <meyering@redhat.com>
---
 alpha-dis.c | 26 +++++++++-----------------
 1 file changed, 9 insertions(+), 17 deletions(-)

diff --git a/alpha-dis.c b/alpha-dis.c
index ae331b3..f39b56d 100644
--- a/alpha-dis.c
+++ b/alpha-dis.c
@@ -53,12 +53,6 @@ struct alpha_opcode
   unsigned char operands[4];
 };

-/* The table itself is sorted by major opcode number, and is otherwise
-   in the order in which the disassembler should consider
-   instructions.  */
-extern const struct alpha_opcode alpha_opcodes[];
-extern const unsigned alpha_num_opcodes;
-
 /* Values defined for the flags field of a struct alpha_opcode.  */

 /* CPU Availability */
@@ -134,12 +128,6 @@ struct alpha_operand
   int (*extract) (unsigned instruction, int *invalid);
 };

-/* Elements in the table are retrieved by indexing with values from
-   the operands field of the alpha_opcodes table.  */
-
-extern const struct alpha_operand alpha_operands[];
-extern const unsigned alpha_num_operands;
-
 /* Values defined for the flags field of a struct alpha_operand.  */

 /* Mask for selecting the type for typecheck purposes */
@@ -292,8 +280,10 @@ static int extract_ev6hwjhint (unsigned, int *);

 \f

 /* The operands table  */
+/* Elements are retrieved by indexing with values from
+   the operands field of the alpha_opcodes table.  */

-const struct alpha_operand alpha_operands[] =
+static const struct alpha_operand alpha_operands[] =
 {
   /* The fields are bits, shift, insert, extract, flags */
   /* The zero index is used to indicate end-of-list */
@@ -424,8 +414,6 @@ const struct alpha_operand alpha_operands[] =
     insert_ev6hwjhint, extract_ev6hwjhint }
 };

-const unsigned alpha_num_operands = sizeof(alpha_operands)/sizeof(*alpha_operands);
-
 /* The RB field when it is the same as the RA field in the same insn.
    This operand is marked fake.  The insertion function just copies
    the RA field into the RB field, and the extraction function just
@@ -662,6 +650,9 @@ extract_ev6hwjhint(unsigned insn, int *invalid ATTRIBUTE_UNUSED)
 #define ARG_EV6HWMEM		{ RA, EV6HWDISP, PRB }
 \f

 /* The opcode table.
+   The table itself is sorted by major opcode number, and is otherwise
+   in the order in which the disassembler should consider
+   instructions.

    The format of the opcode table is:

@@ -706,7 +697,7 @@ extract_ev6hwjhint(unsigned insn, int *invalid ATTRIBUTE_UNUSED)
 		that were not assigned to a particular extension.
 */

-const struct alpha_opcode alpha_opcodes[] = {
+static const struct alpha_opcode alpha_opcodes[] = {
   { "halt",		SPCD(0x00,0x0000), BASE, ARG_NONE },
   { "draina",		SPCD(0x00,0x0002), BASE, ARG_NONE },
   { "bpt",		SPCD(0x00,0x0080), BASE, ARG_NONE },
@@ -1732,7 +1723,8 @@ const struct alpha_opcode alpha_opcodes[] = {
   { "bgt",		BRA(0x3F), BASE, ARG_BRA },
 };

-const unsigned alpha_num_opcodes = sizeof(alpha_opcodes)/sizeof(*alpha_opcodes);
+static const unsigned alpha_num_opcodes =
+  sizeof(alpha_opcodes)/sizeof(*alpha_opcodes);

 /* OSF register names.  */

-- 
1.7.10.2.552.gaa3bb87

[Qemu-devel] [PATCH 4/9] linux-user: arg_table need not have global scope

[Jim Meyering]

From: Jim Meyering <meyering@redhat.com>

Declare arg_table to be "static const", and adjust the two users
to also be const.

Signed-off-by: Jim Meyering <meyering@redhat.com>
---
 linux-user/main.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/linux-user/main.c b/linux-user/main.c
index 191b750..cc5b54b 100644
--- a/linux-user/main.c
+++ b/linux-user/main.c
@@ -3133,7 +3133,7 @@ struct qemu_argument {
     const char *help;
 };

-struct qemu_argument arg_table[] = {
+static const struct qemu_argument arg_table[] = {
     {"h",          "",                 false, handle_arg_help,
      "",           "print this help"},
     {"g",          "QEMU_GDB",         true,  handle_arg_gdb,
@@ -3175,7 +3175,7 @@ struct qemu_argument arg_table[] = {

 static void usage(void)
 {
-    struct qemu_argument *arginfo;
+    const struct qemu_argument *arginfo;
     int maxarglen;
     int maxenvlen;

@@ -3241,7 +3241,7 @@ static int parse_args(int argc, char **argv)
 {
     const char *r;
     int optind;
-    struct qemu_argument *arginfo;
+    const struct qemu_argument *arginfo;

     for (arginfo = arg_table; arginfo->handle_opt != NULL; arginfo++) {
         if (arginfo->env == NULL) {
-- 
1.7.10.2.552.gaa3bb87

[Qemu-devel] [PATCH 5/9] ccid: make backend_enum_table "static const" and adjust users

[Jim Meyering]

From: Jim Meyering <meyering@redhat.com>


Signed-off-by: Jim Meyering <meyering@redhat.com>
---
 hw/ccid-card-emulated.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/hw/ccid-card-emulated.c b/hw/ccid-card-emulated.c
index f4a6da4..440f050 100644
--- a/hw/ccid-card-emulated.c
+++ b/hw/ccid-card-emulated.c
@@ -462,14 +462,14 @@ typedef struct EnumTable {
     uint32_t value;
 } EnumTable;

-EnumTable backend_enum_table[] = {
+static const EnumTable backend_enum_table[] = {
     {BACKEND_NSS_EMULATED_NAME, BACKEND_NSS_EMULATED},
     {BACKEND_CERTIFICATES_NAME, BACKEND_CERTIFICATES},
     {NULL, 0},
 };

 static uint32_t parse_enumeration(char *str,
-    EnumTable *table, uint32_t not_found_value)
+    const EnumTable *table, uint32_t not_found_value)
 {
     uint32_t ret = not_found_value;

@@ -487,7 +487,7 @@ static int emulated_initfn(CCIDCardState *base)
 {
     EmulatedState *card = DO_UPCAST(EmulatedState, base, base);
     VCardEmulError ret;
-    EnumTable *ptable;
+    const EnumTable *ptable;

     QSIMPLEQ_INIT(&card->event_list);
     QSIMPLEQ_INIT(&card->guest_apdu_list);
-- 
1.7.10.2.552.gaa3bb87

[Qemu-devel] [PATCH 6/9] sheepdog: declare bdrv_sheepdog to be static

[Jim Meyering]

From: Jim Meyering <meyering@redhat.com>


Signed-off-by: Jim Meyering <meyering@redhat.com>
---
 block/sheepdog.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/block/sheepdog.c b/block/sheepdog.c
index e01d371..fdb3eca 100644
--- a/block/sheepdog.c
+++ b/block/sheepdog.c
@@ -2014,7 +2014,7 @@ static QEMUOptionParameter sd_create_options[] = {
     { NULL }
 };

-BlockDriver bdrv_sheepdog = {
+static BlockDriver bdrv_sheepdog = {
     .format_name    = "sheepdog",
     .protocol_name  = "sheepdog",
     .instance_size  = sizeof(BDRVSheepdogState),
-- 
1.7.10.2.552.gaa3bb87

[Qemu-devel] [PATCH 7/9] mips-dis: declare four globals to be "static"

[Jim Meyering]

From: Jim Meyering <meyering@redhat.com>


Signed-off-by: Jim Meyering <meyering@redhat.com>
---
 mips-dis.c | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/mips-dis.c b/mips-dis.c
index e3a6e0b..f6109a1 100644
--- a/mips-dis.c
+++ b/mips-dis.c
@@ -888,10 +888,9 @@ enum
    Many instructions are short hand for other instructions (i.e., The
    jal <register> instruction is short for jalr <register>).  */

-extern const struct mips_opcode mips_builtin_opcodes[];
-extern const int bfd_mips_num_builtin_opcodes;
-extern struct mips_opcode *mips_opcodes;
-extern int bfd_mips_num_opcodes;
+static const struct mips_opcode mips_builtin_opcodes[];
+static const int bfd_mips_num_builtin_opcodes;
+static int bfd_mips_num_opcodes;
 #define NUMOPCODES bfd_mips_num_opcodes

 \f

@@ -1203,7 +1202,7 @@ extern const int bfd_mips16_num_opcodes;
    Many instructions are short hand for other instructions (i.e., The
    jal <register> instruction is short for jalr <register>).  */

-const struct mips_opcode mips_builtin_opcodes[] =
+static const struct mips_opcode mips_builtin_opcodes[] =
 {
 /* These instructions appear first so that the disassembler will find
    them first.  The assemblers uses a hash table based on the
@@ -2756,13 +2755,13 @@ const struct mips_opcode mips_builtin_opcodes[] =

 #define MIPS_NUM_OPCODES \
 	((sizeof mips_builtin_opcodes) / (sizeof (mips_builtin_opcodes[0])))
-const int bfd_mips_num_builtin_opcodes = MIPS_NUM_OPCODES;
+static const int bfd_mips_num_builtin_opcodes = MIPS_NUM_OPCODES;

 /* const removed from the following to allow for dynamic extensions to the
  * built-in instruction set. */
-struct mips_opcode *mips_opcodes =
+static struct mips_opcode *mips_opcodes =
   (struct mips_opcode *) mips_builtin_opcodes;
-int bfd_mips_num_opcodes = MIPS_NUM_OPCODES;
+static int bfd_mips_num_opcodes = MIPS_NUM_OPCODES;
 #undef MIPS_NUM_OPCODES

 /* Mips instructions are at maximum this many bytes long.  */
-- 
1.7.10.2.552.gaa3bb87

[Qemu-devel] [PATCH 8/9] bonito: declare bonito_state to be static

[Jim Meyering]

From: Jim Meyering <meyering@redhat.com>


Signed-off-by: Jim Meyering <meyering@redhat.com>
---
 hw/bonito.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/bonito.c b/hw/bonito.c
index 77786f8..6bd0242 100644
--- a/hw/bonito.c
+++ b/hw/bonito.c
@@ -218,7 +218,7 @@ typedef struct PCIBonitoState

 } PCIBonitoState;

-PCIBonitoState * bonito_state;
+static PCIBonitoState *bonito_state;

 static void bonito_writel(void *opaque, target_phys_addr_t addr,
                           uint64_t val, unsigned size)
-- 
1.7.10.2.552.gaa3bb87

[Qemu-devel] [PATCH 9/9] convert many more globals to static

[Jim Meyering]

From: Jim Meyering <meyering@redhat.com>

Minor exceptions:
* arm-dis: move now-detected-as-unused static variables into #if-0'd
block of code where they *are* used.
* microblaze: remove decls of now-detected-as-unused vars

Signed-off-by: Jim Meyering <meyering@redhat.com>
---
 arm-dis.c                 |  8 ++---
 cpus.c                    |  4 +--
 cris-dis.c                |  2 +-
 hw/9pfs/virtio-9p-synth.c |  2 +-
 hw/ide/pci.c              |  2 +-
 hw/leon3.c                |  2 +-
 hw/mips_fulong2e.c        |  2 +-
 hw/s390-virtio-bus.c      |  2 +-
 hw/spapr_rtas.c           |  2 +-
 hw/xen_platform.c         |  2 +-
 hw/xgmac.c                |  2 +-
 m68k-dis.c                | 79 ++++++++++++++++++++++++-----------------------
 memory.c                  |  2 +-
 microblaze-dis.c          |  6 ++--
 ppc-dis.c                 | 26 ++++++++--------
 sh4-dis.c                 |  2 +-
 target-cris/translate.c   |  2 +-
 target-i386/cpu.c         |  4 +--
 target-i386/kvm.c         |  2 +-
 tests/fdc-test.c          |  2 +-
 vl.c                      | 12 ++++---
 21 files changed, 84 insertions(+), 83 deletions(-)

diff --git a/arm-dis.c b/arm-dis.c
index 6bc4d71..43f0253 100644
--- a/arm-dis.c
+++ b/arm-dis.c
@@ -1545,10 +1545,6 @@ enum map_type {
   MAP_DATA
 };

-enum map_type last_type;
-int last_mapping_sym = -1;
-bfd_vma last_mapping_addr = 0;
-
 /* Decode a bitfield of the form matching regexp (N(-N)?,)*N(-N)?.
    Returns pointer to following character of the format string and
    fills in *VALUEP and *WIDTHP with the extracted value and number of
@@ -3877,6 +3873,10 @@ print_insn_arm (bfd_vma pc, struct disassemble_info *info)
 #if 0
   bfd_boolean   found = false;

+  static enum map_type last_type;
+  static int last_mapping_sym = -1;
+  static bfd_vma last_mapping_addr;
+
   if (info->disassembler_options)
     {
       parse_disassembler_options (info->disassembler_options);
diff --git a/cpus.c b/cpus.c
index b182b3d..d5cd318 100644
--- a/cpus.c
+++ b/cpus.c
@@ -84,7 +84,7 @@ typedef struct TimersState {
     int64_t dummy;
 } TimersState;

-TimersState timers_state;
+static TimersState timers_state;

 /* Return the virtual CPU time, based on the instruction counter.  */
 int64_t cpu_get_icount(void)
@@ -611,7 +611,7 @@ static void qemu_tcg_init_cpu_signals(void)
 }
 #endif /* _WIN32 */

-QemuMutex qemu_global_mutex;
+static QemuMutex qemu_global_mutex;
 static QemuCond qemu_io_proceeded_cond;
 static bool iothread_requesting_mutex;

diff --git a/cris-dis.c b/cris-dis.c
index 1d174ba..89ae0b7 100644
--- a/cris-dis.c
+++ b/cris-dis.c
@@ -1215,7 +1215,7 @@ cris_cc_strings[] =
 };

 /* Different names and semantics for condition 1111 (0xf).  */
-const struct cris_cond15 cris_cond15s[] =
+static const struct cris_cond15 cris_cond15s[] =
 {
   /* FIXME: In what version did condition "ext" disappear?  */
   {"ext", cris_ver_v0_3},
diff --git a/hw/9pfs/virtio-9p-synth.c b/hw/9pfs/virtio-9p-synth.c
index 92e0b09..7a15da2 100644
--- a/hw/9pfs/virtio-9p-synth.c
+++ b/hw/9pfs/virtio-9p-synth.c
@@ -21,7 +21,7 @@
 #include <sys/stat.h>

 /* Root node for synth file system */
-V9fsSynthNode v9fs_synth_root = {
+static V9fsSynthNode v9fs_synth_root = {
     .name = "/",
     .actual_attr = {
         .mode = 0555 | S_IFDIR,
diff --git a/hw/ide/pci.c b/hw/ide/pci.c
index 88c0942..ac22d56 100644
--- a/hw/ide/pci.c
+++ b/hw/ide/pci.c
@@ -419,7 +419,7 @@ static const VMStateDescription vmstate_bmdma_current = {
     }
 };

-const VMStateDescription vmstate_bmdma_status = {
+static const VMStateDescription vmstate_bmdma_status = {
     .name ="ide bmdma/status",
     .version_id = 1,
     .minimum_version_id = 1,
diff --git a/hw/leon3.c b/hw/leon3.c
index 0a5ff16..4d9cd68 100644
--- a/hw/leon3.c
+++ b/hw/leon3.c
@@ -208,7 +208,7 @@ static void leon3_generic_hw_init(ram_addr_t  ram_size,
     }
 }

-QEMUMachine leon3_generic_machine = {
+static QEMUMachine leon3_generic_machine = {
     .name     = "leon3_generic",
     .desc     = "Leon-3 generic",
     .init     = leon3_generic_hw_init,
diff --git a/hw/mips_fulong2e.c b/hw/mips_fulong2e.c
index 1a8df10..b266141 100644
--- a/hw/mips_fulong2e.c
+++ b/hw/mips_fulong2e.c
@@ -389,7 +389,7 @@ static void mips_fulong2e_init(ram_addr_t ram_size, const char *boot_device,
     network_init();
 }

-QEMUMachine mips_fulong2e_machine = {
+static QEMUMachine mips_fulong2e_machine = {
     .name = "fulong2e",
     .desc = "Fulong 2e mini pc",
     .init = mips_fulong2e_init,
diff --git a/hw/s390-virtio-bus.c b/hw/s390-virtio-bus.c
index 63ccd5c..114f131 100644
--- a/hw/s390-virtio-bus.c
+++ b/hw/s390-virtio-bus.c
@@ -45,7 +45,7 @@

 #define VIRTIO_EXT_CODE   0x2603

-struct BusInfo s390_virtio_bus_info = {
+static struct BusInfo s390_virtio_bus_info = {
     .name       = "s390-virtio",
     .size       = sizeof(VirtIOS390Bus),
 };
diff --git a/hw/spapr_rtas.c b/hw/spapr_rtas.c
index ae18595..315d0fb 100644
--- a/hw/spapr_rtas.c
+++ b/hw/spapr_rtas.c
@@ -204,7 +204,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(sPAPREnvironment *spapr,
                              uint32_t token, uint32_t nargs, target_ulong args,
diff --git a/hw/xen_platform.c b/hw/xen_platform.c
index a9c52a6..562faf7 100644
--- a/hw/xen_platform.c
+++ b/hw/xen_platform.c
@@ -224,7 +224,7 @@ static void platform_fixed_ioport_reset(void *opaque)
     platform_fixed_ioport_writeb(s, 0, 0);
 }

-const MemoryRegionPortio xen_platform_ioport[] = {
+static const MemoryRegionPortio xen_platform_ioport[] = {
     { 0, 16, 4, .write = platform_fixed_ioport_writel, },
     { 0, 16, 2, .write = platform_fixed_ioport_writew, },
     { 0, 16, 1, .write = platform_fixed_ioport_writeb, },
diff --git a/hw/xgmac.c b/hw/xgmac.c
index dd4bdc4..47ee557 100644
--- a/hw/xgmac.c
+++ b/hw/xgmac.c
@@ -148,7 +148,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/m68k-dis.c b/m68k-dis.c
index 2b155de..20d0a3f 100644
--- a/m68k-dis.c
+++ b/m68k-dis.c
@@ -96,29 +96,29 @@ struct floatformat

 /* floatformats for IEEE single and double, big and little endian.  */

-extern const struct floatformat floatformat_ieee_single_big;
-extern const struct floatformat floatformat_ieee_single_little;
-extern const struct floatformat floatformat_ieee_double_big;
-extern const struct floatformat floatformat_ieee_double_little;
+static const struct floatformat floatformat_ieee_single_big;
+static const struct floatformat floatformat_ieee_single_little;
+static const struct floatformat floatformat_ieee_double_big;
+static const struct floatformat floatformat_ieee_double_little;

 /* floatformat for ARM IEEE double, little endian bytes and big endian words */

-extern const struct floatformat floatformat_ieee_double_littlebyte_bigword;
+static const struct floatformat floatformat_ieee_double_littlebyte_bigword;

 /* floatformats for various extendeds.  */

-extern const struct floatformat floatformat_i387_ext;
-extern const struct floatformat floatformat_m68881_ext;
-extern const struct floatformat floatformat_i960_ext;
-extern const struct floatformat floatformat_m88110_ext;
-extern const struct floatformat floatformat_m88110_harris_ext;
-extern const struct floatformat floatformat_arm_ext_big;
-extern const struct floatformat floatformat_arm_ext_littlebyte_bigword;
+static const struct floatformat floatformat_i387_ext;
+static const struct floatformat floatformat_m68881_ext;
+static const struct floatformat floatformat_i960_ext;
+static const struct floatformat floatformat_m88110_ext;
+static const struct floatformat floatformat_m88110_harris_ext;
+static const struct floatformat floatformat_arm_ext_big;
+static const struct floatformat floatformat_arm_ext_littlebyte_bigword;
 /* IA-64 Floating Point register spilt into memory.  */
-extern const struct floatformat floatformat_ia64_spill_big;
-extern const struct floatformat floatformat_ia64_spill_little;
-extern const struct floatformat floatformat_ia64_quad_big;
-extern const struct floatformat floatformat_ia64_quad_little;
+static const struct floatformat floatformat_ia64_spill_big;
+static const struct floatformat floatformat_ia64_spill_little;
+static const struct floatformat floatformat_ia64_quad_big;
+static const struct floatformat floatformat_ia64_quad_little;

 /* Convert from FMT to a double.
    FROM is the address of the extended float.
@@ -515,10 +515,11 @@ struct m68k_opcode_alias
    ]  first word, bit 10
 */

-extern const struct m68k_opcode m68k_opcodes[];
-extern const struct m68k_opcode_alias m68k_opcode_aliases[];
+static const struct m68k_opcode m68k_opcodes[];
+static const struct m68k_opcode_alias m68k_opcode_aliases[];

-extern const int m68k_numopcodes, m68k_numaliases;
+static const int m68k_numopcodes;
+static const int m68k_numaliases;

 /* **** End of m68k-opcode.h */
 /* **** m68k-dis.c from sourceware.org CVS 2005-08-14.  */
@@ -2059,7 +2060,7 @@ print_insn_m68k (bfd_vma memaddr, disassemble_info *info)
    be consecutive.  If they aren't, the assembler will bomb at
    runtime.  */

-const struct m68k_opcode m68k_opcodes[] =
+static const struct m68k_opcode m68k_opcodes[] =
 {
 {"abcd", 2,	one(0140400),	one(0170770), "DsDd", m68000up },
 {"abcd", 2,	one(0140410),	one(0170770), "-s-d", m68000up },
@@ -4199,7 +4200,7 @@ TBL("tblunb", "tblunw", "tblunl", 0, 0),
 {"wdebug", 4,	two(0175750, 03),	two(0177770, 0xffff), "ds", mcfisa_a },
 };

-const int m68k_numopcodes = sizeof m68k_opcodes / sizeof m68k_opcodes[0];
+static const int m68k_numopcodes = sizeof m68k_opcodes / sizeof m68k_opcodes[0];

 /* These aliases used to be in the above table, each one duplicating
    all of the entries for its primary exactly.  This table was
@@ -4208,7 +4209,7 @@ const int m68k_numopcodes = sizeof m68k_opcodes / sizeof m68k_opcodes[0];
    aliases above that could be moved down here, except for very minor
    differences.  */

-const struct m68k_opcode_alias m68k_opcode_aliases[] =
+static const struct m68k_opcode_alias m68k_opcode_aliases[] =
 {
   { "add",	"addw", },
   { "adda",	"addaw", },
@@ -4452,7 +4453,7 @@ const struct m68k_opcode_alias m68k_opcode_aliases[] =

 };

-const int m68k_numaliases =
+static const int m68k_numaliases =
   sizeof m68k_opcode_aliases / sizeof m68k_opcode_aliases[0];
 /* **** End of m68k-opc.c */
 /* **** floatformat.c from sourceware.org CVS 2005-08-14.  */
@@ -4510,28 +4511,28 @@ floatformat_always_valid (const struct floatformat *fmt ATTRIBUTE_UNUSED,
 #define FLOATFORMAT_CHAR_BIT 8

 /* floatformats for IEEE single and double, big and little endian.  */
-const struct floatformat floatformat_ieee_single_big =
+static const struct floatformat floatformat_ieee_single_big =
 {
   floatformat_big, 32, 0, 1, 8, 127, 255, 9, 23,
   floatformat_intbit_no,
   "floatformat_ieee_single_big",
   floatformat_always_valid
 };
-const struct floatformat floatformat_ieee_single_little =
+static const struct floatformat floatformat_ieee_single_little =
 {
   floatformat_little, 32, 0, 1, 8, 127, 255, 9, 23,
   floatformat_intbit_no,
   "floatformat_ieee_single_little",
   floatformat_always_valid
 };
-const struct floatformat floatformat_ieee_double_big =
+static const struct floatformat floatformat_ieee_double_big =
 {
   floatformat_big, 64, 0, 1, 11, 1023, 2047, 12, 52,
   floatformat_intbit_no,
   "floatformat_ieee_double_big",
   floatformat_always_valid
 };
-const struct floatformat floatformat_ieee_double_little =
+static const struct floatformat floatformat_ieee_double_little =
 {
   floatformat_little, 64, 0, 1, 11, 1023, 2047, 12, 52,
   floatformat_intbit_no,
@@ -4542,7 +4543,7 @@ const struct floatformat floatformat_ieee_double_little =
 /* floatformat for IEEE double, little endian byte order, with big endian word
    ordering, as on the ARM.  */

-const struct floatformat floatformat_ieee_double_littlebyte_bigword =
+static const struct floatformat floatformat_ieee_double_littlebyte_bigword =
 {
   floatformat_littlebyte_bigword, 64, 0, 1, 11, 1023, 2047, 12, 52,
   floatformat_intbit_no,
@@ -4573,14 +4574,14 @@ floatformat_i387_ext_is_valid (const struct floatformat *fmt, const char *from)
     return 1;
 }

-const struct floatformat floatformat_i387_ext =
+static const struct floatformat floatformat_i387_ext =
 {
   floatformat_little, 80, 0, 1, 15, 0x3fff, 0x7fff, 16, 64,
   floatformat_intbit_yes,
   "floatformat_i387_ext",
   floatformat_i387_ext_is_valid
 };
-const struct floatformat floatformat_m68881_ext =
+static const struct floatformat floatformat_m68881_ext =
 {
   /* Note that the bits from 16 to 31 are unused.  */
   floatformat_big, 96, 0, 1, 15, 0x3fff, 0x7fff, 32, 64,
@@ -4588,7 +4589,7 @@ const struct floatformat floatformat_m68881_ext =
   "floatformat_m68881_ext",
   floatformat_always_valid
 };
-const struct floatformat floatformat_i960_ext =
+static const struct floatformat floatformat_i960_ext =
 {
   /* Note that the bits from 0 to 15 are unused.  */
   floatformat_little, 96, 16, 17, 15, 0x3fff, 0x7fff, 32, 64,
@@ -4596,14 +4597,14 @@ const struct floatformat floatformat_i960_ext =
   "floatformat_i960_ext",
   floatformat_always_valid
 };
-const struct floatformat floatformat_m88110_ext =
+static const struct floatformat floatformat_m88110_ext =
 {
   floatformat_big, 80, 0, 1, 15, 0x3fff, 0x7fff, 16, 64,
   floatformat_intbit_yes,
   "floatformat_m88110_ext",
   floatformat_always_valid
 };
-const struct floatformat floatformat_m88110_harris_ext =
+static const struct floatformat floatformat_m88110_harris_ext =
 {
   /* Harris uses raw format 128 bytes long, but the number is just an ieee
      double, and the last 64 bits are wasted. */
@@ -4612,7 +4613,7 @@ const struct floatformat floatformat_m88110_harris_ext =
   "floatformat_m88110_ext_harris",
   floatformat_always_valid
 };
-const struct floatformat floatformat_arm_ext_big =
+static const struct floatformat floatformat_arm_ext_big =
 {
   /* Bits 1 to 16 are unused.  */
   floatformat_big, 96, 0, 17, 15, 0x3fff, 0x7fff, 32, 64,
@@ -4620,7 +4621,7 @@ const struct floatformat floatformat_arm_ext_big =
   "floatformat_arm_ext_big",
   floatformat_always_valid
 };
-const struct floatformat floatformat_arm_ext_littlebyte_bigword =
+static const struct floatformat floatformat_arm_ext_littlebyte_bigword =
 {
   /* Bits 1 to 16 are unused.  */
   floatformat_littlebyte_bigword, 96, 0, 17, 15, 0x3fff, 0x7fff, 32, 64,
@@ -4628,28 +4629,28 @@ const struct floatformat floatformat_arm_ext_littlebyte_bigword =
   "floatformat_arm_ext_littlebyte_bigword",
   floatformat_always_valid
 };
-const struct floatformat floatformat_ia64_spill_big =
+static const struct floatformat floatformat_ia64_spill_big =
 {
   floatformat_big, 128, 0, 1, 17, 65535, 0x1ffff, 18, 64,
   floatformat_intbit_yes,
   "floatformat_ia64_spill_big",
   floatformat_always_valid
 };
-const struct floatformat floatformat_ia64_spill_little =
+static const struct floatformat floatformat_ia64_spill_little =
 {
   floatformat_little, 128, 0, 1, 17, 65535, 0x1ffff, 18, 64,
   floatformat_intbit_yes,
   "floatformat_ia64_spill_little",
   floatformat_always_valid
 };
-const struct floatformat floatformat_ia64_quad_big =
+static const struct floatformat floatformat_ia64_quad_big =
 {
   floatformat_big, 128, 0, 1, 15, 16383, 0x7fff, 16, 112,
   floatformat_intbit_no,
   "floatformat_ia64_quad_big",
   floatformat_always_valid
 };
-const struct floatformat floatformat_ia64_quad_little =
+static const struct floatformat floatformat_ia64_quad_little =
 {
   floatformat_little, 128, 0, 1, 15, 16383, 0x7fff, 16, 112,
   floatformat_intbit_no,
diff --git a/memory.c b/memory.c
index aab4a31..cf6c2e2 100644
--- a/memory.c
+++ b/memory.c
@@ -23,7 +23,7 @@
 #define WANT_EXEC_OBSOLETE
 #include "exec-obsolete.h"

-unsigned memory_region_transaction_depth = 0;
+static unsigned memory_region_transaction_depth;
 static bool memory_region_update_pending = false;
 static bool global_dirty_log = false;

diff --git a/microblaze-dis.c b/microblaze-dis.c
index 16c312f..71810e5 100644
--- a/microblaze-dis.c
+++ b/microblaze-dis.c
@@ -567,10 +567,8 @@ struct op_code_struct {
 };

 /* prefix for register names */
-char register_prefix[] = "r";
-char special_register_prefix[] = "spr";
-char fsl_register_prefix[] = "rfsl";
-char pvr_register_prefix[] = "rpvr";
+static char register_prefix[] = "r";
+static char fsl_register_prefix[] = "rfsl";


 /* #defines for valid immediate range */
diff --git a/ppc-dis.c b/ppc-dis.c
index bc98cbe..89ce7a6 100644
--- a/ppc-dis.c
+++ b/ppc-dis.c
@@ -73,8 +73,8 @@ struct powerpc_opcode
 /* The table itself is sorted by major opcode number, and is otherwise
    in the order in which the disassembler should consider
    instructions.  */
-extern const struct powerpc_opcode powerpc_opcodes[];
-extern const int powerpc_num_opcodes;
+static const struct powerpc_opcode powerpc_opcodes[];
+static const int powerpc_num_opcodes;

 /* Values defined for the flags field of a struct powerpc_opcode.  */

@@ -224,8 +224,8 @@ struct powerpc_operand
 /* Elements in the table are retrieved by indexing with values from
    the operands field of the powerpc_opcodes table.  */

-extern const struct powerpc_operand powerpc_operands[];
-extern const unsigned int num_powerpc_operands;
+static const struct powerpc_operand powerpc_operands[];
+static const unsigned int num_powerpc_operands;

 /* Values defined for the flags field of a struct powerpc_operand.  */

@@ -340,8 +340,8 @@ struct powerpc_macro
   const char *format;
 };

-extern const struct powerpc_macro powerpc_macros[];
-extern const int powerpc_num_macros;
+static const struct powerpc_macro powerpc_macros[];
+static const int powerpc_num_macros;

 /* ppc-opc.c -- PowerPC opcode list
    Copyright 1994, 1995, 1996, 1997, 1998, 2000, 2001, 2002, 2003, 2004,
@@ -424,7 +424,7 @@ static long extract_tbr (unsigned long, int, int *);
    omit the parens, since the macros are never used in a context where
    the addition will be ambiguous.  */

-const struct powerpc_operand powerpc_operands[] =
+static const struct powerpc_operand powerpc_operands[] =
 {
   /* The zero index is used to indicate the end of the list of
      operands.  */
@@ -892,8 +892,8 @@ const struct powerpc_operand powerpc_operands[] =
   { 0x1, 25, NULL, NULL, PPC_OPERAND_OPTIONAL},
 };

-const unsigned int num_powerpc_operands = (sizeof (powerpc_operands)
-					   / sizeof (powerpc_operands[0]));
+static const unsigned int num_powerpc_operands = (sizeof powerpc_operands
+                                                  / sizeof powerpc_operands[0]);

 /* The functions used to insert and extract complicated operands.  */

@@ -2004,7 +2004,7 @@ extract_tbr (unsigned long insn,
    specific instructions before more general instructions.  It is also
    sorted by major opcode.  */

-const struct powerpc_opcode powerpc_opcodes[] = {
+static const struct powerpc_opcode powerpc_opcodes[] = {
 { "attn",    X(0,256), X_MASK,		POWER4,		{ 0 } },
 { "tdlgti",  OPTO(2,TOLGT), OPTO_MASK,	PPC64,		{ RA, SI } },
 { "tdllti",  OPTO(2,TOLLT), OPTO_MASK,	PPC64,		{ RA, SI } },
@@ -5014,7 +5014,7 @@ const struct powerpc_opcode powerpc_opcodes[] = {

 };

-const int powerpc_num_opcodes =
+static const int powerpc_num_opcodes =
   sizeof (powerpc_opcodes) / sizeof (powerpc_opcodes[0]);
 \f

 /* The macro table.  This is only used by the assembler.  */
@@ -5029,7 +5029,7 @@ const int powerpc_num_opcodes =
    the underlying instructions don't support extracting 0 bits but do
    support extracting the whole word (32 bits in this case).  */

-const struct powerpc_macro powerpc_macros[] = {
+static const struct powerpc_macro powerpc_macros[] = {
 { "extldi",  4,   PPC64,	"rldicr %0,%1,%3,(%2)-1" },
 { "extldi.", 4,   PPC64,	"rldicr. %0,%1,%3,(%2)-1" },
 { "extrdi",  4,   PPC64,	"rldicl %0,%1,(%2)+(%3),64-(%2)" },
@@ -5071,7 +5071,7 @@ const struct powerpc_macro powerpc_macros[] = {
 { "clrlslwi.",4,  PPCCOM,	"rlwinm. %0,%1,%3,(%2)-(%3),31-(%3)" },
 };

-const int powerpc_num_macros =
+static const int powerpc_num_macros =
   sizeof (powerpc_macros) / sizeof (powerpc_macros[0]);


diff --git a/sh4-dis.c b/sh4-dis.c
index 673bc78..e9261ff 100644
--- a/sh4-dis.c
+++ b/sh4-dis.c
@@ -332,7 +332,7 @@ typedef struct

 #ifdef DEFINE_TABLE

-const sh_opcode_info sh_table[] =
+static const sh_opcode_info sh_table[] =
   {
 /* 0111nnnni8*1.... add #<imm>,<REG_N>  */{"add",{A_IMM,A_REG_N},{HEX_7,REG_N,IMM0_8}, arch_sh1_up},

diff --git a/target-cris/translate.c b/target-cris/translate.c
index e353ea3..0d0796c 100644
--- a/target-cris/translate.c
+++ b/target-cris/translate.c
@@ -3470,7 +3470,7 @@ void cpu_dump_state (CPUCRISState *env, FILE *f, fprintf_function cpu_fprintf,

 }

-struct
+static const struct
 {
     uint32_t vr;
     const char *name;
diff --git a/target-i386/cpu.c b/target-i386/cpu.c
index 89b4ac7..3f61dd5 100644
--- a/target-i386/cpu.c
+++ b/target-i386/cpu.c
@@ -104,8 +104,8 @@ typedef struct model_features_t {
     uint32_t cpuid;
     } model_features_t;

-int check_cpuid = 0;
-int enforce_cpuid = 0;
+static int check_cpuid;
+static int enforce_cpuid;

 void host_cpuid(uint32_t function, uint32_t count,
                 uint32_t *eax, uint32_t *ebx, uint32_t *ecx, uint32_t *edx)
diff --git a/target-i386/kvm.c b/target-i386/kvm.c
index e74a9e4..6f2f07f 100644
--- a/target-i386/kvm.c
+++ b/target-i386/kvm.c
@@ -90,7 +90,7 @@ static struct kvm_cpuid2 *try_get_cpuid(KVMState *s, int max)
     return cpuid;
 }

-struct kvm_para_features {
+static const struct kvm_para_features {
     int cap;
     int feature;
 } para_features[] = {
diff --git a/tests/fdc-test.c b/tests/fdc-test.c
index 5b5dd74..4d06787 100644
--- a/tests/fdc-test.c
+++ b/tests/fdc-test.c
@@ -58,7 +58,7 @@ enum {
     DSKCHG  = 0x80,
 };

-char test_image[] = "/tmp/qtest.XXXXXX";
+static char test_image[] = "/tmp/qtest.XXXXXX";

 #define assert_bit_set(data, mask) g_assert_cmphex((data) & (mask), ==, (mask))
 #define assert_bit_clear(data, mask) g_assert_cmphex((data) & (mask), ==, 0)
diff --git a/vl.c b/vl.c
index 23ab3a3..beb5cca 100644
--- a/vl.c
+++ b/vl.c
@@ -179,7 +179,7 @@ static const char *data_dir;
 const char *bios_name = NULL;
 enum vga_retrace_method vga_retrace_method = VGA_RETRACE_DUMB;
 DisplayType display_type = DT_DEFAULT;
-int display_remote = 0;
+static int display_remote;
 const char* keyboard_layout = NULL;
 ram_addr_t ram_size;
 const char *mem_path = NULL;
@@ -200,7 +200,7 @@ static int no_frame = 0;
 int no_quit = 0;
 CharDriverState *serial_hds[MAX_SERIAL_PORTS];
 CharDriverState *parallel_hds[MAX_PARALLEL_PORTS];
-CharDriverState *virtcon_hds[MAX_VIRTIO_CONSOLES];
+static const CharDriverState *virtcon_hds[MAX_VIRTIO_CONSOLES];
 int win2k_install_hack = 0;
 int usb_enabled = 0;
 int singlestep = 0;
@@ -214,7 +214,7 @@ const char *vnc_display;
 int acpi_enabled = 1;
 int no_hpet = 0;
 int fd_bootchk = 1;
-int no_reboot = 0;
+static int no_reboot;
 int no_shutdown = 0;
 int cursor_hide = 1;
 int graphic_rotate = 0;
@@ -242,7 +242,8 @@ struct FWBootEntry {
     char *suffix;
 };

-QTAILQ_HEAD(, FWBootEntry) fw_boot_order = QTAILQ_HEAD_INITIALIZER(fw_boot_order);
+static QTAILQ_HEAD(, FWBootEntry) fw_boot_order =
+  QTAILQ_HEAD_INITIALIZER(fw_boot_order);

 int nb_numa_nodes;
 uint64_t node_mem[MAX_NODES];
@@ -1947,7 +1948,8 @@ struct device_config {
     Location loc;
     QTAILQ_ENTRY(device_config) next;
 };
-QTAILQ_HEAD(, device_config) device_configs = QTAILQ_HEAD_INITIALIZER(device_configs);
+static QTAILQ_HEAD(, device_config) device_configs =
+  QTAILQ_HEAD_INITIALIZER(device_configs);

 static void add_device_config(int type, const char *cmdline)
 {
-- 
1.7.10.2.552.gaa3bb87

Re: [Qemu-devel] [PATCH 2/9] tcg: declare __jit_debug_descriptor to be static

[Peter Maydell]

On 21 May 2012 20:51, Jim Meyering <jim@meyering.net> wrote:
> From: Jim Meyering <meyering@redhat.com>
>
>
> Signed-off-by: Jim Meyering <meyering@redhat.com>
> ---
>  tcg/tcg.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/tcg/tcg.c b/tcg/tcg.c
> index ab589c7..350fdad 100644
> --- a/tcg/tcg.c
> +++ b/tcg/tcg.c
> @@ -2293,7 +2293,7 @@ void __jit_debug_register_code(void)
>
>  /* Must statically initialize the version, because GDB may check
>    the version before we can set it.  */
> -struct jit_descriptor __jit_debug_descriptor = { 1, 0, 0, 0 };
> +static struct jit_descriptor __jit_debug_descriptor = { 1, 0, 0, 0 };
>
>  /* End GDB interface.  */

Nak. This symbol is global so that gdb can find it by fishing around
in the executable's symbol table.

-- PMM

Re: [Qemu-devel] [PATCH 2/9] tcg: declare __jit_debug_descriptor to be static

[Jim Meyering]

Peter Maydell wrote:
> On 21 May 2012 20:51, Jim Meyering <jim@meyering.net> wrote:
>> From: Jim Meyering <meyering@redhat.com>
>>
>>
>> Signed-off-by: Jim Meyering <meyering@redhat.com>
>> ---
>>  tcg/tcg.c | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/tcg/tcg.c b/tcg/tcg.c
>> index ab589c7..350fdad 100644
>> --- a/tcg/tcg.c
>> +++ b/tcg/tcg.c
>> @@ -2293,7 +2293,7 @@ void __jit_debug_register_code(void)
>>
>>  /* Must statically initialize the version, because GDB may check
>>    the version before we can set it.  */
>> -struct jit_descriptor __jit_debug_descriptor = { 1, 0, 0, 0 };
>> +static struct jit_descriptor __jit_debug_descriptor = { 1, 0, 0, 0 };
>>
>>  /* End GDB interface.  */
>
> Nak. This symbol is global so that gdb can find it by fishing around
> in the executable's symbol table.

Thanks for the quick feedback.

How does the scope of the symbol affect whether gdb can find it?
With it declared static, it seems to be no less visible than before:

    $ gdb --eval 'p __jit_debug_descriptor' x86_64-softmmu/qemu-system-x86_64
    Reading symbols from /h/j/w/co/qemu/x86_64-softmmu/qemu-system-x86_64...done.
    $1 = {
      version = 1,
      action_flag = 0,
      relevant_entry = 0x0,
      first_entry = 0x0
    }

If declaring this variable "static" is not appropriate,
then the comment saying that static initialization is desired
should be changed.

Re: [Qemu-devel] [PATCH 2/9] tcg: declare __jit_debug_descriptor to be static

[Peter Maydell]

On 21 May 2012 21:10, Jim Meyering <jim@meyering.net> wrote:
> Peter Maydell wrote:
>> On 21 May 2012 20:51, Jim Meyering <jim@meyering.net> wrote:
>>> From: Jim Meyering <meyering@redhat.com>
>>>
>>>
>>> Signed-off-by: Jim Meyering <meyering@redhat.com>
>>> ---
>>>  tcg/tcg.c | 2 +-
>>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> diff --git a/tcg/tcg.c b/tcg/tcg.c
>>> index ab589c7..350fdad 100644
>>> --- a/tcg/tcg.c
>>> +++ b/tcg/tcg.c
>>> @@ -2293,7 +2293,7 @@ void __jit_debug_register_code(void)
>>>
>>>  /* Must statically initialize the version, because GDB may check
>>>    the version before we can set it.  */
>>> -struct jit_descriptor __jit_debug_descriptor = { 1, 0, 0, 0 };
>>> +static struct jit_descriptor __jit_debug_descriptor = { 1, 0, 0, 0 };
>>>
>>>  /* End GDB interface.  */
>>
>> Nak. This symbol is global so that gdb can find it by fishing around
>> in the executable's symbol table.
>
> Thanks for the quick feedback.
>
> How does the scope of the symbol affect whether gdb can find it?

If you mark it 'static' the compiler can throw it away or completely
rearrange it if it's feeling clever enough, I think.

Anyway, we're following a prescribed interface here:
http://sourceware.org/gdb/onlinedocs/gdb/Declarations.html

and I don't think we should deviate from it. As the comment says,
"THE FOLLOWING MUST MATCH GDB DOCS.".

> If declaring this variable "static" is not appropriate,
> then the comment saying that static initialization is desired
> should be changed.

The comment means "statically initialize this variable rather than
doing it dynamically in some function at startup".

-- PMM

Re: [Qemu-devel] [PATCH 2/9] tcg: declare __jit_debug_descriptor to be static

[Jim Meyering]

Peter Maydell wrote:
> On 21 May 2012 21:10, Jim Meyering <jim@meyering.net> wrote:
>> Peter Maydell wrote:
>>> On 21 May 2012 20:51, Jim Meyering <jim@meyering.net> wrote:
>>>> From: Jim Meyering <meyering@redhat.com>
>>>>
>>>>
>>>> Signed-off-by: Jim Meyering <meyering@redhat.com>
>>>> ---
>>>>  tcg/tcg.c | 2 +-
>>>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>>>
>>>> diff --git a/tcg/tcg.c b/tcg/tcg.c
>>>> index ab589c7..350fdad 100644
>>>> --- a/tcg/tcg.c
>>>> +++ b/tcg/tcg.c
>>>> @@ -2293,7 +2293,7 @@ void __jit_debug_register_code(void)
>>>>
>>>>  /* Must statically initialize the version, because GDB may check
>>>>    the version before we can set it.  */
>>>> -struct jit_descriptor __jit_debug_descriptor = { 1, 0, 0, 0 };
>>>> +static struct jit_descriptor __jit_debug_descriptor = { 1, 0, 0, 0 };
>>>>
>>>>  /* End GDB interface.  */
>>>
>>> Nak. This symbol is global so that gdb can find it by fishing around
>>> in the executable's symbol table.
>>
>> Thanks for the quick feedback.
>>
>> How does the scope of the symbol affect whether gdb can find it?
>
> If you mark it 'static' the compiler can throw it away or completely
> rearrange it if it's feeling clever enough, I think.
>
> Anyway, we're following a prescribed interface here:
> http://sourceware.org/gdb/onlinedocs/gdb/Declarations.html
>
> and I don't think we should deviate from it. As the comment says,
> "THE FOLLOWING MUST MATCH GDB DOCS.".
>
>> If declaring this variable "static" is not appropriate,
>> then the comment saying that static initialization is desired
>> should be changed.
>
> The comment means "statically initialize this variable rather than
> doing it dynamically in some function at startup".

Thanks.  I've clarified the comments and posted a V2.

Re: [Qemu-devel] [PATCH 0/9] convert many more globals to "static"

[Jim Meyering]

Jim Meyering wrote:
> From: Jim Meyering <meyering@redhat.com>
>
> Following up on discussion here,
>
>   http://marc.info/?t=133759487600008&r=1&w=2
>
> here are patches to limit the scope of the remaining global variables.
> Most changes simply added a preceding "static".  However, in some cases,
> I've made minor additional changes, e.g., to make a static
> table "const" as well (which sometimes required making an iterator
> pointer const, too), and to move or remove declarations of variables
> that the compiler then was able to identify as unused.
>
> Initially I put the changes to each file in a separate commit, but that
> got old quickly, and I lumped all of the remaining changes into the
> 9th commit.  If that's a problem, let me know and I'll separate it.
>
>
> Jim Meyering (9):
>   ccid: declare DEFAULT_ATR table to be "static const"
>   tcg: declare __jit_debug_descriptor to be static
>   alpha-dis: remove unused global; declare others to be static
>   linux-user: arg_table need not have global scope
>   ccid: make backend_enum_table "static const" and adjust users
>   sheepdog: declare bdrv_sheepdog to be static
>   mips-dis: declare four globals to be "static"
>   bonito: declare bonito_state to be static
>   convert many more globals to static
>
>  alpha-dis.c               | 26 ++++++----------
>  arm-dis.c                 |  8 ++---
>  block/sheepdog.c          |  2 +-
>  cpus.c                    |  4 +--
>  cris-dis.c                |  2 +-
>  hw/9pfs/virtio-9p-synth.c |  2 +-
>  hw/bonito.c               |  2 +-
>  hw/ccid-card-emulated.c   |  6 ++--
>  hw/ccid-card-passthru.c   |  2 +-
>  hw/ide/pci.c              |  2 +-
>  hw/leon3.c                |  2 +-
>  hw/mips_fulong2e.c        |  2 +-
>  hw/s390-virtio-bus.c      |  2 +-
>  hw/spapr_rtas.c           |  2 +-
>  hw/xen_platform.c         |  2 +-
>  hw/xgmac.c                |  2 +-
>  linux-user/main.c         |  6 ++--
>  m68k-dis.c                | 79 ++++++++++++++++++++++++-----------------------
>  memory.c                  |  2 +-
>  microblaze-dis.c          |  6 ++--
>  mips-dis.c                | 15 +++++----
>  ppc-dis.c                 | 26 ++++++++--------
>  sh4-dis.c                 |  2 +-
>  target-cris/translate.c   |  2 +-
>  target-i386/cpu.c         |  4 +--
>  target-i386/kvm.c         |  2 +-
>  tcg/tcg.c                 |  2 +-
>  tests/fdc-test.c          |  2 +-
>  vl.c                      | 12 ++++---
>  29 files changed, 110 insertions(+), 118 deletions(-)

I've just rebased my local branch with these patches and
see that they are still pending.

Let me know if you're interested.

Re: [Qemu-devel] [PATCH 0/9] convert many more globals to "static"

[Stefan Weil]

Am 17.08.2012 15:37, schrieb Jim Meyering:
> Jim Meyering wrote:
>> From: Jim Meyering <meyering@redhat.com>
>>
>> Following up on discussion here,
>>
>>    http://marc.info/?t=133759487600008&r=1&w=2
>>
>> here are patches to limit the scope of the remaining global variables.
>> Most changes simply added a preceding "static".  However, in some cases,
>> I've made minor additional changes, e.g., to make a static
>> table "const" as well (which sometimes required making an iterator
>> pointer const, too), and to move or remove declarations of variables
>> that the compiler then was able to identify as unused.
>>
>> Initially I put the changes to each file in a separate commit, but that
>> got old quickly, and I lumped all of the remaining changes into the
>> 9th commit.  If that's a problem, let me know and I'll separate it.
>>
>>
>> Jim Meyering (9):
>>    ccid: declare DEFAULT_ATR table to be "static const"
>>    tcg: declare __jit_debug_descriptor to be static
>>    alpha-dis: remove unused global; declare others to be static
>>    linux-user: arg_table need not have global scope
>>    ccid: make backend_enum_table "static const" and adjust users
>>    sheepdog: declare bdrv_sheepdog to be static
>>    mips-dis: declare four globals to be "static"
>>    bonito: declare bonito_state to be static
>>    convert many more globals to static
>>
>>   alpha-dis.c               | 26 ++++++----------
>>   arm-dis.c                 |  8 ++---
>>   block/sheepdog.c          |  2 +-
>>   cpus.c                    |  4 +--
>>   cris-dis.c                |  2 +-
>>   hw/9pfs/virtio-9p-synth.c |  2 +-
>>   hw/bonito.c               |  2 +-
>>   hw/ccid-card-emulated.c   |  6 ++--
>>   hw/ccid-card-passthru.c   |  2 +-
>>   hw/ide/pci.c              |  2 +-
>>   hw/leon3.c                |  2 +-
>>   hw/mips_fulong2e.c        |  2 +-
>>   hw/s390-virtio-bus.c      |  2 +-
>>   hw/spapr_rtas.c           |  2 +-
>>   hw/xen_platform.c         |  2 +-
>>   hw/xgmac.c                |  2 +-
>>   linux-user/main.c         |  6 ++--
>>   m68k-dis.c                | 79 ++++++++++++++++++++++++-----------------------
>>   memory.c                  |  2 +-
>>   microblaze-dis.c          |  6 ++--
>>   mips-dis.c                | 15 +++++----
>>   ppc-dis.c                 | 26 ++++++++--------
>>   sh4-dis.c                 |  2 +-
>>   target-cris/translate.c   |  2 +-
>>   target-i386/cpu.c         |  4 +--
>>   target-i386/kvm.c         |  2 +-
>>   tcg/tcg.c                 |  2 +-
>>   tests/fdc-test.c          |  2 +-
>>   vl.c                      | 12 ++++---
>>   29 files changed, 110 insertions(+), 118 deletions(-)
>
> I've just rebased my local branch with these patches and
> see that they are still pending.
>
> Let me know if you're interested.
>

Hi Jim,

I think several of your patches are still missing in QEMU git master.
As some of them fix real or potential bugs, they should be applied
(if possible to QEMU 1.2 which will be released soon).

The usual way to remind people of missing patches is to send
a reply mail with "ping". CC'ing Anthony Liguori also helps.

Regards,

Stefan Weil