From cb434b442a14180a67be1b154b50d14a19095cc4 Mon Sep 17 00:00:00 2001 From: Fabian Freyer Date: Wed, 9 May 2018 03:01:36 +0200 Subject: [PATCH] bhyve: add tests for wiring memory Signed-off-by: Fabian Freyer Reviewed-by: Roman Bogorodskiy --- .../bhyveargv2xml-wired.args | 7 ++++ .../bhyveargv2xmldata/bhyveargv2xml-wired.xml | 19 ++++++++++ tests/bhyveargv2xmltest.c | 1 + .../bhyvexml2argv-wired.args | 10 ++++++ .../bhyvexml2argv-wired.ldargs | 3 ++ .../bhyvexml2argvdata/bhyvexml2argv-wired.xml | 26 ++++++++++++++ tests/bhyvexml2argvtest.c | 1 + .../bhyvexml2xmlout-wired.xml | 36 +++++++++++++++++++ tests/bhyvexml2xmltest.c | 1 + 9 files changed, 104 insertions(+) create mode 100644 tests/bhyveargv2xmldata/bhyveargv2xml-wired.args create mode 100644 tests/bhyveargv2xmldata/bhyveargv2xml-wired.xml create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-wired.args create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-wired.ldargs create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-wired.xml create mode 100644 tests/bhyvexml2xmloutdata/bhyvexml2xmlout-wired.xml diff --git a/tests/bhyveargv2xmldata/bhyveargv2xml-wired.args b/tests/bhyveargv2xmldata/bhyveargv2xml-wired.args new file mode 100644 index 0000000000..5d0ad765b8 --- /dev/null +++ b/tests/bhyveargv2xmldata/bhyveargv2xml-wired.args @@ -0,0 +1,7 @@ +/usr/sbin/bhyve \ +-c 1 \ +-m 214 \ +-H \ +-P \ +-S \ +-s 0:0,hostbridge bhyve diff --git a/tests/bhyveargv2xmldata/bhyveargv2xml-wired.xml b/tests/bhyveargv2xmldata/bhyveargv2xml-wired.xml new file mode 100644 index 0000000000..0f4cea5441 --- /dev/null +++ b/tests/bhyveargv2xmldata/bhyveargv2xml-wired.xml @@ -0,0 +1,19 @@ + + bhyve + c7a5fdbd-edaf-9455-926a-d65c16db1809 + 219136 + 219136 + + + + 1 + + hvm + + + destroy + destroy + destroy + + + diff --git a/tests/bhyveargv2xmltest.c b/tests/bhyveargv2xmltest.c index e5d78530c5..d552364846 100644 --- a/tests/bhyveargv2xmltest.c +++ b/tests/bhyveargv2xmltest.c @@ -163,6 +163,7 @@ mymain(void) driver.bhyvecaps = BHYVE_CAP_RTC_UTC; DO_TEST("base"); + DO_TEST("wired"); DO_TEST("oneline"); DO_TEST("name"); DO_TEST("console"); diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-wired.args b/tests/bhyvexml2argvdata/bhyvexml2argv-wired.args new file mode 100644 index 0000000000..13d4f49095 --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-wired.args @@ -0,0 +1,10 @@ +/usr/sbin/bhyve \ +-c 1 \ +-m 214 \ +-S \ +-u \ +-H \ +-P \ +-s 0:0,hostbridge \ +-s 2:0,ahci,hd:/tmp/freebsd.img \ +-s 3:0,virtio-net,faketapdev,mac=52:54:00:b9:94:02 bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-wired.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-wired.ldargs new file mode 100644 index 0000000000..32538b558e --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-wired.ldargs @@ -0,0 +1,3 @@ +/usr/sbin/bhyveload \ +-m 214 \ +-d /tmp/freebsd.img bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-wired.xml b/tests/bhyvexml2argvdata/bhyvexml2argv-wired.xml new file mode 100644 index 0000000000..639e047dd8 --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-wired.xml @@ -0,0 +1,26 @@ + + bhyve + df3be7e7-a104-11e3-aeb0-50e5492bd3dc + 219136 + + + + 1 + + hvm + + + + + + +
+ + + + + +
+ + + diff --git a/tests/bhyvexml2argvtest.c b/tests/bhyvexml2argvtest.c index 6f3b0c2ebf..b08b1675f3 100644 --- a/tests/bhyvexml2argvtest.c +++ b/tests/bhyvexml2argvtest.c @@ -179,6 +179,7 @@ mymain(void) BHYVE_CAP_FBUF | BHYVE_CAP_XHCI; DO_TEST("base"); + DO_TEST("wired"); DO_TEST("acpiapic"); DO_TEST("disk-cdrom"); DO_TEST("disk-virtio"); diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-wired.xml b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-wired.xml new file mode 100644 index 0000000000..ed564e2777 --- /dev/null +++ b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-wired.xml @@ -0,0 +1,36 @@ + + bhyve + df3be7e7-a104-11e3-aeb0-50e5492bd3dc + 219136 + 219136 + + + + 1 + + hvm + + + + destroy + restart + destroy + + + + + +
+ + + +
+ + + + + +
+ + + diff --git a/tests/bhyvexml2xmltest.c b/tests/bhyvexml2xmltest.c index 4d9c1681db..6aaeab741e 100644 --- a/tests/bhyvexml2xmltest.c +++ b/tests/bhyvexml2xmltest.c @@ -84,6 +84,7 @@ mymain(void) DO_TEST_DIFFERENT("acpiapic"); DO_TEST_DIFFERENT("base"); + DO_TEST_DIFFERENT("wired"); DO_TEST_DIFFERENT("bhyveload-bootorder"); DO_TEST_DIFFERENT("bhyveload-bootorder1"); DO_TEST_DIFFERENT("bhyveload-bootorder2");