On Sat, 26 Jun 2021 at 11:16, Philippe Mathieu-Daudé <f4...@amsat.org> wrote: > > Hi Nolan, Peter, > > On 6/25/21 11:02 PM, Nolan Leake wrote: > > diff --git hw/arm/bcm2835_peripherals.c hw/arm/bcm2835_peripherals.c > > Odd, usually the diff line comes with a/ b/ prefix, I can not > apply your patch (git version 2.31.1, Fedora): > > Applying: Add basic power management to raspi. > error: arm/bcm2835_peripherals.c: does not exist in index > error: misc/meson.build: does not exist in index > error: hw/arm/bcm2835_peripherals.h: does not exist in index > Patch failed at 0001 Add basic power management to raspi. > > But patchew succeeded: > https://patchew.org/QEMU/20210625210209.1870217-1-no...@sigbus.net/ > > Applying: Add basic power management to raspi. > Using index info to reconstruct a base tree... > A arm/bcm2835_peripherals.c > A hw/arm/bcm2835_peripherals.h > A misc/meson.build > Falling back to patching base and 3-way merge... > > So I tested patchew's commit 7856ac0e804: > https://github.com/patchew-project/qemu/commit/7856ac0e8045d006f1008a03e1d4d8710b9d0612
It succeeded, but if you look at that tree you'll notice it was confused enough to create a new top level directory misc/ to put the .c file in! I'm not sure how the result manages to build :-) I have fixed this up locally. I have also moved the bcm2835_powermgt.h file to include/hw/misc, to go with the other bcm2835 headers there, and I have fixed the region size. Applied to target-arm.next, thanks. thanks -- PMM
