[Qemu-commits] [qemu/qemu] 1f80b0: hw/nvram/fw

qemu-commits
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-commits] [qemu/qemu] 1f80b0: hw/nvram/fw_cfg: Add trace events

From:	Peter Maydell
Subject:	[Qemu-commits] [qemu/qemu] 1f80b0: hw/nvram/fw_cfg: Add trace events
Date:	Thu, 23 May 2019 08:46:40 -0700
  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 1f80b0d67e86f0180c72e9e943046d79a63c83f6
      
https://github.com/qemu/qemu/commit/1f80b0d67e86f0180c72e9e943046d79a63c83f6
  Author: Philippe Mathieu-Daudé <address@hidden>
  Date:   2019-05-23 (Thu, 23 May 2019)

  Changed paths:
    M hw/nvram/fw_cfg.c
    M hw/nvram/trace-events

  Log Message:
  -----------
  hw/nvram/fw_cfg: Add trace events

Add trace events to dump the key content.

Reviewed-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Laszlo Ersek <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>


  Commit: b15c0f7d55934c609969f4e6e08efa5ed0f3ad28
      
https://github.com/qemu/qemu/commit/b15c0f7d55934c609969f4e6e08efa5ed0f3ad28
  Author: Philippe Mathieu-Daudé <address@hidden>
  Date:   2019-05-23 (Thu, 23 May 2019)

  Changed paths:
    M MAINTAINERS
    M hw/nvram/fw_cfg.c
    M include/hw/nvram/fw_cfg.h
    M stubs/Makefile.objs
    A stubs/fw_cfg.c

  Log Message:
  -----------
  hw/nvram/fw_cfg: Add fw_cfg_arch_key_name()

Add fw_cfg_arch_key_name() which returns the name of
an architecture-specific key.

Reviewed-by: Laszlo Ersek <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>


  Commit: 87abaa5d8c32cea835601f510ab145f2edbc3da9
      
https://github.com/qemu/qemu/commit/87abaa5d8c32cea835601f510ab145f2edbc3da9
  Author: Philippe Mathieu-Daudé <address@hidden>
  Date:   2019-05-23 (Thu, 23 May 2019)

  Changed paths:
    A hw/i386/fw_cfg.h
    M hw/i386/pc.c

  Log Message:
  -----------
  hw/i386: Extract fw_cfg definitions to local "fw_cfg.h"

Extract the architecture-specific fw_cfg definitions to "fw_cfg.h".

Reviewed-by: Laszlo Ersek <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>


  Commit: bd3f680f66f429451efae2e5f0ace2fa8af199bf
      
https://github.com/qemu/qemu/commit/bd3f680f66f429451efae2e5f0ace2fa8af199bf
  Author: Philippe Mathieu-Daudé <address@hidden>
  Date:   2019-05-23 (Thu, 23 May 2019)

  Changed paths:
    M hw/i386/Makefile.objs
    A hw/i386/fw_cfg.c

  Log Message:
  -----------
  hw/i386: Implement fw_cfg_arch_key_name()

Implement fw_cfg_arch_key_name(), which returns the name of a
i386-specific key.

Reviewed-by: Laszlo Ersek <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>


  Commit: d632b9de7865e05f06f02549e6dbdcf9a61f4ad3
      
https://github.com/qemu/qemu/commit/d632b9de7865e05f06f02549e6dbdcf9a61f4ad3
  Author: Philippe Mathieu-Daudé <address@hidden>
  Date:   2019-05-23 (Thu, 23 May 2019)

  Changed paths:
    M hw/ppc/Makefile.objs
    A hw/ppc/fw_cfg.c

  Log Message:
  -----------
  hw/ppc: Implement fw_cfg_arch_key_name()

Implement fw_cfg_arch_key_name(), which returns the name of a
ppc-specific key.

The fw_cfg device is used by the machine using OpenBIOS:
- 40p
- mac99 (oldworld)
- g3beige (newworld)

Reviewed-by: Laszlo Ersek <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>


  Commit: d5a42d1942b77de0d1271f53d47c14a40b831be6
      
