On 11/24/2011 12:40 AM, Daniel Veillard wrote: > On Wed, Nov 23, 2011 at 02:44:44PM -0700, Eric Blake wrote: >> From: Lei Li <lilei@xxxxxxxxxxxxxxxxxx> >> >> Support Block I/O Throttle setting and query to remote driver. > [...] >> diff --git a/src/libvirt.c b/src/libvirt.c >> index a64bc07..074bc22 100644 >> --- a/src/libvirt.c >> +++ b/src/libvirt.c >> @@ -17336,4 +17336,3 @@ error: >> virDispatchError(dom->conn); >> return -1; >> } >> - > > Can we avoid this ? possly folding it in previous patch if that > comes from it ? Yep, previous patch failed 'make syntax-check' because of an empty blank line at the end, so it looks like I just squashed my fix into the wrong patch. And in the process of fixing this hunk, I had to deal with merge conflicts with Jirka's keepalive stuff, where I noticed he used 0.9.7 instead of 0.9.8 for all the new callbacks he added in the same places that this series touches. We'll get that fixed shortly. -- Eric Blake eblake@xxxxxxxxxx +1-919-301-3266 Libvirt virtualization library http://libvirt.org
Attachment:
signature.asc
Description: OpenPGP digital signature
-- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list