On Wed, Nov 10, 2010 at 5:49 AM, chandra shekar <chandrashekar...@gmail.com> wrote: > hi everyone i have tried to apply the patch > http://lists.gnu.org/archive/html/qemu-devel/2009-01/msg01213.html to qemu > but when i do patch -p1<foo.patch i get error as > > Hunk #1 FAILED at 1454. > 1 out of 1 hunk FAILED -- saving rejects to file monitor.c.rej > patching file savevm.c > Hunk #1 FAILED at 1114. > Hunk #2 FAILED at 1190. > 2 out of 2 hunks FAILED -- saving rejects to file savevm.c.rej > patching file sysemu.h > Hunk #1 FAILED at 47. > 1 out of 1 hunk FAILED -- saving rejects to file sysemu.h.rej > > i know that this part of patch was not applied to qemu files and stored in > .rej files but now what should i do > should i apply the changed part of the code direct to the files or any > solution,thanks
Since the patch is from 2009 it's not surprising there are conflicts. QEMU has changed since then and you'll need to manually resolve conflicts. I don't like .rej files. Instead I use the patch --merge flag to show the two conflicting hunks and perform the resolution using a text editor. Reset your world and then try using patch with the --merge flag. Open the conflicting files in your editor and search for '<<<'. Stefan