[Qemu-devel] [PATCH 1/5] vnc: pass bool pararmeter for vnc_connect

[Qemu-devel] [PATCH 1/5] vnc: pass bool pararmeter for vnc_connect

[liguang]

type last parameter of vnc_connect if bool,
so pass 'false' instead of '0' for it.

Signed-off-by: liguang <lig.fnst@cn.fujitsu.com>
---
 ui/vnc.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ui/vnc.c b/ui/vnc.c
index dfc7459..7d22660 100644
--- a/ui/vnc.c
+++ b/ui/vnc.c
@@ -3283,7 +3283,7 @@ void vnc_display_open(DisplayState *ds, const char *display, Error **errp)
         if (csock < 0) {
             goto fail;
         }
-        vnc_connect(vs, csock, 0, 0);
+        vnc_connect(vs, csock, 0, false);
     } else {
         /* listen for connects */
         char *dpy;
@@ -3345,5 +3345,5 @@ void vnc_display_add_client(DisplayState *ds, int csock, int skipauth)
 {
     VncDisplay *vs = vnc_display;
 
-    vnc_connect(vs, csock, skipauth, 0);
+    vnc_connect(vs, csock, skipauth, false);
 }
-- 
1.7.2.5

[Qemu-devel] [PATCH 2/5] vnc: pass bool parameter for vnc_listen_read

[liguang]

Signed-off-by: liguang <lig.fnst@cn.fujitsu.com>
---
 ui/vnc.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ui/vnc.c b/ui/vnc.c
index 7d22660..1a8b940 100644
--- a/ui/vnc.c
+++ b/ui/vnc.c
@@ -2889,13 +2889,13 @@ static void vnc_listen_read(void *opaque, bool websocket)
 
 static void vnc_listen_regular_read(void *opaque)
 {
-    vnc_listen_read(opaque, 0);
+    vnc_listen_read(opaque, false);
 }
 
 #ifdef CONFIG_VNC_WS
 static void vnc_listen_websocket_read(void *opaque)
 {
-    vnc_listen_read(opaque, 1);
+    vnc_listen_read(opaque, true);
 }
 #endif /* CONFIG_VNC_WS */
 
-- 
1.7.2.5

Re: [Qemu-devel] [PATCH 2/5] vnc: pass bool parameter for vnc_listen_read

[Andreas Färber]

Am 11.06.2013 07:15, schrieb liguang:
> Signed-off-by: liguang <lig.fnst@cn.fujitsu.com>

Reviewed-by: Andreas Färber <afaerber@suse.de>

CC'ing Tim.

Andreas

> ---
>  ui/vnc.c |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/ui/vnc.c b/ui/vnc.c
> index 7d22660..1a8b940 100644
> --- a/ui/vnc.c
> +++ b/ui/vnc.c
> @@ -2889,13 +2889,13 @@ static void vnc_listen_read(void *opaque, bool websocket)
>  
>  static void vnc_listen_regular_read(void *opaque)
>  {
> -    vnc_listen_read(opaque, 0);
> +    vnc_listen_read(opaque, false);
>  }
>  
>  #ifdef CONFIG_VNC_WS
>  static void vnc_listen_websocket_read(void *opaque)
>  {
> -    vnc_listen_read(opaque, 1);
> +    vnc_listen_read(opaque, true);
>  }
>  #endif /* CONFIG_VNC_WS */
>  
> 


-- 
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg

[Qemu-devel] [PATCH 3/5] qemu-char: pass bool parameter for qemu_opt_get_bool

[liguang]

Signed-off-by: liguang <lig.fnst@cn.fujitsu.com>
---
 qemu-char.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/qemu-char.c b/qemu-char.c
index d04b429..8092eb8 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -2767,10 +2767,10 @@ static CharDriverState *qemu_chr_open_socket(QemuOpts *opts)
     int is_unix;
     int is_telnet;
 
-    is_listen      = qemu_opt_get_bool(opts, "server", 0);
-    is_waitconnect = qemu_opt_get_bool(opts, "wait", 1);
-    is_telnet      = qemu_opt_get_bool(opts, "telnet", 0);
-    do_nodelay     = !qemu_opt_get_bool(opts, "delay", 1);
+    is_listen      = qemu_opt_get_bool(opts, "server", false);
+    is_waitconnect = qemu_opt_get_bool(opts, "wait", true);
+    is_telnet      = qemu_opt_get_bool(opts, "telnet", false);
+    do_nodelay     = !qemu_opt_get_bool(opts, "delay", true);
     is_unix        = qemu_opt_get(opts, "path") != NULL;
     if (!is_listen)
         is_waitconnect = 0;
-- 
1.7.2.5

Re: [Qemu-devel] [Qemu-trivial] [PATCH 3/5] qemu-char: pass bool parameter for qemu_opt_get_bool

[Michael Tokarev]

11.06.2013 09:15, liguang wrote:
> Signed-off-by: liguang <lig.fnst@cn.fujitsu.com>
> ---
>  qemu-char.c |    8 ++++----
>  1 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/qemu-char.c b/qemu-char.c
> index d04b429..8092eb8 100644
> --- a/qemu-char.c
> +++ b/qemu-char.c
> @@ -2767,10 +2767,10 @@ static CharDriverState *qemu_chr_open_socket(QemuOpts *opts)
>      int is_unix;
>      int is_telnet;
>  
> -    is_listen      = qemu_opt_get_bool(opts, "server", 0);
> -    is_waitconnect = qemu_opt_get_bool(opts, "wait", 1);
> -    is_telnet      = qemu_opt_get_bool(opts, "telnet", 0);
> -    do_nodelay     = !qemu_opt_get_bool(opts, "delay", 1);
> +    is_listen      = qemu_opt_get_bool(opts, "server", false);
> +    is_waitconnect = qemu_opt_get_bool(opts, "wait", true);
> +    is_telnet      = qemu_opt_get_bool(opts, "telnet", false);
> +    do_nodelay     = !qemu_opt_get_bool(opts, "delay", true);
>      is_unix        = qemu_opt_get(opts, "path") != NULL;
>      if (!is_listen)
>          is_waitconnect = 0;

While we're at it, all the is_* variables themselves should be made
bool instead of int too.

Thanks,

/mjt

Re: [Qemu-devel] [Qemu-trivial] [PATCH 3/5] qemu-char: pass bool parameter for qemu_opt_get_bool

[li guang]

在 2013-06-11二的 15:35 +0400，Michael Tokarev写道：
> 11.06.2013 09:15, liguang wrote:
> > Signed-off-by: liguang <lig.fnst@cn.fujitsu.com>
> > ---
> >  qemu-char.c |    8 ++++----
> >  1 files changed, 4 insertions(+), 4 deletions(-)
> > 
> > diff --git a/qemu-char.c b/qemu-char.c
> > index d04b429..8092eb8 100644
> > --- a/qemu-char.c
> > +++ b/qemu-char.c
> > @@ -2767,10 +2767,10 @@ static CharDriverState *qemu_chr_open_socket(QemuOpts *opts)
> >      int is_unix;
> >      int is_telnet;
> >  
> > -    is_listen      = qemu_opt_get_bool(opts, "server", 0);
> > -    is_waitconnect = qemu_opt_get_bool(opts, "wait", 1);
> > -    is_telnet      = qemu_opt_get_bool(opts, "telnet", 0);
> > -    do_nodelay     = !qemu_opt_get_bool(opts, "delay", 1);
> > +    is_listen      = qemu_opt_get_bool(opts, "server", false);
> > +    is_waitconnect = qemu_opt_get_bool(opts, "wait", true);
> > +    is_telnet      = qemu_opt_get_bool(opts, "telnet", false);
> > +    do_nodelay     = !qemu_opt_get_bool(opts, "delay", true);
> >      is_unix        = qemu_opt_get(opts, "path") != NULL;
> >      if (!is_listen)
> >          is_waitconnect = 0;
> 
> While we're at it, all the is_* variables themselves should be made
> bool instead of int too.
> 

right,

Thanks!

[Qemu-devel] [PATCH 4/5] memory: use '=' instead of '|=' for memory_region_update_pending

[liguang]

because memory_region_update_pending is bool

Signed-off-by: liguang <lig.fnst@cn.fujitsu.com>
---
 memory.c |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/memory.c b/memory.c
index 5cb8f4a..d99eecd 100644
--- a/memory.c
+++ b/memory.c
@@ -1114,7 +1114,7 @@ void memory_region_set_log(MemoryRegion *mr, bool log, unsigned client)
 
     memory_region_transaction_begin();
     mr->dirty_log_mask = (mr->dirty_log_mask & ~mask) | (log * mask);
-    memory_region_update_pending |= mr->enabled;
+    memory_region_update_pending = mr->enabled;
     memory_region_transaction_commit();
 }
 
