Commit b1b2feac authored by Thomas Huth's avatar Thomas Huth Committed by Cornelia Huck
Browse files

tests/pxe: Check virtio-net-ccw on s390x 



Now that we've got a firmware that can do TFTP booting on s390x (i.e.
the pc-bios/s390-netboot.img), we can enable the PXE tester for this
architecture, too.

Signed-off-by: default avatarThomas Huth <thuth@redhat.com>
Reviewed-by: default avatarCornelia Huck <cohuck@redhat.com>
Message-Id: <1502431076-22849-3-git-send-email-thuth@redhat.com>
Signed-off-by: default avatarCornelia Huck <cohuck@redhat.com>
parent 83898cce

tests/Makefile.include

+1 −0
Original line number Diff line number Diff line
@@ -360,6 +360,7 @@ check-qtest-microblazeel-y = $(check-qtest-microblaze-y) 
check-qtest-xtensaeb-y = $(check-qtest-xtensa-y)



check-qtest-s390x-y = tests/boot-serial-test$(EXESUF)

check-qtest-s390x-$(CONFIG_SLIRP) += tests/pxe-test$(EXESUF)



check-qtest-generic-y += tests/qom-test$(EXESUF)

check-qtest-generic-y += tests/test-hmp$(EXESUF)

tests/boot-sector.c

+20 −0
Original line number Diff line number Diff line
@@ -67,6 +67,21 @@ static uint8_t x86_boot_sector[512] = { 
    [0x1FF] = 0xAA,

};



/* For s390x, use a mini "kernel" with the appropriate signature */

static const uint8_t s390x_psw[] = {

    0x00, 0x08, 0x00, 0x00, 0x80, 0x01, 0x00, 0x00

};

static const uint8_t s390x_code[] = {

    0xa7, 0xf4, 0x00, 0x0a,                                /* j 0x10010 */

    0x00, 0x00, 0x00, 0x00,

    'S', '3', '9', '0',

    'E', 'P', 0x00, 0x01,

    0xa7, 0x38, HIGH(SIGNATURE_ADDR), LOW(SIGNATURE_ADDR), /* lhi r3,0x7c10 */

    0xa7, 0x48, LOW(SIGNATURE), HIGH(SIGNATURE),           /* lhi r4,0xadde */

    0x40, 0x40, 0x30, 0x00,                                /* sth r4,0(r3) */

    0xa7, 0xf4, 0xff, 0xfa                                 /* j 0x10010 */

};



/* Create boot disk file.  */

int boot_sector_init(char *fname)

{
@@ -92,6 +107,11 @@ int boot_sector_init(char *fname) 
                                    LOW(SIGNATURE), SIGNATURE_ADDR,

                                    HIGH(SIGNATURE), SIGNATURE_ADDR + 1);

        len = strlen(boot_code);

    } else if (g_str_equal(arch, "s390x")) {

        len = 0x10000 + sizeof(s390x_code);

        boot_code = g_malloc0(len);

        memcpy(boot_code, s390x_psw, sizeof(s390x_psw));

        memcpy(&boot_code[0x10000], s390x_code, sizeof(s390x_code));

    } else {

        g_assert_not_reached();

    }

tests/pxe-test.c

+7 −0
Original line number Diff line number Diff line
@@ -51,6 +51,11 @@ static void test_pxe_spapr_vlan(void) 
    test_pxe_one("-device spapr-vlan,netdev=" NETNAME, true);

}



static void test_pxe_virtio_ccw(void)

{

    test_pxe_one("-device virtio-net-ccw,bootindex=1,netdev=" NETNAME, false);

}



int main(int argc, char *argv[])

{

    int ret;
@@ -68,6 +73,8 @@ int main(int argc, char *argv[]) 
    } else if (strcmp(arch, "ppc64") == 0) {

        qtest_add_func("pxe/virtio", test_pxe_virtio_pci);

        qtest_add_func("pxe/spapr-vlan", test_pxe_spapr_vlan);

    } else if (g_str_equal(arch, "s390x")) {

        qtest_add_func("pxe/virtio-ccw", test_pxe_virtio_ccw);

    }

    ret = g_test_run();

    boot_sector_cleanup(disk);