Re: [Xen-devel] [PATCH 2 of 2] PV-GRUB: add support for btrfs

[Teck Choon Giam <giamteckchoon@xxxxxxxxx>]

On Sun, Mar 11, 2012 at 4:00 AM, Matt Wilson <msw@xxxxxxxxxx> wrote:
> On Sat, Mar 10, 2012 at 06:47:00AM -0800, Teck Choon Giam wrote:
>>
>> I tried to apply this in my xen-4.1-testing changeset
>> 23264:3f158dd40b31 tree but failed.  See comment below.  Thanks.
>>
>> On Fri, Mar 9, 2012 at 11:03 AM, Matt Wilson <msw@xxxxxxxxxx> wrote:
>> > This patch adds btrfs support to the GRUB tree used to build PV-GRUB.
>> > The original patch is from Gentoo:
>> > https://bugs.gentoo.org/show_bug.cgi?id=283637
>> >
>> > Signed-off-by: Matt Wilson <msw@xxxxxxxxxx>
>> >
>> > +             if (! devwrite (*saved_sector - part_start, 1, 
>> > stage2_buffer))
>>
>> In stock grub-0.97 it is as below:
>>
>> if (! devwrite (saved_sector - part_start, 1, stage2_buffer))
>>
>> So my question is how you get it to apply in your tree without other
>> patch to change the above from saved_sector to *saved_sector?
>>
>> I have tried to grep saved_sector string in xen tree which I believe
>> all other patches in grub.patches directory doesn't touch that line or
>> am I totally wrong about this?
>
> You're right, a hunk of this patch fails to apply. I missed the reject
> file being created, and the main functionality appears to work. I will
> rework the btrfs patch when I have some time to apply cleanly.  That
> would also probably be a good time change the GRUB patching step to
> abort loudly if a patch doesn't apply cleanly.
>
> Thanks for catching this!
>
> Matt

Attached is my fix/patch and see whether you are able to apply cleanly
in your tree or check whether do I make any mistake?

Thanks.

Kindest regards,
Giam Teck Choon

Attachment: grub-btrfs-support.patch
Description: Text Data

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel