[PULL for-4.2-rc2 0/2] Tracing patches

[PULL for-4.2-rc2 0/2] Tracing patches

[Stefan Hajnoczi]

The following changes since commit f086f22d6c068ba151b0f6e81e75a64f130df712:

  Merge remote-tracking branch 'remotes/awilliam/tags/vfio-fixes-20191118.0' into staging (2019-11-18 21:35:48 +0000)

are available in the Git repository at:

  https://github.com/stefanha/qemu.git tags/tracing-pull-request

for you to fetch changes up to 6b904f1a528a6d8c21f7fbdeab13b9603d1b6df7:

  hw/mips/gt64xxx: Remove dynamic field width from trace events (2019-11-19 16:17:05 +0000)

----------------------------------------------------------------
Pull request

Tracing fixes for MIPS.

----------------------------------------------------------------

Philippe Mathieu-Daudé (2):
  hw/block/pflash: Remove dynamic field width from trace events
  hw/mips/gt64xxx: Remove dynamic field width from trace events

 hw/block/pflash_cfi01.c |  8 ++++----
 hw/block/pflash_cfi02.c |  8 ++++----
 hw/block/trace-events   |  8 ++++----
 hw/mips/gt64xxx_pci.c   | 16 ++++++++--------
 hw/mips/trace-events    |  4 ++--
 5 files changed, 22 insertions(+), 22 deletions(-)

-- 
2.23.0

[PULL for-4.2-rc2 1/2] hw/block/pflash: Remove dynamic field width from trace events

[Stefan Hajnoczi]

From: Philippe Mathieu-Daudé <philmd@redhat.com>

Since not all trace backends support dynamic field width in
format (dtrace via stap does not), replace by a static field
width instead.

We previously passed to the trace API 'width << 1' as the number
of hex characters to display (the dynamic field width). We don't
need this anymore. Instead, display the size of bytes accessed.

Fixes: e8aa2d95ea (pflash: Simplify trace_pflash_io_read/write)
Fixes: c1474acd5d (pflash: Simplify trace_pflash_data_read/write)
Reported-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-id: 20191118222746.31467-2-philmd@redhat.com
Buglink: https://bugs.launchpad.net/qemu/+bug/1844817
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20191118222746.31467-2-philmd@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 hw/block/pflash_cfi01.c | 8 ++++----
 hw/block/pflash_cfi02.c | 8 ++++----
 hw/block/trace-events   | 8 ++++----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/hw/block/pflash_cfi01.c b/hw/block/pflash_cfi01.c
index 566c0acb77..54e6ebd385 100644
--- a/hw/block/pflash_cfi01.c
+++ b/hw/block/pflash_cfi01.c
@@ -276,7 +276,7 @@ static uint32_t pflash_data_read(PFlashCFI01 *pfl, hwaddr offset,
         DPRINTF("BUG in %s\n", __func__);
         abort();
     }
-    trace_pflash_data_read(offset, width << 1, ret);
+    trace_pflash_data_read(offset, width, ret);
     return ret;
 }
 
@@ -389,7 +389,7 @@ static uint32_t pflash_read(PFlashCFI01 *pfl, hwaddr offset,
 
         break;
     }
-    trace_pflash_io_read(offset, width, width << 1, ret, pfl->cmd, pfl->wcycle);
+    trace_pflash_io_read(offset, width, ret, pfl->cmd, pfl->wcycle);
 
     return ret;
 }
