[Qemu-devel] [PATCH 3/3] vnc: remove superfluous DisplayState *ds parameter

[arei.gonglei]

From: Gonglei <address@hidden>

Signed-off-by: Gonglei <address@hidden>
---
 include/ui/console.h | 2 +-
 qmp.c                | 2 +-
 ui/vnc.c             | 2 +-
 vl.c                 | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/ui/console.h b/include/ui/console.h
index 22ef8ca..8cc48cc 100644
--- a/include/ui/console.h
+++ b/include/ui/console.h
@@ -328,7 +328,7 @@ void cocoa_display_init(DisplayState *ds, int full_screen);
 
 /* vnc.c */
 void vnc_display_init(DisplayState *ds);
-void vnc_display_open(DisplayState *ds, const char *display, Error **errp);
+void vnc_display_open(const char *display, Error **errp);
 void vnc_display_add_client(DisplayState *ds, int csock, bool skipauth);
 char *vnc_display_local_addr(DisplayState *ds);
 #ifdef CONFIG_VNC
diff --git a/qmp.c b/qmp.c
index 0b4f131..0c8136e 100644
--- a/qmp.c
+++ b/qmp.c
@@ -368,7 +368,7 @@ void qmp_change_vnc_password(const char *password, Error 
**errp)
 
 static void qmp_change_vnc_listen(const char *target, Error **errp)
 {
-    vnc_display_open(NULL, target, errp);
+    vnc_display_open(target, errp);
 }
 
 static void qmp_change_vnc(const char *target, bool has_arg, const char *arg,
diff --git a/ui/vnc.c b/ui/vnc.c
index 38229a7..8f2f277 100644
--- a/ui/vnc.c
+++ b/ui/vnc.c
@@ -3010,7 +3010,7 @@ char *vnc_display_local_addr(DisplayState *ds)
     return vnc_socket_local_addr("%s:%s", vs->lsock);
 }
 
-void vnc_display_open(DisplayState *ds, const char *display, Error **errp)
+void vnc_display_open(const char *display, Error **errp)
 {
     VncDisplay *vs = vnc_display;
     const char *options;
diff --git a/vl.c b/vl.c
index aee73e1..8ae6eca 100644
--- a/vl.c
+++ b/vl.c
@@ -4318,7 +4318,7 @@ int main(int argc, char **argv, char **envp)
     if (vnc_display) {
         Error *local_err = NULL;
         vnc_display_init(ds);
-        vnc_display_open(ds, vnc_display, &local_err);
+        vnc_display_open(vnc_display, &local_err);
         if (local_err != NULL) {
             error_report("Failed to start VNC server on `%s': %s",
                          vnc_display, error_get_pretty(local_err));
-- 
1.7.12.4