External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-03 19:45:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: Move some functions to qemu_capspriv.h

Browse Source 
This header file has been created so that we can expose
internal functions to the test suite without making them
public: those in qemu_capabilities.h bearing the comment

  /* Only for use by test suite */

are obvious candidates for being moved over.
This commit is contained in:
Andrea Bolognani 2017-04-05 15:38:37 +02:00
parent 611ddefc16
commit 2e5de445a1
3 changed files with 26 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/qemu/qemu_capabilities.h
View File

@ -473,11 +473,6 @@ bool virQEMUCapsIsValid(virQEMUCapsPtr qemuCaps,
void virQEMUCapsFilterByMachineType(virQEMUCapsPtr qemuCaps, void virQEMUCapsFilterByMachineType(virQEMUCapsPtr qemuCaps,
const char *machineType); const char *machineType);
/* Only for use by test suite */
void virQEMUCapsSetGICCapabilities(virQEMUCapsPtr qemuCaps,
virGICCapability *capabilities,
size_t ncapabilities);
virQEMUCapsCachePtr virQEMUCapsCacheNew(const char *libDir, virQEMUCapsCachePtr virQEMUCapsCacheNew(const char *libDir,
const char *cacheDir, const char *cacheDir,
uid_t uid, gid_t gid); uid_t uid, gid_t gid);
@ -499,20 +494,6 @@ int virQEMUCapsGetDefaultVersion(virCapsPtr caps,
virQEMUCapsCachePtr capsCache, virQEMUCapsCachePtr capsCache,
unsigned int *version); unsigned int *version);
/* Only for use by test suite */
int virQEMUCapsParseHelpStr(const char *qemu,
const char *str,
virQEMUCapsPtr qemuCaps,
unsigned int *version,
bool *is_kvm,
unsigned int *kvm_version,
bool check_yajl,
const char *qmperr);
/* Only for use by test suite */
int virQEMUCapsParseDeviceStr(virQEMUCapsPtr qemuCaps, const char *str);
/* Only for use by test suite */
void virQEMUCapsInitQMPBasicArch(virQEMUCapsPtr qemuCaps);
VIR_ENUM_DECL(virQEMUCaps); VIR_ENUM_DECL(virQEMUCaps);
bool virQEMUCapsSupportsChardev(const virDomainDef *def, bool virQEMUCapsSupportsChardev(const virDomainDef *def,

22
src/qemu/qemu_capspriv.h
View File

@ -83,6 +83,9 @@ virQEMUCapsInitCPUModel(virQEMUCapsPtr qemuCaps,
virDomainVirtType type, virDomainVirtType type,
virCPUDefPtr cpu); virCPUDefPtr cpu);
void
virQEMUCapsInitQMPBasicArch(virQEMUCapsPtr qemuCaps);
void void
virQEMUCapsSetCPUModelInfo(virQEMUCapsPtr qemuCaps, virQEMUCapsSetCPUModelInfo(virQEMUCapsPtr qemuCaps,
virDomainVirtType type, virDomainVirtType type,
@ -92,4 +95,23 @@ virCPUDefPtr
virQEMUCapsProbeHostCPUForEmulator(virCapsPtr caps, virQEMUCapsProbeHostCPUForEmulator(virCapsPtr caps,
virQEMUCapsPtr qemuCaps, virQEMUCapsPtr qemuCaps,
virDomainVirtType type); virDomainVirtType type);
void
virQEMUCapsSetGICCapabilities(virQEMUCapsPtr qemuCaps,
virGICCapability *capabilities,
size_t ncapabilities);
int
virQEMUCapsParseHelpStr(const char *qemu,
const char *str,
virQEMUCapsPtr qemuCaps,
unsigned int *version,
bool *is_kvm,
unsigned int *kvm_version,
bool check_yajl,
const char *qmperr);
int
virQEMUCapsParseDeviceStr(virQEMUCapsPtr qemuCaps,
const char *str);
#endif #endif

4
tests/qemuhelptest.c
View File

@ -8,6 +8,10 @@
# include <stdlib.h> # include <stdlib.h>
# include "qemu/qemu_capabilities.h" # include "qemu/qemu_capabilities.h"
# define __QEMU_CAPSPRIV_H_ALLOW__
# include "qemu/qemu_capspriv.h"
# undef __QEMU_CAPSPRIV_H_ALLOW__
# include "viralloc.h" # include "viralloc.h"
# include "virstring.h" # include "virstring.h"