tests: Rename pc-cpu-test.c to cpu-plug-test.c
The test will be extended to work on other architectures, too, so let's use a more generic name for the file and the functions in here first. Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Reviewed-by: David Hildenbrand <david@redhat.com> Signed-off-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
parent
b384cd95eb
commit
152e039359
@ -278,7 +278,7 @@ gcov-files-i386-y += hw/usb/dev-hid.c
|
|||||||
gcov-files-i386-y += hw/usb/dev-storage.c
|
gcov-files-i386-y += hw/usb/dev-storage.c
|
||||||
check-qtest-i386-y += tests/usb-hcd-xhci-test$(EXESUF)
|
check-qtest-i386-y += tests/usb-hcd-xhci-test$(EXESUF)
|
||||||
gcov-files-i386-y += hw/usb/hcd-xhci.c
|
gcov-files-i386-y += hw/usb/hcd-xhci.c
|
||||||
check-qtest-i386-y += tests/pc-cpu-test$(EXESUF)
|
check-qtest-i386-y += tests/cpu-plug-test$(EXESUF)
|
||||||
check-qtest-i386-y += tests/q35-test$(EXESUF)
|
check-qtest-i386-y += tests/q35-test$(EXESUF)
|
||||||
check-qtest-i386-y += tests/vmgenid-test$(EXESUF)
|
check-qtest-i386-y += tests/vmgenid-test$(EXESUF)
|
||||||
gcov-files-i386-y += hw/pci-host/q35.c
|
gcov-files-i386-y += hw/pci-host/q35.c
|
||||||
@ -795,7 +795,7 @@ tests/usb-hcd-ohci-test$(EXESUF): tests/usb-hcd-ohci-test.o $(libqos-usb-obj-y)
|
|||||||
tests/usb-hcd-uhci-test$(EXESUF): tests/usb-hcd-uhci-test.o $(libqos-usb-obj-y)
|
tests/usb-hcd-uhci-test$(EXESUF): tests/usb-hcd-uhci-test.o $(libqos-usb-obj-y)
|
||||||
tests/usb-hcd-ehci-test$(EXESUF): tests/usb-hcd-ehci-test.o $(libqos-usb-obj-y)
|
tests/usb-hcd-ehci-test$(EXESUF): tests/usb-hcd-ehci-test.o $(libqos-usb-obj-y)
|
||||||
tests/usb-hcd-xhci-test$(EXESUF): tests/usb-hcd-xhci-test.o $(libqos-usb-obj-y)
|
tests/usb-hcd-xhci-test$(EXESUF): tests/usb-hcd-xhci-test.o $(libqos-usb-obj-y)
|
||||||
tests/pc-cpu-test$(EXESUF): tests/pc-cpu-test.o
|
tests/cpu-plug-test$(EXESUF): tests/cpu-plug-test.o
|
||||||
tests/migration-test$(EXESUF): tests/migration-test.o
|
tests/migration-test$(EXESUF): tests/migration-test.o
|
||||||
tests/vhost-user-test$(EXESUF): tests/vhost-user-test.o $(test-util-obj-y) \
|
tests/vhost-user-test$(EXESUF): tests/vhost-user-test.o $(test-util-obj-y) \
|
||||||
$(qtest-obj-y) $(test-io-obj-y) $(libqos-virtio-obj-y) $(libqos-pc-obj-y) \
|
$(qtest-obj-y) $(test-io-obj-y) $(libqos-virtio-obj-y) $(libqos-pc-obj-y) \
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* QTest testcase for PC CPUs
|
* QTest testcase for CPU plugging
|
||||||
*
|
*
|
||||||
* Copyright (c) 2015 SUSE Linux GmbH
|
* Copyright (c) 2015 SUSE Linux GmbH
|
||||||
*
|
*
|
||||||
@ -13,7 +13,7 @@
|
|||||||
#include "libqtest.h"
|
#include "libqtest.h"
|
||||||
#include "qapi/qmp/types.h"
|
#include "qapi/qmp/types.h"
|
||||||
|
|
||||||
struct PCTestData {
|
struct PlugTestData {
|
||||||
char *machine;
|
char *machine;
|
||||||
const char *cpu_model;
|
const char *cpu_model;
|
||||||
unsigned sockets;
|
unsigned sockets;
|
||||||
@ -21,11 +21,11 @@ struct PCTestData {
|
|||||||
unsigned threads;
|
unsigned threads;
|
||||||
unsigned maxcpus;
|
unsigned maxcpus;
|
||||||
};
|
};
|
||||||
typedef struct PCTestData PCTestData;
|
typedef struct PlugTestData PlugTestData;
|
||||||
|
|
||||||
static void test_pc_with_cpu_add(gconstpointer data)
|
static void test_plug_with_cpu_add(gconstpointer data)
|
||||||
{
|
{
|
||||||
const PCTestData *s = data;
|
const PlugTestData *s = data;
|
||||||
char *args;
|
char *args;
|
||||||
QDict *response;
|
QDict *response;
|
||||||
unsigned int i;
|
unsigned int i;
|
||||||
@ -48,9 +48,9 @@ static void test_pc_with_cpu_add(gconstpointer data)
|
|||||||
g_free(args);
|
g_free(args);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void test_pc_without_cpu_add(gconstpointer data)
|
static void test_plug_without_cpu_add(gconstpointer data)
|
||||||
{
|
{
|
||||||
const PCTestData *s = data;
|
const PlugTestData *s = data;
|
||||||
char *args;
|
char *args;
|
||||||
QDict *response;
|
QDict *response;
|
||||||
|
|
||||||
@ -73,7 +73,7 @@ static void test_pc_without_cpu_add(gconstpointer data)
|
|||||||
|
|
||||||
static void test_data_free(gpointer data)
|
static void test_data_free(gpointer data)
|
||||||
{
|
{
|
||||||
PCTestData *pc = data;
|
PlugTestData *pc = data;
|
||||||
|
|
||||||
g_free(pc->machine);
|
g_free(pc->machine);
|
||||||
g_free(pc);
|
g_free(pc);
|
||||||
@ -82,12 +82,12 @@ static void test_data_free(gpointer data)
|
|||||||
static void add_pc_test_case(const char *mname)
|
static void add_pc_test_case(const char *mname)
|
||||||
{
|
{
|
||||||
char *path;
|
char *path;
|
||||||
PCTestData *data;
|
PlugTestData *data;
|
||||||
|
|
||||||
if (!g_str_has_prefix(mname, "pc-")) {
|
if (!g_str_has_prefix(mname, "pc-")) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
data = g_new(PCTestData, 1);
|
data = g_new(PlugTestData, 1);
|
||||||
data->machine = g_strdup(mname);
|
data->machine = g_strdup(mname);
|
||||||
data->cpu_model = "Haswell"; /* 1.3+ theoretically */
|
data->cpu_model = "Haswell"; /* 1.3+ theoretically */
|
||||||
data->sockets = 1;
|
data->sockets = 1;
|
||||||
@ -108,14 +108,14 @@ static void add_pc_test_case(const char *mname)
|
|||||||
path = g_strdup_printf("cpu/%s/init/%ux%ux%u&maxcpus=%u",
|
path = g_strdup_printf("cpu/%s/init/%ux%ux%u&maxcpus=%u",
|
||||||
mname, data->sockets, data->cores,
|
mname, data->sockets, data->cores,
|
||||||
data->threads, data->maxcpus);
|
data->threads, data->maxcpus);
|
||||||
qtest_add_data_func_full(path, data, test_pc_without_cpu_add,
|
qtest_add_data_func_full(path, data, test_plug_without_cpu_add,
|
||||||
test_data_free);
|
test_data_free);
|
||||||
g_free(path);
|
g_free(path);
|
||||||
} else {
|
} else {
|
||||||
path = g_strdup_printf("cpu/%s/add/%ux%ux%u&maxcpus=%u",
|
path = g_strdup_printf("cpu/%s/add/%ux%ux%u&maxcpus=%u",
|
||||||
mname, data->sockets, data->cores,
|
mname, data->sockets, data->cores,
|
||||||
data->threads, data->maxcpus);
|
data->threads, data->maxcpus);
|
||||||
qtest_add_data_func_full(path, data, test_pc_with_cpu_add,
|
qtest_add_data_func_full(path, data, test_plug_with_cpu_add,
|
||||||
test_data_free);
|
test_data_free);
|
||||||
g_free(path);
|
g_free(path);
|
||||||
}
|
}
|
Loading…
Reference in New Issue
Block a user