https://github.com/qemu/qemu/commit/d5a42d1942b77de0d1271f53d47c14a40b831be6
  Author: Philippe Mathieu-Daudé <address@hidden>
  Date:   2019-05-23 (Thu, 23 May 2019)

  Changed paths:
    M hw/sparc/sun4m.c

  Log Message:
  -----------
  hw/sparc: Implement fw_cfg_arch_key_name()

Implement fw_cfg_arch_key_name(), which returns the name of a
sparc32-specific key.

Reviewed-by: Laszlo Ersek <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>


  Commit: a2b45ea5087dbaf4a57b47763da61339b1e7adb1
      
https://github.com/qemu/qemu/commit/a2b45ea5087dbaf4a57b47763da61339b1e7adb1
  Author: Philippe Mathieu-Daudé <address@hidden>
  Date:   2019-05-23 (Thu, 23 May 2019)

  Changed paths:
    M hw/sparc64/sun4u.c

  Log Message:
  -----------
  hw/sparc64: Implement fw_cfg_arch_key_name()

Implement fw_cfg_arch_key_name(), which returns the name of a
sparc64-specific key.

Reviewed-by: Laszlo Ersek <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>


  Commit: 0729d833d6d6f9ec7a865b3f1c2bb727bb9e604b
      
https://github.com/qemu/qemu/commit/0729d833d6d6f9ec7a865b3f1c2bb727bb9e604b
  Author: Philippe Mathieu-Daudé <address@hidden>
  Date:   2019-05-23 (Thu, 23 May 2019)

  Changed paths:
    M tests/libqos/fw_cfg.c
    M tests/libqos/fw_cfg.h

  Log Message:
  -----------
  tests/libqos: Add io_fw_cfg_uninit() and mm_fw_cfg_uninit()

The mm_fw_cfg_init() allocates a QFWCFG object,
add mm_fw_cfg_uninit() to deallocate it.
Similarly with io_fw_cfg_init(), add io_fw_cfg_uninit().

Signed-off-by: Li Qiang <address@hidden>
Tested-by: Thomas Huth <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Tested-by: Philippe Mathieu-Daudé <address@hidden>
Message-Id: <address@hidden>
[PMD: Split patch, filled commit description]
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Laszlo Ersek <address@hidden>


  Commit: 65461d124363d97b387337db9b970df60c31819d
      
https://github.com/qemu/qemu/commit/65461d124363d97b387337db9b970df60c31819d
  Author: Philippe Mathieu-Daudé <address@hidden>
  Date:   2019-05-23 (Thu, 23 May 2019)

  Changed paths:
    M tests/libqos/fw_cfg.h
    M tests/libqos/malloc-pc.c

  Log Message:
  -----------
  tests/libqos: Add pc_fw_cfg_uninit() and use it

The pc_fw_cfg_init() function allocates an IO QFWCFG object.
Add the pc_fw_cfg_uninit() function to deallocate it (and use it).

Signed-off-by: Li Qiang <address@hidden>
Tested-by: Thomas Huth <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Tested-by: Philippe Mathieu-Daudé <address@hidden>
[PMD: Split patch, fill commit description, call uninit in malloc-pc.c]
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Laszlo Ersek <address@hidden>


  Commit: 10b789b70cb78e7215f4efd2c568bec7b0b826a0
      
https://github.com/qemu/qemu/commit/10b789b70cb78e7215f4efd2c568bec7b0b826a0
  Author: Philippe Mathieu-Daudé <address@hidden>
  Date:   2019-05-23 (Thu, 23 May 2019)

  Changed paths:
    M tests/fw_cfg-test.c

  Log Message:
  -----------
  tests/fw_cfg: Free QFWCFG object after qtest has run

We allocate the QFWCFG object previous to run the qtests,
free it once we are finished.

Signed-off-by: Li Qiang <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
[PMD: Split patch, fill commit description]
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Laszlo Ersek <address@hidden>


  Commit: 7a44091d48c1054a859f44a70ef280c7cef4698f
      
