On Fri, 2 Feb 2024 at 16:01, David Woodhouse <dw...@infradead.org> wrote:
>
> On Fri, 2024-02-02 at 15:32 +0000, Peter Maydell wrote:
> >
> > $ ./build/all/qemu-system-hppa -M C3700
> > Segmentation fault (core dumped)
>
> Ah, got it. Some HPPA machine types don't have a lasi_dev.
>
>
> --- a/hw/hppa/machine.c
> +++ b/hw/hppa/machine.c
> @@ -362,9 +362,11 @@ static void machine_HP_common_init_tail(MachineState
> *machine, PCIBus *pci_bus,
> }
>
> /* Network setup. */
> - lasi_82596_init(addr_space, translate(NULL, LASI_LAN_HPA),
> - qdev_get_gpio_in(lasi_dev, LASI_IRQ_LAN_HPA),
> - enable_lasi_lan());
> + if (lasi_dev) {
> + lasi_82596_init(addr_space, translate(NULL, LASI_LAN_HPA),
> + qdev_get_gpio_in(lasi_dev, LASI_IRQ_LAN_HPA),
> + enable_lasi_lan());
> + }
>
> pci_init_nic_devices(pci_bus, mc->default_nic);
>
> New pipeline running (FWIW) at
> https://gitlab.com/dwmw2/qemu/-/pipelines/1162635873
>
> What is the next step? Post the full series as a v5, or perhaps just
> the single fixed patch which is now at
> https://git.infradead.org/?p=users/dwmw2/qemu.git;a=commitdiff;h=2c20b4ee96db
>
> ... and then another pull request?
If that diff above is the only change, then:
* roll a new pullrequest with the fix squashed into the appropriate patch
* have the subject marker be "PULL v2"
* you can send just the cover-letter and the one patch that has changed,
you don't need to resend the entire series (though it's not a big
deal if you do send the whole set of mails again)
> The docs are fairly clear that pull
> requests can't have even minor changes that haven't been posted
> separately... and I guess the above incremental doesn't count?
Which bit of the docs is that? It's not our actual practice,
so we should really fix the wording. The principle is "don't
stick code into pullreqs that hasn't been through the review
process", but in practice especially for submaintainers who
know the system it's not uncommon to say "I'm going to
squash change X in and take this" or similar rather than
forcing submitters to do another round of sending out patches.
There should be *something* on the list to say this change was
put in, but eg the exchange in this email thread is fine for that.
thanks
-- PMM
