[pve-devel] backup RFC preview

[Dietmar Maurer]

My patches are against commit 6801038bc52d61f81ac8a25fbe392f1bad982887

Try to use that commit.

Maybe I should expose my internal qemu-git tree?

> -----Original Message-----
> From: Alexandre DERUMIER [mailto:aderumier at odiso.com]
> Sent: Montag, 19. November 2012 13:33
> To: Dietmar Maurer
> Cc: pve-devel at pve.proxmox.com
> Subject: Re: [pve-devel] backup RFC preview
> 
> >>Just sent an updated version - does that work better?
> no :/
> 
> Last qemu git:
> 
> I got Hunk Failed on Makefile
> 
> root at kvmtest1:~/qemu2/qemu# patch -p1 < patch1.patch patching file
> docs/backup-rfc.txt root at kvmtest1:~/qemu2/qemu# patch -p1 <
> patch2.patch patching file Makefile.objs Hunk #1 succeeded at 48 (offset 4
> lines).
> patching file backup.c
> patching file block.c
> patching file block.h
> patching file block_int.h
> root at kvmtest1:~/qemu2/qemu# patch -p1 < patch3.patch patching file
> Makefile Hunk #2 FAILED at 186.
> 1 out of 2 hunks FAILED -- saving rejects to file Makefile.rej patching file
> docs/specs/vma_spec.txt patching file vma-reader.c patching file vma-
> writer.c patching file vma.c patching file vma.h
> root at kvmtest1:~/qemu2/qemu# patch -p1 < patch4.patch patching file
> Makefile Hunk #1 FAILED at 186.
> 1 out of 1 hunk FAILED -- saving rejects to file Makefile.rej patching file
> Makefile.objs Hunk #1 succeeded at 48 (offset 4 lines).
> patching file blockdev.c
> patching file hmp-commands.hx
> patching file hmp.c
> patching file hmp.h
> patching file monitor.c
> patching file qapi-schema.json
> patching file qmp-commands.hx
> root at kvmtest1:~/qemu2/qemu# patch -p1 < patch5.patch patching file
> include/qemu/ratelimit.h patching file tests/Makefile patching file
> tests/backup-test.c
> 
> 
> 
> After manually add to Makefile
> 
> 
> +vma$(EXESUF): vma.o vma-reader.o $(tools-obj-y) $(block-obj-y)
> 
> I get same error:
> 
> 
> #./configure --target-list=x86_64-softmmu --prefix=/usr --datadir=/usr/share
> --docdir=/usr/share/doc/pve-qemu-kvm --sysconfdir=/etc --disable-xen
> 
> # make
>   CC    async.o
>   CC    nbd.o
>   CC    block.o
>   CC    blockjob.o
>   CC    aes.o
>   CC    qemu-config.o
>   CC    thread-pool.o
>   CC    qemu-progress.o
>   CC    uri.o
>   CC    notify.o
>   CC    vma-writer.o
>   CC    backup.o
>   CC    qemu-coroutine.o
>   CC    qemu-coroutine-lock.o
>   CC    qemu-coroutine-io.o
>   CC    qemu-coroutine-sleep.o
>   CC    coroutine-ucontext.o
>   CC    event_notifier-posix.o
>   CC    aio-posix.o
>   CC    block/raw.o
>   CC    block/cow.o
>   CC    block/qcow.o
>   CC    block/vdi.o
>   CC    block/vmdk.o
>   CC    block/cloop.o
>   CC    block/dmg.o
>   CC    block/bochs.o
>   CC    block/vpc.o
>   CC    block/vvfat.o
>   CC    block/qcow2.o
>   CC    block/qcow2-refcount.o
>   CC    block/qcow2-cluster.o
>   CC    block/qcow2-snapshot.o
>   CC    block/qcow2-cache.o
>   CC    block/qed.o
>   CC    block/qed-gencb.o
>   CC    block/qed-l2-cache.o
>   CC    block/qed-table.o
>   CC    block/qed-cluster.o
>   CC    block/qed-check.o
>   CC    block/parallels.o
>   CC    block/blkdebug.o
>   CC    block/blkverify.o
>   CC    block/raw-posix.o
>   CC    block/linux-aio.o
>   CC    block/nbd.o
>   CC    block/sheepdog.o
>   CC    block/iscsi.o
>   CC    block/curl.o
>   CC    block/rbd.o
>   LINK  qemu-nbd
>   GEN   qemu-img-cmds.h
>   CC    qemu-img.o
>   LINK  qemu-img
>   CC    qemu-io.o
>   CC    cmd.o
>   LINK  qemu-io
>   CC    fsdev/virtfs-proxy-helper.o
>   CC    fsdev/virtio-9p-marshal.o
>   LINK  fsdev/virtfs-proxy-helper
>   CC    vma.o
>   CC    vma-reader.o
>   LINK  vma
> osdep.o: In function `qemu_close':
> /root/qemu2/qemu/osdep.c:212: undefined reference to
> `monitor_fdset_dup_fd_find'
> /root/qemu2/qemu/osdep.c:218: undefined reference to
> `monitor_fdset_dup_fd_remove'
> osdep.o: In function `qemu_open':
> /root/qemu2/qemu/osdep.c:166: undefined reference to
> `monitor_fdset_get_fd'
> /root/qemu2/qemu/osdep.c:176: undefined reference to
> `monitor_fdset_dup_fd_add'
> qemu-sockets.o: In function `socket_connect':
> /root/qemu2/qemu/qemu-sockets.c:906: undefined reference to
> `monitor_get_fd'
> qemu-sockets.o: In function `socket_listen':
> /root/qemu2/qemu/qemu-sockets.c:937: undefined reference to
> `monitor_get_fd'
> collect2: ld returned 1 exit status
> make: *** [vma] Error 1
> 
> 
> 
> 
> note :
> patch3 add:
> +vma$(EXESUF): vma.o vma-writer.o vma-reader.o $(tools-obj-y)
> +$(block-obj-y)
> 
> 
> and patch 4:
> -vma$(EXESUF): vma.o vma-writer.o vma-reader.o $(tools-obj-y) $(block-obj-
> y)
> +vma$(EXESUF): vma.o vma-reader.o $(tools-obj-y) $(block-obj-y)
> 
> 
> 
> ----- Mail original -----
> 
> De: "Dietmar Maurer" <dietmar at proxmox.com>
> À: "Alexandre DERUMIER" <aderumier at odiso.com>
> Cc: pve-devel at pve.proxmox.com
> Envoyé: Lundi 19 Novembre 2012 12:30:23
> Objet: RE: [pve-devel] backup RFC preview
> 
> Just sent an updated version - does that work better?
> 
> > -----Original Message-----
> > From: Alexandre DERUMIER [mailto:aderumier at odiso.com]
> > Sent: Montag, 19. November 2012 12:24
> > To: Dietmar Maurer
> > Cc: pve-devel at pve.proxmox.com
> > Subject: Re: [pve-devel] backup RFC preview
> >
> >
> > >>Does it help when you specify the correct target-list (else it tries
> > >>to build all
> > targets)
> > >>
> > >>./configure --target-list x86_64-softmmu ...
> >
> > Doesn't help, but I have found the problem, I have a part of the patch
> > which doesn't apply