mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-07-11 12:25:52 +00:00
9cf38263d0
Yajl has not seen much activity upstream recently. Switch to using Jansson >= 2.5. All the platforms we target on https://libvirt.org/platforms.html have a version >= 2.7 listed on the sites below: https://repology.org/metapackage/jansson/versions https://build.opensuse.org/package/show/devel:libraries:c_c++/libjansson Additionally, Ubuntu 14.04 on Travis-CI has 2.5. Set the requirement to 2.5 since we don't use anything from newer versions. Implement virJSONValue{From,To}String using Jansson, delete the yajl code (and the related virJSONParser structure) and report an error if someone explicitly specifies --with-yajl. Also adjust the test data to account for Jansson's different whitespace usage for empty arrays and tune up the specfile to keep 'make rpm' working when bisecting. Signed-off-by: Ján Tomko <jtomko@redhat.com>
140 lines
3.7 KiB
C
140 lines
3.7 KiB
C
/*
|
|
* virmocklibxl.c: mocking of xenstore/libxs for libxl
|
|
*
|
|
* Copyright (C) 2014 Red Hat, Inc.
|
|
*
|
|
* This library is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2.1 of the License, or (at your option) any later version.
|
|
*
|
|
* This library is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with this library. If not, see
|
|
* <http://www.gnu.org/licenses/>.
|
|
*
|
|
* Author: Daniel P. Berrange <berrange@redhat.com>
|
|
*/
|
|
|
|
#include <config.h>
|
|
|
|
#if defined(WITH_LIBXL) && defined(WITH_JANSSON)
|
|
# include "virmock.h"
|
|
# include <sys/stat.h>
|
|
# include <unistd.h>
|
|
# include <libxl.h>
|
|
# include <xenstore.h>
|
|
# include <xenctrl.h>
|
|
# include <sys/socket.h>
|
|
|
|
# include "virfile.h"
|
|
|
|
VIR_MOCK_IMPL_RET_VOID(xs_daemon_open,
|
|
struct xs_handle *)
|
|
{
|
|
VIR_MOCK_REAL_INIT(xs_daemon_open);
|
|
return (void*)0x1;
|
|
}
|
|
|
|
VIR_MOCK_IMPL_RET_ARGS(xc_interface_open,
|
|
xc_interface *,
|
|
xentoollog_logger *, logger,
|
|
xentoollog_logger *, dombuild_logger,
|
|
unsigned, open_flags)
|
|
{
|
|
VIR_MOCK_REAL_INIT(xc_interface_open);
|
|
return (void*)0x1;
|
|
}
|
|
|
|
|
|
VIR_MOCK_IMPL_RET_ARGS(libxl_get_version_info,
|
|
const libxl_version_info*,
|
|
libxl_ctx *, ctx)
|
|
{
|
|
static libxl_version_info info;
|
|
|
|
memset(&info, 0, sizeof(info));
|
|
|
|
/* silence gcc warning about unused function */
|
|
if (0)
|
|
real_libxl_get_version_info(ctx);
|
|
return &info;
|
|
}
|
|
|
|
VIR_MOCK_STUB_RET_ARGS(libxl_get_free_memory,
|
|
int, 0,
|
|
libxl_ctx *, ctx,
|
|
uint32_t *, memkb);
|
|
|
|
VIR_MOCK_STUB_RET_ARGS(xc_interface_close,
|
|
int, 0,
|
|
xc_interface *, handle)
|
|
|
|
VIR_MOCK_STUB_RET_ARGS(xc_physinfo,
|
|
int, 0,
|
|
xc_interface *, handle,
|
|
xc_physinfo_t *, put_info)
|
|
|
|
VIR_MOCK_STUB_RET_ARGS(xc_sharing_freed_pages,
|
|
long, 0,
|
|
xc_interface *, handle)
|
|
|
|
VIR_MOCK_STUB_RET_ARGS(xc_sharing_used_frames,
|
|
long, 0,
|
|
xc_interface *, handle)
|
|
|
|
VIR_MOCK_STUB_VOID_ARGS(xs_daemon_close,
|
|
struct xs_handle *, handle)
|
|
|
|
VIR_MOCK_STUB_RET_ARGS(bind,
|
|
int, 0,
|
|
int, sockfd,
|
|
const struct sockaddr *, addr,
|
|
socklen_t, addrlen)
|
|
|
|
VIR_MOCK_IMPL_RET_ARGS(virFileMakePath, int,
|
|
const char *, path)
|
|
{
|
|
/* replace log path with a writable directory */
|
|
if (strstr(path, "/log/")) {
|
|
snprintf((char*)path, strlen(path), ".");
|
|
return 0;
|
|
}
|
|
return real_virFileMakePath(path);
|
|
}
|
|
|
|
VIR_MOCK_IMPL_RET_ARGS(__xstat, int,
|
|
int, ver,
|
|
const char *, path,
|
|
struct stat *, sb)
|
|
{
|
|
VIR_MOCK_REAL_INIT(__xstat);
|
|
|
|
if (strstr(path, "xenstored.pid")) {
|
|
memset(sb, 0, sizeof(*sb));
|
|
return 0;
|
|
}
|
|
|
|
return real___xstat(ver, path, sb);
|
|
}
|
|
|
|
VIR_MOCK_IMPL_RET_ARGS(stat, int,
|
|
const char *, path,
|
|
struct stat *, sb)
|
|
{
|
|
VIR_MOCK_REAL_INIT(stat);
|
|
|
|
if (strstr(path, "xenstored.pid")) {
|
|
memset(sb, 0, sizeof(*sb));
|
|
return 0;
|
|
}
|
|
|
|
return real_stat(path, sb);
|
|
}
|
|
|
|
#endif /* WITH_LIBXL && WITH_JANSSON */
|