On Wed, Dec 25, 2013 at 12:47 AM, Jean-Baptiste Rouault <jean-baptiste.rouault@xxxxxxxxxxx> wrote: > While working on adding virDomain*Stats support to the vbox driver, we > found bugs in the VirtualBox API C bindings. These bugs have been fixed > in versions 4.2.20 and 4.3.4. > However, the changes in the C bindings are incompatible with the vbox_CAPI_v4_2.h > and vbox_CAPI_v4_3.h files which are bundled in libvirt source code. This is why the > following patch adds vbox_CAPI_v4_2_20.h and vbox_CAPI_v4_3_4.h. > > We tried to keep compatibility with older VirtualBox 4.2.x and 4.3.x releases so we > added a "SPECIAL_VERSION" identifier to conditionnaly include the right header. > I'm not really pleased with this "SPECIAL_VERSION" identifier, maybe we could instead > increase the precision of "VBOX_API_VERSION", for example 4002 would become 4002000. > This would permit us to select the right header based on the VBOX_API_VERSION only, what > do you think ? Can we use VBOX_XPCOMC_VERSION instead of adding a new flag? The version has been bumped up when the incompatibility is introduced. ozaki-r > > Jean-Baptiste Rouault (1): > vbox: add support for v4.2.20+ and v4.3.4+ > > src/Makefile.am | 4 +- > src/vbox/vbox_CAPI_v4_2_20.h | 9001 +++++++++++++++++++++++++++++++++++ > src/vbox/vbox_CAPI_v4_3_4.h | 10321 +++++++++++++++++++++++++++++++++++++++++ > src/vbox/vbox_V2_2.c | 1 + > src/vbox/vbox_V3_0.c | 1 + > src/vbox/vbox_V3_1.c | 1 + > src/vbox/vbox_V3_2.c | 1 + > src/vbox/vbox_V4_0.c | 1 + > src/vbox/vbox_V4_1.c | 1 + > src/vbox/vbox_V4_2.c | 1 + > src/vbox/vbox_V4_2_20.c | 14 + > src/vbox/vbox_V4_3.c | 1 + > src/vbox/vbox_V4_3_4.c | 14 + > src/vbox/vbox_driver.c | 20 +- > src/vbox/vbox_tmpl.c | 12 +- > 15 files changed, 19389 insertions(+), 5 deletions(-) > create mode 100644 src/vbox/vbox_CAPI_v4_2_20.h > create mode 100644 src/vbox/vbox_CAPI_v4_3_4.h > create mode 100644 src/vbox/vbox_V4_2_20.c > create mode 100644 src/vbox/vbox_V4_3_4.c > > -- > 1.8.5.1 > > -- > libvir-list mailing list > libvir-list@xxxxxxxxxx > https://www.redhat.com/mailman/listinfo/libvir-list -- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list