@@ -414,7 +414,7 @@ static inline void pflash_data_write(PFlashCFI01 *pfl, hwaddr offset,
 {
     uint8_t *p = pfl->storage;
 
-    trace_pflash_data_write(offset, width << 1, value, pfl->counter);
+    trace_pflash_data_write(offset, width, value, pfl->counter);
     switch (width) {
     case 1:
         p[offset] = value;
@@ -453,7 +453,7 @@ static void pflash_write(PFlashCFI01 *pfl, hwaddr offset,
 
     cmd = value;
 
-    trace_pflash_io_write(offset, width, width << 1, value, pfl->wcycle);
+    trace_pflash_io_write(offset, width, value, pfl->wcycle);
     if (!pfl->wcycle) {
         /* Set the device in I/O access mode */
         memory_region_rom_device_set_romd(&pfl->mem, false);
diff --git a/hw/block/pflash_cfi02.c b/hw/block/pflash_cfi02.c
index 4baca701b7..c7d92c3e79 100644
--- a/hw/block/pflash_cfi02.c
+++ b/hw/block/pflash_cfi02.c
@@ -260,7 +260,7 @@ static uint64_t pflash_data_read(PFlashCFI02 *pfl, hwaddr offset,
 {
     uint8_t *p = (uint8_t *)pfl->storage + offset;
     uint64_t ret = pfl->be ? ldn_be_p(p, width) : ldn_le_p(p, width);
-    trace_pflash_data_read(offset, width << 1, ret);
+    trace_pflash_data_read(offset, width, ret);
     return ret;
 }
 
@@ -385,7 +385,7 @@ static uint64_t pflash_read(void *opaque, hwaddr offset, unsigned int width)
         }
         break;
     }
-    trace_pflash_io_read(offset, width, width << 1, ret, pfl->cmd, pfl->wcycle);
+    trace_pflash_io_read(offset, width, ret, pfl->cmd, pfl->wcycle);
 
     return ret;
 }
@@ -432,7 +432,7 @@ static void pflash_write(void *opaque, hwaddr offset, uint64_t value,
     uint8_t *p;
     uint8_t cmd;
 
-    trace_pflash_io_write(offset, width, width << 1, value, pfl->wcycle);
+    trace_pflash_io_write(offset, width, value, pfl->wcycle);
     cmd = value;
     if (pfl->cmd != 0xA0) {
         /* Reset does nothing during chip erase and sector erase. */
@@ -542,7 +542,7 @@ static void pflash_write(void *opaque, hwaddr offset, uint64_t value,
                 }
                 goto reset_flash;
             }
-            trace_pflash_data_write(offset, width << 1, value, 0);
+            trace_pflash_data_write(offset, width, value, 0);
             if (!pfl->ro) {
                 p = (uint8_t *)pfl->storage + offset;
                 if (pfl->be) {
diff --git a/hw/block/trace-events b/hw/block/trace-events
index 13d1b21dd4..c03e80c2c9 100644
--- a/hw/block/trace-events
+++ b/hw/block/trace-events
@@ -8,10 +8,10 @@ fdc_ioport_write(uint8_t reg, uint8_t value) "write reg 0x%02x val 0x%02x"
 # pflash_cfi01.c
 pflash_reset(void) "reset"
 pflash_timer_expired(uint8_t cmd) "command 0x%02x done"
-pflash_io_read(uint64_t offset, int width, int fmt_width, uint32_t value, uint8_t cmd, uint8_t wcycle) "offset:0x%04"PRIx64" width:%d value:0x%0*x cmd:0x%02x wcycle:%u"
-pflash_io_write(uint64_t offset, int width, int fmt_width, uint32_t value, uint8_t wcycle) "offset:0x%04"PRIx64" width:%d value:0x%0*x wcycle:%u"
-pflash_data_read(uint64_t offset, int width, uint32_t value) "data offset:0x%04"PRIx64" value:0x%0*x"
-pflash_data_write(uint64_t offset, int width, uint32_t value, uint64_t counter) "data offset:0x%04"PRIx64" value:0x%0*x counter:0x%016"PRIx64
+pflash_io_read(uint64_t offset, unsigned size, uint32_t value, uint8_t cmd, uint8_t wcycle) "offset:0x%04"PRIx64" size:%u value:0x%04x cmd:0x%02x wcycle:%u"
+pflash_io_write(uint64_t offset, unsigned size, uint32_t value, uint8_t wcycle) "offset:0x%04"PRIx64" size:%u value:0x%04x wcycle:%u"
+pflash_data_read(uint64_t offset, unsigned size, uint32_t value) "data offset:0x%04"PRIx64" size:%u value:0x%04x"
+pflash_data_write(uint64_t offset, unsigned size, uint32_t value, uint64_t counter) "data offset:0x%04"PRIx64" size:%u value:0x%04x counter:0x%016"PRIx64
 pflash_manufacturer_id(uint16_t id) "Read Manufacturer ID: 0x%04x"
 pflash_device_id(uint16_t id) "Read Device ID: 0x%04x"
 pflash_device_info(uint64_t offset) "Read Device Information offset:0x%04"PRIx64
-- 
2.23.0

[PULL for-4.2-rc2 2/2] hw/mips/gt64xxx: Remove dynamic field width from trace events

[Stefan Hajnoczi]

From: Philippe Mathieu-Daudé <philmd@redhat.com>

Since not all trace backends support dynamic field width in
format (dtrace via stap does not), replace by a static field
width instead.

We previously passed to the trace API 'width << 1' as the number
of hex characters to display (the dynamic field width). We don't
need this anymore. Instead, display the size of bytes accessed.

Fixes: ab6bff424f (gt64xxx_pci: Convert debug printf to trace events)
Reported-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-id: 20191118222746.31467-3-philmd@redhat.com
Buglink: https://bugs.launchpad.net/qemu/+bug/1844817
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20191118222746.31467-3-philmd@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 hw/mips/gt64xxx_pci.c | 16 ++++++++--------
 hw/mips/trace-events  |  4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/hw/mips/gt64xxx_pci.c b/hw/mips/gt64xxx_pci.c
index 5cab9c1ee1..f1af840d8e 100644
--- a/hw/mips/gt64xxx_pci.c
+++ b/hw/mips/gt64xxx_pci.c
@@ -642,19 +642,19 @@ static void gt64120_writel(void *opaque, hwaddr addr,
         /* not really implemented */
         s->regs[saddr] = ~(~(s->regs[saddr]) | ~(val & 0xfffffffe));
         s->regs[saddr] |= !!(s->regs[saddr] & 0xfffffffe);
-        trace_gt64120_write("INTRCAUSE", size << 1, val);
+        trace_gt64120_write("INTRCAUSE", size, val);
         break;
     case GT_INTRMASK:
         s->regs[saddr] = val & 0x3c3ffffe;
-        trace_gt64120_write("INTRMASK", size << 1, val);
+        trace_gt64120_write("INTRMASK", size, val);
         break;
     case GT_PCI0_ICMASK:
         s->regs[saddr] = val & 0x03fffffe;
-        trace_gt64120_write("ICMASK", size << 1, val);
+        trace_gt64120_write("ICMASK", size, val);
         break;
     case GT_PCI0_SERR0MASK:
         s->regs[saddr] = val & 0x0000003f;
-        trace_gt64120_write("SERR0MASK", size << 1, val);
+        trace_gt64120_write("SERR0MASK", size, val);
         break;
 
     /* Reserved when only PCI_0 is configured. */
@@ -930,19 +930,19 @@ static uint64_t gt64120_readl(void *opaque,
     /* Interrupts */
     case GT_INTRCAUSE:
         val = s->regs[saddr];
-        trace_gt64120_read("INTRCAUSE", size << 1, val);
+        trace_gt64120_read("INTRCAUSE", size, val);
         break;
     case GT_INTRMASK:
         val = s->regs[saddr];
-        trace_gt64120_read("INTRMASK", size << 1, val);
+        trace_gt64120_read("INTRMASK", size, val);
         break;
     case GT_PCI0_ICMASK:
         val = s->regs[saddr];
-        trace_gt64120_read("ICMASK", size << 1, val);
+        trace_gt64120_read("ICMASK", size, val);
         break;
     case GT_PCI0_SERR0MASK:
         val = s->regs[saddr];
-        trace_gt64120_read("SERR0MASK", size << 1, val);
+        trace_gt64120_read("SERR0MASK", size, val);
         break;
 
     /* Reserved when only PCI_0 is configured. */
diff --git a/hw/mips/trace-events b/hw/mips/trace-events
index 75d4c73f2e..321933283f 100644
--- a/hw/mips/trace-events
+++ b/hw/mips/trace-events
@@ -1,4 +1,4 @@
 # gt64xxx.c
-gt64120_read(const char *regname, int width, uint64_t value) "gt64120 read %s value:0x%0*" PRIx64
-gt64120_write(const char *regname, int width, uint64_t value) "gt64120 write %s value:0x%0*" PRIx64
+gt64120_read(const char *regname, unsigned size, uint64_t value) "gt64120 read %s size:%u value:0x%08" PRIx64
+gt64120_write(const char *regname, unsigned size, uint64_t value) "gt64120 write %s size:%u value:0x%08" PRIx64
 gt64120_isd_remap(uint64_t from_length, uint64_t from_addr, uint64_t to_length, uint64_t to_addr) "ISD: 0x%08" PRIx64 "@0x%08" PRIx64 " -> 0x%08" PRIx64 "@0x%08" PRIx64
-- 
2.23.0

Re: [PULL for-4.2-rc2 0/2] Tracing patches

[Aleksandar Markovic]

On Tue, Nov 19, 2019 at 9:46 PM Stefan Hajnoczi <stefanha@redhat.com> wrote:
>
> The following changes since commit f086f22d6c068ba151b0f6e81e75a64f130df712:
>
>   Merge remote-tracking branch 'remotes/awilliam/tags/vfio-fixes-20191118.0' into staging (2019-11-18 21:35:48 +0000)
>
> are available in the Git repository at:
>
>   https://github.com/stefanha/qemu.git tags/tracing-pull-request
>
> for you to fetch changes up to 6b904f1a528a6d8c21f7fbdeab13b9603d1b6df7:
>
>   hw/mips/gt64xxx: Remove dynamic field width from trace events (2019-11-19 16:17:05 +0000)
>
> ----------------------------------------------------------------
> Pull request
>
> Tracing fixes for MIPS.
>
> ----------------------------------------------------------------
>

Hello, Stefan, Philippe, Peter.

This appears to be a duplicate of the pull request sent today by Philippe
(and already applied by Peter just hours ago):

https://lists.gnu.org/archive/html/qemu-devel/2019-11/msg02894.html

The patches from the two pull requests appear to be identical, except
some minor details in commit messages: Stefan's versions contain
"Message-Id:" identifiers, while Philippe's don't (my suggestion to
Philippe is to include "Message-Id:" for all patches that are part of any
pull request in future; this can be achieved effortlessly/automatically
by applying patches using patchwork).

In summary, for this very situation, it looks to me we are all set, no need
for Peter to process this pull request.

Regards,
Aleksandar

> Philippe Mathieu-Daudé (2):
>   hw/block/pflash: Remove dynamic field width from trace events
>   hw/mips/gt64xxx: Remove dynamic field width from trace events
>
>  hw/block/pflash_cfi01.c |  8 ++++----
>  hw/block/pflash_cfi02.c |  8 ++++----
>  hw/block/trace-events   |  8 ++++----
>  hw/mips/gt64xxx_pci.c   | 16 ++++++++--------
>  hw/mips/trace-events    |  4 ++--
>  5 files changed, 22 insertions(+), 22 deletions(-)
>
> --
> 2.23.0
>
>

Re: [PULL for-4.2-rc2 0/2] Tracing patches

[Aleksandar Markovic]

On Tue, Nov 19, 2019 at 10:14 PM Aleksandar Markovic
<aleksandar.m.mail@gmail.com> wrote:
>
> On Tue, Nov 19, 2019 at 9:46 PM Stefan Hajnoczi <stefanha@redhat.com> wrote:
> >
> > The following changes since commit f086f22d6c068ba151b0f6e81e75a64f130df712:
> >
> >   Merge remote-tracking branch 'remotes/awilliam/tags/vfio-fixes-20191118.0' into staging (2019-11-18 21:35:48 +0000)
> >
> > are available in the Git repository at:
> >
> >   https://github.com/stefanha/qemu.git tags/tracing-pull-request
> >
> > for you to fetch changes up to 6b904f1a528a6d8c21f7fbdeab13b9603d1b6df7:
> >
> >   hw/mips/gt64xxx: Remove dynamic field width from trace events (2019-11-19 16:17:05 +0000)
> >
> > ----------------------------------------------------------------
> > Pull request
> >
> > Tracing fixes for MIPS.
> >
> > ----------------------------------------------------------------
> >
>
> Hello, Stefan, Philippe, Peter.
>
> This appears to be a duplicate of the pull request sent today by Philippe
> (and already applied by Peter just hours ago):
>
> https://lists.gnu.org/archive/html/qemu-devel/2019-11/msg02894.html
>
> The patches from the two pull requests appear to be identical, except
> some minor details in commit messages: Stefan's versions contain
> "Message-Id:" identifiers, while Philippe's don't (my suggestion to
> Philippe is to include "Message-Id:" for all patches that are part of any
> pull request in future; this can be achieved effortlessly/automatically
> by applying patches using patchwork).
>
> In summary, for this very situation, it looks to me we are all set, no need
> for Peter to process this pull request.
>

And just another really friendly advice for Philippe: When you apply
some patches or a series to your pull request, just inform others
about that by replying to the patches or a series: "I applied XXX to
my queue/pull request" - this helps avoiding duplicate efforts like
it happened here. This is also reminder to me too, I didn't do it in
all cases of my applying to my my pull requests, and I should have,
but I will improve too.

Thanks for these fixes!

Aleksandar

> Regards,
> Aleksandar
>
> > Philippe Mathieu-Daudé (2):
> >   hw/block/pflash: Remove dynamic field width from trace events
> >   hw/mips/gt64xxx: Remove dynamic field width from trace events
> >
> >  hw/block/pflash_cfi01.c |  8 ++++----
> >  hw/block/pflash_cfi02.c |  8 ++++----
> >  hw/block/trace-events   |  8 ++++----
> >  hw/mips/gt64xxx_pci.c   | 16 ++++++++--------
> >  hw/mips/trace-events    |  4 ++--
> >  5 files changed, 22 insertions(+), 22 deletions(-)
> >
> > --
> > 2.23.0
> >
> >

Re: [PULL for-4.2-rc2 0/2] Tracing patches

[no-reply]

Patchew URL: https://patchew.org/QEMU/20191119204551.240792-1-stefanha@redhat.com/



Hi,

This series seems to have some coding style problems. See output below for
more information:

Subject: [PULL for-4.2-rc2 0/2] Tracing patches
Type: series
Message-id: 20191119204551.240792-1-stefanha@redhat.com

=== TEST SCRIPT BEGIN ===
#!/bin/bash
git rev-parse base > /dev/null || exit 0
git config --local diff.renamelimit 0
git config --local diff.renames True
git config --local diff.algorithm histogram
./scripts/checkpatch.pl --mailback base..
=== TEST SCRIPT END ===

Switched to a new branch 'test'

=== OUTPUT BEGIN ===
checkpatch.pl: no revisions returned for revlist '1'
=== OUTPUT END ===

Test command exited with code: 255


The full log is available at
http://patchew.org/logs/20191119204551.240792-1-stefanha@redhat.com/testing.checkpatch/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to patchew-devel@redhat.com

Re: [PULL for-4.2-rc2 0/2] Tracing patches

[Philippe Mathieu-Daudé]

On 11/19/19 10:14 PM, Aleksandar Markovic wrote:
> On Tue, Nov 19, 2019 at 9:46 PM Stefan Hajnoczi <stefanha@redhat.com> wrote:
>>
>> The following changes since commit f086f22d6c068ba151b0f6e81e75a64f130df712:
>>
>>    Merge remote-tracking branch 'remotes/awilliam/tags/vfio-fixes-20191118.0' into staging (2019-11-18 21:35:48 +0000)
>>
>> are available in the Git repository at:
>>
>>    https://github.com/stefanha/qemu.git tags/tracing-pull-request
>>
>> for you to fetch changes up to 6b904f1a528a6d8c21f7fbdeab13b9603d1b6df7:
>>
>>    hw/mips/gt64xxx: Remove dynamic field width from trace events (2019-11-19 16:17:05 +0000)
>>
>> ----------------------------------------------------------------
>> Pull request
>>
>> Tracing fixes for MIPS.
>>
>> ----------------------------------------------------------------
>>
> 
> Hello, Stefan, Philippe, Peter.
> 
> This appears to be a duplicate of the pull request sent today by Philippe
> (and already applied by Peter just hours ago):
> 
> https://lists.gnu.org/archive/html/qemu-devel/2019-11/msg02894.html
> 
> The patches from the two pull requests appear to be identical, except
> some minor details in commit messages: Stefan's versions contain
> "Message-Id:" identifiers, while Philippe's don't (my suggestion to
> Philippe is to include "Message-Id:" for all patches that are part of any
> pull request in future; this can be achieved effortlessly/automatically
> by applying patches using patchwork).

Yes you are right. I usually use 'pwclient git-am' to apply patches from 
the mailing list, which automatically amend the proper Message-Id tag.
I totally forgot to use it with here. I'll see how to not miss them in 
the future.

> In summary, for this very situation, it looks to me we are all set, no need
> for Peter to process this pull request.
> 
> Regards,
> Aleksandar
> 
>> Philippe Mathieu-Daudé (2):
>>    hw/block/pflash: Remove dynamic field width from trace events
>>    hw/mips/gt64xxx: Remove dynamic field width from trace events
>>
>>   hw/block/pflash_cfi01.c |  8 ++++----
>>   hw/block/pflash_cfi02.c |  8 ++++----
>>   hw/block/trace-events   |  8 ++++----
>>   hw/mips/gt64xxx_pci.c   | 16 ++++++++--------
>>   hw/mips/trace-events    |  4 ++--
>>   5 files changed, 22 insertions(+), 22 deletions(-)
>>
>> --
>> 2.23.0
>>
>>
> 

Re: [PULL for-4.2-rc2 0/2] Tracing patches

[Philippe Mathieu-Daudé]

On 11/19/19 10:35 PM, Aleksandar Markovic wrote:
> On Tue, Nov 19, 2019 at 10:14 PM Aleksandar Markovic
> <aleksandar.m.mail@gmail.com> wrote:
>>
>> On Tue, Nov 19, 2019 at 9:46 PM Stefan Hajnoczi <stefanha@redhat.com> wrote:
>>>
>>> The following changes since commit f086f22d6c068ba151b0f6e81e75a64f130df712:
>>>
>>>    Merge remote-tracking branch 'remotes/awilliam/tags/vfio-fixes-20191118.0' into staging (2019-11-18 21:35:48 +0000)
>>>
>>> are available in the Git repository at:
>>>
>>>    https://github.com/stefanha/qemu.git tags/tracing-pull-request
>>>
>>> for you to fetch changes up to 6b904f1a528a6d8c21f7fbdeab13b9603d1b6df7:
>>>
>>>    hw/mips/gt64xxx: Remove dynamic field width from trace events (2019-11-19 16:17:05 +0000)
>>>
>>> ----------------------------------------------------------------
>>> Pull request
>>>
>>> Tracing fixes for MIPS.
>>>
>>> ----------------------------------------------------------------
>>>
>>
>> Hello, Stefan, Philippe, Peter.
>>
>> This appears to be a duplicate of the pull request sent today by Philippe
>> (and already applied by Peter just hours ago):
>>
>> https://lists.gnu.org/archive/html/qemu-devel/2019-11/msg02894.html
>>
>> The patches from the two pull requests appear to be identical, except
>> some minor details in commit messages: Stefan's versions contain
>> "Message-Id:" identifiers, while Philippe's don't (my suggestion to
>> Philippe is to include "Message-Id:" for all patches that are part of any
>> pull request in future; this can be achieved effortlessly/automatically
>> by applying patches using patchwork).
>>
>> In summary, for this very situation, it looks to me we are all set, no need
>> for Peter to process this pull request.
>>
> 
> And just another really friendly advice for Philippe: When you apply
> some patches or a series to your pull request, just inform others
> about that by replying to the patches or a series: "I applied XXX to
> my queue/pull request" - this helps avoiding duplicate efforts like
> it happened here. This is also reminder to me too, I didn't do it in
> all cases of my applying to my my pull requests, and I should have,
> but I will improve too.

You are totally correct, in a rush to get these patches merged before 
the release candidate get tagged, I neglected to reply to my series and 
let Stefan waste his time.

Stefan, I sincerely apologize and will make efforts so this won't happen 
again.

> 
> Thanks for these fixes!
> 
> Aleksandar
> 
>> Regards,
>> Aleksandar
>>
>>> Philippe Mathieu-Daudé (2):
>>>    hw/block/pflash: Remove dynamic field width from trace events
>>>    hw/mips/gt64xxx: Remove dynamic field width from trace events
>>>
>>>   hw/block/pflash_cfi01.c |  8 ++++----
>>>   hw/block/pflash_cfi02.c |  8 ++++----
>>>   hw/block/trace-events   |  8 ++++----
>>>   hw/mips/gt64xxx_pci.c   | 16 ++++++++--------
>>>   hw/mips/trace-events    |  4 ++--
>>>   5 files changed, 22 insertions(+), 22 deletions(-)
>>>
>>> --
>>> 2.23.0
>>>
>>>
> 

Re: [PULL for-4.2-rc2 0/2] Tracing patches

[Stefan Hajnoczi]

[-- Attachment #1: Type: text/plain, Size: 2825 bytes --]

On Wed, Nov 20, 2019 at 10:33:35AM +0100, Philippe Mathieu-Daudé wrote:
> On 11/19/19 10:35 PM, Aleksandar Markovic wrote:
> > On Tue, Nov 19, 2019 at 10:14 PM Aleksandar Markovic
> > <aleksandar.m.mail@gmail.com> wrote:
> > > 
> > > On Tue, Nov 19, 2019 at 9:46 PM Stefan Hajnoczi <stefanha@redhat.com> wrote:
> > > > 
> > > > The following changes since commit f086f22d6c068ba151b0f6e81e75a64f130df712:
> > > > 
> > > >    Merge remote-tracking branch 'remotes/awilliam/tags/vfio-fixes-20191118.0' into staging (2019-11-18 21:35:48 +0000)
> > > > 
> > > > are available in the Git repository at:
> > > > 
> > > >    https://github.com/stefanha/qemu.git tags/tracing-pull-request
> > > > 
> > > > for you to fetch changes up to 6b904f1a528a6d8c21f7fbdeab13b9603d1b6df7:
> > > > 
> > > >    hw/mips/gt64xxx: Remove dynamic field width from trace events (2019-11-19 16:17:05 +0000)
> > > > 
> > > > ----------------------------------------------------------------
> > > > Pull request
> > > > 
> > > > Tracing fixes for MIPS.
> > > > 
> > > > ----------------------------------------------------------------
> > > > 
> > > 
> > > Hello, Stefan, Philippe, Peter.
> > > 
> > > This appears to be a duplicate of the pull request sent today by Philippe
> > > (and already applied by Peter just hours ago):
> > > 
> > > https://lists.gnu.org/archive/html/qemu-devel/2019-11/msg02894.html
> > > 
> > > The patches from the two pull requests appear to be identical, except
> > > some minor details in commit messages: Stefan's versions contain
> > > "Message-Id:" identifiers, while Philippe's don't (my suggestion to
> > > Philippe is to include "Message-Id:" for all patches that are part of any
> > > pull request in future; this can be achieved effortlessly/automatically
> > > by applying patches using patchwork).
> > > 
> > > In summary, for this very situation, it looks to me we are all set, no need
> > > for Peter to process this pull request.
> > > 
> > 
> > And just another really friendly advice for Philippe: When you apply
> > some patches or a series to your pull request, just inform others
> > about that by replying to the patches or a series: "I applied XXX to
> > my queue/pull request" - this helps avoiding duplicate efforts like
> > it happened here. This is also reminder to me too, I didn't do it in
> > all cases of my applying to my my pull requests, and I should have,
> > but I will improve too.
> 
> You are totally correct, in a rush to get these patches merged before the
> release candidate get tagged, I neglected to reply to my series and let
> Stefan waste his time.
> 
> Stefan, I sincerely apologize and will make efforts so this won't happen
> again.

No problem, I just wanted to make sure we don't miss these patches.

Stefan

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]