[Qemu-commits] [qemu/qemu] 1ceaef: QemuOpts: increase number of vm_config_groups

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 1ceaefbd0d09642fcff05c6b8da49ad8fbc050cb
      
https://github.com/qemu/qemu/commit/1ceaefbd0d09642fcff05c6b8da49ad8fbc050cb
  Author: Gerd Hoffmann <address@hidden>
  Date:   2015-06-10 (Wed, 10 Jun 2015)

  Changed paths:
    M util/qemu-config.c

  Log Message:
  -----------
  QemuOpts: increase number of vm_config_groups

Adding the fw_cfg cmd line support patch by
Gabriel L. Somlo hits the limit.

Fix this by making the array larger.

Cc: Gabriel L. Somlo <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 1edd34b638f73d39a175fbc4f9ad5c97800d7470
      
https://github.com/qemu/qemu/commit/1edd34b638f73d39a175fbc4f9ad5c97800d7470
  Author: Gabriel L. Somlo <address@hidden>
  Date:   2015-06-10 (Wed, 10 Jun 2015)

  Changed paths:
    M hw/nvram/fw_cfg.c
    M include/hw/nvram/fw_cfg.h

  Log Message:
  -----------
  fw_cfg: add fw_cfg_modify_i16 (update) method

Allow the ability to modify the value of an existing 16-bit integer
fw_cfg item.

Signed-off-by: Gabriel Somlo <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 48779e501810c5046ff8af7b9cf9c99bec2928a1
      
https://github.com/qemu/qemu/commit/48779e501810c5046ff8af7b9cf9c99bec2928a1
  Author: Gabriel L. Somlo <address@hidden>
  Date:   2015-06-10 (Wed, 10 Jun 2015)

  Changed paths:
    M hw/ppc/mac_newworld.c
    M hw/ppc/mac_oldworld.c
    M hw/sparc/sun4m.c
    M hw/sparc64/sun4u.c

  Log Message:
  -----------
  fw_cfg: fix FW_CFG_BOOT_DEVICE update on ppc and sparc

On ppc, sparc, and sparc64, the value of the FW_CFG_BOOT_DEVICE 16bit
fw_cfg entry is repeatedly modified from a series of callbacks, which
currently results in the previous value's dynamically allocated memory
being leaked.

This patch switches updating to the new fw_cfg_modify_i16() call, which
does not cause memory leaks.

Signed-off-by: Gabriel Somlo <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 023e3148567ac898c7258138f8e86c3c2bb40d07
      
https://github.com/qemu/qemu/commit/023e3148567ac898c7258138f8e86c3c2bb40d07
  Author: Gabriel L. Somlo <address@hidden>
  Date:   2015-06-10 (Wed, 10 Jun 2015)

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

  Log Message:
  -----------
  fw_cfg: remove support for guest-side data writes

>From this point forward, any guest-side writes to the fw_cfg
data register will be treated as no-ops. This patch also removes
the unused host-side API function fw_cfg_add_callback(), which
allowed the registration of a callback to be executed each time
the guest completed a full overwrite of a given fw_cfg data item.

Signed-off-by: Gabriel Somlo <address@hidden>
Reviewed-by: Laszlo Ersek <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 0f9b214139d11ef058fa0f1c11c89e94fa6ef95d
      
https://github.com/qemu/qemu/commit/0f9b214139d11ef058fa0f1c11c89e94fa6ef95d
  Author: Gabriel L. Somlo <address@hidden>
  Date:   2015-06-10 (Wed, 10 Jun 2015)

  Changed paths:
    M hw/nvram/fw_cfg.c

  Log Message:
  -----------
  fw_cfg: prevent selector key conflict

Enforce a single assignment of data for each distinct selector key.

Signed-off-by: Gabriel Somlo <address@hidden>
Reviewed-by: Laszlo Ersek <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 0eb973f91521c6bcb6399d25327711d083f6eb10
      
https://github.com/qemu/qemu/commit/0eb973f91521c6bcb6399d25327711d083f6eb10
  Author: Gabriel L. Somlo <address@hidden>
  Date:   2015-06-10 (Wed, 10 Jun 2015)

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

  Log Message:
  -----------
  fw_cfg: prohibit insertion of duplicate fw_cfg file names

