On 12/16/2010 01:13 PM, Eric Blake wrote:
> Hmm, seems this went wrong during a rebase. The qemu_conf.h
> addition somehow ended up in the next patch. I should just
> squash the patches 3 & 4 together
I wondered that too, at first, but the diffstat for 4 doesn't concur either:
src/qemu/qemu_conf.h | 3 -
At any rate, if I paste the 45 lines, and add #include "qemu_monitor.h"
at the top, then things compile, but I don't know if you wanted
qemu_monitor.h dragging that in for all clients of qemu_conf.h.
Oh, I see - you moved those lines, _again_, into the new qemu_domain.h
for patch 4. In which case, squashing 3 and 4 is the right way to go.
ACK to that approach.
--
Eric Blake eblake(a)redhat.com +1-801-349-2682
Libvirt virtualization library
http://libvirt.org