mbox

[PULL,00/11] pflash patches for 2021-03-16

Message ID 20210315233527.2988483-1-philmd@redhat.com (mailing list archive)
State New, archived
Headers show

Pull-request

https://github.com/philmd/qemu.git tags/pflash-20210316

Message

Philippe Mathieu-Daudé March 15, 2021, 11:35 p.m. UTC 
The following changes since commit 2615a5e433aeb812c300d3a48e1a88e1303e2339:

  Merge remote-tracking branch 'remotes/stefanha-gitlab/tags/block-pull-request' into staging (2021-03-15 19:23:00 +0000)

are available in the Git repository at:

  https://github.com/philmd/qemu.git tags/pflash-20210316

for you to fetch changes up to 3b6a1da064ac6ce5256f1f6f16870ea79c2422d0:

  hw/block/pflash_cfi: Replace DPRINTF with trace events (2021-03-16 00:28:33 +0100)

----------------------------------------------------------------
Parallel NOR Flash patches queue

- Code movement to ease maintainability
- Tracing improvements
----------------------------------------------------------------

David Edmondson (2):
  hw/block/pflash_cfi01: Correct the type of PFlashCFI01.ro
  hw/block/pflash_cfi: Replace DPRINTF with trace events

Philippe Mathieu-Daudé (9):
  hw/block/pflash_cfi: Fix code style for checkpatch.pl
  hw/block/pflash_cfi01: Extract pflash_cfi01_fill_cfi_table()
  hw/block/pflash_cfi02: Extract pflash_cfi02_fill_cfi_table()
  hw/block/pflash_cfi02: Set rom_mode to true in pflash_setup_mappings()
  hw/block/pflash_cfi02: Open-code pflash_register_memory(rom=false)
  hw/block/pflash_cfi02: Rename register_memory(true) as mode_read_array
  hw/block/pflash_cfi02: Factor out pflash_reset_state_machine()
  hw/block/pflash_cfi02: Add DeviceReset method
  hw/block/pflash_cfi01: Clarify trace events

 hw/block/pflash_cfi01.c | 253 ++++++++++++++++----------------
 hw/block/pflash_cfi02.c | 316 ++++++++++++++++++++--------------------
 hw/block/trace-events   |  40 +++--
 3 files changed, 320 insertions(+), 289 deletions(-)

Comments

Peter Maydell March 17, 2021, 1:37 p.m. UTC | #1 
On Mon, 15 Mar 2021 at 23:37, Philippe Mathieu-Daudé <philmd@redhat.com> wrote:
>
> The following changes since commit 2615a5e433aeb812c300d3a48e1a88e1303e2339:
>
>   Merge remote-tracking branch 'remotes/stefanha-gitlab/tags/block-pull-request' into staging (2021-03-15 19:23:00 +0000)
>
> are available in the Git repository at:
>
>   https://github.com/philmd/qemu.git tags/pflash-20210316
>
> for you to fetch changes up to 3b6a1da064ac6ce5256f1f6f16870ea79c2422d0:
>
>   hw/block/pflash_cfi: Replace DPRINTF with trace events (2021-03-16 00:28:33 +0100)
>
> ----------------------------------------------------------------
> Parallel NOR Flash patches queue
>
> - Code movement to ease maintainability
> - Tracing improvements
> ----------------------------------------------------------------

Fails to build on 32-bit and OSX due to format string issues:

In file included from trace/trace-hw_block.c:5:
/Users/pm215/src/qemu-for-merges/hw/block/trace-events:36:38: error:
format specifies type 'unsigned long' but the argument has type
'uint64_t' (aka 'unsigned long long') [-Werror,-Wformat]
                     , name, offset, len);
                                     ^~~
/Users/pm215/src/qemu-for-merges/hw/block/trace-events:33:121: error:
format specifies type 'unsigned long' but the argument has type
'uint64_t' (aka 'unsigned long long') [-Werror,-Wformat]
            qemu_log("pflash_write_block_erase " "%s: block erase
offset:0x%" PRIx64 " bytes:0x%lx" "\n", name, offset, len);

                        ~~~                      ^~~

                        %llx


thanks
-- PMM
Philippe Mathieu-Daudé March 17, 2021, 2:22 p.m. UTC | #2 
On 3/17/21 2:37 PM, Peter Maydell wrote:
> On Mon, 15 Mar 2021 at 23:37, Philippe Mathieu-Daudé <philmd@redhat.com> wrote:
>>
>> The following changes since commit 2615a5e433aeb812c300d3a48e1a88e1303e2339:
>>
>>   Merge remote-tracking branch 'remotes/stefanha-gitlab/tags/block-pull-request' into staging (2021-03-15 19:23:00 +0000)
>>
>> are available in the Git repository at:
>>
>>   https://github.com/philmd/qemu.git tags/pflash-20210316
>>
>> for you to fetch changes up to 3b6a1da064ac6ce5256f1f6f16870ea79c2422d0:
>>
>>   hw/block/pflash_cfi: Replace DPRINTF with trace events (2021-03-16 00:28:33 +0100)
>>
>> ----------------------------------------------------------------
>> Parallel NOR Flash patches queue
>>
>> - Code movement to ease maintainability
>> - Tracing improvements
>> ----------------------------------------------------------------
> 
> Fails to build on 32-bit and OSX due to format string issues:
> 
> In file included from trace/trace-hw_block.c:5:
> /Users/pm215/src/qemu-for-merges/hw/block/trace-events:36:38: error:
> format specifies type 'unsigned long' but the argument has type
> 'uint64_t' (aka 'unsigned long long') [-Werror,-Wformat]
>                      , name, offset, len);
>                                      ^~~
> /Users/pm215/src/qemu-for-merges/hw/block/trace-events:33:121: error:
> format specifies type 'unsigned long' but the argument has type
> 'uint64_t' (aka 'unsigned long long') [-Werror,-Wformat]
>             qemu_log("pflash_write_block_erase " "%s: block erase
> offset:0x%" PRIx64 " bytes:0x%lx" "\n", name, offset, len);
> 
>                         ~~~                      ^~~
> 
>                         %llx

Oops. I lost access to Gitlab [*] so couldn't run the test suite.
I tried to run all of them manually but forgot the win32 cross
compilation job which usually show these problems.

[*] Which made me realize we put all your eggs in one basket.