david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

-----BEGIN PGP SIGNATURE-----

Browse Source 
Version: GnuPG v1
 
 iQEcBAABAgAGBQJVAfHaAAoJEJykq7OBq3PIv3MH/3U5jKORmKLx1N/xE4C+aAh6
 +7nRnPxBvGVNNY70cXwASKBeAZTH9DKdwirK46+K9CBwWj6D2ZQ4/RjdR6v8hRUf
 pskGBEMKigz5+Hif15ZpcE1aQ+Y3XwcIXY/s5tzUFSyucjRhJdsO+x/LnKfq+HoW
 qAm8IQfH/1WFP2nDw0FiNA88pfYX7zjOle8vI7ZMlyl7JvmgOpYPetY0BSU+8HAG
 NA3z8NtXdoD76kGJUVDzNMxXjYTB2onmVkte316PgsSy+CMyA+1vAM7QwIeozR1T
 NVrYuz/CUiXBMoVsrana0sBaIwkjCWJh9uOLJZ2P+XqQurzBQi/a33uUELoZ5o4=
 =elQH
 -----END PGP SIGNATURE-----

Merge remote-tracking branch 'remotes/stefanha/tags/net-pull-request' into staging

# gpg: Signature made Thu Mar 12 20:06:50 2015 GMT using RSA key ID 81AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg:                 aka "Stefan Hajnoczi <stefanha@gmail.com>"

* remotes/stefanha/tags/net-pull-request:
  tests: rtl8139: test timers and interrupt
  net: synchronize net_host_device_remove with host_net_remove_completion

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2015-03-13 11:00:57 +00:00
commit 82389dcc13
3 changed files with 185 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
net/net.c
View File

