Re: [libvirt] [PATCH] ppc: Remove deprecated ppcemb target
On Tue, Aug 21, 2018 at 01:27:48PM +0200, Thomas Huth wrote:
> There is no known available OS for ppc around anymore that uses page
> sizes below 4k, so it does not make much sense that we keep wasting
> our time on building and testing the ppcemb-softmmu target. It has
> been deprecated since two releases, and nobody complained, so let's
> remove this now.
>
> Signed-off-by: Thomas Huth
Applied, thanks.
> ---
> configure | 13 +++--
> cpus.c | 1 -
> default-configs/ppcemb-softmmu.mak | 23 ---
> hw/ppc/ppc405_boards.c | 14 --
> hw/ppc/ppc440_bamboo.c | 7 ---
> hw/ppc/sam460ex.c | 7 ---
> hw/ppc/virtex_ml507.c | 7 ---
> include/exec/poison.h | 1 -
> qapi/common.json | 2 +-
> qemu-deprecated.texi | 6 --
> target/ppc/cpu-qom.h | 2 --
> target/ppc/cpu.h | 16
> target/ppc/kvm.c | 4 +---
> target/ppc/mmu_helper.c| 6 +++---
> target/ppc/translate_init.inc.c| 35 +--
> tests/machine-none-test.c | 1 -
> 16 files changed, 9 insertions(+), 136 deletions(-)
> delete mode 100644 default-configs/ppcemb-softmmu.mak
>
> diff --git a/configure b/configure
> index e7bddc0..0fc55eb 100755
> --- a/configure
> +++ b/configure
> @@ -195,8 +195,7 @@ supported_kvm_target() {
> i386:i386 | i386:x86_64 | i386:x32 | \
> x86_64:i386 | x86_64:x86_64 | x86_64:x32 | \
> mips:mips | mipsel:mips | \
> -ppc:ppc | ppcemb:ppc | ppc64:ppc | \
> -ppc:ppc64 | ppcemb:ppc64 | ppc64:ppc64 | \
> +ppc:ppc | ppc64:ppc | ppc:ppc64 | ppc64:ppc64 | \
> s390x:s390x)
> return 0
> ;;
> @@ -6935,7 +6934,7 @@ if test "$linux" = "yes" ; then
>i386|x86_64|x32)
> linux_arch=x86
> ;;
> - ppcemb|ppc|ppc64)
> + ppc|ppc64)
> linux_arch=powerpc
> ;;
>s390x)
> @@ -6965,7 +6964,7 @@ target_name=$(echo $target | cut -d '-' -f 1)
> target_bigendian="no"
>
> case "$target_name" in
> -
> armeb|aarch64_be|hppa|lm32|m68k|microblaze|mips|mipsn32|mips64|moxie|or1k|ppc|ppcemb|ppc64|ppc64abi32|s390x|sh4eb|sparc|sparc64|sparc32plus|xtensaeb)
> +
> armeb|aarch64_be|hppa|lm32|m68k|microblaze|mips|mipsn32|mips64|moxie|or1k|ppc|ppc64|ppc64abi32|s390x|sh4eb|sparc|sparc64|sparc32plus|xtensaeb)
>target_bigendian=yes
>;;
> esac
> @@ -7093,12 +7092,6 @@ case "$target_name" in
> gdb_xml_files="power-core.xml power-fpu.xml power-altivec.xml
> power-spe.xml"
> target_compiler=$cross_cc_powerpc
>;;
> - ppcemb)
> -TARGET_BASE_ARCH=ppc
> -TARGET_ABI_DIR=ppc
> -gdb_xml_files="power-core.xml power-fpu.xml power-altivec.xml
> power-spe.xml"
> -target_compiler=$cross_cc_ppcemb
> - ;;
>ppc64)
> TARGET_BASE_ARCH=ppc
> TARGET_ABI_DIR=ppc
> diff --git a/cpus.c b/cpus.c
> index b5844b7..80ca683 100644
> --- a/cpus.c
> +++ b/cpus.c
> @@ -2203,7 +2203,6 @@ static CpuInfoArch
> sysemu_target_to_cpuinfo_arch(SysEmuTarget target)
> return CPU_INFO_ARCH_X86;
>
> case SYS_EMU_TARGET_PPC:
> -case SYS_EMU_TARGET_PPCEMB:
> case SYS_EMU_TARGET_PPC64:
> return CPU_INFO_ARCH_PPC;
>
> diff --git a/default-configs/ppcemb-softmmu.mak
> b/default-configs/ppcemb-softmmu.mak
> deleted file mode 100644
> index ac44f15..000
> --- a/default-configs/ppcemb-softmmu.mak
> +++ /dev/null
> @@ -1,23 +0,0 @@
> -# Default configuration for ppcemb-softmmu
> -
> -include pci.mak
> -include sound.mak
> -include usb.mak
> -CONFIG_PPC4XX=y
> -CONFIG_M48T59=y
> -CONFIG_SERIAL=y
> -CONFIG_SERIAL_ISA=y
> -CONFIG_I8257=y
> -CONFIG_OPENPIC=y
> -CONFIG_PFLASH_CFI01=y
> -CONFIG_PFLASH_CFI02=y
> -CONFIG_PTIMER=y
> -CONFIG_I8259=y
> -CONFIG_XILINX=y
> -CONFIG_XILINX_ETHLITE=y
> -CONFIG_USB_EHCI_SYSBUS=y
> -CONFIG_SM501=y
> -CONFIG_DDC=y
> -CONFIG_IDE_SII3112=y
> -CONFIG_I2C=y
> -CONFIG_BITBANG_I2C=y
> diff --git a/hw/ppc/ppc405_boards.c b/hw/ppc/ppc405_boards.c
> index 7011107..3a54d52 100644
> --- a/hw/ppc/ppc405_boards.c
> +++ b/hw/ppc/ppc405_boards.c
> @@ -202,13 +202,6 @@ static void ref405ep_init(MachineState *machine)
> DriveInfo *dinfo;
> MemoryRegion *sysmem = get_system_memory();
>
> -#ifdef TARGET_PPCEMB
> -if (!qtest_enabled()) {
> -warn_report("qemu-system-ppcemb is deprecated, "
> -"please use qemu-system-ppc instead.");
> -}
> -#endif
> -
> /* XXX: fix this */
> memory_region_allocate_system_memory(_memories[0], NULL,
> "ef405ep.ram",
> 0x0800);
> @@ -503,13 +496,6 @@ static void taihu_405ep_init(MachineState *machine)
> int fl_idx, fl_sectors;
> DriveInfo *dinfo;
>
> -#ifdef TARGET_PPCEMB
> -if (!qtest_enabled()) {
> -
[libvirt] [PATCH] ppc: Remove deprecated ppcemb target
There is no known available OS for ppc around anymore that uses page
sizes below 4k, so it does not make much sense that we keep wasting
our time on building and testing the ppcemb-softmmu target. It has
been deprecated since two releases, and nobody complained, so let's
remove this now.
Signed-off-by: Thomas Huth
---
configure | 13 +++--
cpus.c | 1 -
default-configs/ppcemb-softmmu.mak | 23 ---
hw/ppc/ppc405_boards.c | 14 --
hw/ppc/ppc440_bamboo.c | 7 ---
hw/ppc/sam460ex.c | 7 ---
hw/ppc/virtex_ml507.c | 7 ---
include/exec/poison.h | 1 -
qapi/common.json | 2 +-
qemu-deprecated.texi | 6 --
target/ppc/cpu-qom.h | 2 --
target/ppc/cpu.h | 16
target/ppc/kvm.c | 4 +---
target/ppc/mmu_helper.c| 6 +++---
target/ppc/translate_init.inc.c| 35 +--
tests/machine-none-test.c | 1 -
16 files changed, 9 insertions(+), 136 deletions(-)
delete mode 100644 default-configs/ppcemb-softmmu.mak
diff --git a/configure b/configure
index e7bddc0..0fc55eb 100755
--- a/configure
+++ b/configure
@@ -195,8 +195,7 @@ supported_kvm_target() {
i386:i386 | i386:x86_64 | i386:x32 | \
x86_64:i386 | x86_64:x86_64 | x86_64:x32 | \
mips:mips | mipsel:mips | \
-ppc:ppc | ppcemb:ppc | ppc64:ppc | \
-ppc:ppc64 | ppcemb:ppc64 | ppc64:ppc64 | \
+ppc:ppc | ppc64:ppc | ppc:ppc64 | ppc64:ppc64 | \
s390x:s390x)
return 0
;;
@@ -6935,7 +6934,7 @@ if test "$linux" = "yes" ; then
i386|x86_64|x32)
linux_arch=x86
;;
- ppcemb|ppc|ppc64)
+ ppc|ppc64)
linux_arch=powerpc
;;
s390x)
@@ -6965,7 +6964,7 @@ target_name=$(echo $target | cut -d '-' -f 1)
target_bigendian="no"
case "$target_name" in
-
armeb|aarch64_be|hppa|lm32|m68k|microblaze|mips|mipsn32|mips64|moxie|or1k|ppc|ppcemb|ppc64|ppc64abi32|s390x|sh4eb|sparc|sparc64|sparc32plus|xtensaeb)
+
armeb|aarch64_be|hppa|lm32|m68k|microblaze|mips|mipsn32|mips64|moxie|or1k|ppc|ppc64|ppc64abi32|s390x|sh4eb|sparc|sparc64|sparc32plus|xtensaeb)
target_bigendian=yes
;;
esac
@@ -7093,12 +7092,6 @@ case "$target_name" in
gdb_xml_files="power-core.xml power-fpu.xml power-altivec.xml
power-spe.xml"
target_compiler=$cross_cc_powerpc
;;
- ppcemb)
-TARGET_BASE_ARCH=ppc
-TARGET_ABI_DIR=ppc
-gdb_xml_files="power-core.xml power-fpu.xml power-altivec.xml
power-spe.xml"
-target_compiler=$cross_cc_ppcemb
- ;;
ppc64)
TARGET_BASE_ARCH=ppc
TARGET_ABI_DIR=ppc
diff --git a/cpus.c b/cpus.c
index b5844b7..80ca683 100644
--- a/cpus.c
+++ b/cpus.c
@@ -2203,7 +2203,6 @@ static CpuInfoArch
sysemu_target_to_cpuinfo_arch(SysEmuTarget target)
return CPU_INFO_ARCH_X86;
case SYS_EMU_TARGET_PPC:
-case SYS_EMU_TARGET_PPCEMB:
case SYS_EMU_TARGET_PPC64:
return CPU_INFO_ARCH_PPC;
diff --git a/default-configs/ppcemb-softmmu.mak
b/default-configs/ppcemb-softmmu.mak
deleted file mode 100644
index ac44f15..000
--- a/default-configs/ppcemb-softmmu.mak
+++ /dev/null
@@ -1,23 +0,0 @@
-# Default configuration for ppcemb-softmmu
-
-include pci.mak
-include sound.mak
-include usb.mak
-CONFIG_PPC4XX=y
-CONFIG_M48T59=y
-CONFIG_SERIAL=y
-CONFIG_SERIAL_ISA=y
-CONFIG_I8257=y
-CONFIG_OPENPIC=y
-CONFIG_PFLASH_CFI01=y
-CONFIG_PFLASH_CFI02=y
-CONFIG_PTIMER=y
-CONFIG_I8259=y
-CONFIG_XILINX=y
-CONFIG_XILINX_ETHLITE=y
-CONFIG_USB_EHCI_SYSBUS=y
-CONFIG_SM501=y
-CONFIG_DDC=y
-CONFIG_IDE_SII3112=y
-CONFIG_I2C=y
-CONFIG_BITBANG_I2C=y
diff --git a/hw/ppc/ppc405_boards.c b/hw/ppc/ppc405_boards.c
index 7011107..3a54d52 100644
--- a/hw/ppc/ppc405_boards.c
+++ b/hw/ppc/ppc405_boards.c
@@ -202,13 +202,6 @@ static void ref405ep_init(MachineState *machine)
DriveInfo *dinfo;
MemoryRegion *sysmem = get_system_memory();
-#ifdef TARGET_PPCEMB
-if (!qtest_enabled()) {
-warn_report("qemu-system-ppcemb is deprecated, "
-"please use qemu-system-ppc instead.");
-}
-#endif
-
/* XXX: fix this */
memory_region_allocate_system_memory(_memories[0], NULL, "ef405ep.ram",
0x0800);
@@ -503,13 +496,6 @@ static void taihu_405ep_init(MachineState *machine)
int fl_idx, fl_sectors;
DriveInfo *dinfo;
-#ifdef TARGET_PPCEMB
-if (!qtest_enabled()) {
-warn_report("qemu-system-ppcemb is deprecated, "
-"please use qemu-system-ppc instead.");
-}
-#endif
-
/* RAM is soldered to the board so the size cannot be changed */
ram_size = 0x0800;
memory_region_allocate_system_memory(ram, NULL, "taihu_405ep.ram",
diff --git a/hw/ppc/ppc440_bamboo.c b/hw/ppc/ppc440_bamboo.c
index 3d4c43b..f5720f9
