On Thu, Oct 02, 2014 at 03:23:59PM +0200, Michal Privoznik wrote: > On 26.09.2014 12:22, Daniel P. Berrange wrote: > >Fix the typo in VIR_DOMAIN_TUNABLE_CPU_EMULATORIN > > > >Signed-off-by: Daniel P. Berrange <berrange@xxxxxxxxxx> > >--- > > include/libvirt/libvirt.h.in | 4 ++-- > > src/qemu/qemu_driver.c | 2 +- > > 2 files changed, 3 insertions(+), 3 deletions(-) > > > >Pushed under trivial rule > > > >diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in > >index 2ff5204..5217ab3 100644 > >--- a/include/libvirt/libvirt.h.in > >+++ b/include/libvirt/libvirt.h.in > >@@ -5213,12 +5213,12 @@ typedef void (*virConnectDomainEventDeviceRemovedCallback)(virConnectPtr conn, > > #define VIR_DOMAIN_TUNABLE_CPU_VCPUPIN "cputune.vcpupin%u" > > > > /** > >- * VIR_DOMAIN_TUNABLE_CPU_EMULATORIN: > >+ * VIR_DOMAIN_TUNABLE_CPU_EMULATORPIN: > > * > > * Macro represents formatted pinning for emulator process, > > * as VIR_TYPED_PARAM_STRING. > > */ > >-#define VIR_DOMAIN_TUNABLE_CPU_EMULATORIN "cputune.emulatorpin" > >+#define VIR_DOMAIN_TUNABLE_CPU_EMULATORPIN "cputune.emulatorpin" > > > > /** > > * VIR_DOMAIN_TUNABLE_CPU_CPU_SHARES: > >diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c > >index 54119f5..6606154 100644 > >--- a/src/qemu/qemu_driver.c > >+++ b/src/qemu/qemu_driver.c > >@@ -4940,7 +4940,7 @@ qemuDomainPinEmulator(virDomainPtr dom, > > str = virBitmapFormat(pcpumap); > > if (virTypedParamsAddString(&eventParams, &eventNparams, > > &eventMaxparams, > >- VIR_DOMAIN_TUNABLE_CPU_EMULATORIN, > >+ VIR_DOMAIN_TUNABLE_CPU_EMULATORPIN, > > str) < 0) > > goto cleanup; > > > > > > This makes already existing application fail to compile with new libvirt > headers. And I think libvirt header files are part of our API. Hence I'm not > that inclined to ACKing this one, sorry (I know you've already pushed it > anyway). The constant was added after 1.2.8 and this rename applied before 1.2.9, so was never in any release & thus safe to change. Regards, Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :| -- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list