@@ -1168,7 +1168,7 @@ void memory_region_set_readonly(MemoryRegion *mr, bool readonly)
     if (mr->readonly != readonly) {
         memory_region_transaction_begin();
         mr->readonly = readonly;
-        memory_region_update_pending |= mr->enabled;
+        memory_region_update_pending = mr->enabled;
         memory_region_transaction_commit();
     }
 }
@@ -1178,7 +1178,7 @@ void memory_region_rom_device_set_romd(MemoryRegion *mr, bool romd_mode)
     if (mr->romd_mode != romd_mode) {
         memory_region_transaction_begin();
         mr->romd_mode = romd_mode;
-        memory_region_update_pending |= mr->enabled;
+        memory_region_update_pending = mr->enabled;
         memory_region_transaction_commit();
     }
 }
@@ -1321,7 +1321,7 @@ void memory_region_add_eventfd(MemoryRegion *mr,
     memmove(&mr->ioeventfds[i+1], &mr->ioeventfds[i],
             sizeof(*mr->ioeventfds) * (mr->ioeventfd_nb-1 - i));
     mr->ioeventfds[i] = mrfd;
-    memory_region_update_pending |= mr->enabled;
+    memory_region_update_pending = mr->enabled;
     memory_region_transaction_commit();
 }
 
