[Qemu-devel] [PATCH] vnc: fix option misspelling ("non-adapative" -> "non-adaptive")

[Qemu-devel] [PATCH] vnc: fix option misspelling ("non-adapative" -> "non-adaptive")

[Catalin Patulea]

Signed-off-by: Catalin Patulea <catalinp@google.com>
---
A cursory web search shows that this flag doesn't show up much other than in
QEMU mailing lists and source. I don't think this will break anything.

ui/vnc.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/ui/vnc.c b/ui/vnc.c
index 61f120e..073fbe7 100644
--- a/ui/vnc.c
+++ b/ui/vnc.c
@@ -2945,7 +2945,7 @@ void vnc_display_open(DisplayState *ds, const char *display, Error **errp)
 #endif
         } else if (strncmp(options, "lossy", 5) == 0) {
             vs->lossy = true;
-        } else if (strncmp(options, "non-adapative", 13) == 0) {
+        } else if (strncmp(options, "non-adaptive", 13) == 0) {
             vs->non_adaptive = true;
         } else if (strncmp(options, "share=", 6) == 0) {
             if (strncmp(options+6, "ignore", 6) == 0) {
-- 
1.7.7.3

Re: [Qemu-devel] [PATCH] vnc: fix option misspelling ("non-adapative" -> "non-adaptive")

[Peter Maydell]

On 10 November 2012 00:31, Catalin Patulea <catalinp@google.com> wrote:
>
> Signed-off-by: Catalin Patulea <catalinp@google.com>
> ---
> A cursory web search shows that this flag doesn't show up much other than in
> QEMU mailing lists and source. I don't think this will break anything.

Yeah. In particular we documented it with the correct spelling
and nobody came along and reported the option as missing. I think
we can get away with this change. However...

> ui/vnc.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/ui/vnc.c b/ui/vnc.c
> index 61f120e..073fbe7 100644
> --- a/ui/vnc.c
> +++ b/ui/vnc.c
> @@ -2945,7 +2945,7 @@ void vnc_display_open(DisplayState *ds, const char *display, Error **errp)
>  #endif
>          } else if (strncmp(options, "lossy", 5) == 0) {
>              vs->lossy = true;
> -        } else if (strncmp(options, "non-adapative", 13) == 0) {
> +        } else if (strncmp(options, "non-adaptive", 13) == 0) {

...this is a strncmp, you need to update the length parameter
because you've changed the string.

>              vs->non_adaptive = true;
>          } else if (strncmp(options, "share=", 6) == 0) {
>              if (strncmp(options+6, "ignore", 6) == 0) {
> --
> 1.7.7.3

-- PMM

[Qemu-devel] [PATCH] vnc: fix option misspelling ("non-adapative" -> "non-adaptive")

[Catalin Patulea]

Signed-off-by: Catalin Patulea <catalinp@google.com>
---
D'oh, that was really stupid. Here it is with the correct length.

 ui/vnc.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/ui/vnc.c b/ui/vnc.c
index 61f120e..ba30362 100644
--- a/ui/vnc.c
+++ b/ui/vnc.c
@@ -2945,7 +2945,7 @@ void vnc_display_open(DisplayState *ds, const char *display, Error **errp)
 #endif
         } else if (strncmp(options, "lossy", 5) == 0) {
             vs->lossy = true;
-        } else if (strncmp(options, "non-adapative", 13) == 0) {
+        } else if (strncmp(options, "non-adaptive", 12) == 0) {
             vs->non_adaptive = true;
         } else if (strncmp(options, "share=", 6) == 0) {
             if (strncmp(options+6, "ignore", 6) == 0) {
-- 
1.7.7.3

Re: [Qemu-devel] [PATCH] vnc: fix option misspelling ("non-adapative" -> "non-adaptive")

[Peter Maydell]

On 10 November 2012 01:01, Catalin Patulea <catalinp@google.com> wrote:
>
> Signed-off-by: Catalin Patulea <catalinp@google.com>
> ---
> D'oh, that was really stupid. Here it is with the correct length.
>
>  ui/vnc.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/ui/vnc.c b/ui/vnc.c
> index 61f120e..ba30362 100644
> --- a/ui/vnc.c
> +++ b/ui/vnc.c
> @@ -2945,7 +2945,7 @@ void vnc_display_open(DisplayState *ds, const char *display, Error **errp)
>  #endif
>          } else if (strncmp(options, "lossy", 5) == 0) {
>              vs->lossy = true;
> -        } else if (strncmp(options, "non-adapative", 13) == 0) {
> +        } else if (strncmp(options, "non-adaptive", 12) == 0) {
>              vs->non_adaptive = true;
>          } else if (strncmp(options, "share=", 6) == 0) {
>              if (strncmp(options+6, "ignore", 6) == 0) {
> --
> 1.7.7.3
>

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>

If we're gonna do this I guess it should go into 1.3...
cc'ing Anthony.

-- PMM

Re: [Qemu-devel] [PATCH] vnc: fix option misspelling ("non-adapative" -> "non-adaptive")

[Catalin Patulea]

On Fri, Nov 9, 2012 at 7:19 PM, Peter Maydell <peter.maydell@linaro.org> wrote:
> If we're gonna do this I guess it should go into 1.3...
> cc'ing Anthony.
Friendly ping for trivial patch :)

Re: [Qemu-devel] [PATCH] vnc: fix option misspelling ("non-adapative" -> "non-adaptive")

[Stefan Hajnoczi]

On Tue, Nov 20, 2012 at 04:06:31AM -0500, Catalin Patulea wrote:
> On Fri, Nov 9, 2012 at 7:19 PM, Peter Maydell <peter.maydell@linaro.org> wrote:
> > If we're gonna do this I guess it should go into 1.3...
> > cc'ing Anthony.
> Friendly ping for trivial patch :)

Hi Catalin,
In the future feel free to email qemu-trivial@nongnu.org and I'll make
sure trival patches get merged.

For the 1.3-rc cycle this patch can go directly through Anthony.

Stefan

Re: [Qemu-devel] [PATCH] vnc: fix option misspelling ("non-adapative" -> "non-adaptive")

[Peter Maydell]

On 20 November 2012 13:07, Stefan Hajnoczi <stefanha@gmail.com> wrote:
> On Tue, Nov 20, 2012 at 04:06:31AM -0500, Catalin Patulea wrote:
>> On Fri, Nov 9, 2012 at 7:19 PM, Peter Maydell <peter.maydell@linaro.org> wrote:
>> > If we're gonna do this I guess it should go into 1.3...
>> > cc'ing Anthony.
>> Friendly ping for trivial patch :)
>
> Hi Catalin,
> In the future feel free to email qemu-trivial@nongnu.org and I'll make
> sure trival patches get merged.
>
> For the 1.3-rc cycle this patch can go directly through Anthony.

Yes, I cc'd Anthony rather than -trivial when I reviewed this
patch because I felt we were far enough into the freeze/release
process that it shouldn't go via trivial.

-- PMM

Re: [Qemu-devel] [PATCH] vnc: fix option misspelling ("non-adapative" -> "non-adaptive")

[Anthony Liguori]

Catalin Patulea <catalinp@google.com> writes:

> Signed-off-by: Catalin Patulea <catalinp@google.com>
> ---
> A cursory web search shows that this flag doesn't show up much other than in
> QEMU mailing lists and source. I don't think this will break anything.
>

Applied. Thanks.

Regards,

Anthony Liguori

> ui/vnc.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/ui/vnc.c b/ui/vnc.c
> index 61f120e..073fbe7 100644
> --- a/ui/vnc.c
> +++ b/ui/vnc.c
> @@ -2945,7 +2945,7 @@ void vnc_display_open(DisplayState *ds, const char *display, Error **errp)
>  #endif
>          } else if (strncmp(options, "lossy", 5) == 0) {
>              vs->lossy = true;
> -        } else if (strncmp(options, "non-adapative", 13) == 0) {
> +        } else if (strncmp(options, "non-adaptive", 13) == 0) {
>              vs->non_adaptive = true;
>          } else if (strncmp(options, "share=", 6) == 0) {
>              if (strncmp(options+6, "ignore", 6) == 0) {
> -- 
> 1.7.7.3