mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-08 18:23:57 -06:00
pci,pc,virtio: features, tests, fixes, cleanups
lots of acpi rework first version of biosbits infrastructure ASID support in vhost-vdpa core_count2 support in smbios PCIe DOE emulation virtio vq reset HMAT support part of infrastructure for viommu support in vhost-vdpa VTD PASID support fixes, tests all over the place Signed-off-by: Michael S. Tsirkin <mst@redhat.com> -----BEGIN PGP SIGNATURE----- iQFDBAABCAAtFiEEXQn9CHHI+FuUyooNKB8NuNKNVGkFAmNpXDkPHG1zdEByZWRo YXQuY29tAAoJECgfDbjSjVRpD0AH/2G8ZPrgrxJC9y3uD5/5J6QRzO+TsDYbg5ut uBf4rKSHHzcu6zdyAfsrhbAKKzyD4HrEGNXZrBjnKM1xCiB/SGBcDIWntwrca2+s 5Dpbi4xvd4tg6tVD4b47XNDCcn2uUbeI0e2M5QIbtCmzdi/xKbFAfl5G8DQp431X Kmz79G4CdKWyjVlM0HoYmdCw/4FxkdjD02tE/Uc5YMrePNaEg5Bw4hjCHbx1b6ur 6gjeXAtncm9s4sO0l+sIdyiqlxiTry9FSr35WaQ0qPU+Og5zaf1EiWfdl8TRo4qU EAATw5A4hyw11GfOGp7oOVkTGvcNB/H7aIxD7emdWZV8+BMRPKo= =zTCn -----END PGP SIGNATURE----- Merge tag 'for_upstream' of https://git.kernel.org/pub/scm/virt/kvm/mst/qemu into staging pci,pc,virtio: features, tests, fixes, cleanups lots of acpi rework first version of biosbits infrastructure ASID support in vhost-vdpa core_count2 support in smbios PCIe DOE emulation virtio vq reset HMAT support part of infrastructure for viommu support in vhost-vdpa VTD PASID support fixes, tests all over the place Signed-off-by: Michael S. Tsirkin <mst@redhat.com> # -----BEGIN PGP SIGNATURE----- # # iQFDBAABCAAtFiEEXQn9CHHI+FuUyooNKB8NuNKNVGkFAmNpXDkPHG1zdEByZWRo # YXQuY29tAAoJECgfDbjSjVRpD0AH/2G8ZPrgrxJC9y3uD5/5J6QRzO+TsDYbg5ut # uBf4rKSHHzcu6zdyAfsrhbAKKzyD4HrEGNXZrBjnKM1xCiB/SGBcDIWntwrca2+s # 5Dpbi4xvd4tg6tVD4b47XNDCcn2uUbeI0e2M5QIbtCmzdi/xKbFAfl5G8DQp431X # Kmz79G4CdKWyjVlM0HoYmdCw/4FxkdjD02tE/Uc5YMrePNaEg5Bw4hjCHbx1b6ur # 6gjeXAtncm9s4sO0l+sIdyiqlxiTry9FSr35WaQ0qPU+Og5zaf1EiWfdl8TRo4qU # EAATw5A4hyw11GfOGp7oOVkTGvcNB/H7aIxD7emdWZV8+BMRPKo= # =zTCn # -----END PGP SIGNATURE----- # gpg: Signature made Mon 07 Nov 2022 14:27:53 EST # gpg: using RSA key 5D09FD0871C8F85B94CA8A0D281F0DB8D28D5469 # gpg: issuer "mst@redhat.com" # gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>" [full] # gpg: aka "Michael S. Tsirkin <mst@redhat.com>" [full] # Primary key fingerprint: 0270 606B 6F3C DF3D 0B17 0970 C350 3912 AFBE 8E67 # Subkey fingerprint: 5D09 FD08 71C8 F85B 94CA 8A0D 281F 0DB8 D28D 5469 * tag 'for_upstream' of https://git.kernel.org/pub/scm/virt/kvm/mst/qemu: (83 commits) checkpatch: better pattern for inline comments hw/virtio: introduce virtio_device_should_start tests/acpi: update tables for new core count test bios-tables-test: add test for number of cores > 255 tests/acpi: allow changes for core_count2 test bios-tables-test: teach test to use smbios 3.0 tables hw/smbios: add core_count2 to smbios table type 4 vhost-user: Support vhost_dev_start vhost: Change the sequence of device start intel-iommu: PASID support intel-iommu: convert VTD_PE_GET_FPD_ERR() to be a function intel-iommu: drop VTDBus intel-iommu: don't warn guest errors when getting rid2pasid entry vfio: move implement of vfio_get_xlat_addr() to memory.c tests: virt: Update expected *.acpihmatvirt tables tests: acpi: aarch64/virt: add a test for hmat nodes with no initiators hw/arm/virt: Enable HMAT on arm virt machine tests: Add HMAT AArch64/virt empty table files tests: acpi: q35: update expected blobs *.hmat-noinitiators expected HMAT: tests: acpi: q35: add test for hmat nodes without initiators ... Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
Stefan Hajnoczi
commit
f21f1cfeb9
155 changed files with 7996 additions and 1020 deletions
|
|
@ -88,10 +88,12 @@ typedef struct {
|
|||
uint64_t rsdp_addr;
|
||||
uint8_t rsdp_table[36 /* ACPI 2.0+ RSDP size */];
|
||||
GArray *tables;
|
||||
uint32_t smbios_ep_addr;
|
||||
struct smbios_21_entry_point smbios_ep_table;
|
||||
uint64_t smbios_ep_addr[SMBIOS_ENTRY_POINT_TYPE__MAX];
|
||||
SmbiosEntryPoint smbios_ep_table;
|
||||
uint16_t smbios_cpu_max_speed;
|
||||
uint16_t smbios_cpu_curr_speed;
|
||||
uint8_t smbios_core_count;
|
||||
uint16_t smbios_core_count2;
|
||||
uint8_t *required_struct_types;
|
||||
int required_struct_types_len;
|
||||
QTestState *qts;
|
||||
|
|
@ -533,10 +535,9 @@ static void test_acpi_asl(test_data *data)
|
|||
free_test_data(&exp_data);
|
||||
}
|
||||
|
||||
static bool smbios_ep_table_ok(test_data *data)
|
||||
static bool smbios_ep2_table_ok(test_data *data, uint32_t addr)
|
||||
{
|
||||
struct smbios_21_entry_point *ep_table = &data->smbios_ep_table;
|
||||
uint32_t addr = data->smbios_ep_addr;
|
||||
struct smbios_21_entry_point *ep_table = &data->smbios_ep_table.ep21;
|
||||
|
||||
qtest_memread(data->qts, addr, ep_table, sizeof(*ep_table));
|
||||
if (memcmp(ep_table->anchor_string, "_SM_", 4)) {
|
||||
|
|
@ -559,13 +560,29 @@ static bool smbios_ep_table_ok(test_data *data)
|
|||
return true;
|
||||
}
|
||||
|
||||
static void test_smbios_entry_point(test_data *data)
|
||||
static bool smbios_ep3_table_ok(test_data *data, uint64_t addr)
|
||||
{
|
||||
struct smbios_30_entry_point *ep_table = &data->smbios_ep_table.ep30;
|
||||
|
||||
qtest_memread(data->qts, addr, ep_table, sizeof(*ep_table));
|
||||
if (memcmp(ep_table->anchor_string, "_SM3_", 5)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if (acpi_calc_checksum((uint8_t *)ep_table, sizeof *ep_table)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
static SmbiosEntryPointType test_smbios_entry_point(test_data *data)
|
||||
{
|
||||
uint32_t off;
|
||||
|
||||
/* find smbios entry point structure */
|
||||
for (off = 0xf0000; off < 0x100000; off += 0x10) {
|
||||
uint8_t sig[] = "_SM_";
|
||||
uint8_t sig[] = "_SM_", sig3[] = "_SM3_";
|
||||
int i;
|
||||
|
||||
for (i = 0; i < sizeof sig - 1; ++i) {
|
||||
|
|
@ -574,14 +591,30 @@ static void test_smbios_entry_point(test_data *data)
|
|||
|
||||
if (!memcmp(sig, "_SM_", sizeof sig)) {
|
||||
/* signature match, but is this a valid entry point? */
|
||||
data->smbios_ep_addr = off;
|
||||
if (smbios_ep_table_ok(data)) {
|
||||
if (smbios_ep2_table_ok(data, off)) {
|
||||
data->smbios_ep_addr[SMBIOS_ENTRY_POINT_TYPE_32] = off;
|
||||
}
|
||||
}
|
||||
|
||||
for (i = 0; i < sizeof sig3 - 1; ++i) {
|
||||
sig3[i] = qtest_readb(data->qts, off + i);
|
||||
}
|
||||
|
||||
if (!memcmp(sig3, "_SM3_", sizeof sig3)) {
|
||||
if (smbios_ep3_table_ok(data, off)) {
|
||||
data->smbios_ep_addr[SMBIOS_ENTRY_POINT_TYPE_64] = off;
|
||||
/* found 64-bit entry point, no need to look for 32-bit one */
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
g_assert_cmphex(off, <, 0x100000);
|
||||
/* found at least one entry point */
|
||||
g_assert_true(data->smbios_ep_addr[SMBIOS_ENTRY_POINT_TYPE_32] ||
|
||||
data->smbios_ep_addr[SMBIOS_ENTRY_POINT_TYPE_64]);
|
||||
|
||||
return data->smbios_ep_addr[SMBIOS_ENTRY_POINT_TYPE_64] ?
|
||||
SMBIOS_ENTRY_POINT_TYPE_64 : SMBIOS_ENTRY_POINT_TYPE_32;
|
||||
}
|
||||
|
||||
static inline bool smbios_single_instance(uint8_t type)
|
||||
|
|
@ -600,41 +633,61 @@ static inline bool smbios_single_instance(uint8_t type)
|
|||
}
|
||||
}
|
||||
|
||||
static bool smbios_cpu_test(test_data *data, uint32_t addr)
|
||||
static void smbios_cpu_test(test_data *data, uint32_t addr,
|
||||
SmbiosEntryPointType ep_type)
|
||||
{
|
||||
uint16_t expect_speed[2];
|
||||
uint16_t real;
|
||||
uint8_t core_count, expected_core_count = data->smbios_core_count;
|
||||
uint16_t speed, expected_speed[2];
|
||||
uint16_t core_count2, expected_core_count2 = data->smbios_core_count2;
|
||||
int offset[2];
|
||||
int i;
|
||||
|
||||
/* Check CPU speed for backward compatibility */
|
||||
offset[0] = offsetof(struct smbios_type_4, max_speed);
|
||||
offset[1] = offsetof(struct smbios_type_4, current_speed);
|
||||
expect_speed[0] = data->smbios_cpu_max_speed ? : 2000;
|
||||
expect_speed[1] = data->smbios_cpu_curr_speed ? : 2000;
|
||||
expected_speed[0] = data->smbios_cpu_max_speed ? : 2000;
|
||||
expected_speed[1] = data->smbios_cpu_curr_speed ? : 2000;
|
||||
|
||||
for (i = 0; i < 2; i++) {
|
||||
real = qtest_readw(data->qts, addr + offset[i]);
|
||||
if (real != expect_speed[i]) {
|
||||
fprintf(stderr, "Unexpected SMBIOS CPU speed: real %u expect %u\n",
|
||||
real, expect_speed[i]);
|
||||
return false;
|
||||
}
|
||||
speed = qtest_readw(data->qts, addr + offset[i]);
|
||||
g_assert_cmpuint(speed, ==, expected_speed[i]);
|
||||
}
|
||||
|
||||
return true;
|
||||
core_count = qtest_readb(data->qts,
|
||||
addr + offsetof(struct smbios_type_4, core_count));
|
||||
|
||||
if (expected_core_count) {
|
||||
g_assert_cmpuint(core_count, ==, expected_core_count);
|
||||
}
|
||||
|
||||
if (ep_type == SMBIOS_ENTRY_POINT_TYPE_64) {
|
||||
core_count2 = qtest_readw(data->qts,
|
||||
addr + offsetof(struct smbios_type_4, core_count2));
|
||||
|
||||
/* Core Count has reached its limit, checking Core Count 2 */
|
||||
if (expected_core_count == 0xFF && expected_core_count2) {
|
||||
g_assert_cmpuint(core_count2, ==, expected_core_count2);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static void test_smbios_structs(test_data *data)
|
||||
static void test_smbios_structs(test_data *data, SmbiosEntryPointType ep_type)
|
||||
{
|
||||
DECLARE_BITMAP(struct_bitmap, SMBIOS_MAX_TYPE+1) = { 0 };
|
||||
struct smbios_21_entry_point *ep_table = &data->smbios_ep_table;
|
||||
uint32_t addr = le32_to_cpu(ep_table->structure_table_address);
|
||||
int i, len, max_len = 0;
|
||||
|
||||
SmbiosEntryPoint *ep_table = &data->smbios_ep_table;
|
||||
int i = 0, len, max_len = 0;
|
||||
uint8_t type, prv, crt;
|
||||
uint64_t addr;
|
||||
|
||||
if (ep_type == SMBIOS_ENTRY_POINT_TYPE_32) {
|
||||
addr = le32_to_cpu(ep_table->ep21.structure_table_address);
|
||||
} else {
|
||||
addr = le64_to_cpu(ep_table->ep30.structure_table_address);
|
||||
}
|
||||
|
||||
/* walk the smbios tables */
|
||||
for (i = 0; i < le16_to_cpu(ep_table->number_of_structures); i++) {
|
||||
do {
|
||||
|
||||
/* grab type and formatted area length from struct header */
|
||||
type = qtest_readb(data->qts, addr);
|
||||
|
|
@ -648,7 +701,7 @@ static void test_smbios_structs(test_data *data)
|
|||
set_bit(type, struct_bitmap);
|
||||
|
||||
if (type == 4) {
|
||||
g_assert(smbios_cpu_test(data, addr));
|
||||
smbios_cpu_test(data, addr, ep_type);
|
||||
}
|
||||
|
||||
/* seek to end of unformatted string area of this struct ("\0\0") */
|
||||
|
|
@ -660,19 +713,33 @@ static void test_smbios_structs(test_data *data)
|
|||
}
|
||||
|
||||
/* keep track of max. struct size */
|
||||
if (max_len < len) {
|
||||
if (ep_type == SMBIOS_ENTRY_POINT_TYPE_32 && max_len < len) {
|
||||
max_len = len;
|
||||
g_assert_cmpuint(max_len, <=, ep_table->max_structure_size);
|
||||
g_assert_cmpuint(max_len, <=, ep_table->ep21.max_structure_size);
|
||||
}
|
||||
|
||||
/* start of next structure */
|
||||
addr += len;
|
||||
}
|
||||
|
||||
/* total table length and max struct size must match entry point values */
|
||||
g_assert_cmpuint(le16_to_cpu(ep_table->structure_table_length), ==,
|
||||
addr - le32_to_cpu(ep_table->structure_table_address));
|
||||
g_assert_cmpuint(le16_to_cpu(ep_table->max_structure_size), ==, max_len);
|
||||
/*
|
||||
* Until all structures have been scanned (ep21)
|
||||
* or an EOF structure is found (ep30)
|
||||
*/
|
||||
} while (ep_type == SMBIOS_ENTRY_POINT_TYPE_32 ?
|
||||
++i < le16_to_cpu(ep_table->ep21.number_of_structures) :
|
||||
type != 127);
|
||||
|
||||
if (ep_type == SMBIOS_ENTRY_POINT_TYPE_32) {
|
||||
/*
|
||||
* Total table length and max struct size
|
||||
* must match entry point values
|
||||
*/
|
||||
g_assert_cmpuint(le16_to_cpu(ep_table->ep21.structure_table_length), ==,
|
||||
addr - le32_to_cpu(ep_table->ep21.structure_table_address));
|
||||
|
||||
g_assert_cmpuint(le16_to_cpu(ep_table->ep21.max_structure_size), ==,
|
||||
max_len);
|
||||
}
|
||||
|
||||
/* required struct types must all be present */
|
||||
for (i = 0; i < data->required_struct_types_len; i++) {
|
||||
|
|
@ -756,8 +823,8 @@ static void test_acpi_one(const char *params, test_data *data)
|
|||
* https://bugs.launchpad.net/qemu/+bug/1821884
|
||||
*/
|
||||
if (!use_uefi) {
|
||||
test_smbios_entry_point(data);
|
||||
test_smbios_structs(data);
|
||||
SmbiosEntryPointType ep_type = test_smbios_entry_point(data);
|
||||
test_smbios_structs(data, ep_type);
|
||||
}
|
||||
|
||||
qtest_quit(data->qts);
|
||||
|
|
@ -856,6 +923,21 @@ static void test_acpi_q35_tcg(void)
|
|||
free_test_data(&data);
|
||||
}
|
||||
|
||||
static void test_acpi_q35_tcg_core_count2(void)
|
||||
{
|
||||
test_data data = {
|
||||
.machine = MACHINE_Q35,
|
||||
.variant = ".core-count2",
|
||||
.required_struct_types = base_required_struct_types,
|
||||
.required_struct_types_len = ARRAY_SIZE(base_required_struct_types),
|
||||
.smbios_core_count = 0xFF,
|
||||
.smbios_core_count2 = 275,
|
||||
};
|
||||
|
||||
test_acpi_one("-machine smbios-entry-point-type=64 -smp 275", &data);
|
||||
free_test_data(&data);
|
||||
}
|
||||
|
||||
static void test_acpi_q35_tcg_bridge(void)
|
||||
{
|
||||
test_data data;
|
||||
|
|
@ -1461,6 +1543,111 @@ static void test_acpi_piix4_tcg_acpi_hmat(void)
|
|||
test_acpi_tcg_acpi_hmat(MACHINE_PC);
|
||||
}
|
||||
|
||||
static void test_acpi_virt_tcg_acpi_hmat(void)
|
||||
{
|
||||
test_data data = {
|
||||
.machine = "virt",
|
||||
.tcg_only = true,
|
||||
.uefi_fl1 = "pc-bios/edk2-aarch64-code.fd",
|
||||
.uefi_fl2 = "pc-bios/edk2-arm-vars.fd",
|
||||
.cd = "tests/data/uefi-boot-images/bios-tables-test.aarch64.iso.qcow2",
|
||||
.ram_start = 0x40000000ULL,
|
||||
.scan_len = 128ULL * 1024 * 1024,
|
||||
};
|
||||
|
||||
data.variant = ".acpihmatvirt";
|
||||
|
||||
test_acpi_one(" -machine hmat=on"
|
||||
" -cpu cortex-a57"
|
||||
" -smp 4,sockets=2"
|
||||
" -m 256M"
|
||||
" -object memory-backend-ram,size=64M,id=ram0"
|
||||
" -object memory-backend-ram,size=64M,id=ram1"
|
||||
" -object memory-backend-ram,size=128M,id=ram2"
|
||||
" -numa node,nodeid=0,memdev=ram0"
|
||||
" -numa node,nodeid=1,memdev=ram1"
|
||||
" -numa node,nodeid=2,memdev=ram2"
|
||||
" -numa cpu,node-id=0,socket-id=0"
|
||||
" -numa cpu,node-id=0,socket-id=0"
|
||||
" -numa cpu,node-id=1,socket-id=1"
|
||||
" -numa cpu,node-id=1,socket-id=1"
|
||||
" -numa hmat-lb,initiator=0,target=0,hierarchy=memory,"
|
||||
"data-type=access-latency,latency=10"
|
||||
" -numa hmat-lb,initiator=0,target=0,hierarchy=memory,"
|
||||
"data-type=access-bandwidth,bandwidth=10485760"
|
||||
" -numa hmat-lb,initiator=0,target=1,hierarchy=memory,"
|
||||
"data-type=access-latency,latency=20"
|
||||
" -numa hmat-lb,initiator=0,target=1,hierarchy=memory,"
|
||||
"data-type=access-bandwidth,bandwidth=5242880"
|
||||
" -numa hmat-lb,initiator=0,target=2,hierarchy=memory,"
|
||||
"data-type=access-latency,latency=30"
|
||||
" -numa hmat-lb,initiator=0,target=2,hierarchy=memory,"
|
||||
"data-type=access-bandwidth,bandwidth=1048576"
|
||||
" -numa hmat-lb,initiator=1,target=0,hierarchy=memory,"
|
||||
"data-type=access-latency,latency=20"
|
||||
" -numa hmat-lb,initiator=1,target=0,hierarchy=memory,"
|
||||
"data-type=access-bandwidth,bandwidth=5242880"
|
||||
" -numa hmat-lb,initiator=1,target=1,hierarchy=memory,"
|
||||
"data-type=access-latency,latency=10"
|
||||
" -numa hmat-lb,initiator=1,target=1,hierarchy=memory,"
|
||||
"data-type=access-bandwidth,bandwidth=10485760"
|
||||
" -numa hmat-lb,initiator=1,target=2,hierarchy=memory,"
|
||||
"data-type=access-latency,latency=30"
|
||||
" -numa hmat-lb,initiator=1,target=2,hierarchy=memory,"
|
||||
"data-type=access-bandwidth,bandwidth=1048576",
|
||||
&data);
|
||||
|
||||
free_test_data(&data);
|
||||
}
|
||||
|
||||
static void test_acpi_q35_tcg_acpi_hmat_noinitiator(void)
|
||||
{
|
||||
test_data data;
|
||||
|
||||
memset(&data, 0, sizeof(data));
|
||||
data.machine = MACHINE_Q35;
|
||||
data.variant = ".acpihmat-noinitiator";
|
||||
test_acpi_one(" -machine hmat=on"
|
||||
" -smp 4,sockets=2"
|
||||
" -m 128M"
|
||||
" -object memory-backend-ram,size=32M,id=ram0"
|
||||
" -object memory-backend-ram,size=32M,id=ram1"
|
||||
" -object memory-backend-ram,size=64M,id=ram2"
|
||||
" -numa node,nodeid=0,memdev=ram0"
|
||||
" -numa node,nodeid=1,memdev=ram1"
|
||||
" -numa node,nodeid=2,memdev=ram2"
|
||||
" -numa cpu,node-id=0,socket-id=0"
|
||||
" -numa cpu,node-id=0,socket-id=0"
|
||||
" -numa cpu,node-id=1,socket-id=1"
|
||||
" -numa cpu,node-id=1,socket-id=1"
|
||||
" -numa hmat-lb,initiator=0,target=0,hierarchy=memory,"
|
||||
"data-type=access-latency,latency=10"
|
||||
" -numa hmat-lb,initiator=0,target=0,hierarchy=memory,"
|
||||
"data-type=access-bandwidth,bandwidth=10485760"
|
||||
" -numa hmat-lb,initiator=0,target=1,hierarchy=memory,"
|
||||
"data-type=access-latency,latency=20"
|
||||
" -numa hmat-lb,initiator=0,target=1,hierarchy=memory,"
|
||||
"data-type=access-bandwidth,bandwidth=5242880"
|
||||
" -numa hmat-lb,initiator=0,target=2,hierarchy=memory,"
|
||||
"data-type=access-latency,latency=30"
|
||||
" -numa hmat-lb,initiator=0,target=2,hierarchy=memory,"
|
||||
"data-type=access-bandwidth,bandwidth=1048576"
|
||||
" -numa hmat-lb,initiator=1,target=0,hierarchy=memory,"
|
||||
"data-type=access-latency,latency=20"
|
||||
" -numa hmat-lb,initiator=1,target=0,hierarchy=memory,"
|
||||
"data-type=access-bandwidth,bandwidth=5242880"
|
||||
" -numa hmat-lb,initiator=1,target=1,hierarchy=memory,"
|
||||
"data-type=access-latency,latency=10"
|
||||
" -numa hmat-lb,initiator=1,target=1,hierarchy=memory,"
|
||||
"data-type=access-bandwidth,bandwidth=10485760"
|
||||
" -numa hmat-lb,initiator=1,target=2,hierarchy=memory,"
|
||||
"data-type=access-latency,latency=30"
|
||||
" -numa hmat-lb,initiator=1,target=2,hierarchy=memory,"
|
||||
"data-type=access-bandwidth,bandwidth=1048576",
|
||||
&data);
|
||||
free_test_data(&data);
|
||||
}
|
||||
|
||||
#ifdef CONFIG_POSIX
|
||||
static void test_acpi_erst(const char *machine)
|
||||
{
|
||||
|
|
@ -1824,6 +2011,8 @@ int main(int argc, char *argv[])
|
|||
qtest_add_func("acpi/q35/nohpet", test_acpi_q35_tcg_nohpet);
|
||||
qtest_add_func("acpi/q35/dimmpxm", test_acpi_q35_tcg_dimm_pxm);
|
||||
qtest_add_func("acpi/q35/acpihmat", test_acpi_q35_tcg_acpi_hmat);
|
||||
qtest_add_func("acpi/q35/acpihmat-noinitiator",
|
||||
test_acpi_q35_tcg_acpi_hmat_noinitiator);
|
||||
#ifdef CONFIG_POSIX
|
||||
qtest_add_func("acpi/q35/acpierst", test_acpi_q35_acpi_erst);
|
||||
#endif
|
||||
|
|
@ -1835,6 +2024,8 @@ int main(int argc, char *argv[])
|
|||
if (has_kvm) {
|
||||
qtest_add_func("acpi/q35/kvm/xapic", test_acpi_q35_kvm_xapic);
|
||||
qtest_add_func("acpi/q35/kvm/dmar", test_acpi_q35_kvm_dmar);
|
||||
qtest_add_func("acpi/q35/core-count2",
|
||||
test_acpi_q35_tcg_core_count2);
|
||||
}
|
||||
qtest_add_func("acpi/q35/viot", test_acpi_q35_viot);
|
||||
#ifdef CONFIG_POSIX
|
||||
|
|
@ -1864,6 +2055,8 @@ int main(int argc, char *argv[])
|
|||
} else if (strcmp(arch, "aarch64") == 0) {
|
||||
if (has_tcg) {
|
||||
qtest_add_func("acpi/virt", test_acpi_virt_tcg);
|
||||
qtest_add_func("acpi/virt/acpihmatvirt",
|
||||
test_acpi_virt_tcg_acpi_hmat);
|
||||
qtest_add_func("acpi/virt/numamem", test_acpi_virt_tcg_numamem);
|
||||
qtest_add_func("acpi/virt/memhp", test_acpi_virt_tcg_memhp);
|
||||
qtest_add_func("acpi/virt/pxb", test_acpi_virt_tcg_pxb);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue