1. Patchew
  2. QEMU
  3. View series

[PATCH v2] tests: fix test-qga on macosx

Paolo Bonzini posted 1 patch 4 years, 3 months ago
Test docker-mingw@fedora passed
Test asan failed
Test checkpatch passed
Test docker-quick@centos7 passed
Test FreeBSD passed
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/1578490555-6363-1-git-send-email-pbonzini@redhat.com
tests/Makefile.include |  2 +-
tests/test-qga.c       | 25 ++++++++++++++++++-------
2 files changed, 19 insertions(+), 8 deletions(-)
[PATCH v2] tests: fix test-qga on macosx
Posted by Paolo Bonzini 4 years, 3 months ago 
From: Marc-André Lureau <marcandre.lureau@redhat.com>

Fix Unix socket connection & skip commands that are not implemented.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 tests/Makefile.include |  2 +-
 tests/test-qga.c       | 25 ++++++++++++++++++-------
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/tests/Makefile.include b/tests/Makefile.include
index 49e3b0d..192a08e 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -119,7 +119,7 @@ check-unit-$(CONFIG_BLOCK) += tests/test-crypto-secret$(EXESUF)
 check-unit-$(call land,$(CONFIG_BLOCK),$(CONFIG_GNUTLS)) += tests/test-crypto-tlscredsx509$(EXESUF)
 check-unit-$(call land,$(CONFIG_BLOCK),$(CONFIG_GNUTLS)) += tests/test-crypto-tlssession$(EXESUF)
 ifneq (,$(findstring qemu-ga,$(TOOLS)))
-check-unit-$(call land,$(CONFIG_LINUX),$(CONFIG_VIRTIO_SERIAL)) += tests/test-qga$(EXESUF)
+check-unit-$(call land,$(CONFIG_POSIX),$(CONFIG_VIRTIO_SERIAL)) += tests/test-qga$(EXESUF)
 endif
 check-unit-y += tests/test-timed-average$(EXESUF)
 check-unit-$(CONFIG_INOTIFY1) += tests/test-util-filemonitor$(EXESUF)
