| Message ID | 20210923091308.13832-15-mark.cave-ayland@ilande.co.uk |
|---|---|
| State | New |
| Headers | show |
| Series | nubus: bus, device, bridge, IRQ and address space improvements | expand |
Le 23/09/2021 à 11:13, Mark Cave-Ayland a écrit : > This better reflects that the mac-nubus-bridge device is derived from the > nubus-bridge device, and that the structure represents the state of the bridge > device and not the Nubus itself. Also update the comment in the file header to > reflect that mac-nubus-bridge is specific to the Macintosh. > > Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> > Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > --- > hw/nubus/mac-nubus-bridge.c | 8 +++++--- > include/hw/nubus/mac-nubus-bridge.h | 4 ++-- > 2 files changed, 7 insertions(+), 5 deletions(-) > Reviewed-by: Laurent Vivier <laurent@vivier.eu> (it could be merged with previous one)
On 23/09/2021 11:35, Laurent Vivier wrote: > Le 23/09/2021 à 11:13, Mark Cave-Ayland a écrit : >> This better reflects that the mac-nubus-bridge device is derived from the >> nubus-bridge device, and that the structure represents the state of the bridge >> device and not the Nubus itself. Also update the comment in the file header to >> reflect that mac-nubus-bridge is specific to the Macintosh. >> >> Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> >> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> >> --- >> hw/nubus/mac-nubus-bridge.c | 8 +++++--- >> include/hw/nubus/mac-nubus-bridge.h | 4 ++-- >> 2 files changed, 7 insertions(+), 5 deletions(-) >> > > > Reviewed-by: Laurent Vivier <laurent@vivier.eu> > > (it could be merged with previous one) I like to try and keep renames on a per-device basis if possible, even if it's just to help rebasing during development. Other than that, is there anything else outstanding you think would require a v6 series? ATB, Mark.
Le 23/09/2021 à 14:50, Mark Cave-Ayland a écrit : > On 23/09/2021 11:35, Laurent Vivier wrote: > >> Le 23/09/2021 à 11:13, Mark Cave-Ayland a écrit : >>> This better reflects that the mac-nubus-bridge device is derived from the >>> nubus-bridge device, and that the structure represents the state of the bridge >>> device and not the Nubus itself. Also update the comment in the file header to >>> reflect that mac-nubus-bridge is specific to the Macintosh. >>> >>> Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> >>> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> >>> --- >>> hw/nubus/mac-nubus-bridge.c | 8 +++++--- >>> include/hw/nubus/mac-nubus-bridge.h | 4 ++-- >>> 2 files changed, 7 insertions(+), 5 deletions(-) >>> >> >> >> Reviewed-by: Laurent Vivier <laurent@vivier.eu> >> >> (it could be merged with previous one) > > I like to try and keep renames on a per-device basis if possible, even if it's just to help rebasing > during development. Ok. No problem. > Other than that, is there anything else outstanding you think would require a v6 series? Except if you want to address comments from Philippe, I can collect this series and send a PR. Thanks, Laurent
On 23/09/2021 14:53, Laurent Vivier wrote: > Le 23/09/2021 à 14:50, Mark Cave-Ayland a écrit : >> On 23/09/2021 11:35, Laurent Vivier wrote: >> >>> Le 23/09/2021 à 11:13, Mark Cave-Ayland a écrit : >>>> This better reflects that the mac-nubus-bridge device is derived from the >>>> nubus-bridge device, and that the structure represents the state of the bridge >>>> device and not the Nubus itself. Also update the comment in the file header to >>>> reflect that mac-nubus-bridge is specific to the Macintosh. >>>> >>>> Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> >>>> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> >>>> --- >>>> hw/nubus/mac-nubus-bridge.c | 8 +++++--- >>>> include/hw/nubus/mac-nubus-bridge.h | 4 ++-- >>>> 2 files changed, 7 insertions(+), 5 deletions(-) >>>> >>> >>> >>> Reviewed-by: Laurent Vivier <laurent@vivier.eu> >>> >>> (it could be merged with previous one) >> >> I like to try and keep renames on a per-device basis if possible, even if it's just to help rebasing >> during development. > > Ok. No problem. > >> Other than that, is there anything else outstanding you think would require a v6 series? > > Except if you want to address comments from Philippe, I can collect this series and send a PR. Okay I see there are a couple more comments on v5 - let me take a quick look. ATB, Mark.
On 23/09/2021 17:03, Mark Cave-Ayland wrote: > On 23/09/2021 14:53, Laurent Vivier wrote: > >> Le 23/09/2021 à 14:50, Mark Cave-Ayland a écrit : >>> On 23/09/2021 11:35, Laurent Vivier wrote: >>> >>>> Le 23/09/2021 à 11:13, Mark Cave-Ayland a écrit : >>>>> This better reflects that the mac-nubus-bridge device is derived from the >>>>> nubus-bridge device, and that the structure represents the state of the bridge >>>>> device and not the Nubus itself. Also update the comment in the file header to >>>>> reflect that mac-nubus-bridge is specific to the Macintosh. >>>>> >>>>> Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> >>>>> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> >>>>> --- >>>>> hw/nubus/mac-nubus-bridge.c | 8 +++++--- >>>>> include/hw/nubus/mac-nubus-bridge.h | 4 ++-- >>>>> 2 files changed, 7 insertions(+), 5 deletions(-) >>>>> >>>> >>>> >>>> Reviewed-by: Laurent Vivier <laurent@vivier.eu> >>>> >>>> (it could be merged with previous one) >>> >>> I like to try and keep renames on a per-device basis if possible, even if it's >>> just to help rebasing >>> during development. >> >> Ok. No problem. >> >>> Other than that, is there anything else outstanding you think would require a v6 >>> series? >> >> Except if you want to address comments from Philippe, I can collect this series and >> send a PR. > > Okay I see there are a couple more comments on v5 - let me take a quick look. There's probably just about enough minor comments to make it worth doing a v6, so I will update and resend. ATB, Mark.
diff --git a/hw/nubus/mac-nubus-bridge.c b/hw/nubus/mac-nubus-bridge.c index 3af4f5d396..e241c581b5 100644 --- a/hw/nubus/mac-nubus-bridge.c +++ b/hw/nubus/mac-nubus-bridge.c @@ -1,5 +1,7 @@ /* - * Copyright (c) 2013-2018 Laurent Vivier <laurent@vivier.eu> + * QEMU Macintosh Nubus + * + * Copyright (c) 2013-2018 Laurent Vivier <laurent@vivier.eu> * * This work is licensed under the terms of the GNU GPL, version 2 or later. * See the COPYING file in the top-level directory. @@ -13,7 +15,7 @@ static void mac_nubus_bridge_init(Object *obj) { - MacNubusState *s = MAC_NUBUS_BRIDGE(obj); + MacNubusBridge *s = MAC_NUBUS_BRIDGE(obj); SysBusDevice *sbd = SYS_BUS_DEVICE(obj); s->bus = NUBUS_BUS(qbus_create(TYPE_NUBUS_BUS, DEVICE(s), NULL)); @@ -49,7 +51,7 @@ static const TypeInfo mac_nubus_bridge_info = { .name = TYPE_MAC_NUBUS_BRIDGE, .parent = TYPE_NUBUS_BRIDGE, .instance_init = mac_nubus_bridge_init, - .instance_size = sizeof(MacNubusState), + .instance_size = sizeof(MacNubusBridge), .class_init = mac_nubus_bridge_class_init, }; diff --git a/include/hw/nubus/mac-nubus-bridge.h b/include/hw/nubus/mac-nubus-bridge.h index fa454f5fbe..b595e1b7ef 100644 --- a/include/hw/nubus/mac-nubus-bridge.h +++ b/include/hw/nubus/mac-nubus-bridge.h @@ -17,9 +17,9 @@ #define MAC_NUBUS_SLOT_NB (MAC_NUBUS_LAST_SLOT - MAC_NUBUS_FIRST_SLOT + 1) #define TYPE_MAC_NUBUS_BRIDGE "mac-nubus-bridge" -OBJECT_DECLARE_SIMPLE_TYPE(MacNubusState, MAC_NUBUS_BRIDGE) +OBJECT_DECLARE_SIMPLE_TYPE(MacNubusBridge, MAC_NUBUS_BRIDGE) -struct MacNubusState { +struct MacNubusBridge { NubusBridge parent_obj; NubusBus *bus;