https://github.com/qemu/qemu/commit/7a44091d48c1054a859f44a70ef280c7cef4698f
  Author: Li Qiang <address@hidden>
  Date:   2019-05-23 (Thu, 23 May 2019)

  Changed paths:
    M tests/fw_cfg-test.c

  Log Message:
  -----------
  tests: refactor fw_cfg_test

Currently, fw_cfg_test uses one QTestState for every test case.
This will add all command lines for every test case and
this is unnecessary. This patch split the test cases and for
every test case it uses his own QTestState. This patch does following
things:

1. Get rid of the global 'fw_cfg', this need add a uninit function

2. Convert every test case in a separate QTestState

After this patch, we can add fw_cfg test case freely and will not
have effect on other test cases.

Signed-off-by: Li Qiang <address@hidden>
Acked-by: Thomas Huth <address@hidden>
Tested-by: Thomas Huth <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Tested-by: Philippe Mathieu-Daudé <address@hidden>
Message-Id: <address@hidden>
[PMD: Removed 'ret' local variable in main()]
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>


  Commit: c99f5f1dd4161012ee9ba69e7f5d351e52ed18ae
      
https://github.com/qemu/qemu/commit/c99f5f1dd4161012ee9ba69e7f5d351e52ed18ae
  Author: Li Qiang <address@hidden>
  Date:   2019-05-23 (Thu, 23 May 2019)

  Changed paths:
    M tests/libqos/fw_cfg.c
    M tests/libqos/fw_cfg.h

  Log Message:
  -----------
  tests: fw_cfg: add a function to get the fw_cfg file

This is useful to write qtest about fw_cfg file entry.

Signed-off-by: Li Qiang <address@hidden>
Acked-by: Thomas Huth <address@hidden>
Tested-by: Thomas Huth <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Tested-by: Philippe Mathieu-Daudé <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>


  Commit: 04da973501b591525ce68c2925c61c8886badd4d
      
https://github.com/qemu/qemu/commit/04da973501b591525ce68c2925c61c8886badd4d
  Author: Li Qiang <address@hidden>
  Date:   2019-05-23 (Thu, 23 May 2019)

  Changed paths:
    M hw/nvram/fw_cfg.c

  Log Message:
  -----------
  hw/nvram/fw_cfg: Store 'reboot-timeout' as little endian

The current codebase is not specific about the endianess of the
fw_cfg 'file' entry 'reboot-timeout'.

Per docs/specs/fw_cfg.txt:

  === All Other Data Items ===

  Please consult the QEMU source for the most up-to-date
  and authoritative list of selector keys and their respective
  items' purpose, format and writeability.

Checking the git history, this code was introduced in commit
ac05f3492421, very similar to commit 3d3b8303c6f8 for the
'boot-menu-wait' entry, which explicitely use little-endian.

OVMF consumes 'boot-menu-wait' as little-endian, however it does
not consume 'reboot-timeout'.

Regarding the git history and OVMF use, we choose to explicit
'reboot-timeout' endianess as little-endian.

Signed-off-by: Li Qiang <address@hidden>
Tested-by: Thomas Huth <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Tested-by: Philippe Mathieu-Daudé <address@hidden>
Message-Id: <address@hidden>
[PMD: Reword commit description based on review comments]
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>


  Commit: b41e912f32db79f97cc289dce57a13ca7d45332c
      
https://github.com/qemu/qemu/commit/b41e912f32db79f97cc289dce57a13ca7d45332c
  Author: Li Qiang <address@hidden>
  Date:   2019-05-23 (Thu, 23 May 2019)

  Changed paths:
    M tests/fw_cfg-test.c

  Log Message:
  -----------
  tests: fw_cfg: add 'reboot-timeout' test case

Signed-off-by: Li Qiang <address@hidden>
Tested-by: Thomas Huth <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Tested-by: Philippe Mathieu-Daudé <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>


  Commit: 3ae9dd1a304248e1f6ca631cdd43eb44a3e9e7b4
      
https://github.com/qemu/qemu/commit/3ae9dd1a304248e1f6ca631cdd43eb44a3e9e7b4
  Author: Li Qiang <address@hidden>
  Date:   2019-05-23 (Thu, 23 May 2019)

  Changed paths:
    M tests/fw_cfg-test.c

  Log Message:
  -----------
  tests: fw_cfg: add 'splash-time' test case