diff --git a/tests/test-qga.c b/tests/test-qga.c
index d2b2435..191bfca 100644
--- a/tests/test-qga.c
+++ b/tests/test-qga.c
@@ -17,17 +17,17 @@ typedef struct {
 
 static int connect_qga(char *path)
 {
-    int s, ret, len, i = 0;
+    int s, ret, i = 0;
     struct sockaddr_un remote;
 
     s = socket(AF_UNIX, SOCK_STREAM, 0);
     g_assert(s != -1);
 
+    memset(&remote, 0, sizeof(struct sockaddr_un));
     remote.sun_family = AF_UNIX;
     do {
-        strcpy(remote.sun_path, path);
-        len = strlen(remote.sun_path) + sizeof(remote.sun_family);
-        ret = connect(s, (struct sockaddr *)&remote, len);
+        strncpy(remote.sun_path, path, sizeof(remote.sun_path) - 1);
+        ret = connect(s, (struct sockaddr *)&remote, sizeof(struct sockaddr_un));
         if (ret == -1) {
             g_usleep(G_USEC_PER_SEC);
         }
@@ -305,6 +305,7 @@ static void test_qga_info(gconstpointer fix)
     qobject_unref(ret);
 }
 
+#if defined(CONFIG_LINUX)
 static void test_qga_get_vcpus(gconstpointer fix)
 {
     const TestFixture *fixture = fix;
@@ -324,7 +325,9 @@ static void test_qga_get_vcpus(gconstpointer fix)
 
     qobject_unref(ret);
 }
+#endif
 
+#if defined(CONFIG_LINUX)
 static void test_qga_get_fsinfo(gconstpointer fix)
 {
     const TestFixture *fixture = fix;
@@ -348,6 +351,7 @@ static void test_qga_get_fsinfo(gconstpointer fix)
 
     qobject_unref(ret);
 }
+#endif
 
 static void test_qga_get_memory_block_info(gconstpointer fix)
 {
@@ -394,6 +398,7 @@ static void test_qga_get_memory_blocks(gconstpointer fix)
     qobject_unref(ret);
 }
 
+#if defined(CONFIG_LINUX)
 static void test_qga_network_get_interfaces(gconstpointer fix)
 {
     const TestFixture *fixture = fix;
@@ -412,6 +417,7 @@ static void test_qga_network_get_interfaces(gconstpointer fix)
 
     qobject_unref(ret);
 }
+#endif
 
 static void test_qga_file_ops(gconstpointer fix)
 {
@@ -682,7 +688,7 @@ static void test_qga_blacklist(gconstpointer data)
     qobject_unref(ret);
 
     /* check something work */
-    ret = qmp_fd(fix.fd, "{'execute': 'guest-get-fsinfo'}");
+    ret = qmp_fd(fix.fd, "{'execute': 'guest-info'}");
     qmp_assert_no_error(ret);
     qobject_unref(ret);
 
@@ -766,6 +772,7 @@ static void test_qga_config(gconstpointer data)
     g_key_file_free(kf);
 }
 
+#if defined(CONFIG_LINUX)
 static void test_qga_fsfreeze_status(gconstpointer fix)
 {
     const TestFixture *fixture = fix;
@@ -781,6 +788,7 @@ static void test_qga_fsfreeze_status(gconstpointer fix)
 
     qobject_unref(ret);
 }
+#endif
 
 static void test_qga_guest_exec(gconstpointer fix)
 {
@@ -976,12 +984,17 @@ int main(int argc, char **argv)
     g_test_add_data_func("/qga/sync", &fix, test_qga_sync);
     g_test_add_data_func("/qga/ping", &fix, test_qga_ping);
     g_test_add_data_func("/qga/info", &fix, test_qga_info);
+#if defined(CONFIG_LINUX)
     g_test_add_data_func("/qga/network-get-interfaces", &fix,
                          test_qga_network_get_interfaces);
     if (!access("/sys/devices/system/cpu/cpu0", F_OK)) {
         g_test_add_data_func("/qga/get-vcpus", &fix, test_qga_get_vcpus);
     }
     g_test_add_data_func("/qga/get-fsinfo", &fix, test_qga_get_fsinfo);
+    g_test_add_data_func("/qga/fsfreeze-status", &fix,
+                         test_qga_fsfreeze_status);
+#endif
+
     g_test_add_data_func("/qga/get-memory-block-info", &fix,
                          test_qga_get_memory_block_info);
     g_test_add_data_func("/qga/get-memory-blocks", &fix,
@@ -993,8 +1006,6 @@ int main(int argc, char **argv)
     g_test_add_data_func("/qga/invalid-oob", &fix, test_qga_invalid_oob);
     g_test_add_data_func("/qga/invalid-cmd", &fix, test_qga_invalid_cmd);
     g_test_add_data_func("/qga/invalid-args", &fix, test_qga_invalid_args);
-    g_test_add_data_func("/qga/fsfreeze-status", &fix,
-                         test_qga_fsfreeze_status);
 
     g_test_add_data_func("/qga/blacklist", NULL, test_qga_blacklist);
     g_test_add_data_func("/qga/config", NULL, test_qga_config);
-- 
1.8.3.1
Re: [PATCH v2] tests: fix test-qga on macosx
Posted by Thomas Huth 4 years, 3 months ago 
On 08/01/2020 14.35, Paolo Bonzini wrote:
> From: Marc-André Lureau <marcandre.lureau@redhat.com>
> 
> Fix Unix socket connection & skip commands that are not implemented.
> 
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
>  tests/Makefile.include |  2 +-
>  tests/test-qga.c       | 25 ++++++++++++++++++-------
>  2 files changed, 19 insertions(+), 8 deletions(-)

Reviewed-by: Thomas Huth <thuth@redhat.com>
Re: [PATCH v2] tests: fix test-qga on macosx
Posted by Philippe Mathieu-Daudé 4 years, 3 months ago 
On 1/8/20 2:35 PM, Paolo Bonzini wrote:
> From: Marc-André Lureau <marcandre.lureau@redhat.com>
> 
> Fix Unix socket connection & skip commands that are not implemented.
> 
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
>   tests/Makefile.include |  2 +-
>   tests/test-qga.c       | 25 ++++++++++++++++++-------
>   2 files changed, 19 insertions(+), 8 deletions(-)
> 
> diff --git a/tests/Makefile.include b/tests/Makefile.include
> index 49e3b0d..192a08e 100644
> --- a/tests/Makefile.include
> +++ b/tests/Makefile.include
> @@ -119,7 +119,7 @@ check-unit-$(CONFIG_BLOCK) += tests/test-crypto-secret$(EXESUF)
>   check-unit-$(call land,$(CONFIG_BLOCK),$(CONFIG_GNUTLS)) += tests/test-crypto-tlscredsx509$(EXESUF)
>   check-unit-$(call land,$(CONFIG_BLOCK),$(CONFIG_GNUTLS)) += tests/test-crypto-tlssession$(EXESUF)
>   ifneq (,$(findstring qemu-ga,$(TOOLS)))
> -check-unit-$(call land,$(CONFIG_LINUX),$(CONFIG_VIRTIO_SERIAL)) += tests/test-qga$(EXESUF)
> +check-unit-$(call land,$(CONFIG_POSIX),$(CONFIG_VIRTIO_SERIAL)) += tests/test-qga$(EXESUF)
>   endif
>   check-unit-y += tests/test-timed-average$(EXESUF)
>   check-unit-$(CONFIG_INOTIFY1) += tests/test-util-filemonitor$(EXESUF)
> diff --git a/tests/test-qga.c b/tests/test-qga.c
> index d2b2435..191bfca 100644
> --- a/tests/test-qga.c
> +++ b/tests/test-qga.c
> @@ -17,17 +17,17 @@ typedef struct {
>   
>   static int connect_qga(char *path)
>   {
> -    int s, ret, len, i = 0;
> +    int s, ret, i = 0;
>       struct sockaddr_un remote;

Or
         struct sockaddr_un remote = { };
and remove memset().

Regardless:
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>

>   
>       s = socket(AF_UNIX, SOCK_STREAM, 0);
>       g_assert(s != -1);
>   
> +    memset(&remote, 0, sizeof(struct sockaddr_un));
>       remote.sun_family = AF_UNIX;
>       do {
> -        strcpy(remote.sun_path, path);
> -        len = strlen(remote.sun_path) + sizeof(remote.sun_family);
> -        ret = connect(s, (struct sockaddr *)&remote, len);
> +        strncpy(remote.sun_path, path, sizeof(remote.sun_path) - 1);
> +        ret = connect(s, (struct sockaddr *)&remote, sizeof(struct sockaddr_un));
>           if (ret == -1) {
>               g_usleep(G_USEC_PER_SEC);
>           }
> @@ -305,6 +305,7 @@ static void test_qga_info(gconstpointer fix)
>       qobject_unref(ret);
>   }
>   
> +#if defined(CONFIG_LINUX)
>   static void test_qga_get_vcpus(gconstpointer fix)
>   {
>       const TestFixture *fixture = fix;
> @@ -324,7 +325,9 @@ static void test_qga_get_vcpus(gconstpointer fix)
>   
>       qobject_unref(ret);
>   }
> +#endif
>   
> +#if defined(CONFIG_LINUX)
>   static void test_qga_get_fsinfo(gconstpointer fix)
>   {
>       const TestFixture *fixture = fix;
> @@ -348,6 +351,7 @@ static void test_qga_get_fsinfo(gconstpointer fix)
>   
>       qobject_unref(ret);
>   }
> +#endif
>   
>   static void test_qga_get_memory_block_info(gconstpointer fix)
>   {
> @@ -394,6 +398,7 @@ static void test_qga_get_memory_blocks(gconstpointer fix)
>       qobject_unref(ret);
>   }
>   
> +#if defined(CONFIG_LINUX)
>   static void test_qga_network_get_interfaces(gconstpointer fix)
>   {
>       const TestFixture *fixture = fix;
> @@ -412,6 +417,7 @@ static void test_qga_network_get_interfaces(gconstpointer fix)
>   
>       qobject_unref(ret);
>   }
> +#endif
>   
>   static void test_qga_file_ops(gconstpointer fix)
>   {
> @@ -682,7 +688,7 @@ static void test_qga_blacklist(gconstpointer data)
>       qobject_unref(ret);
>   
>       /* check something work */
> -    ret = qmp_fd(fix.fd, "{'execute': 'guest-get-fsinfo'}");
> +    ret = qmp_fd(fix.fd, "{'execute': 'guest-info'}");
>       qmp_assert_no_error(ret);
>       qobject_unref(ret);
>   
> @@ -766,6 +772,7 @@ static void test_qga_config(gconstpointer data)
>       g_key_file_free(kf);
>   }
>   
> +#if defined(CONFIG_LINUX)
>   static void test_qga_fsfreeze_status(gconstpointer fix)
>   {
>       const TestFixture *fixture = fix;
> @@ -781,6 +788,7 @@ static void test_qga_fsfreeze_status(gconstpointer fix)
>   
>       qobject_unref(ret);
>   }
> +#endif
>   
>   static void test_qga_guest_exec(gconstpointer fix)
>   {
> @@ -976,12 +984,17 @@ int main(int argc, char **argv)
>       g_test_add_data_func("/qga/sync", &fix, test_qga_sync);
>       g_test_add_data_func("/qga/ping", &fix, test_qga_ping);
>       g_test_add_data_func("/qga/info", &fix, test_qga_info);
> +#if defined(CONFIG_LINUX)
>       g_test_add_data_func("/qga/network-get-interfaces", &fix,
>                            test_qga_network_get_interfaces);
>       if (!access("/sys/devices/system/cpu/cpu0", F_OK)) {
>           g_test_add_data_func("/qga/get-vcpus", &fix, test_qga_get_vcpus);
>       }
>       g_test_add_data_func("/qga/get-fsinfo", &fix, test_qga_get_fsinfo);
> +    g_test_add_data_func("/qga/fsfreeze-status", &fix,
> +                         test_qga_fsfreeze_status);
> +#endif
> +
>       g_test_add_data_func("/qga/get-memory-block-info", &fix,
>                            test_qga_get_memory_block_info);
>       g_test_add_data_func("/qga/get-memory-blocks", &fix,
> @@ -993,8 +1006,6 @@ int main(int argc, char **argv)
>       g_test_add_data_func("/qga/invalid-oob", &fix, test_qga_invalid_oob);
>       g_test_add_data_func("/qga/invalid-cmd", &fix, test_qga_invalid_cmd);
>       g_test_add_data_func("/qga/invalid-args", &fix, test_qga_invalid_args);
> -    g_test_add_data_func("/qga/fsfreeze-status", &fix,
> -                         test_qga_fsfreeze_status);
>   
>       g_test_add_data_func("/qga/blacklist", NULL, test_qga_blacklist);
>       g_test_add_data_func("/qga/config", NULL, test_qga_config);
>

Patchew 2.1-devel-0870f84

© 2016 - 2024 Red Hat, Inc.