On Thu, Dec 12, 2013 at 09:20:43PM -0700, Eric Blake wrote: > On 12/09/2013 02:11 AM, Hu Tao wrote: > > Signed-off-by: Hu Tao <hutao@xxxxxxxxxxxxxx> > > --- > > src/qemu/qemu_capabilities.c | 3 +++ > > src/qemu/qemu_capabilities.h | 2 ++ > > src/qemu/qemu_command.c | 16 ++++++++++++++++ > > tests/qemucapabilitiesdata/caps_1.5.3-1.caps | 1 + > > tests/qemucapabilitiesdata/caps_1.6.0-1.caps | 1 + > > tests/qemucapabilitiesdata/caps_1.6.50-1.caps | 1 + > > 6 files changed, 24 insertions(+) > > More merge conflicts, and it's my bedtime; I'll resolve and push in the > morning, as well as squash 3 and 4 into one patch. Thanks! -- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list