[libvirt] [RFC PATCH 00/10] Revert the switch to Jansson

Ján Tomko posted 10 patches 5 years, 8 months ago
Failed in applying to current master (apply log)
config-post.h                            |   3 +-
configure.ac                             |   3 -
libvirt.spec.in                          |   4 +-
m4/virt-driver-qemu.m4                   |   9 +-
m4/virt-jansson.m4                       |  32 --
m4/virt-nss.m4                           |   4 +-
m4/virt-yajl.m4                          |  27 +-
src/Makefile.am                          |   8 +-
src/libvirt_private.syms                 |   1 +
src/qemu/qemu_driver.c                   |   2 +-
src/util/Makefile.inc.am                 |   4 +-
src/util/virjson.c                       | 616 ++++++++++++++++++++++++-------
src/util/virjson.h                       |   1 +
tests/Makefile.am                        |  12 +-
tests/cputest.c                          |  16 +-
tests/libxlxml2domconfigtest.c           |   4 +-
tests/qemuagenttest.c                    |   4 +-
tests/qemublocktest.c                    |   6 -
tests/qemucapabilitiestest.c             |   7 +-
tests/qemucaps2xmltest.c                 |   2 +-
tests/qemucommandutiltest.c              |   7 +-
tests/qemuhotplugtest.c                  |   7 +-
tests/qemumigparamsdata/empty.json       |   4 +-
tests/qemumigparamsdata/unsupported.json |   4 +-
tests/qemumigparamstest.c                |   7 +-
tests/qemumonitorjsontest.c              |   7 +-
tests/virjsontest.c                      |   5 -
tests/virmacmaptest.c                    |   5 -
tests/virmacmaptestdata/empty.json       |   4 +-
tests/virmocklibxl.c                     |   4 +-
tests/virnetdaemontest.c                 |   7 +-
tests/virstoragetest.c                   |   4 +-
32 files changed, 555 insertions(+), 275 deletions(-)
delete mode 100644 m4/virt-jansson.m4
[libvirt] [RFC PATCH 00/10] Revert the switch to Jansson
Posted by Ján Tomko 5 years, 8 months ago
As reported by Andrea Bolognani (Thanks, Andrea!), since the switch
to jansson applications using libvirt_nss crash due to a function
name collision with json-glib:
https://www.redhat.com/archives/libvir-list/2018-July/msg02044.html

Revert the changes until we come up with a better solution.

Ján Tomko (10):
  Revert "tests: also skip qemuagenttest with old jansson"
  Revert "m4: Introduce STABLE_ORDERING_JANSSON"
  Revert "build: require Jansson if QEMU driver is enabled"
  Revert "build: switch --with-qemu default from yes to check"
  Revert "Remove virJSONValueNewStringLen"
  Revert "build: remove references to WITH_YAJL for SETUID_RPC_CLIENT"
  Revert "Remove functions using yajl"
  Revert "Switch from yajl to Jansson"
  Revert "build: undef WITH_JANSSON for SETUID_RPC_CLIENT"
  Revert "build: add --with-jansson"

 config-post.h                            |   3 +-
 configure.ac                             |   3 -
 libvirt.spec.in                          |   4 +-
 m4/virt-driver-qemu.m4                   |   9 +-
 m4/virt-jansson.m4                       |  32 --
 m4/virt-nss.m4                           |   4 +-
 m4/virt-yajl.m4                          |  27 +-
 src/Makefile.am                          |   8 +-
 src/libvirt_private.syms                 |   1 +
 src/qemu/qemu_driver.c                   |   2 +-
 src/util/Makefile.inc.am                 |   4 +-
 src/util/virjson.c                       | 616 ++++++++++++++++++++++++-------
 src/util/virjson.h                       |   1 +
 tests/Makefile.am                        |  12 +-
 tests/cputest.c                          |  16 +-
 tests/libxlxml2domconfigtest.c           |   4 +-
 tests/qemuagenttest.c                    |   4 +-
 tests/qemublocktest.c                    |   6 -
 tests/qemucapabilitiestest.c             |   7 +-
 tests/qemucaps2xmltest.c                 |   2 +-
 tests/qemucommandutiltest.c              |   7 +-
 tests/qemuhotplugtest.c                  |   7 +-
 tests/qemumigparamsdata/empty.json       |   4 +-
 tests/qemumigparamsdata/unsupported.json |   4 +-
 tests/qemumigparamstest.c                |   7 +-
 tests/qemumonitorjsontest.c              |   7 +-
 tests/virjsontest.c                      |   5 -
 tests/virmacmaptest.c                    |   5 -
 tests/virmacmaptestdata/empty.json       |   4 +-
 tests/virmocklibxl.c                     |   4 +-
 tests/virnetdaemontest.c                 |   7 +-
 tests/virstoragetest.c                   |   4 +-
 32 files changed, 555 insertions(+), 275 deletions(-)
 delete mode 100644 m4/virt-jansson.m4

-- 
2.16.1

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list