qemu-commits
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-commits] [qemu/qemu] 3458b2: pc: add 2.1 machine type

From: GitHub
Subject: [Qemu-commits] [qemu/qemu] 3458b2: pc: add 2.1 machine type
Date: Tue, 06 May 2014 05:30:04 -0700 
  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 3458b2b075f92f163ccb9a1f24733eb5705947f0
      
https://github.com/qemu/qemu/commit/3458b2b075f92f163ccb9a1f24733eb5705947f0
  Author: Michael S. Tsirkin <address@hidden>
  Date:   2014-05-05 (Mon, 05 May 2014)

  Changed paths:
    M hw/i386/pc_piix.c
    M hw/i386/pc_q35.c

  Log Message:
  -----------
  pc: add 2.1 machine type

At the moment, 2.1 and 2.0 machines are identical.
As several people are working on incompatible changes
to the PC machine, collaboration will be made easier
by merging this place-holder.

Signed-off-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 7bf8ef196e80bedec3c48017e3105e46548e7a7b
      
https://github.com/qemu/qemu/commit/7bf8ef196e80bedec3c48017e3105e46548e7a7b
  Author: Gabriel L. Somlo <address@hidden>
  Date:   2014-05-05 (Mon, 05 May 2014)

  Changed paths:
    M hw/i386/pc.c
    M include/hw/i386/pc.h

  Log Message:
  -----------
  E820: Add interface for accessing e820 table

Add the following two functions:

  - e820_get_num_entries() - query the size of the e820 table
  - e820_get_entry() - grab an entry matching a given set of criteria

This interface is currently necessary for creating type 19
(memory array mapped address) structures in smbios.

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


  Commit: e6667f719caa7b5edcb491f61a7744f6a6affd27
      
https://github.com/qemu/qemu/commit/e6667f719caa7b5edcb491f61a7744f6a6affd27
  Author: Gabriel L. Somlo <address@hidden>
  Date:   2014-05-05 (Mon, 05 May 2014)

  Changed paths:
    M hw/i386/pc.c
    M hw/i386/pc_piix.c
    M hw/i386/pc_q35.c
    M hw/i386/smbios.c
    M include/hw/i386/smbios.h

  Log Message:
  -----------
  SMBIOS: Rename symbols to better reflect future use

Rename the following symbols:

  - smbios_set_type1_defaults() to the more general smbios_set_defaults();
  - bool smbios_type1_defaults to the more general smbios_defaults;
  - smbios_get_table() to smbios_get_table_legacy();

This patch contains no functional changes.

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


  Commit: e41fca3da72d556942a3e0dc601fbeca5eaab9ce
      
https://github.com/qemu/qemu/commit/e41fca3da72d556942a3e0dc601fbeca5eaab9ce
  Author: Gabriel L. Somlo <address@hidden>
  Date:   2014-05-05 (Mon, 05 May 2014)

  Changed paths:
    M include/hw/i386/smbios.h

  Log Message:
  -----------
  SMBIOS: Update header file definitions

Add definitions for smbios entry point (anchor), and for type 2
(base board) structure which is required by some versions of OS X.

Remove definition for type 20 (memory device mapped address)
structure, which is no longer required as of smbios spec v2.5.

Update all other structure definitions to bring them into
compliance with smbios spec v2.8.

This patch contains no functional changes.

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


  Commit: cb36acb672a380b4ca430e4a12abb3f2186f9f4f
      
https://github.com/qemu/qemu/commit/cb36acb672a380b4ca430e4a12abb3f2186f9f4f
  Author: Gabriel L. Somlo <address@hidden>
  Date:   2014-05-05 (Mon, 05 May 2014)

  Changed paths:
    M hw/i386/smbios.c

  Log Message:
  -----------
  SMBIOS: Use macro to set smbios defaults

The function smbios_set_defaults() uses a repeating code pattern
for each field. This patch replaces that pattern with a macro.

This patch contains no functional changes.

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


  Commit: 2e6e8d7a25a6e31dee58226ea7fc374844d69732
      
https://github.com/qemu/qemu/commit/2e6e8d7a25a6e31dee58226ea7fc374844d69732
  Author: Gabriel L. Somlo <address@hidden>
  Date:   2014-05-05 (Mon, 05 May 2014)

  Changed paths:
    M hw/i386/smbios.c
    M include/hw/i386/smbios.h

  Log Message:
  -----------
  SMBIOS: Use bitmaps to prevent incompatible comand line options

Replace existing smbios_check_collision() functionality with
a pair of bitmaps: have_binfile_bitmap and have_fields_bitmap.
Bits corresponding to each smbios type are set by smbios_entry_add(),
which also uses the bitmaps to ensure that binary blobs and field
values are never accepted for the same type.

These bitmaps will also be used in the future to decide whether
or not to build a full table for a given smbios type.

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


  Commit: c97294ec1b9e36887e119589d456557d72ab37b5
      
https://github.com/qemu/qemu/commit/c97294ec1b9e36887e119589d456557d72ab37b5
  Author: Gabriel L. Somlo <address@hidden>
  Date:   2014-05-05 (Mon, 05 May 2014)

  Changed paths:
    M hw/i386/pc.c
    M hw/i386/pc_piix.c
    M hw/i386/pc_q35.c
    M hw/i386/smbios.c
    M include/hw/i386/smbios.h

  Log Message:
  -----------
  SMBIOS: Build aggregate smbios tables and entry point

Build an aggregate set of smbios tables and an entry point structure.

Insert tables and entry point into fw_cfg respectively under
"etc/smbios/smbios-tables" and "etc/smbios/smbios-anchor".

Machine types <= 2.0 will for now continue using field-by-field
overrides to SeaBIOS defaults, but for machine types 2.1 and up we
expect the BIOS to look for and use the aggregate tables generated
by this patch.

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

[ kraxel: fix 32bit build ]

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


  Commit: 9898370497da3f18e0c9555b65c858eabc78ab50
      
https://github.com/qemu/qemu/commit/9898370497da3f18e0c9555b65c858eabc78ab50
  Author: Peter Maydell <address@hidden>
  Date:   2014-05-06 (Tue, 06 May 2014)

  Changed paths:
    M hw/i386/pc.c
    M hw/i386/pc_piix.c
    M hw/i386/pc_q35.c
    M hw/i386/smbios.c
    M include/hw/i386/pc.h
    M include/hw/i386/smbios.h

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/kraxel/tags/pull-smbios-2' into staging

smbios: make qemu generate smbios tables.

# gpg: Signature made Mon 05 May 2014 12:20:27 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-smbios-2:
  SMBIOS: Build aggregate smbios tables and entry point
  SMBIOS: Use bitmaps to prevent incompatible comand line options
  SMBIOS: Use macro to set smbios defaults
  SMBIOS: Update header file definitions
  SMBIOS: Rename symbols to better reflect future use
  E820: Add interface for accessing e820 table
  pc: add 2.1 machine type

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


Compare: https://github.com/qemu/qemu/compare/03e2bfee371e...9898370497da
reply via email to
[Prev in Thread] Current Thread [Next in Thread]