[Spice-devel] [PATCH 2/2] Make some variables static

Frediano Ziglio fziglio at redhat.com
Fri Apr 7 11:05:23 UTC 2017


Signed-off-by: Frediano Ziglio <fziglio at redhat.com>
---
 src/qxl_driver.c         | 2 +-
 src/qxl_kms.c            | 2 +-
 src/qxl_mem.c            | 2 +-
 src/spiceqxl_display.c   | 2 +-
 src/spiceqxl_smartcard.c | 2 +-
 src/spiceqxl_vdagent.c   | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/qxl_driver.c b/src/qxl_driver.c
index 8aecf3c..80d021b 100644
--- a/src/qxl_driver.c
+++ b/src/qxl_driver.c
@@ -73,7 +73,7 @@ static char spice_vdagent_virtio_path_default[] = "/tmp/xspice-virtio";
 static char spice_vdagent_uinput_path_default[] = "/tmp/xspice-uinput";
 #endif
 static char driver_name[] = QXL_DRIVER_NAME;
-const OptionInfoRec DefaultOptions[] =
+static const OptionInfoRec DefaultOptions[] =
 {
     { OPTION_ENABLE_IMAGE_CACHE,
       "EnableImageCache",         OPTV_BOOLEAN, { 1 }, FALSE },
diff --git a/src/qxl_kms.c b/src/qxl_kms.c
index d11b20e..47d7a34 100644
--- a/src/qxl_kms.c
+++ b/src/qxl_kms.c
@@ -751,7 +751,7 @@ static void qxl_bo_output_surf_reloc(qxl_screen_t *qxl, uint32_t dst_offset,
     qxl->cmds.n_relocs++;
 }
 
-struct qxl_bo_funcs qxl_kms_bo_funcs = {
+static struct qxl_bo_funcs qxl_kms_bo_funcs = {
     qxl_bo_alloc,
     qxl_cmd_alloc,
     qxl_bo_map,
diff --git a/src/qxl_mem.c b/src/qxl_mem.c
index 5159abd..50505e3 100644
--- a/src/qxl_mem.c
+++ b/src/qxl_mem.c
@@ -690,7 +690,7 @@ static void qxl_bo_output_surf_reloc(qxl_screen_t *qxl, uint32_t dst_offset,
     *(uint32_t *)((char *)dst_bo->internal_virt_addr + dst_offset) = surf->id;
 }
 
-struct qxl_bo_funcs qxl_ums_bo_funcs = {
+static struct qxl_bo_funcs qxl_ums_bo_funcs = {
     qxl_bo_alloc,
     qxl_cmd_alloc,
     qxl_bo_map,
diff --git a/src/spiceqxl_display.c b/src/spiceqxl_display.c
index 4e1e382..7da10f0 100644
--- a/src/spiceqxl_display.c
+++ b/src/spiceqxl_display.c
@@ -72,7 +72,7 @@
  * We currently add it during attache_worker - should not be called more
  * then once during lifetime (but we don't check)
  */
-QXLDevMemSlot slot = {
+static QXLDevMemSlot slot = {
 .slot_group_id = MEMSLOT_GROUP,
 .slot_id = 0,
 .generation = 0,
diff --git a/src/spiceqxl_smartcard.c b/src/spiceqxl_smartcard.c
index f2ec2e2..759aa63 100644
--- a/src/spiceqxl_smartcard.c
+++ b/src/spiceqxl_smartcard.c
@@ -44,7 +44,7 @@ typedef struct XSpiceSmartcardCharDeviceInstance {
     SpiceWatch *watch;
 } XSpiceSmartcardCharDeviceInstance;
 
-XSpiceSmartcardCharDeviceInstance smartcard_sin = {
+static XSpiceSmartcardCharDeviceInstance smartcard_sin = {
     .base = {
         .subtype = "smartcard"
     }
diff --git a/src/spiceqxl_vdagent.c b/src/spiceqxl_vdagent.c
index a62c1e6..ca29df9 100644
--- a/src/spiceqxl_vdagent.c
+++ b/src/spiceqxl_vdagent.c
@@ -24,7 +24,7 @@ typedef struct XSpiceVdagentCharDeviceInstance {
     qxl_screen_t *qxl;
 } XSpiceVdagentCharDeviceInstance;
 
-XSpiceVdagentCharDeviceInstance vdagent_sin = {
+static XSpiceVdagentCharDeviceInstance vdagent_sin = {
     .base = {
         .subtype = "vdagent"
     }
-- 
2.9.3



More information about the Spice-devel mailing list