Update include from tests/tcg/s390x accordingly. Signed-off-by: Pierrick Bouvier <[email protected]> --- {pc-bios => roms}/s390-ccw/Makefile | 0 {pc-bios => roms}/s390-ccw/bootmap.c | 0 {pc-bios => roms}/s390-ccw/bootmap.h | 0 {pc-bios => roms}/s390-ccw/bswap.h | 0 {pc-bios => roms}/s390-ccw/cio.c | 0 {pc-bios => roms}/s390-ccw/cio.h | 0 {pc-bios => roms}/s390-ccw/clp.c | 0 {pc-bios => roms}/s390-ccw/clp.h | 0 {pc-bios => roms}/s390-ccw/dasd-ipl.c | 0 {pc-bios => roms}/s390-ccw/dasd-ipl.h | 0 {pc-bios => roms}/s390-ccw/helper.h | 0 {pc-bios => roms}/s390-ccw/iplb.h | 0 {pc-bios => roms}/s390-ccw/jump2ipl.c | 0 {pc-bios => roms}/s390-ccw/main.c | 0 {pc-bios => roms}/s390-ccw/menu.c | 0 {pc-bios => roms}/s390-ccw/netmain.c | 0 {pc-bios => roms}/s390-ccw/pci.c | 0 {pc-bios => roms}/s390-ccw/pci.h | 0 {pc-bios => roms}/s390-ccw/s390-arch.h | 0 {pc-bios => roms}/s390-ccw/s390-ccw.h | 0 {pc-bios => roms}/s390-ccw/s390-time.h | 0 {pc-bios => roms}/s390-ccw/sclp.c | 0 {pc-bios => roms}/s390-ccw/sclp.h | 0 {pc-bios => roms}/s390-ccw/scsi.h | 0 {pc-bios => roms}/s390-ccw/secure-ipl.c | 0 {pc-bios => roms}/s390-ccw/secure-ipl.h | 0 {pc-bios => roms}/s390-ccw/start.S | 0 {pc-bios => roms}/s390-ccw/virtio-blkdev.c | 0 {pc-bios => roms}/s390-ccw/virtio-ccw.c | 0 {pc-bios => roms}/s390-ccw/virtio-ccw.h | 0 {pc-bios => roms}/s390-ccw/virtio-net.c | 0 {pc-bios => roms}/s390-ccw/virtio-pci.c | 0 {pc-bios => roms}/s390-ccw/virtio-pci.h | 0 {pc-bios => roms}/s390-ccw/virtio-scsi.c | 0 {pc-bios => roms}/s390-ccw/virtio-scsi.h | 0 {pc-bios => roms}/s390-ccw/virtio.c | 0 {pc-bios => roms}/s390-ccw/virtio.h | 0 tests/tcg/s390x/console.c | 4 ++-- tests/tcg/s390x/head64.S | 4 ++-- 39 files changed, 4 insertions(+), 4 deletions(-) rename {pc-bios => roms}/s390-ccw/Makefile (100%) rename {pc-bios => roms}/s390-ccw/bootmap.c (100%) rename {pc-bios => roms}/s390-ccw/bootmap.h (100%) rename {pc-bios => roms}/s390-ccw/bswap.h (100%) rename {pc-bios => roms}/s390-ccw/cio.c (100%) rename {pc-bios => roms}/s390-ccw/cio.h (100%) rename {pc-bios => roms}/s390-ccw/clp.c (100%) rename {pc-bios => roms}/s390-ccw/clp.h (100%) rename {pc-bios => roms}/s390-ccw/dasd-ipl.c (100%) rename {pc-bios => roms}/s390-ccw/dasd-ipl.h (100%) rename {pc-bios => roms}/s390-ccw/helper.h (100%) rename {pc-bios => roms}/s390-ccw/iplb.h (100%) rename {pc-bios => roms}/s390-ccw/jump2ipl.c (100%) rename {pc-bios => roms}/s390-ccw/main.c (100%) rename {pc-bios => roms}/s390-ccw/menu.c (100%) rename {pc-bios => roms}/s390-ccw/netmain.c (100%) rename {pc-bios => roms}/s390-ccw/pci.c (100%) rename {pc-bios => roms}/s390-ccw/pci.h (100%) rename {pc-bios => roms}/s390-ccw/s390-arch.h (100%) rename {pc-bios => roms}/s390-ccw/s390-ccw.h (100%) rename {pc-bios => roms}/s390-ccw/s390-time.h (100%) rename {pc-bios => roms}/s390-ccw/sclp.c (100%) rename {pc-bios => roms}/s390-ccw/sclp.h (100%) rename {pc-bios => roms}/s390-ccw/scsi.h (100%) rename {pc-bios => roms}/s390-ccw/secure-ipl.c (100%) rename {pc-bios => roms}/s390-ccw/secure-ipl.h (100%) rename {pc-bios => roms}/s390-ccw/start.S (100%) rename {pc-bios => roms}/s390-ccw/virtio-blkdev.c (100%) rename {pc-bios => roms}/s390-ccw/virtio-ccw.c (100%) rename {pc-bios => roms}/s390-ccw/virtio-ccw.h (100%) rename {pc-bios => roms}/s390-ccw/virtio-net.c (100%) rename {pc-bios => roms}/s390-ccw/virtio-pci.c (100%) rename {pc-bios => roms}/s390-ccw/virtio-pci.h (100%) rename {pc-bios => roms}/s390-ccw/virtio-scsi.c (100%) rename {pc-bios => roms}/s390-ccw/virtio-scsi.h (100%) rename {pc-bios => roms}/s390-ccw/virtio.c (100%) rename {pc-bios => roms}/s390-ccw/virtio.h (100%)
diff --git a/pc-bios/s390-ccw/Makefile b/roms/s390-ccw/Makefile similarity index 100% rename from pc-bios/s390-ccw/Makefile rename to roms/s390-ccw/Makefile diff --git a/pc-bios/s390-ccw/bootmap.c b/roms/s390-ccw/bootmap.c similarity index 100% rename from pc-bios/s390-ccw/bootmap.c rename to roms/s390-ccw/bootmap.c diff --git a/pc-bios/s390-ccw/bootmap.h b/roms/s390-ccw/bootmap.h similarity index 100% rename from pc-bios/s390-ccw/bootmap.h rename to roms/s390-ccw/bootmap.h diff --git a/pc-bios/s390-ccw/bswap.h b/roms/s390-ccw/bswap.h similarity index 100% rename from pc-bios/s390-ccw/bswap.h rename to roms/s390-ccw/bswap.h diff --git a/pc-bios/s390-ccw/cio.c b/roms/s390-ccw/cio.c similarity index 100% rename from pc-bios/s390-ccw/cio.c rename to roms/s390-ccw/cio.c diff --git a/pc-bios/s390-ccw/cio.h b/roms/s390-ccw/cio.h similarity index 100% rename from pc-bios/s390-ccw/cio.h rename to roms/s390-ccw/cio.h diff --git a/pc-bios/s390-ccw/clp.c b/roms/s390-ccw/clp.c similarity index 100% rename from pc-bios/s390-ccw/clp.c rename to roms/s390-ccw/clp.c diff --git a/pc-bios/s390-ccw/clp.h b/roms/s390-ccw/clp.h similarity index 100% rename from pc-bios/s390-ccw/clp.h rename to roms/s390-ccw/clp.h diff --git a/pc-bios/s390-ccw/dasd-ipl.c b/roms/s390-ccw/dasd-ipl.c similarity index 100% rename from pc-bios/s390-ccw/dasd-ipl.c rename to roms/s390-ccw/dasd-ipl.c diff --git a/pc-bios/s390-ccw/dasd-ipl.h b/roms/s390-ccw/dasd-ipl.h similarity index 100% rename from pc-bios/s390-ccw/dasd-ipl.h rename to roms/s390-ccw/dasd-ipl.h diff --git a/pc-bios/s390-ccw/helper.h b/roms/s390-ccw/helper.h similarity index 100% rename from pc-bios/s390-ccw/helper.h rename to roms/s390-ccw/helper.h diff --git a/pc-bios/s390-ccw/iplb.h b/roms/s390-ccw/iplb.h similarity index 100% rename from pc-bios/s390-ccw/iplb.h rename to roms/s390-ccw/iplb.h diff --git a/pc-bios/s390-ccw/jump2ipl.c b/roms/s390-ccw/jump2ipl.c similarity index 100% rename from pc-bios/s390-ccw/jump2ipl.c rename to roms/s390-ccw/jump2ipl.c diff --git a/pc-bios/s390-ccw/main.c b/roms/s390-ccw/main.c similarity index 100% rename from pc-bios/s390-ccw/main.c rename to roms/s390-ccw/main.c diff --git a/pc-bios/s390-ccw/menu.c b/roms/s390-ccw/menu.c similarity index 100% rename from pc-bios/s390-ccw/menu.c rename to roms/s390-ccw/menu.c diff --git a/pc-bios/s390-ccw/netmain.c b/roms/s390-ccw/netmain.c similarity index 100% rename from pc-bios/s390-ccw/netmain.c rename to roms/s390-ccw/netmain.c diff --git a/pc-bios/s390-ccw/pci.c b/roms/s390-ccw/pci.c similarity index 100% rename from pc-bios/s390-ccw/pci.c rename to roms/s390-ccw/pci.c diff --git a/pc-bios/s390-ccw/pci.h b/roms/s390-ccw/pci.h similarity index 100% rename from pc-bios/s390-ccw/pci.h rename to roms/s390-ccw/pci.h diff --git a/pc-bios/s390-ccw/s390-arch.h b/roms/s390-ccw/s390-arch.h similarity index 100% rename from pc-bios/s390-ccw/s390-arch.h rename to roms/s390-ccw/s390-arch.h diff --git a/pc-bios/s390-ccw/s390-ccw.h b/roms/s390-ccw/s390-ccw.h similarity index 100% rename from pc-bios/s390-ccw/s390-ccw.h rename to roms/s390-ccw/s390-ccw.h diff --git a/pc-bios/s390-ccw/s390-time.h b/roms/s390-ccw/s390-time.h similarity index 100% rename from pc-bios/s390-ccw/s390-time.h rename to roms/s390-ccw/s390-time.h diff --git a/pc-bios/s390-ccw/sclp.c b/roms/s390-ccw/sclp.c similarity index 100% rename from pc-bios/s390-ccw/sclp.c rename to roms/s390-ccw/sclp.c diff --git a/pc-bios/s390-ccw/sclp.h b/roms/s390-ccw/sclp.h similarity index 100% rename from pc-bios/s390-ccw/sclp.h rename to roms/s390-ccw/sclp.h diff --git a/pc-bios/s390-ccw/scsi.h b/roms/s390-ccw/scsi.h similarity index 100% rename from pc-bios/s390-ccw/scsi.h rename to roms/s390-ccw/scsi.h diff --git a/pc-bios/s390-ccw/secure-ipl.c b/roms/s390-ccw/secure-ipl.c similarity index 100% rename from pc-bios/s390-ccw/secure-ipl.c rename to roms/s390-ccw/secure-ipl.c diff --git a/pc-bios/s390-ccw/secure-ipl.h b/roms/s390-ccw/secure-ipl.h similarity index 100% rename from pc-bios/s390-ccw/secure-ipl.h rename to roms/s390-ccw/secure-ipl.h diff --git a/pc-bios/s390-ccw/start.S b/roms/s390-ccw/start.S similarity index 100% rename from pc-bios/s390-ccw/start.S rename to roms/s390-ccw/start.S diff --git a/pc-bios/s390-ccw/virtio-blkdev.c b/roms/s390-ccw/virtio-blkdev.c similarity index 100% rename from pc-bios/s390-ccw/virtio-blkdev.c rename to roms/s390-ccw/virtio-blkdev.c diff --git a/pc-bios/s390-ccw/virtio-ccw.c b/roms/s390-ccw/virtio-ccw.c similarity index 100% rename from pc-bios/s390-ccw/virtio-ccw.c rename to roms/s390-ccw/virtio-ccw.c diff --git a/pc-bios/s390-ccw/virtio-ccw.h b/roms/s390-ccw/virtio-ccw.h similarity index 100% rename from pc-bios/s390-ccw/virtio-ccw.h rename to roms/s390-ccw/virtio-ccw.h diff --git a/pc-bios/s390-ccw/virtio-net.c b/roms/s390-ccw/virtio-net.c similarity index 100% rename from pc-bios/s390-ccw/virtio-net.c rename to roms/s390-ccw/virtio-net.c diff --git a/pc-bios/s390-ccw/virtio-pci.c b/roms/s390-ccw/virtio-pci.c similarity index 100% rename from pc-bios/s390-ccw/virtio-pci.c rename to roms/s390-ccw/virtio-pci.c diff --git a/pc-bios/s390-ccw/virtio-pci.h b/roms/s390-ccw/virtio-pci.h similarity index 100% rename from pc-bios/s390-ccw/virtio-pci.h rename to roms/s390-ccw/virtio-pci.h diff --git a/pc-bios/s390-ccw/virtio-scsi.c b/roms/s390-ccw/virtio-scsi.c similarity index 100% rename from pc-bios/s390-ccw/virtio-scsi.c rename to roms/s390-ccw/virtio-scsi.c diff --git a/pc-bios/s390-ccw/virtio-scsi.h b/roms/s390-ccw/virtio-scsi.h similarity index 100% rename from pc-bios/s390-ccw/virtio-scsi.h rename to roms/s390-ccw/virtio-scsi.h diff --git a/pc-bios/s390-ccw/virtio.c b/roms/s390-ccw/virtio.c similarity index 100% rename from pc-bios/s390-ccw/virtio.c rename to roms/s390-ccw/virtio.c diff --git a/pc-bios/s390-ccw/virtio.h b/roms/s390-ccw/virtio.h similarity index 100% rename from pc-bios/s390-ccw/virtio.h rename to roms/s390-ccw/virtio.h diff --git a/tests/tcg/s390x/console.c b/tests/tcg/s390x/console.c index 061b9437d98..34b9c7f86ea 100644 --- a/tests/tcg/s390x/console.c +++ b/tests/tcg/s390x/console.c @@ -1,11 +1,11 @@ /* * Console code for multiarch tests. - * Reuses the pc-bios/s390-ccw implementation. + * Reuses the roms/s390-ccw implementation. * * SPDX-License-Identifier: GPL-2.0-or-later */ -#include "../../../pc-bios/s390-ccw/sclp.c" +#include "../../../roms/s390-ccw/sclp.c" #include "string.h" diff --git a/tests/tcg/s390x/head64.S b/tests/tcg/s390x/head64.S index 0523fcacb33..23b15ea1a72 100644 --- a/tests/tcg/s390x/head64.S +++ b/tests/tcg/s390x/head64.S @@ -1,11 +1,11 @@ /* * Startup code for multiarch tests. - * Reuses the pc-bios/s390-ccw implementation. + * Reuses the roms/s390-ccw implementation. * * SPDX-License-Identifier: GPL-2.0-or-later */ #define main main_pre -#include "../../../pc-bios/s390-ccw/start.S" +#include "../../../roms/s390-ccw/start.S" #undef main .text -- 2.43.0