@@ -1354,7 +1354,7 @@ void memory_region_del_eventfd(MemoryRegion *mr,
     --mr->ioeventfd_nb;
     mr->ioeventfds = g_realloc(mr->ioeventfds,
                                   sizeof(*mr->ioeventfds)*mr->ioeventfd_nb + 1);
-    memory_region_update_pending |= mr->enabled;
+    memory_region_update_pending = mr->enabled;
     memory_region_transaction_commit();
 }
 
@@ -1398,7 +1398,7 @@ static void memory_region_add_subregion_common(MemoryRegion *mr,
     }
     QTAILQ_INSERT_TAIL(&mr->subregions, subregion, subregions_link);
 done:
-    memory_region_update_pending |= mr->enabled && subregion->enabled;
+    memory_region_update_pending = mr->enabled && subregion->enabled;
     memory_region_transaction_commit();
 }
 
@@ -1429,7 +1429,7 @@ void memory_region_del_subregion(MemoryRegion *mr,
     assert(subregion->parent == mr);
     subregion->parent = NULL;
     QTAILQ_REMOVE(&mr->subregions, subregion, subregions_link);
-    memory_region_update_pending |= mr->enabled && subregion->enabled;
+    memory_region_update_pending = mr->enabled && subregion->enabled;
     memory_region_transaction_commit();
 }
 
@@ -1475,7 +1475,7 @@ void memory_region_set_alias_offset(MemoryRegion *mr, hwaddr offset)
 
     memory_region_transaction_begin();
     mr->alias_offset = offset;
-    memory_region_update_pending |= mr->enabled;
+    memory_region_update_pending = mr->enabled;
     memory_region_transaction_commit();
 }
 
@@ -1634,7 +1634,7 @@ void address_space_init(AddressSpace *as, MemoryRegion *root)
     QTAILQ_INSERT_TAIL(&address_spaces, as, address_spaces_link);
     as->name = NULL;
     address_space_init_dispatch(as);
-    memory_region_update_pending |= root->enabled;
+    memory_region_update_pending = root->enabled;
     memory_region_transaction_commit();
 }
 
-- 
1.7.2.5

Re: [Qemu-devel] [Qemu-trivial] [PATCH 4/5] memory: use '=' instead of '|=' for memory_region_update_pending

[Michael Tokarev]

11.06.2013 09:15, liguang wrote:
> because memory_region_update_pending is bool
> 
> Signed-off-by: liguang <lig.fnst@cn.fujitsu.com>
> ---
>  memory.c |   18 +++++++++---------
>  1 files changed, 9 insertions(+), 9 deletions(-)
> 
> diff --git a/memory.c b/memory.c
> index 5cb8f4a..d99eecd 100644
> --- a/memory.c
> +++ b/memory.c
> @@ -1114,7 +1114,7 @@ void memory_region_set_log(MemoryRegion *mr, bool log, unsigned client)
>  
>      memory_region_transaction_begin();
>      mr->dirty_log_mask = (mr->dirty_log_mask & ~mask) | (log * mask);
> -    memory_region_update_pending |= mr->enabled;
> +    memory_region_update_pending = mr->enabled;

