From 13cc2c3e867605122351c68f34af838bc75d8692 Mon Sep 17 00:00:00 2001 From: BALATON Zoltan Date: Thu, 27 Feb 2014 02:05:05 +0100 Subject: serial-pci: Set prog interface field of pci config to 16550 compatible Signed-off-by: BALATON Zoltan Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin Reviewed-by: Gerd Hoffmann --- include/hw/i386/pc.h | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'include/hw/i386') diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 32a76876c7..552fbd8243 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -271,6 +271,21 @@ bool e820_get_entry(int, uint32_t, uint64_t *, uint64_t *); .driver = "apic",\ .property = "version",\ .value = stringify(0x11),\ + },\ + {\ + .driver = "pci-serial",\ + .property = "prog_if",\ + .value = stringify(0),\ + },\ + {\ + .driver = "pci-serial-2x",\ + .property = "prof_if",\ + .value = stringify(0),\ + },\ + {\ + .driver = "pci-serial-4x",\ + .property = "prog_if",\ + .value = stringify(0),\ } #define PC_COMPAT_1_7 \ -- cgit v1.2.1 From 84351843eba330022e245a742899cf71fc817ec5 Mon Sep 17 00:00:00 2001 From: "Gabriel L. Somlo" Date: Mon, 19 May 2014 10:09:54 -0400 Subject: SMBIOS: Update Type 0 struct generator for machines >= 2.1 Update how type 0 (bios info) structures are generated, as follows: - convert bios_characteristics field to uin64_t (instead of uint8_t[8]), as described in the current smbios spec (v2.8) - enable "virtual machine" bit in bios_characteristics_extension_bits - add command line option to enable "uefi supported" bit in bios_characteristics_extension_bits These updates should make this optional structure more useful when used with edk2/ovmf. Only pc machines >= 2.1 are affected, and only when a type 0 structure is explicitly specified on the command line. Signed-off-by: Gabriel Somlo Reviewed-by: Laszlo Ersek Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- include/hw/i386/smbios.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/hw/i386') diff --git a/include/hw/i386/smbios.h b/include/hw/i386/smbios.h index 6d854b7f1e..5583f60405 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; -- cgit v1.2.1 From 0d73394ad93aa12755316b3a90b3193aeeb95f90 Mon Sep 17 00:00:00 2001 From: "Gabriel L. Somlo" Date: Mon, 19 May 2014 10:09:55 -0400 Subject: SMBIOS: Fix type 17 field sizes Fields for configured_clock_speed and various voltage values introduced in spec v2.7+ should be "word", i.e. 16 bits. Reported-by: Laszlo Ersek Signed-off-by: Gabriel Somlo Reviewed-by: Laszlo Ersek Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- include/hw/i386/smbios.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'include/hw/i386') diff --git a/include/hw/i386/smbios.h b/include/hw/i386/smbios.h index 5583f60405..a3f4d88bf0 100644 --- a/include/hw/i386/smbios.h +++ b/include/hw/i386/smbios.h @@ -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) */ -- cgit v1.2.1