hw/m68k/next-cube: Disable the default CD-ROM drive

[PATCH] hw/m68k/next-cube: Disable the default CD-ROM drive

Posted by Thomas Huth 3 months, 3 weeks ago

The NeXT-Cube does not have a CD-ROM drive by default, and the
kernel does not seem to deal with the empty drive very well, so
let's disable the CD-ROM drive for this machine.

Signed-off-by: Thomas Huth <huth@tuxfamily.org>
---
 hw/m68k/next-cube.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/hw/m68k/next-cube.c b/hw/m68k/next-cube.c
index f576452fc3..de7ce13762 100644
--- a/hw/m68k/next-cube.c
+++ b/hw/m68k/next-cube.c
@@ -1052,6 +1052,7 @@ static void next_machine_class_init(ObjectClass *oc, void *data)
     mc->default_ram_size = RAM_SIZE;
     mc->default_ram_id = "next.ram";
     mc->default_cpu_type = M68K_CPU_TYPE_NAME("m68040");
+    mc->no_cdrom = true;
 }
 
 static const TypeInfo next_typeinfo = {
-- 
2.47.1

Re: [PATCH] hw/m68k/next-cube: Disable the default CD-ROM drive

Posted by Mark Cave-Ayland 3 months, 3 weeks ago

On 14/12/2024 09:17, Thomas Huth wrote:

> The NeXT-Cube does not have a CD-ROM drive by default, and the
> kernel does not seem to deal with the empty drive very well, so
> let's disable the CD-ROM drive for this machine.
> 
> Signed-off-by: Thomas Huth <huth@tuxfamily.org>
> ---
>   hw/m68k/next-cube.c | 1 +
>   1 file changed, 1 insertion(+)
> 
> diff --git a/hw/m68k/next-cube.c b/hw/m68k/next-cube.c
> index f576452fc3..de7ce13762 100644
> --- a/hw/m68k/next-cube.c
> +++ b/hw/m68k/next-cube.c
> @@ -1052,6 +1052,7 @@ static void next_machine_class_init(ObjectClass *oc, void *data)
>       mc->default_ram_size = RAM_SIZE;
>       mc->default_ram_id = "next.ram";
>       mc->default_cpu_type = M68K_CPU_TYPE_NAME("m68040");
> +    mc->no_cdrom = true;
>   }
>   
>   static const TypeInfo next_typeinfo = {

Reviewed-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>

Just out of curiosity, can you share the kernel configuration you are using for testing?


ATB,

Mark.

Re: [PATCH] hw/m68k/next-cube: Disable the default CD-ROM drive

Posted by Philippe Mathieu-Daudé 3 months, 3 weeks ago

On 14/12/24 10:17, Thomas Huth wrote:
> The NeXT-Cube does not have a CD-ROM drive by default, and the
> kernel does not seem to deal with the empty drive very well, so
> let's disable the CD-ROM drive for this machine.
> 
> Signed-off-by: Thomas Huth <huth@tuxfamily.org>
> ---
>   hw/m68k/next-cube.c | 1 +
>   1 file changed, 1 insertion(+)
> 
> diff --git a/hw/m68k/next-cube.c b/hw/m68k/next-cube.c
> index f576452fc3..de7ce13762 100644
> --- a/hw/m68k/next-cube.c
> +++ b/hw/m68k/next-cube.c
> @@ -1052,6 +1052,7 @@ static void next_machine_class_init(ObjectClass *oc, void *data)
>       mc->default_ram_size = RAM_SIZE;
>       mc->default_ram_id = "next.ram";
>       mc->default_cpu_type = M68K_CPU_TYPE_NAME("m68040");
> +    mc->no_cdrom = true;
>   }

Sigh.

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>