This is wrong, and the original code was right.  Here and in all other places.

Thanks,

/mjt

Re: [Qemu-devel] [Qemu-trivial] [PATCH 4/5] memory: use '=' instead of '|=' for memory_region_update_pending

[li guang]

在 2013-06-11二的 15:34 +0400，Michael Tokarev写道：
> 11.06.2013 09:15, liguang wrote:
> > because memory_region_update_pending is bool
> > 
> > Signed-off-by: liguang <lig.fnst@cn.fujitsu.com>
> > ---
> >  memory.c |   18 +++++++++---------
> >  1 files changed, 9 insertions(+), 9 deletions(-)
> > 
> > diff --git a/memory.c b/memory.c
> > index 5cb8f4a..d99eecd 100644
> > --- a/memory.c
> > +++ b/memory.c
> > @@ -1114,7 +1114,7 @@ void memory_region_set_log(MemoryRegion *mr, bool log, unsigned client)
> >  
> >      memory_region_transaction_begin();
> >      mr->dirty_log_mask = (mr->dirty_log_mask & ~mask) | (log * mask);
> > -    memory_region_update_pending |= mr->enabled;
> > +    memory_region_update_pending = mr->enabled;
> 
> This is wrong, and the original code was right.  Here and in all other places.
> 

Is it valid to do '|' operation for boolean?
or maybe memory_region_update_pending should be int?

Re: [Qemu-devel] [Qemu-trivial] [PATCH 4/5] memory: use '=' instead of '|=' for memory_region_update_pending

[Michael Tokarev]

18.06.2013 06:32, li guang пишет:
> 在 2013-06-11二的 15:34 +0400，Michael Tokarev写道：
>> 11.06.2013 09:15, liguang wrote:
>>> because memory_region_update_pending is bool
>>>
>>> Signed-off-by: liguang <lig.fnst@cn.fujitsu.com>
>>> ---
>>>  memory.c |   18 +++++++++---------
>>>  1 files changed, 9 insertions(+), 9 deletions(-)
>>>
>>> diff --git a/memory.c b/memory.c
>>> index 5cb8f4a..d99eecd 100644
>>> --- a/memory.c
>>> +++ b/memory.c
>>> @@ -1114,7 +1114,7 @@ void memory_region_set_log(MemoryRegion *mr, bool log, unsigned client)
>>>  
>>>      memory_region_transaction_begin();
>>>      mr->dirty_log_mask = (mr->dirty_log_mask & ~mask) | (log * mask);
>>> -    memory_region_update_pending |= mr->enabled;
>>> +    memory_region_update_pending = mr->enabled;
>>
>> This is wrong, and the original code was right.  Here and in all other places.
> 
> Is it valid to do '|' operation for boolean?

Yes it is.  Why do you think it might be problematic?

Thanks,

/mjt

Re: [Qemu-devel] [Qemu-trivial] [PATCH 4/5] memory: use '=' instead of '|=' for memory_region_update_pending

[li guang]

在 2013-06-18二的 07:50 +0400，Michael Tokarev写道：
> 18.06.2013 06:32, li guang пишет:
> > 在 2013-06-11二的 15:34 +0400，Michael Tokarev写道：
> >> 11.06.2013 09:15, liguang wrote:
> >>> because memory_region_update_pending is bool
> >>>
> >>> Signed-off-by: liguang <lig.fnst@cn.fujitsu.com>
> >>> ---
> >>>  memory.c |   18 +++++++++---------
> >>>  1 files changed, 9 insertions(+), 9 deletions(-)
> >>>
> >>> diff --git a/memory.c b/memory.c
> >>> index 5cb8f4a..d99eecd 100644
> >>> --- a/memory.c
> >>> +++ b/memory.c
> >>> @@ -1114,7 +1114,7 @@ void memory_region_set_log(MemoryRegion *mr, bool log, unsigned client)
> >>>  
> >>>      memory_region_transaction_begin();
> >>>      mr->dirty_log_mask = (mr->dirty_log_mask & ~mask) | (log * mask);
> >>> -    memory_region_update_pending |= mr->enabled;
> >>> +    memory_region_update_pending = mr->enabled;
> >>
> >> This is wrong, and the original code was right.  Here and in all other places.
> > 
> > Is it valid to do '|' operation for boolean?
> 
> Yes it is.  Why do you think it might be problematic?
> 

