* [Qemu-devel] [PATCH] tests: add pxe e1000 test
@ 2016-02-14 12:10 Victor Kaplansky
2016-02-14 13:31 ` Michael S. Tsirkin
0 siblings, 1 reply; 2+ messages in thread
From: Victor Kaplansky @ 2016-02-14 12:10 UTC (permalink / raw)
To: qemu-devel; +Cc: Jason Wang, Michael S. Tsirkin
The test is based on bios-tables-test.c. It creates a file with
a boot sector image and loads it into a guest using PXE and TFTP
functionality.
Cc: Jason Wang <jasowang@redhat.com>
Signed-off-by: Victor Kaplansky <victork@redhat.com>
Suggested-by: Michael S. Tsirkin <mst@redhat.com>
---
tests/pxe-test.c | 141 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
tests/Makefile | 2 +
2 files changed, 143 insertions(+)
create mode 100644 tests/pxe-test.c
diff --git a/tests/pxe-test.c b/tests/pxe-test.c
new file mode 100644
index 00000000..3a45698d
--- /dev/null
+++ b/tests/pxe-test.c
@@ -0,0 +1,141 @@
+/*
+ * PXE test cases.
+ *
+ * Copyright (c) 2013 Red Hat Inc.
+ *
+ * Authors:
+ * Michael S. Tsirkin <mst@redhat.com>,
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or later.
+ * See the COPYING file in the top-level directory.
+ */
+
+#include <string.h>
+#include <stdio.h>
+#include <glib.h>
+#include <glib/gstdio.h>
+#include "qemu-common.h"
+#include "libqtest.h"
+
+#define LOW(x) ((x) & 0xff)
+#define HIGH(x) ((x) >> 8)
+
+#define SIGNATURE 0xdead
+#define SIGNATURE_OFFSET 0x10
+#define BOOT_SECTOR_ADDRESS 0x7c00
+#define NETNAME "net0"
+
+/* Boot sector code: write SIGNATURE into memory,
+ * then halt.
+ * Q35 machine requires a minimum 0x7e000 bytes disk.
+ * (bug or feature?)
+ */
+static uint8_t boot_sector[0x7e000] = {
+ /* The first sector will be placed at RAM address 00007C00, and
+ * the BIOS transfers control to 00007C00
+ */
+
+ /* Data Segment register should be initialized, since pxe
+ * boot loader can leave it dirty.
+ */
+
+ /* 7c00: move $0000,%ax */
+ [0x00] = 0xb8,
+ [0x01] = 0x00,
+ [0x02] = 0x00,
+ /* 7c03: move %ax,%ds */
+ [0x03] = 0x8e,
+ [0x04] = 0xd8,
+
+ /* 7c05: mov $0xdead,%ax */
+ [0x05] = 0xb8,
+ [0x06] = LOW(SIGNATURE),
+ [0x07] = HIGH(SIGNATURE),
+ /* 7c08: mov %ax,0x7c10 */
+ [0x08] = 0xa3,
+ [0x09] = LOW(BOOT_SECTOR_ADDRESS + SIGNATURE_OFFSET),
+ [0x0a] = HIGH(BOOT_SECTOR_ADDRESS + SIGNATURE_OFFSET),
+
+ /* 7c0b cli */
+ [0x0b] = 0xfa,
+ /* 7c0c: hlt */
+ [0x0c] = 0xf4,
+ /* 7c0e: jmp 0x7c07=0x7c0f-3 */
+ [0x0d] = 0xeb,
+ [0x0e] = LOW(-3),
+ /* We mov 0xdead here: set value to make debugging easier */
+ [SIGNATURE_OFFSET] = LOW(0xface),
+ [SIGNATURE_OFFSET + 1] = HIGH(0xface),
+ /* End of boot sector marker */
+ [0x1FE] = 0x55,
+ [0x1FF] = 0xAA,
+};
+
+static const char *disk = "tests/pxe-test-disk.raw";
+
+static void test_pxe_e1000_one(const char *params)
+{
+ char *args;
+ uint8_t signature_low;
+ uint8_t signature_high;
+ uint16_t signature;
+ int i;
+
+ args = g_strdup_printf("-machine accel=tcg "
+ "-netdev user,id=" NETNAME ",tftp=./,bootfile=%s "
+ "%s ",
+ disk, params);
+
+ qtest_start(args);
+
+ /* Wait at most 1 minute */
+#define TEST_DELAY (1 * G_USEC_PER_SEC / 10)
+#define TEST_CYCLES MAX((60 * G_USEC_PER_SEC / TEST_DELAY), 1)
+
+ /* Poll until code has run and modified memory. Once it has we know BIOS
+ * initialization is done. TODO: check that IP reached the halt
+ * instruction.
+ */
+ for (i = 0; i < TEST_CYCLES; ++i) {
+ signature_low = readb(BOOT_SECTOR_ADDRESS + SIGNATURE_OFFSET);
+ signature_high = readb(BOOT_SECTOR_ADDRESS + SIGNATURE_OFFSET + 1);
+ signature = (signature_high << 8) | signature_low;
+ if (signature == SIGNATURE) {
+ break;
+ }
+ g_usleep(TEST_DELAY);
+ }
+
+ g_assert_cmphex(signature, ==, SIGNATURE);
+
+ qtest_quit(global_qtest);
+ g_free(args);
+}
+
+static void test_pxe_e1000(void)
+{
+ test_pxe_e1000_one("-device virtio-net-pci,netdev=" NETNAME);
+}
+
+int main(int argc, char *argv[])
+{
+ const char *arch = qtest_get_arch();
+ FILE *f = fopen(disk, "w");
+ int ret;
+
+ if (!f) {
+ fprintf(stderr, "Couldn't open \"%s\": %s", disk, strerror(errno));
+ return 1;
+ }
+ fwrite(boot_sector, 1, sizeof boot_sector, f);
+ fclose(f);
+
+ g_test_init(&argc, &argv, NULL);
+
+ if (strcmp(arch, "i386") == 0 || strcmp(arch, "x86_64") == 0) {
+ qtest_add_func("pxe/e1000", test_pxe_e1000);
+ }
+ ret = g_test_run();
+ unlink(disk);
+ return ret;
+}
diff --git a/tests/Makefile b/tests/Makefile
index 650e654e..2de51e4d 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -173,6 +173,7 @@ check-qtest-i386-y += tests/hd-geo-test$(EXESUF)
gcov-files-i386-y += hw/block/hd-geometry.c
check-qtest-i386-y += tests/boot-order-test$(EXESUF)
check-qtest-i386-y += tests/bios-tables-test$(EXESUF)
+check-qtest-i386-y += tests/pxe-test$(EXESUF)
check-qtest-i386-y += tests/rtc-test$(EXESUF)
check-qtest-i386-y += tests/ipmi-kcs-test$(EXESUF)
check-qtest-i386-y += tests/ipmi-bt-test$(EXESUF)
@@ -519,6 +520,7 @@ tests/ipmi-bt-test$(EXESUF): tests/ipmi-bt-test.o
tests/hd-geo-test$(EXESUF): tests/hd-geo-test.o
tests/boot-order-test$(EXESUF): tests/boot-order-test.o $(libqos-obj-y)
tests/bios-tables-test$(EXESUF): tests/bios-tables-test.o $(libqos-obj-y)
+tests/pxe-test$(EXESUF): tests/pxe-test.o $(libqos-obj-y)
tests/tmp105-test$(EXESUF): tests/tmp105-test.o $(libqos-omap-obj-y)
tests/ds1338-test$(EXESUF): tests/ds1338-test.o $(libqos-imx-obj-y)
tests/i440fx-test$(EXESUF): tests/i440fx-test.o $(libqos-pc-obj-y)
--
--Victor
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [Qemu-devel] [PATCH] tests: add pxe e1000 test
2016-02-14 12:10 [Qemu-devel] [PATCH] tests: add pxe e1000 test Victor Kaplansky
@ 2016-02-14 13:31 ` Michael S. Tsirkin
0 siblings, 0 replies; 2+ messages in thread
From: Michael S. Tsirkin @ 2016-02-14 13:31 UTC (permalink / raw)
To: Victor Kaplansky; +Cc: Jason Wang, qemu-devel
On Sun, Feb 14, 2016 at 02:10:17PM +0200, Victor Kaplansky wrote:
> The test is based on bios-tables-test.c. It creates a file with
> a boot sector image and loads it into a guest using PXE and TFTP
> functionality.
>
> Cc: Jason Wang <jasowang@redhat.com>
> Signed-off-by: Victor Kaplansky <victork@redhat.com>
> Suggested-by: Michael S. Tsirkin <mst@redhat.com>
Looks good to me, except it actually tests virtio and not e1000.
It's probably easiest to test them both straight away.
> ---
> tests/pxe-test.c | 141 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
> tests/Makefile | 2 +
> 2 files changed, 143 insertions(+)
> create mode 100644 tests/pxe-test.c
>
> diff --git a/tests/pxe-test.c b/tests/pxe-test.c
> new file mode 100644
> index 00000000..3a45698d
> --- /dev/null
> +++ b/tests/pxe-test.c
> @@ -0,0 +1,141 @@
> +/*
> + * PXE test cases.
> + *
> + * Copyright (c) 2013 Red Hat Inc.
> + *
> + * Authors:
> + * Michael S. Tsirkin <mst@redhat.com>,
> + *
> + * This work is licensed under the terms of the GNU GPL, version 2 or later.
> + * See the COPYING file in the top-level directory.
> + */
> +
> +#include <string.h>
> +#include <stdio.h>
> +#include <glib.h>
> +#include <glib/gstdio.h>
> +#include "qemu-common.h"
> +#include "libqtest.h"
> +
> +#define LOW(x) ((x) & 0xff)
> +#define HIGH(x) ((x) >> 8)
> +
> +#define SIGNATURE 0xdead
> +#define SIGNATURE_OFFSET 0x10
> +#define BOOT_SECTOR_ADDRESS 0x7c00
> +#define NETNAME "net0"
> +
> +/* Boot sector code: write SIGNATURE into memory,
> + * then halt.
> + * Q35 machine requires a minimum 0x7e000 bytes disk.
> + * (bug or feature?)
> + */
> +static uint8_t boot_sector[0x7e000] = {
> + /* The first sector will be placed at RAM address 00007C00, and
> + * the BIOS transfers control to 00007C00
> + */
> +
> + /* Data Segment register should be initialized, since pxe
> + * boot loader can leave it dirty.
> + */
> +
> + /* 7c00: move $0000,%ax */
> + [0x00] = 0xb8,
> + [0x01] = 0x00,
> + [0x02] = 0x00,
> + /* 7c03: move %ax,%ds */
> + [0x03] = 0x8e,
> + [0x04] = 0xd8,
> +
> + /* 7c05: mov $0xdead,%ax */
> + [0x05] = 0xb8,
> + [0x06] = LOW(SIGNATURE),
> + [0x07] = HIGH(SIGNATURE),
> + /* 7c08: mov %ax,0x7c10 */
> + [0x08] = 0xa3,
> + [0x09] = LOW(BOOT_SECTOR_ADDRESS + SIGNATURE_OFFSET),
> + [0x0a] = HIGH(BOOT_SECTOR_ADDRESS + SIGNATURE_OFFSET),
> +
> + /* 7c0b cli */
> + [0x0b] = 0xfa,
> + /* 7c0c: hlt */
> + [0x0c] = 0xf4,
> + /* 7c0e: jmp 0x7c07=0x7c0f-3 */
> + [0x0d] = 0xeb,
> + [0x0e] = LOW(-3),
> + /* We mov 0xdead here: set value to make debugging easier */
> + [SIGNATURE_OFFSET] = LOW(0xface),
> + [SIGNATURE_OFFSET + 1] = HIGH(0xface),
> + /* End of boot sector marker */
> + [0x1FE] = 0x55,
> + [0x1FF] = 0xAA,
> +};
> +
> +static const char *disk = "tests/pxe-test-disk.raw";
> +
> +static void test_pxe_e1000_one(const char *params)
> +{
> + char *args;
> + uint8_t signature_low;
> + uint8_t signature_high;
> + uint16_t signature;
> + int i;
> +
> + args = g_strdup_printf("-machine accel=tcg "
> + "-netdev user,id=" NETNAME ",tftp=./,bootfile=%s "
> + "%s ",
> + disk, params);
> +
> + qtest_start(args);
> +
> + /* Wait at most 1 minute */
> +#define TEST_DELAY (1 * G_USEC_PER_SEC / 10)
> +#define TEST_CYCLES MAX((60 * G_USEC_PER_SEC / TEST_DELAY), 1)
> +
> + /* Poll until code has run and modified memory. Once it has we know BIOS
> + * initialization is done. TODO: check that IP reached the halt
> + * instruction.
> + */
> + for (i = 0; i < TEST_CYCLES; ++i) {
> + signature_low = readb(BOOT_SECTOR_ADDRESS + SIGNATURE_OFFSET);
> + signature_high = readb(BOOT_SECTOR_ADDRESS + SIGNATURE_OFFSET + 1);
> + signature = (signature_high << 8) | signature_low;
> + if (signature == SIGNATURE) {
> + break;
> + }
> + g_usleep(TEST_DELAY);
> + }
> +
> + g_assert_cmphex(signature, ==, SIGNATURE);
> +
> + qtest_quit(global_qtest);
> + g_free(args);
> +}
> +
> +static void test_pxe_e1000(void)
> +{
> + test_pxe_e1000_one("-device virtio-net-pci,netdev=" NETNAME);
> +}
> +
> +int main(int argc, char *argv[])
> +{
> + const char *arch = qtest_get_arch();
> + FILE *f = fopen(disk, "w");
> + int ret;
> +
> + if (!f) {
> + fprintf(stderr, "Couldn't open \"%s\": %s", disk, strerror(errno));
> + return 1;
> + }
> + fwrite(boot_sector, 1, sizeof boot_sector, f);
> + fclose(f);
> +
> + g_test_init(&argc, &argv, NULL);
> +
> + if (strcmp(arch, "i386") == 0 || strcmp(arch, "x86_64") == 0) {
> + qtest_add_func("pxe/e1000", test_pxe_e1000);
> + }
> + ret = g_test_run();
> + unlink(disk);
> + return ret;
I can imagine sharing code with bios test.
Move the common stuff into tests/boot-sector.c + tests/boot-sector.h,
and add api e.g.
boot_sector_init(char *fname); // create boot disk
boot_sector_test(); // loop until signature in memory is OK
boot_sector_cleanup(char *fname); // unlike boot disk
Your boot sector is a bit bigger but I think it will also work
for the bios test.
> +}
> diff --git a/tests/Makefile b/tests/Makefile
> index 650e654e..2de51e4d 100644
> --- a/tests/Makefile
> +++ b/tests/Makefile
> @@ -173,6 +173,7 @@ check-qtest-i386-y += tests/hd-geo-test$(EXESUF)
> gcov-files-i386-y += hw/block/hd-geometry.c
> check-qtest-i386-y += tests/boot-order-test$(EXESUF)
> check-qtest-i386-y += tests/bios-tables-test$(EXESUF)
> +check-qtest-i386-y += tests/pxe-test$(EXESUF)
> check-qtest-i386-y += tests/rtc-test$(EXESUF)
> check-qtest-i386-y += tests/ipmi-kcs-test$(EXESUF)
> check-qtest-i386-y += tests/ipmi-bt-test$(EXESUF)
> @@ -519,6 +520,7 @@ tests/ipmi-bt-test$(EXESUF): tests/ipmi-bt-test.o
> tests/hd-geo-test$(EXESUF): tests/hd-geo-test.o
> tests/boot-order-test$(EXESUF): tests/boot-order-test.o $(libqos-obj-y)
> tests/bios-tables-test$(EXESUF): tests/bios-tables-test.o $(libqos-obj-y)
> +tests/pxe-test$(EXESUF): tests/pxe-test.o $(libqos-obj-y)
> tests/tmp105-test$(EXESUF): tests/tmp105-test.o $(libqos-omap-obj-y)
> tests/ds1338-test$(EXESUF): tests/ds1338-test.o $(libqos-imx-obj-y)
> tests/i440fx-test$(EXESUF): tests/i440fx-test.o $(libqos-pc-obj-y)
> --
> --Victor
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-02-14 13:31 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-02-14 12:10 [Qemu-devel] [PATCH] tests: add pxe e1000 test Victor Kaplansky
2016-02-14 13:31 ` Michael S. Tsirkin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).