[Qemu-devel] [PATCH 1/2] clean unnecessary code

[Qemu-devel] [PATCH 1/2] clean unnecessary code

[Trival]

Duplicates a string. If str is NULL it returns NULL, so
can make code simple.

Signed-off-by: Trival <trivial@linux.vnet.ibm.com>
---
 util/uri.c | 2 +-
 vl.c       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/util/uri.c b/util/uri.c
index 4238729..e348c17 100644
--- a/util/uri.c
+++ b/util/uri.c
@@ -2162,7 +2162,7 @@ query_params_append (struct QueryParams *ps,
     }
 
     ps->p[ps->n].name = g_strdup(name);
-    ps->p[ps->n].value = value ? g_strdup(value) : NULL;
+    ps->p[ps->n].value = g_strdup(value);
     ps->p[ps->n].ignore = 0;
     ps->n++;
 
diff --git a/vl.c b/vl.c
index 6e6225f..be0a93c 100644
--- a/vl.c
+++ b/vl.c
@@ -1215,7 +1215,7 @@ void add_boot_device_path(int32_t bootindex, DeviceState *dev,
 
     node = g_malloc0(sizeof(FWBootEntry));
     node->bootindex = bootindex;
-    node->suffix = suffix ? g_strdup(suffix) : NULL;
+    node->suffix = g_strdup(suffix);
     node->dev = dev;
 
     QTAILQ_FOREACH(i, &fw_boot_order, link) {
-- 
1.7.11.7

[Qemu-devel] [PATCH 2/2] remove needless semicolon

[Trival]

Signed-off-by: Trival <trivial@linux.vnet.ibm.com>
---
 block/nbd.c                 | 2 +-
 fsdev/virtfs-proxy-helper.c | 4 ++--
 hw/9pfs/virtio-9p-local.c   | 2 +-
 hw/i386/pc_q35.c            | 2 +-
 hw/intc/imx_avic.c          | 2 +-
 hw/usb/host-linux.c         | 4 ++--
 qga/channel-win32.c         | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/block/nbd.c b/block/nbd.c
index fab114b..30e3b78 100644
--- a/block/nbd.c
+++ b/block/nbd.c
@@ -609,7 +609,7 @@ static int nbd_co_discard(BlockDriverState *bs, int64_t sector_num,
         return 0;
     }
     request.type = NBD_CMD_TRIM;
-    request.from = sector_num * 512;;
+    request.from = sector_num * 512;
     request.len = nb_sectors * 512;
 
     nbd_coroutine_start(s, &request);
diff --git a/fsdev/virtfs-proxy-helper.c b/fsdev/virtfs-proxy-helper.c
index 36f6616..713a7b2 100644
--- a/fsdev/virtfs-proxy-helper.c
+++ b/fsdev/virtfs-proxy-helper.c
@@ -248,7 +248,7 @@ static int send_fd(int sockfd, int fd)
 static int send_status(int sockfd, struct iovec *iovec, int status)
 {
     ProxyHeader header;
-    int retval, msg_size;;
+    int retval, msg_size;
 
     if (status < 0) {
         header.type = T_ERROR;
@@ -381,7 +381,7 @@ static int send_response(int sock, struct iovec *iovec, int size)
     proxy_marshal(iovec, 0, "dd", header.type, header.size);
     retval = socket_write(sock, iovec->iov_base, header.size + PROXY_HDR_SZ);
     if (retval < 0) {
-        return retval;;
+        return retval;
     }
     return 0;
 }
diff --git a/hw/9pfs/virtio-9p-local.c b/hw/9pfs/virtio-9p-local.c
index be898ec..6ece6f7 100644
--- a/hw/9pfs/virtio-9p-local.c
+++ b/hw/9pfs/virtio-9p-local.c
@@ -878,7 +878,7 @@ static int local_remove(FsContext *ctx, const char *path)
          * Now remove the name from parent directory
          * .virtfs_metadata directory
          */
-        err = remove(local_mapped_attr_path(ctx, path, buffer));;
+        err = remove(local_mapped_attr_path(ctx, path, buffer));
         if (err < 0 && errno != ENOENT) {
             /*
              * We didn't had the .virtfs_metadata file. May be file created
diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
index 4160e2b..6825380 100644
--- a/hw/i386/pc_q35.c
+++ b/hw/i386/pc_q35.c
@@ -128,7 +128,7 @@ static void pc_q35_init(QEMUMachineInitArgs *args)
     q35_host->mch.ram_memory = ram_memory;
     q35_host->mch.pci_address_space = pci_memory;
     q35_host->mch.system_memory = get_system_memory();
-    q35_host->mch.address_space_io = get_system_io();;
+    q35_host->mch.address_space_io = get_system_io();
     q35_host->mch.below_4g_mem_size = below_4g_mem_size;
     q35_host->mch.above_4g_mem_size = above_4g_mem_size;
     /* pci */
diff --git a/hw/intc/imx_avic.c b/hw/intc/imx_avic.c
index 4e280b6..ff45dcd 100644
--- a/hw/intc/imx_avic.c
+++ b/hw/intc/imx_avic.c
@@ -370,7 +370,7 @@ static void imx_avic_reset(DeviceState *dev)
 
 static int imx_avic_init(SysBusDevice *dev)
 {
-    IMXAVICState *s = FROM_SYSBUS(IMXAVICState, dev);;
+    IMXAVICState *s = FROM_SYSBUS(IMXAVICState, dev);
 
     memory_region_init_io(&s->iomem, &imx_avic_ops, s, "imx_avic", 0x1000);
     sysbus_init_mmio(dev, &s->iomem);
diff --git a/hw/usb/host-linux.c b/hw/usb/host-linux.c
index 8994668..ca09a89 100644
--- a/hw/usb/host-linux.c
+++ b/hw/usb/host-linux.c
@@ -651,7 +651,7 @@ static void usb_host_handle_reset(USBDevice *dev)
 
     trace_usb_host_reset(s->bus_num, s->addr);
 
-    usb_host_do_reset(s);;
+    usb_host_do_reset(s);
 
     usb_host_claim_interfaces(s, 0);
     usb_linux_update_endp_table(s);
@@ -1429,7 +1429,7 @@ static void usb_host_exit_notifier(struct Notifier *n, void *data)
 
     usb_host_release_port(s);
     if (s->fd != -1) {
-        usb_host_do_reset(s);;
+        usb_host_do_reset(s);
     }
 }
 
diff --git a/qga/channel-win32.c b/qga/channel-win32.c
index 7ed98d7..8a303f3 100644
--- a/qga/channel-win32.c
+++ b/qga/channel-win32.c
@@ -268,7 +268,7 @@ static GIOStatus ga_channel_write(GAChannel *c, const char *buf, size_t size,
 
 GIOStatus ga_channel_write_all(GAChannel *c, const char *buf, size_t size)
 {
-    GIOStatus status = G_IO_STATUS_NORMAL;;
+    GIOStatus status = G_IO_STATUS_NORMAL;
     size_t count;
 
     while (size) {
-- 
1.7.11.7

Re: [Qemu-devel] [Qemu-trivial] [PATCH 1/2] clean unnecessary code

[Michael Tokarev]

08.05.2013 13:46, Trival wrote:
> Duplicates a string. If str is NULL it returns NULL, so
> can make code simple.

Thanks, applied to the trivial queue.  I renamed this patch:
"clean unnecessary code: don't check g_strdup arg for NULL"
to better describe what's going on.

/mjt

Re: [Qemu-devel] [Qemu-trivial] [PATCH 2/2] remove needless semicolon

[Michael Tokarev]

08.05.2013 13:46, Trival wrote:
> Signed-off-by: Trival <trivial@linux.vnet.ibm.com>
> ---
>  block/nbd.c                 | 2 +-
>  fsdev/virtfs-proxy-helper.c | 4 ++--
>  hw/9pfs/virtio-9p-local.c   | 2 +-
>  hw/i386/pc_q35.c            | 2 +-
>  hw/intc/imx_avic.c          | 2 +-
>  hw/usb/host-linux.c         | 4 ++--
>  qga/channel-win32.c         | 2 +-
>  7 files changed, 9 insertions(+), 9 deletions(-)

Applied to the trivial queue.  I renamed the patch to be
"remove double semicolons", to better describe what it does.

Thank you!

/mjt

Re: [Qemu-devel] [Qemu-trivial] [PATCH 2/2] remove needless semicolon

[Anthony Liguori]

Michael Tokarev <mjt@tls.msk.ru> writes:

> 08.05.2013 13:46, Trival wrote:
>> Signed-off-by: Trival <trivial@linux.vnet.ibm.com>

Something went wrong in sending this.  This is not a valid SoB.

Regards,

Anthony Liguori

>> ---
>>  block/nbd.c                 | 2 +-
>>  fsdev/virtfs-proxy-helper.c | 4 ++--
>>  hw/9pfs/virtio-9p-local.c   | 2 +-
>>  hw/i386/pc_q35.c            | 2 +-
>>  hw/intc/imx_avic.c          | 2 +-
>>  hw/usb/host-linux.c         | 4 ++--
>>  qga/channel-win32.c         | 2 +-
>>  7 files changed, 9 insertions(+), 9 deletions(-)
>
> Applied to the trivial queue.  I renamed the patch to be
> "remove double semicolons", to better describe what it does.
>
> Thank you!
>
> /mjt

Re: [Qemu-devel] [Qemu-trivial] [PATCH 2/2] remove needless semicolon

[Michael Tokarev]

08.05.2013 17:25, Anthony Liguori wrote:
> Michael Tokarev <mjt@tls.msk.ru> writes:
> 
>> 08.05.2013 13:46, Trival wrote:
>>> Signed-off-by: Trival <trivial@linux.vnet.ibm.com>
> 
> Something went wrong in sending this.  This is not a valid SoB.

So, do we not accept it?  Should I revert it in the
trivial-patches-next ?

Thanks,

/mjt

Re: [Qemu-devel] [Qemu-trivial] [PATCH 2/2] remove needless semicolon

[Hu Tao]

On Thu, May 09, 2013 at 10:23:09AM +0400, Michael Tokarev wrote:
> 08.05.2013 17:25, Anthony Liguori wrote:
> > Michael Tokarev <mjt@tls.msk.ru> writes:
> > 
> >> 08.05.2013 13:46, Trival wrote:
> >>> Signed-off-by: Trival <trivial@linux.vnet.ibm.com>

I think wdongxu probably wants HIS name and email go here. wdongxu, can
you resend your patches with:

  Signed-off-by: <your real name> <wdongxu@linux.vnet.ibm.com>

?

> > 
> > Something went wrong in sending this.  This is not a valid SoB.
> 
> So, do we not accept it?  Should I revert it in the
> trivial-patches-next ?
> 
> Thanks,
> 
> /mjt

Re: [Qemu-devel] [Qemu-trivial] [PATCH 2/2] remove needless semicolon

[Peter Maydell]

On 9 May 2013 08:08, Hu Tao <hutao@cn.fujitsu.com> wrote:
> On Thu, May 09, 2013 at 10:23:09AM +0400, Michael Tokarev wrote:
>> 08.05.2013 17:25, Anthony Liguori wrote:
>> > Michael Tokarev <mjt@tls.msk.ru> writes:
>> >
>> >> 08.05.2013 13:46, Trival wrote:
>> >>> Signed-off-by: Trival <trivial@linux.vnet.ibm.com>
>
> I think wdongxu probably wants HIS name and email go here. wdongxu, can
> you resend your patches with:
>
>   Signed-off-by: <your real name> <wdongxu@linux.vnet.ibm.com>
>
> ?

You should make sure you fix the From: line as well
as the Signed-off-by:, please.

thanks
-- PMM

Re: [Qemu-devel] [Qemu-trivial] [PATCH 2/2] remove needless semicolon

[Dong Xu Wang]

On 2013/5/9 15:08, Hu Tao wrote:
> On Thu, May 09, 2013 at 10:23:09AM +0400, Michael Tokarev wrote:
>> 08.05.2013 17:25, Anthony Liguori wrote:
>>> Michael Tokarev <mjt@tls.msk.ru> writes:
>>>
>>>> 08.05.2013 13:46, Trival wrote:
>>>>> Signed-off-by: Trival <trivial@linux.vnet.ibm.com>
>
> I think wdongxu probably wants HIS name and email go here. wdongxu, can
> you resend your patches with:
>
Sorry for the inconvenience, will re-send the patches.
>    Signed-off-by: <your real name> <wdongxu@linux.vnet.ibm.com>
>
> ?
>
>>>
>>> Something went wrong in sending this.  This is not a valid SoB.
>>
>> So, do we not accept it?  Should I revert it in the
>> trivial-patches-next ?
>>
>> Thanks,
>>
>> /mjt
>
>

Re: [Qemu-devel] [Qemu-trivial] [PATCH 2/2] remove needless semicolon

[Andreas Färber]

Am 09.05.2013 08:23, schrieb Michael Tokarev:
> 08.05.2013 17:25, Anthony Liguori wrote:
>> Michael Tokarev <mjt@tls.msk.ru> writes:
>>
>>> 08.05.2013 13:46, Trival wrote:
>>>> Signed-off-by: Trival <trivial@linux.vnet.ibm.com>
>>
>> Something went wrong in sending this.  This is not a valid SoB.
> 
> So, do we not accept it?

No, we don't. See SubmitAPatch.

>  Should I revert it in the
> trivial-patches-next ?

Yes, please drop it from your queue until you get a replacement (or
instructions from the author how to fix it up).

Cheers,
Andreas

-- 
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 2/2] remove needless semicolon

[Anthony Liguori]

Andreas Färber <afaerber@suse.de> writes:

> Am 09.05.2013 08:23, schrieb Michael Tokarev:
>> 08.05.2013 17:25, Anthony Liguori wrote:
>>> Michael Tokarev <mjt@tls.msk.ru> writes:
>>>
>>>> 08.05.2013 13:46, Trival wrote:
>>>>> Signed-off-by: Trival <trivial@linux.vnet.ibm.com>
>>>
>>> Something went wrong in sending this.  This is not a valid SoB.
>> 
>> So, do we not accept it?
>
> No, we don't. See SubmitAPatch.

What constitutes a legally valid name is quite complex and demands on
the country of origin.  I don't challenge SoBs unless I know with
certainity that they are not legally valid.

In this case, Dong Xu is a colleague of mine and I clearly recognize
that it was a mistake.

That doesn't mean I expect submaintainers to challenge SoBs on a regular
basis.  Assume it's valid unless you have a reason not to.

Regards,

Anthony Liguori

>
>>  Should I revert it in the
>> trivial-patches-next ?
>
> Yes, please drop it from your queue until you get a replacement (or
> instructions from the author how to fix it up).
>
> Cheers,
> Andreas
>
> -- 
> SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
> GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg