diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-06-05 21:52:37 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-06-05 21:52:37 +0100 |
| commit | 26edf8cc08e2ec15d9e65bb0dd4fbac22edd730b (patch) | |
| tree | a010815e0435a73d2a6347b5b75ee3f6ece1c788 /include/hw/i386/smbios.h | |
| parent | 31e25e3e5701607a2a88b5b6c5fb1057b20941fd (diff) | |
| parent | 711e2f1e9ecad845e142fdddbbf1e8037bce902b (diff) | |
| download | focaccia-qemu-26edf8cc08e2ec15d9e65bb0dd4fbac22edd730b.tar.gz focaccia-qemu-26edf8cc08e2ec15d9e65bb0dd4fbac22edd730b.zip | |
Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging
pc,pci,virtio,qdev fixes, tests new tests for SMBIOS SMBIOS fixes pc, pci fixes qdev patches stayed on list for a month with no review, as I told people on KVM forum I'm merging stuch patches if they look fine. Signed-off-by: Michael S. Tsirkin <mst@redhat.com> * remotes/mst/tags/for_upstream: qdev: Add test of qdev_prop_check_global qdev: Display warning about unused -global tests: add smbios testing tests: rename acpi-test to bios-tables-test virtio-balloon: return empty data when no stats are available pcie_host: Turn pcie_host_init() into an instance_init SMBIOS: Fix type 17 field sizes SMBIOS: Update Type 0 struct generator for machines >= 2.1 SMBIOS: Fix endian-ness when populating multi-byte fields serial-pci: Set prog interface field of pci config to 16550 compatible Conflicts: include/hw/i386/pc.h [PMM: fixed trivial conflict in pc.h] Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/hw/i386/smbios.h')
| -rw-r--r-- | include/hw/i386/smbios.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/hw/i386/smbios.h b/include/hw/i386/smbios.h index 6d854b7f1e..a3f4d88bf0 100644 --- a/include/hw/i386/smbios.h +++ b/include/hw/i386/smbios.h @@ -64,7 +64,7 @@ struct smbios_type_0 { uint16_t bios_starting_address_segment; uint8_t bios_release_date_str; uint8_t bios_rom_size; - uint8_t bios_characteristics[8]; + uint64_t bios_characteristics; uint8_t bios_characteristics_extension_bytes[2]; uint8_t system_bios_major_release; uint8_t system_bios_minor_release; @@ -182,10 +182,10 @@ struct smbios_type_17 { uint8_t part_number_str; uint8_t attributes; uint32_t extended_size; - uint32_t configured_clock_speed; - uint32_t minimum_voltage; - uint32_t maximum_voltage; - uint32_t configured_voltage; + uint16_t configured_clock_speed; + uint16_t minimum_voltage; + uint16_t maximum_voltage; + uint16_t configured_voltage; } QEMU_PACKED; /* SMBIOS type 19 - Memory Array Mapped Address (v2.7) */ |