Signed-off-by: Li Qiang <address@hidden>
Tested-by: Thomas Huth <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Tested-by: Philippe Mathieu-Daudé <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>


  Commit: 8dc7fd56dd4f56ab8ff1df3765ae6b5d3ac11c5e
      
https://github.com/qemu/qemu/commit/8dc7fd56dd4f56ab8ff1df3765ae6b5d3ac11c5e
  Author: Peter Maydell <address@hidden>
  Date:   2019-05-23 (Thu, 23 May 2019)

  Changed paths:
    M MAINTAINERS
    M hw/i386/Makefile.objs
    A hw/i386/fw_cfg.c
    A hw/i386/fw_cfg.h
    M hw/i386/pc.c
    M hw/nvram/fw_cfg.c
    M hw/nvram/trace-events
    M hw/ppc/Makefile.objs
    A hw/ppc/fw_cfg.c
    M hw/sparc/sun4m.c
    M hw/sparc64/sun4u.c
    M include/hw/nvram/fw_cfg.h
    M stubs/Makefile.objs
    A stubs/fw_cfg.c
    M tests/fw_cfg-test.c
    M tests/libqos/fw_cfg.c
    M tests/libqos/fw_cfg.h
    M tests/libqos/malloc-pc.c

  Log Message:
  -----------
  Merge remote-tracking branch 
'remotes/philmd-gitlab/tags/fw_cfg-20190523-pull-request' into staging

fw_cfg patches for 2019-05-23

- Add trace events
- Get rid of globals in fw_cfg-test
- Explicit 'reboot-timeout' is little endian
- Add tests for 'reboot-timeout' and 'splash-time'

# gpg: Signature made Thu 23 May 2019 13:40:32 BST
# gpg:                using RSA key E3E32C2CDEADC0DE
# gpg: Good signature from "Philippe Mathieu-Daudé (F4BUG) <address@hidden>" 
[full]
# Primary key fingerprint: FAAB E75E 1291 7221 DCFD  6BB2 E3E3 2C2C DEAD C0DE

* remotes/philmd-gitlab/tags/fw_cfg-20190523-pull-request:
  tests: fw_cfg: add 'splash-time' test case
  tests: fw_cfg: add 'reboot-timeout' test case
  hw/nvram/fw_cfg: Store 'reboot-timeout' as little endian
  tests: fw_cfg: add a function to get the fw_cfg file
  tests: refactor fw_cfg_test
  tests/fw_cfg: Free QFWCFG object after qtest has run
  tests/libqos: Add pc_fw_cfg_uninit() and use it
  tests/libqos: Add io_fw_cfg_uninit() and mm_fw_cfg_uninit()
  hw/sparc64: Implement fw_cfg_arch_key_name()
  hw/sparc: Implement fw_cfg_arch_key_name()
  hw/ppc: Implement fw_cfg_arch_key_name()
  hw/i386: Implement fw_cfg_arch_key_name()
  hw/i386: Extract fw_cfg definitions to local "fw_cfg.h"
  hw/nvram/fw_cfg: Add fw_cfg_arch_key_name()
  hw/nvram/fw_cfg: Add trace events

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/d418238dca7b...8dc7fd56dd4f
[Prev in Thread]
Current Thread
[Next in Thread]
[Qemu-commits] [qemu/qemu] 1f80b0: hw/nvram/fw_cfg: Add trace events, Peter Maydell <=
Prev by Date: [Qemu-commits] [qemu/qemu] a73e82: configure: Link test before auto-enabling crypto l...
Next by Date: [Qemu-commits] [qemu/qemu] 80ac95: target/arm: Use extract2 for EXTR
Previous by thread: [Qemu-commits] [qemu/qemu] a73e82: configure: Link test before auto-enabling crypto l...
Next by thread: [Qemu-commits] [qemu/qemu] 80ac95: target/arm: Use extract2 for EXTR
Index(es):
- Date
- Thread