[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 8/8] tests: Add missing 'static' attributes (fix warn
From: |
Michael Tokarev |
Subject: |
[Qemu-devel] [PULL 8/8] tests: Add missing 'static' attributes (fix warnings from smatch) |
Date: |
Fri, 18 Jul 2014 18:09:13 +0400 |
From: Stefan Weil <address@hidden>
Smatch also complains about 0 used for pointers, so replace those by
NULL in test-visitor-serialization.c, too.
Signed-off-by: Stefan Weil <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>
---
tests/fdc-test.c | 2 +-
tests/test-aio.c | 2 +-
tests/test-qemu-opts.c | 2 +-
tests/test-throttle.c | 8 ++++----
tests/test-visitor-serialization.c | 6 +++---
tests/test-vmstate.c | 4 ++--
6 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/tests/fdc-test.c b/tests/fdc-test.c
index c8e1e7b..203074c 100644
--- a/tests/fdc-test.c
+++ b/tests/fdc-test.c
@@ -65,7 +65,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/tests/test-aio.c b/tests/test-aio.c
index 4c40a49..f12b6e0 100644
--- a/tests/test-aio.c
+++ b/tests/test-aio.c
@@ -15,7 +15,7 @@
#include "qemu/timer.h"
#include "qemu/sockets.h"
-AioContext *ctx;
+static AioContext *ctx;
typedef struct {
EventNotifier e;
diff --git a/tests/test-qemu-opts.c b/tests/test-qemu-opts.c
index 3653507..ca08ac5 100644
--- a/tests/test-qemu-opts.c
+++ b/tests/test-qemu-opts.c
@@ -56,7 +56,7 @@ static QemuOptsList opts_list_02 = {
},
};
-QemuOptsList opts_list_03 = {
+static QemuOptsList opts_list_03 = {
.name = "opts_list_03",
.head = QTAILQ_HEAD_INITIALIZER(opts_list_03.head),
.desc = {
diff --git a/tests/test-throttle.c b/tests/test-throttle.c
index 3de6ab8..000ae31 100644
--- a/tests/test-throttle.c
+++ b/tests/test-throttle.c
@@ -15,10 +15,10 @@
#include "block/aio.h"
#include "qemu/throttle.h"
-AioContext *ctx;
-LeakyBucket bkt;
-ThrottleConfig cfg;
-ThrottleState ts;
+static AioContext *ctx;
+static LeakyBucket bkt;
+static ThrottleConfig cfg;
+static ThrottleState ts;
/* useful function */
static bool double_cmp(double x, double y)
diff --git a/tests/test-visitor-serialization.c
b/tests/test-visitor-serialization.c
index 74d6481..7ad1886 100644
--- a/tests/test-visitor-serialization.c
+++ b/tests/test-visitor-serialization.c
@@ -372,8 +372,8 @@ static void test_primitive_lists(gconstpointer opaque)
TestArgs *args = (TestArgs *) opaque;
const SerializeOps *ops = args->ops;
PrimitiveType *pt = args->test_data;
- PrimitiveList pl = { .value = { 0 } };
- PrimitiveList pl_copy = { .value = { 0 } };
+ PrimitiveList pl = { .value = { NULL } };
+ PrimitiveList pl_copy = { .value = { NULL } };
PrimitiveList *pl_copy_ptr = &pl_copy;
Error *err = NULL;
void *serialize_data;
@@ -771,7 +771,7 @@ static void test_nested_struct_list(gconstpointer opaque)
g_free(args);
}
-PrimitiveType pt_values[] = {
+static PrimitiveType pt_values[] = {
/* string tests */
{
.description = "string_empty",
diff --git a/tests/test-vmstate.c b/tests/test-vmstate.c
index a462335..d72c64c 100644
--- a/tests/test-vmstate.c
+++ b/tests/test-vmstate.c
@@ -29,8 +29,8 @@
#include "migration/vmstate.h"
#include "block/coroutine.h"
-char temp_file[] = "/tmp/vmst.test.XXXXXX";
-int temp_fd;
+static char temp_file[] = "/tmp/vmst.test.XXXXXX";
+static int temp_fd;
/* Fake yield_until_fd_readable() implementation so we don't have to pull the
* coroutine code as dependency.
--
1.7.10.4
- [Qemu-devel] [PULL for-2.1 0/8] Trivial patches for 2014-07-18, Michael Tokarev, 2014/07/18
- [Qemu-devel] [PULL 7/8] migration: Add missing 'static' attribute, Michael Tokarev, 2014/07/18
- [Qemu-devel] [PULL 2/8] Fix new typos in comments (found by codespell), Michael Tokarev, 2014/07/18
- [Qemu-devel] [PULL 4/8] doc: slirp supports ICMP echo if enabled in Linux, Michael Tokarev, 2014/07/18
- [Qemu-devel] [PULL 5/8] hw/usb: Add missing 'static' attribute, Michael Tokarev, 2014/07/18
- [Qemu-devel] [PULL 6/8] qga: Add missing 'static' attribute, Michael Tokarev, 2014/07/18
- [Qemu-devel] [PULL 3/8] qemu-img: Remove redundancy "ret = -1", Michael Tokarev, 2014/07/18
- [Qemu-devel] [PULL 8/8] tests: Add missing 'static' attributes (fix warnings from smatch),
Michael Tokarev <=
- [Qemu-devel] [PULL 1/8] slirp: Give error message if hostfwd_add/remove for unrecognized vlan/stack, Michael Tokarev, 2014/07/18
- Re: [Qemu-devel] [PULL for-2.1 0/8] Trivial patches for 2014-07-18, Peter Maydell, 2014/07/21