Exit with an error (instead of simply logging a trace event)
whenever the same fw_cfg file name is added multiple times via
one of the fw_cfg_add_file[_callback]() host-side API calls.

Signed-off-by: Gabriel Somlo <address@hidden>
Reviewed-by: Laszlo Ersek <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 81b2b81062612ebeac4cd5333a3b15c7d79a5a3d
      
https://github.com/qemu/qemu/commit/81b2b81062612ebeac4cd5333a3b15c7d79a5a3d
  Author: Gabriel L. Somlo <address@hidden>
  Date:   2015-06-10 (Wed, 10 Jun 2015)

  Changed paths:
    M docs/specs/fw_cfg.txt
    M qemu-options.hx
    M vl.c

  Log Message:
  -----------
  fw_cfg: insert fw_cfg file blobs via qemu cmdline

Allow user supplied files to be inserted into the fw_cfg
device before starting the guest. Since fw_cfg_add_file()
already disallows duplicate fw_cfg file names, qemu will
exit with an error message if the user supplies multiple
blobs with the same fw_cfg file name, or if a blob name
collides with a fw_cfg name programmatically added from
within the QEMU source code. A warning message will be
printed if the fw_cfg item name does not begin with the
prefix "opt/", which is recommended for external, user
provided blobs.

Signed-off-by: Gabriel Somlo <address@hidden>
Reviewed-by: Laszlo Ersek <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 5efed5a172881f601ac3c57c22ec5c5721f895be
      
https://github.com/qemu/qemu/commit/5efed5a172881f601ac3c57c22ec5c5721f895be
  Author: Gabriel L. Somlo <address@hidden>
  Date:   2015-06-10 (Wed, 10 Jun 2015)

  Changed paths:
    M tests/bios-tables-test.c

  Log Message:
  -----------
  bios-tables-test: handle false-positive smbios signature matches

It has been reported that sometimes the .rodata section of SeaBIOS,
containing the constant string against which the SMBIOS signature
ends up being compared, also falls within the guest f-segment. In
that case, the test obviously fails, unless we continue searching
for the *real* SMBIOS entry point.

Rather than stopping at the first match for the SMBIOS signature
("_SM_") in the f-segment (0xF0000-0xFFFFF), continue scanning
until either a valid entry point table is found, or the f-segment
has been exhausted.

Reported-by: Bruce Rogers <address@hidden>
Signed-off-by: Gabriel Somlo <address@hidden>
Tested-by: Bruce Rogers <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 3974c9d8ccfccbd81edc9df271fcae7082f3921d
      
https://github.com/qemu/qemu/commit/3974c9d8ccfccbd81edc9df271fcae7082f3921d
  Author: Peter Maydell <address@hidden>
  Date:   2015-06-10 (Wed, 10 Jun 2015)

  Changed paths:
    M docs/specs/fw_cfg.txt
    M hw/nvram/fw_cfg.c
    M hw/ppc/mac_newworld.c
    M hw/ppc/mac_oldworld.c
    M hw/sparc/sun4m.c
    M hw/sparc64/sun4u.c
    M include/hw/nvram/fw_cfg.h
    M qemu-options.hx
    M tests/bios-tables-test.c
    M trace-events
    M util/qemu-config.c
    M vl.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/kraxel/tags/pull-fw_cfg-20150610-1' 
into staging

fw_cfg: drop write support, qemu cmdline support, bugfixes.
bios-tables-test: fix smbios test.

# gpg: Signature made Wed Jun 10 07:29:53 2015 BST using RSA key ID D3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <address@hidden>"
# gpg:                 aka "Gerd Hoffmann <address@hidden>"
# gpg:                 aka "Gerd Hoffmann (private) <address@hidden>"

* remotes/kraxel/tags/pull-fw_cfg-20150610-1:
  bios-tables-test: handle false-positive smbios signature matches
  fw_cfg: insert fw_cfg file blobs via qemu cmdline
  fw_cfg: prohibit insertion of duplicate fw_cfg file names
  fw_cfg: prevent selector key conflict
  fw_cfg: remove support for guest-side data writes
  fw_cfg: fix FW_CFG_BOOT_DEVICE update on ppc and sparc
  fw_cfg: add fw_cfg_modify_i16 (update) method
  QemuOpts: increase number of vm_config_groups

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


Compare: https://github.com/qemu/qemu/compare/eed8a8f572e6...3974c9d8ccfc