[Qemu-devel] [PATCH 0/2] mac: fix booting from hd device with -drive syntax

[Qemu-devel] [PATCH 0/2] mac: fix booting from hd device with -drive syntax

[Mark Cave-Ayland]

These two patches correct a mistake in the original FWPathProvider
implementation for Old World and New World Macs whereby the alias name is
used instead of the node name.

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


Mark Cave-Ayland (2):
  mac_oldworld: use node name instead of alias name for hd device in
    FWPathProvider
  mac_newworld: use node name instead of alias name for hd device in
    FWPathProvider

 hw/ppc/mac_newworld.c | 4 ++--
 hw/ppc/mac_oldworld.c | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

-- 
2.11.0

[Qemu-devel] [PATCH 1/2] mac_oldworld: use node name instead of alias name for hd device in FWPathProvider

[Mark Cave-Ayland]

When using -drive to configure the hd drive for the Old World machine, the node
name "disk" should be used instead of the "hd" alias.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
---
 hw/ppc/mac_oldworld.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hw/ppc/mac_oldworld.c b/hw/ppc/mac_oldworld.c
index cc1e463466..460cbc7923 100644
--- a/hw/ppc/mac_oldworld.c
+++ b/hw/ppc/mac_oldworld.c
@@ -402,11 +402,11 @@ static char *heathrow_fw_dev_path(FWPathProvider *p, BusState *bus,
             return g_strdup("cdrom");
         }
 
-        return g_strdup("hd");
+        return g_strdup("disk");
     }
 
     if (!strcmp(object_get_typename(OBJECT(dev)), "ide-hd")) {
-        return g_strdup("hd");
+        return g_strdup("disk");
     }
 
     if (!strcmp(object_get_typename(OBJECT(dev)), "ide-cd")) {
-- 
2.11.0

[Qemu-devel] [PATCH 2/2] mac_newworld: use node name instead of alias name for hd device in FWPathProvider

[Mark Cave-Ayland]

When using -drive to configure the hd drive for the New World machine, the node
name "disk" should be used instead of the "hd" alias.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
---
 hw/ppc/mac_newworld.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c
index 97e8817145..02d8559621 100644
--- a/hw/ppc/mac_newworld.c
+++ b/hw/ppc/mac_newworld.c
@@ -547,11 +547,11 @@ static char *core99_fw_dev_path(FWPathProvider *p, BusState *bus,
             return g_strdup("cdrom");
         }
 
-        return g_strdup("hd");
+        return g_strdup("disk");
     }
 
     if (!strcmp(object_get_typename(OBJECT(dev)), "ide-hd")) {
-        return g_strdup("hd");
+        return g_strdup("disk");
     }
 
     if (!strcmp(object_get_typename(OBJECT(dev)), "ide-cd")) {
-- 
2.11.0

Re: [Qemu-devel] [PATCH 0/2] mac: fix booting from hd device with -drive syntax

[David Gibson]

[-- Attachment #1: Type: text/plain, Size: 889 bytes --]

On Thu, Mar 07, 2019 at 09:20:56PM +0000, Mark Cave-Ayland wrote:
> These two patches correct a mistake in the original FWPathProvider
> implementation for Old World and New World Macs whereby the alias name is
> used instead of the node name.
> 
> Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>

Applied, thanks.

> 
> 
> Mark Cave-Ayland (2):
>   mac_oldworld: use node name instead of alias name for hd device in
>     FWPathProvider
>   mac_newworld: use node name instead of alias name for hd device in
>     FWPathProvider
> 
>  hw/ppc/mac_newworld.c | 4 ++--
>  hw/ppc/mac_oldworld.c | 4 ++--
>  2 files changed, 4 insertions(+), 4 deletions(-)
> 

-- 
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]