* [Qemu-devel] [PATCH] fix chardev_init for win32
@ 2010-04-15 4:37 TeLeMan
2010-05-18 17:57 ` Aurelien Jarno
0 siblings, 1 reply; 4+ messages in thread
From: TeLeMan @ 2010-04-15 4:37 UTC (permalink / raw)
To: qemu-devel
chardev_init functions use socket,so socket_init() shoud be placed at
the front of chardev_init on win32.
Signed-off-by: TeLeMan <geleman@gmail.com>
---
vl.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/vl.c b/vl.c
index 460e050..96835e2 100644
--- a/vl.c
+++ b/vl.c
@@ -3468,6 +3468,8 @@ int main(int argc, char **argv, char **envp)
if (default_vga)
vga_interface_type = VGA_CIRRUS;
+ socket_init();
+
if (qemu_opts_foreach(&qemu_chardev_opts, chardev_init_func, NULL, 1) != 0)
exit(1);
@@ -3569,8 +3571,6 @@ int main(int argc, char **argv, char **envp)
}
configure_icount(icount_option);
- socket_init();
-
if (net_init_clients() < 0) {
exit(1);
}
--
1.6.5.1.1367.gcd48
--
SUN OF A BEACH
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PATCH] fix chardev_init for win32
2010-04-15 4:37 [Qemu-devel] [PATCH] fix chardev_init for win32 TeLeMan
@ 2010-05-18 17:57 ` Aurelien Jarno
0 siblings, 0 replies; 4+ messages in thread
From: Aurelien Jarno @ 2010-05-18 17:57 UTC (permalink / raw)
To: TeLeMan; +Cc: qemu-devel
On Thu, Apr 15, 2010 at 12:37:55PM +0800, TeLeMan wrote:
> chardev_init functions use socket,so socket_init() shoud be placed at
> the front of chardev_init on win32.
>
> Signed-off-by: TeLeMan <geleman@gmail.com>
> ---
> vl.c | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
Thanks, applied.
> diff --git a/vl.c b/vl.c
> index 460e050..96835e2 100644
> --- a/vl.c
> +++ b/vl.c
> @@ -3468,6 +3468,8 @@ int main(int argc, char **argv, char **envp)
> if (default_vga)
> vga_interface_type = VGA_CIRRUS;
>
> + socket_init();
> +
> if (qemu_opts_foreach(&qemu_chardev_opts, chardev_init_func, NULL, 1) != 0)
> exit(1);
>
> @@ -3569,8 +3571,6 @@ int main(int argc, char **argv, char **envp)
> }
> configure_icount(icount_option);
>
> - socket_init();
> -
> if (net_init_clients() < 0) {
> exit(1);
> }
> --
> 1.6.5.1.1367.gcd48
> --
> SUN OF A BEACH
>
>
>
--
Aurelien Jarno GPG: 1024D/F1BCDB73
aurelien@aurel32.net http://www.aurel32.net
^ permalink raw reply [flat|nested] 4+ messages in thread
* [Qemu-devel] [PATCH] fix chardev_init for win32
@ 2010-01-05 1:45 TeLeMan
2010-01-08 16:50 ` Anthony Liguori
0 siblings, 1 reply; 4+ messages in thread
From: TeLeMan @ 2010-01-05 1:45 UTC (permalink / raw)
To: qemu-devel
Before calling chardev_init_func(), socket_init() should be called on win32.
---
vl.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/vl.c b/vl.c
index 0f59142..3b39cad 100644
--- a/vl.c
+++ b/vl.c
@@ -5768,6 +5768,10 @@ int main(int argc, char **argv, char **envp)
if (default_vga)
vga_interface_type = VGA_CIRRUS;
+#ifdef _WIN32
+ socket_init();
+#endif
+
if (qemu_opts_foreach(&qemu_chardev_opts, chardev_init_func, NULL, 1) != 0)
exit(1);
@@ -5873,10 +5877,6 @@ int main(int argc, char **argv, char **envp)
init_icount_adjust();
}
-#ifdef _WIN32
- socket_init();
-#endif
-
if (net_init_clients() < 0) {
exit(1);
}
--
1.6.5.1.1367.gcd48
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PATCH] fix chardev_init for win32
2010-01-05 1:45 TeLeMan
@ 2010-01-08 16:50 ` Anthony Liguori
0 siblings, 0 replies; 4+ messages in thread
From: Anthony Liguori @ 2010-01-08 16:50 UTC (permalink / raw)
To: TeLeMan; +Cc: qemu-devel
On 01/04/2010 07:45 PM, TeLeMan wrote:
> Before calling chardev_init_func(), socket_init() should be called on win32.
>
Needs a Signed-off-by
Regards,
Anthony Liguori
> ---
> vl.c | 8 ++++----
> 1 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/vl.c b/vl.c
> index 0f59142..3b39cad 100644
> --- a/vl.c
> +++ b/vl.c
> @@ -5768,6 +5768,10 @@ int main(int argc, char **argv, char **envp)
> if (default_vga)
> vga_interface_type = VGA_CIRRUS;
>
> +#ifdef _WIN32
> + socket_init();
> +#endif
> +
> if (qemu_opts_foreach(&qemu_chardev_opts, chardev_init_func, NULL, 1) != 0)
> exit(1);
>
> @@ -5873,10 +5877,6 @@ int main(int argc, char **argv, char **envp)
> init_icount_adjust();
> }
>
> -#ifdef _WIN32
> - socket_init();
> -#endif
> -
> if (net_init_clients()< 0) {
> exit(1);
> }
>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2010-05-18 17:59 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-04-15 4:37 [Qemu-devel] [PATCH] fix chardev_init for win32 TeLeMan
2010-05-18 17:57 ` Aurelien Jarno
-- strict thread matches above, loose matches on Subject: below --
2010-01-05 1:45 TeLeMan
2010-01-08 16:50 ` Anthony Liguori
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).