@ -324,6 +324,8 @@ void qemu_del_net_client(NetClientState *nc)
NetClientState *ncs[MAX_QUEUE_NUM];
int queues, i;
assert(nc->info->type != NET_CLIENT_OPTIONS_KIND_NIC);
/* If the NetClientState belongs to a multiqueue backend, we will change all
* other NetClientStates also.
*/
@ -355,8 +357,6 @@ void qemu_del_net_client(NetClientState *nc)
return;
}
assert(nc->info->type != NET_CLIENT_OPTIONS_KIND_NIC);
for (i = 0; i < queues; i++) {
qemu_cleanup_net_client(ncs[i]);
qemu_free_net_client(ncs[i]);
@ -991,7 +991,7 @@ void hmp_host_net_remove(Monitor *mon, const QDict *qdict)
device, vlan_id);
return;
}
if (!net_host_check_device(nc->model)) {
if (nc->info->type == NET_CLIENT_OPTIONS_KIND_NIC) {
error_report("invalid host network device '%s'", device);
return;
}

2
tests/Makefile
View File

@ -332,7 +332,7 @@ tests/tmp105-test$(EXESUF): tests/tmp105-test.o $(libqos-omap-obj-y)
tests/i440fx-test$(EXESUF): tests/i440fx-test.o $(libqos-pc-obj-y)
tests/fw_cfg-test$(EXESUF): tests/fw_cfg-test.o $(libqos-pc-obj-y)
tests/e1000-test$(EXESUF): tests/e1000-test.o
tests/rtl8139-test$(EXESUF): tests/rtl8139-test.o
tests/rtl8139-test$(EXESUF): tests/rtl8139-test.o $(libqos-pc-obj-y)
tests/pcnet-test$(EXESUF): tests/pcnet-test.o
tests/eepro100-test$(EXESUF): tests/eepro100-test.o
tests/vmxnet3-test$(EXESUF): tests/vmxnet3-test.o

181
tests/rtl8139-test.c
View File

@ -10,19 +10,200 @@
#include <glib.h>
#include <string.h>
#include "libqtest.h"
#include "libqos/pci-pc.h"
#include "qemu/osdep.h"
#include "qemu-common.h"
/* Tests only initialization so far. TODO: Replace with functional tests */
static void nop(void)
{
}
#define CLK 33000000
#define NS_PER_SEC 1000000000ULL
static QPCIBus *pcibus;
static QPCIDevice *dev;
static void *dev_base;
static void save_fn(QPCIDevice *dev, int devfn, void *data)
{
QPCIDevice **pdev = (QPCIDevice **) data;
*pdev = dev;
}
static QPCIDevice *get_device(void)
{
QPCIDevice *dev;
pcibus = qpci_init_pc();
qpci_device_foreach(pcibus, 0x10ec, 0x8139, save_fn, &dev);
g_assert(dev != NULL);
return dev;
}
#define PORT(name, len, val) \
static unsigned __attribute__((unused)) in_##name(void) \
{ \
unsigned res = qpci_io_read##len(dev, dev_base+(val)); \
g_test_message("*%s -> %x\n", #name, res); \
return res; \
} \
static void out_##name(unsigned v) \
{ \
g_test_message("%x -> *%s\n", v, #name); \
qpci_io_write##len(dev, dev_base+(val), v); \
}
PORT(Timer, l, 0x48)
PORT(IntrMask, w, 0x3c)
PORT(IntrStatus, w, 0x3E)
PORT(TimerInt, l, 0x54)
#define fatal(...) do { g_test_message(__VA_ARGS__); g_assert(0); } while (0)
static void test_timer(void)
{
const unsigned from = 0.95 * CLK;
const unsigned to = 1.6 * CLK;
unsigned prev, curr, next;
unsigned cnt, diff;
out_IntrMask(0);
in_IntrStatus();
in_Timer();
in_Timer();
/* Test 1. test counter continue and continue */
out_TimerInt(0); /* disable timer */
out_IntrStatus(0x4000);
out_Timer(12345); /* reset timer to 0 */
curr = in_Timer();
if (curr > 0.1 * CLK) {
fatal("time too big %u\n", curr);
}
for (cnt = 0; ; ) {
clock_step(1 * NS_PER_SEC);
prev = curr;
curr = in_Timer();
/* test skip is in a specific range */
diff = (curr-prev) & 0xffffffffu;
if (diff < from || diff > to) {
fatal("Invalid diff %u (%u-%u)\n", diff, from, to);
}
if (curr < prev && ++cnt == 3) {
break;
}
}
/* Test 2. Check we didn't get an interrupt with TimerInt == 0 */
if (in_IntrStatus() & 0x4000) {
fatal("got an interrupt\n");
}
/* Test 3. Setting TimerInt to 1 and Timer to 0 get interrupt */
out_TimerInt(1);
out_Timer(0);
clock_step(40);
if ((in_IntrStatus() & 0x4000) == 0) {
fatal("we should have an interrupt here!\n");
}
/* Test 3. Check acknowledge */
out_IntrStatus(0x4000);
if (in_IntrStatus() & 0x4000) {
fatal("got an interrupt\n");
}
/* Test. Status set after Timer reset */
out_Timer(0);
out_TimerInt(0);
out_IntrStatus(0x4000);
curr = in_Timer();
out_TimerInt(curr + 0.5 * CLK);
clock_step(1 * NS_PER_SEC);
out_Timer(0);
if ((in_IntrStatus() & 0x4000) == 0) {
fatal("we should have an interrupt here!\n");
}
/* Test. Status set after TimerInt reset */
out_Timer(0);
out_TimerInt(0);
out_IntrStatus(0x4000);
curr = in_Timer();
out_TimerInt(curr + 0.5 * CLK);
clock_step(1 * NS_PER_SEC);
out_TimerInt(0);
if ((in_IntrStatus() & 0x4000) == 0) {
fatal("we should have an interrupt here!\n");
}
/* Test 4. Increment TimerInt we should see an interrupt */
curr = in_Timer();
next = curr + 5.0 * CLK;
out_TimerInt(next);
for (cnt = 0; ; ) {
clock_step(1 * NS_PER_SEC);
prev = curr;
curr = in_Timer();
diff = (curr-prev) & 0xffffffffu;
if (diff < from || diff > to) {
fatal("Invalid diff %u (%u-%u)\n", diff, from, to);
}
if (cnt < 3 && curr > next) {
if ((in_IntrStatus() & 0x4000) == 0) {
fatal("we should have an interrupt here!\n");
}
out_IntrStatus(0x4000);
next = curr + 5.0 * CLK;
out_TimerInt(next);
if (++cnt == 3) {
out_TimerInt(1);
}
/* Test 5. Second time we pass from 0 should see an interrupt */
} else if (cnt >= 3 && curr < prev) {
/* here we should have an interrupt */
if ((in_IntrStatus() & 0x4000) == 0) {
fatal("we should have an interrupt here!\n");
}
out_IntrStatus(0x4000);
if (++cnt == 5) {
break;
}
}
}
g_test_message("Everythink is ok!\n");
}
static void test_init(void)
{
uint64_t barsize;
dev = get_device();
dev_base = qpci_iomap(dev, 0, &barsize);
g_assert(dev_base != NULL);
qpci_device_enable(dev);
test_timer();
}
int main(int argc, char **argv)
{
int ret;
g_test_init(&argc, &argv, NULL);
qtest_add_func("/rtl8139/nop", nop);
qtest_add_func("/rtl8139/timer", test_init);
qtest_start("-device rtl8139");
ret = g_test_run();