No problem now,

Thanks!

[Qemu-devel] [PATCH 5/5] sd: pass bool parameter for sd_init

[liguang]

Signed-off-by: liguang <lig.fnst@cn.fujitsu.com>
---
 hw/sd/milkymist-memcard.c |    2 +-
 hw/sd/omap_mmc.c          |    4 ++--
 hw/sd/pl181.c             |    2 +-
 hw/sd/pxa2xx_mmci.c       |    2 +-
 hw/sd/sdhci.c             |    2 +-
 hw/sd/ssi-sd.c            |    2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/hw/sd/milkymist-memcard.c b/hw/sd/milkymist-memcard.c
index d5944bc..61a8aad 100644
--- a/hw/sd/milkymist-memcard.c
+++ b/hw/sd/milkymist-memcard.c
@@ -250,7 +250,7 @@ static int milkymist_memcard_init(SysBusDevice *dev)
     DriveInfo *dinfo;
 
     dinfo = drive_get_next(IF_SD);
-    s->card = sd_init(dinfo ? dinfo->bdrv : NULL, 0);
+    s->card = sd_init(dinfo ? dinfo->bdrv : NULL, false);
     s->enabled = dinfo ? bdrv_is_inserted(dinfo->bdrv) : 0;
 
     memory_region_init_io(&s->regs_region, &memcard_mmio_ops, s,
diff --git a/hw/sd/omap_mmc.c b/hw/sd/omap_mmc.c
index d4079cd..ba9f4b3 100644
--- a/hw/sd/omap_mmc.c
+++ b/hw/sd/omap_mmc.c
@@ -592,7 +592,7 @@ struct omap_mmc_s *omap_mmc_init(hwaddr base,
     memory_region_add_subregion(sysmem, base, &s->iomem);
 
     /* Instantiate the storage */
-    s->card = sd_init(bd, 0);
+    s->card = sd_init(bd, false);
 
     return s;
 }
@@ -617,7 +617,7 @@ struct omap_mmc_s *omap2_mmc_init(struct omap_target_agent_s *ta,
     omap_l4_attach(ta, 0, &s->iomem);
 
     /* Instantiate the storage */
-    s->card = sd_init(bd, 0);
+    s->card = sd_init(bd, false);
 
     s->cdet = qemu_allocate_irqs(omap_mmc_cover_cb, s, 1)[0];
     sd_set_cb(s->card, NULL, s->cdet);
diff --git a/hw/sd/pl181.c b/hw/sd/pl181.c
index 2527296..e08fd04 100644
--- a/hw/sd/pl181.c
+++ b/hw/sd/pl181.c
@@ -485,7 +485,7 @@ static int pl181_init(SysBusDevice *dev)
     sysbus_init_irq(dev, &s->irq[1]);
     qdev_init_gpio_out(&s->busdev.qdev, s->cardstatus, 2);
     dinfo = drive_get_next(IF_SD);
-    s->card = sd_init(dinfo ? dinfo->bdrv : NULL, 0);
+    s->card = sd_init(dinfo ? dinfo->bdrv : NULL, false);
     return 0;
 }
 
diff --git a/hw/sd/pxa2xx_mmci.c b/hw/sd/pxa2xx_mmci.c
index 2db1cab..0574d6b 100644
--- a/hw/sd/pxa2xx_mmci.c
+++ b/hw/sd/pxa2xx_mmci.c
@@ -538,7 +538,7 @@ PXA2xxMMCIState *pxa2xx_mmci_init(MemoryRegion *sysmem,
     memory_region_add_subregion(sysmem, base, &s->iomem);
 
     /* Instantiate the actual storage */
-    s->card = sd_init(bd, 0);
+    s->card = sd_init(bd, false);
 
     register_savevm(NULL, "pxa2xx_mmci", 0, 0,
                     pxa2xx_mmci_save, pxa2xx_mmci_load, s);
diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c
index e64899c..ddc260f 100644
--- a/hw/sd/sdhci.c
+++ b/hw/sd/sdhci.c
@@ -1165,7 +1165,7 @@ static void sdhci_initfn(Object *obj)
     DriveInfo *di;
 
     di = drive_get_next(IF_SD);
-    s->card = sd_init(di ? di->bdrv : NULL, 0);
+    s->card = sd_init(di ? di->bdrv : NULL, false);
     s->eject_cb = qemu_allocate_irqs(sdhci_insert_eject_cb, s, 1)[0];
     s->ro_cb = qemu_allocate_irqs(sdhci_card_readonly_cb, s, 1)[0];
     sd_set_cb(s->card, s->ro_cb, s->eject_cb);
diff --git a/hw/sd/ssi-sd.c b/hw/sd/ssi-sd.c
index 4d3c4f6..d47e237 100644
--- a/hw/sd/ssi-sd.c
+++ b/hw/sd/ssi-sd.c
@@ -245,7 +245,7 @@ static int ssi_sd_init(SSISlave *dev)
 
     s->mode = SSI_SD_CMD;
     dinfo = drive_get_next(IF_SD);
-    s->sd = sd_init(dinfo ? dinfo->bdrv : NULL, 1);
+    s->sd = sd_init(dinfo ? dinfo->bdrv : NULL, true);
     register_savevm(&dev->qdev, "ssi_sd", -1, 1, ssi_sd_save, ssi_sd_load, s);
     return 0;
 }
-- 
1.7.2.5

Re: [Qemu-devel] [PATCH 1/5] vnc: pass bool pararmeter for vnc_connect

[Andreas Färber]

"parameter"

Am 11.06.2013 07:15, schrieb liguang:
> type last parameter of vnc_connect if bool,

"Type of last ...", "is"

> so pass 'false' instead of '0' for it.
> 
> Signed-off-by: liguang <lig.fnst@cn.fujitsu.com>

Michael, can you fix those up? Then,

Reviewed-by: Andreas Färber <afaerber@suse.de>

Thanks,
Andreas

> ---
>  ui/vnc.c |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/ui/vnc.c b/ui/vnc.c
> index dfc7459..7d22660 100644
> --- a/ui/vnc.c
> +++ b/ui/vnc.c
> @@ -3283,7 +3283,7 @@ void vnc_display_open(DisplayState *ds, const char *display, Error **errp)
>          if (csock < 0) {
>              goto fail;
>          }
> -        vnc_connect(vs, csock, 0, 0);
> +        vnc_connect(vs, csock, 0, false);
>      } else {
>          /* listen for connects */
>          char *dpy;
> @@ -3345,5 +3345,5 @@ void vnc_display_add_client(DisplayState *ds, int csock, int skipauth)
>  {
>      VncDisplay *vs = vnc_display;
>  
> -    vnc_connect(vs, csock, skipauth, 0);
> +    vnc_connect(vs, csock, skipauth, false);
>  }
> 


-- 
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg

Re: [Qemu-devel] [Qemu-trivial] [PATCH 1/5] vnc: pass bool pararmeter for vnc_connect

[Michael Tokarev]

11.06.2013 09:15, liguang wrote:
> type last parameter of vnc_connect if bool,
> so pass 'false' instead of '0' for it.

There's another parameter in here, `skipauth', which should be
bool in vnc_connect(), and should be bool in vnc_display_add_client()
too.

Also, there's no big point in splitting 1/5 and 2/5 (vnc_listen_read),
I think.

Does something like the below look ok? (not even compile-tested)
(and I'd really rename `skipauth' to `doauth' everywhere, to mean
exactly the opposite so that we don't have double negatives, but
it is too late already)

From: Michael Tokarev <mjt@tls.msk.ru>
Date:   Tue Jun 11 15:42:44 2013 +0400

    vnc: use booleans for vnc_connect, vnc_listen_read and vnc_display_add_client

    Some arguments to these functions are booleans - either by declaration,
    or by actual usage, but sometimes value of 0 or 1 is passed for a bool,
    and sometimes it is declared as int but a bool value, or true/false,
    is passed to it instead.  Clean it up a bit.

    Cc: liguang <lig.fnst@cn.fujitsu.com>
    Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>

diff --git a/include/ui/console.h b/include/ui/console.h
index f1d79f9..98edf41 100644
--- a/include/ui/console.h
+++ b/include/ui/console.h
@@ -314,7 +314,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_add_client(DisplayState *ds, int csock, int skipauth);
+void vnc_display_add_client(DisplayState *ds, int csock, bool skipauth);
 char *vnc_display_local_addr(DisplayState *ds);
 #ifdef CONFIG_VNC
 int vnc_display_password(DisplayState *ds, const char *password);
diff --git a/ui/vnc.c b/ui/vnc.c
index dfc7459..5601cc3 100644
--- a/ui/vnc.c
+++ b/ui/vnc.c
@@ -2771,7 +2771,8 @@ static void vnc_refresh(DisplayChangeListener *dcl)
     }
 }

-static void vnc_connect(VncDisplay *vd, int csock, int skipauth, bool websocket)
+static void vnc_connect(VncDisplay *vd, int csock,
+                        bool skipauth, bool websocket)
 {
     VncState *vs = g_malloc0(sizeof(VncState));
     int i;
@@ -2883,19 +2884,19 @@ static void vnc_listen_read(void *opaque, bool websocket)
     }

     if (csock != -1) {
-        vnc_connect(vs, csock, 0, websocket);
+        vnc_connect(vs, csock, false, websocket);
     }
 }

 static void vnc_listen_regular_read(void *opaque)
 {
-    vnc_listen_read(opaque, 0);
+    vnc_listen_read(opaque, false);
 }

 #ifdef CONFIG_VNC_WS
 static void vnc_listen_websocket_read(void *opaque)
 {
-    vnc_listen_read(opaque, 1);
+    vnc_listen_read(opaque, true);
 }
 #endif /* CONFIG_VNC_WS */

@@ -3283,7 +3284,7 @@ void vnc_display_open(DisplayState *ds, const char *display, Error **errp)
         if (csock < 0) {
             goto fail;
         }
-        vnc_connect(vs, csock, 0, 0);
+        vnc_connect(vs, csock, false, false);
     } else {
         /* listen for connects */
         char *dpy;
@@ -3341,9 +3342,9 @@ fail:
 #endif /* CONFIG_VNC_WS */
 }

-void vnc_display_add_client(DisplayState *ds, int csock, int skipauth)
+void vnc_display_add_client(DisplayState *ds, int csock, bool skipauth)
 {
     VncDisplay *vs = vnc_display;

-    vnc_connect(vs, csock, skipauth, 0);
+    vnc_connect(vs, csock, skipauth, false);
 }

Re: [Qemu-devel] [Qemu-trivial] [PATCH 1/5] vnc: pass bool pararmeter for vnc_connect

[li guang]

在 2013-06-11二的 15:50 +0400，Michael Tokarev写道：
> 11.06.2013 09:15, liguang wrote:
> > type last parameter of vnc_connect if bool,
> > so pass 'false' instead of '0' for it.
> 
> There's another parameter in here, `skipauth', which should be
> bool in vnc_connect(), and should be bool in vnc_display_add_client()
> too.
> 
> Also, there's no big point in splitting 1/5 and 2/5 (vnc_listen_read),
> I think.
> 
> Does something like the below look ok? (not even compile-tested)

OK for me.

> (and I'd really rename `skipauth' to `doauth' everywhere, to mean
> exactly the opposite so that we don't have double negatives, but
> it is too late already)
> 
> From: Michael Tokarev <mjt@tls.msk.ru>
> Date:   Tue Jun 11 15:42:44 2013 +0400
> 
>     vnc: use booleans for vnc_connect, vnc_listen_read and vnc_display_add_client
> 
>     Some arguments to these functions are booleans - either by declaration,
>     or by actual usage, but sometimes value of 0 or 1 is passed for a bool,
>     and sometimes it is declared as int but a bool value, or true/false,
>     is passed to it instead.  Clean it up a bit.
> 
>     Cc: liguang <lig.fnst@cn.fujitsu.com>
>     Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
> 
> diff --git a/include/ui/console.h b/include/ui/console.h
> index f1d79f9..98edf41 100644
> --- a/include/ui/console.h
> +++ b/include/ui/console.h
> @@ -314,7 +314,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_add_client(DisplayState *ds, int csock, int skipauth);
> +void vnc_display_add_client(DisplayState *ds, int csock, bool skipauth);
>  char *vnc_display_local_addr(DisplayState *ds);
>  #ifdef CONFIG_VNC
>  int vnc_display_password(DisplayState *ds, const char *password);
> diff --git a/ui/vnc.c b/ui/vnc.c
> index dfc7459..5601cc3 100644
> --- a/ui/vnc.c
> +++ b/ui/vnc.c
> @@ -2771,7 +2771,8 @@ static void vnc_refresh(DisplayChangeListener *dcl)
>      }
>  }
> 
> -static void vnc_connect(VncDisplay *vd, int csock, int skipauth, bool websocket)
> +static void vnc_connect(VncDisplay *vd, int csock,
> +                        bool skipauth, bool websocket)
>  {
>      VncState *vs = g_malloc0(sizeof(VncState));
>      int i;
> @@ -2883,19 +2884,19 @@ static void vnc_listen_read(void *opaque, bool websocket)
>      }
> 
>      if (csock != -1) {
> -        vnc_connect(vs, csock, 0, websocket);
> +        vnc_connect(vs, csock, false, websocket);
>      }
>  }
> 
>  static void vnc_listen_regular_read(void *opaque)
>  {
> -    vnc_listen_read(opaque, 0);
> +    vnc_listen_read(opaque, false);
>  }
> 
>  #ifdef CONFIG_VNC_WS
>  static void vnc_listen_websocket_read(void *opaque)
>  {
> -    vnc_listen_read(opaque, 1);
> +    vnc_listen_read(opaque, true);
>  }
>  #endif /* CONFIG_VNC_WS */
> 
> @@ -3283,7 +3284,7 @@ void vnc_display_open(DisplayState *ds, const char *display, Error **errp)
>          if (csock < 0) {
>              goto fail;
>          }
> -        vnc_connect(vs, csock, 0, 0);
> +        vnc_connect(vs, csock, false, false);
>      } else {
>          /* listen for connects */
>          char *dpy;
> @@ -3341,9 +3342,9 @@ fail:
>  #endif /* CONFIG_VNC_WS */
>  }
> 
> -void vnc_display_add_client(DisplayState *ds, int csock, int skipauth)
> +void vnc_display_add_client(DisplayState *ds, int csock, bool skipauth)
>  {
>      VncDisplay *vs = vnc_display;
> 
> -    vnc_connect(vs, csock, skipauth, 0);
> +    vnc_connect(vs, csock, skipauth, false);
>  }
> 
> 

Re: [Qemu-devel] [Qemu-trivial] [PATCH 1/5] vnc: pass bool pararmeter for vnc_connect

[Michael Tokarev]

11.06.2013 15:50, Michael Tokarev wrote:
> 11.06.2013 09:15, liguang wrote:
>> type last parameter of vnc_connect if bool,
>> so pass 'false' instead of '0' for it.
> 
> There's another parameter in here, `skipauth', which should be
> bool in vnc_connect(), and should be bool in vnc_display_add_client()
> too.
> 
> Also, there's no big point in splitting 1/5 and 2/5 (vnc_listen_read),
> I think.
> 
> Does something like the below look ok? (not even compile-tested)
> (and I'd really rename `skipauth' to `doauth' everywhere, to mean
> exactly the opposite so that we don't have double negatives, but
> it is too late already)

Hello.

Do you want/plan to respin the series, addressing comments?
Are you okay with my version?

Thanks!

/mjt

Re: [Qemu-devel] [Qemu-trivial] [PATCH 1/5] vnc: pass bool pararmeter for vnc_connect

[li guang]

在 2013-06-18二的 06:35 +0400，Michael Tokarev写道：
> 11.06.2013 15:50, Michael Tokarev wrote:
> > 11.06.2013 09:15, liguang wrote:
> >> type last parameter of vnc_connect if bool,
> >> so pass 'false' instead of '0' for it.
> > 
> > There's another parameter in here, `skipauth', which should be
> > bool in vnc_connect(), and should be bool in vnc_display_add_client()
> > too.
> > 
> > Also, there's no big point in splitting 1/5 and 2/5 (vnc_listen_read),
> > I think.
> > 
> > Does something like the below look ok? (not even compile-tested)
> > (and I'd really rename `skipauth' to `doauth' everywhere, to mean
> > exactly the opposite so that we don't have double negatives, but
> > it is too late already)
> 
> Hello.
> 
> Do you want/plan to respin the series, addressing comments?
> Are you okay with my version?
> 

Yes, I'm little busy now, but I'll re-spin as soon as possible.