On Thu, Feb 07, 2013 at 17:01:50 +0000, Daniel P. Berrange wrote:
On Wed, Feb 06, 2013 at 04:30:18PM +0100, Jiri Denemark wrote:
I'm not sure if it was intentional or not but the rename of all qemuCapsPtr (now virQEMUCapsPtr) to qemuCaps is incomplete. Lots of missed instances can be found in src/qemu/qemu_capabilities.[ch] and two of them remained in src/qemu/qemu_process.c.
Hmm, yes that was an oversight.
Here is a delta-patch for review.
ACK with the following patch squashed in: diff --git i/src/qemu/qemu_capabilities.h w/src/qemu/qemu_capabilities.h index 6020d0a..e69d558 100644 --- i/src/qemu/qemu_capabilities.h +++ w/src/qemu/qemu_capabilities.h @@ -177,46 +177,46 @@ typedef struct _virQEMUCapsCache virQEMUCapsCache; typedef virQEMUCapsCache *virQEMUCapsCachePtr; virQEMUCapsPtr virQEMUCapsNew(void); -virQEMUCapsPtr virQEMUCapsNewCopy(virQEMUCapsPtr caps); +virQEMUCapsPtr virQEMUCapsNewCopy(virQEMUCapsPtr qemuCaps); virQEMUCapsPtr virQEMUCapsNewForBinary(const char *binary, const char *libDir, uid_t runUid, gid_t runGid); -int virQEMUCapsProbeQMP(virQEMUCapsPtr caps, +int virQEMUCapsProbeQMP(virQEMUCapsPtr qemuCaps, qemuMonitorPtr mon); -void virQEMUCapsSet(virQEMUCapsPtr caps, +void virQEMUCapsSet(virQEMUCapsPtr qemuCaps, enum virQEMUCapsFlags flag) ATTRIBUTE_NONNULL(1); -void virQEMUCapsSetList(virQEMUCapsPtr caps, ...) ATTRIBUTE_NONNULL(1); +void virQEMUCapsSetList(virQEMUCapsPtr qemuCaps, ...) ATTRIBUTE_NONNULL(1); -void virQEMUCapsClear(virQEMUCapsPtr caps, +void virQEMUCapsClear(virQEMUCapsPtr qemuCaps, enum virQEMUCapsFlags flag) ATTRIBUTE_NONNULL(1); -bool virQEMUCapsGet(virQEMUCapsPtr caps, +bool virQEMUCapsGet(virQEMUCapsPtr qemuCaps, enum virQEMUCapsFlags flag); -char *virQEMUCapsFlagsString(virQEMUCapsPtr caps); +char *virQEMUCapsFlagsString(virQEMUCapsPtr qemuCaps); -const char *virQEMUCapsGetBinary(virQEMUCapsPtr caps); -virArch virQEMUCapsGetArch(virQEMUCapsPtr caps); -unsigned int virQEMUCapsGetVersion(virQEMUCapsPtr caps); -unsigned int virQEMUCapsGetKVMVersion(virQEMUCapsPtr caps); -int virQEMUCapsAddCPUDefinition(virQEMUCapsPtr caps, +const char *virQEMUCapsGetBinary(virQEMUCapsPtr qemuCaps); +virArch virQEMUCapsGetArch(virQEMUCapsPtr qemuCaps); +unsigned int virQEMUCapsGetVersion(virQEMUCapsPtr qemuCaps); +unsigned int virQEMUCapsGetKVMVersion(virQEMUCapsPtr qemuCaps); +int virQEMUCapsAddCPUDefinition(virQEMUCapsPtr qemuCaps, const char *name); -size_t virQEMUCapsGetCPUDefinitions(virQEMUCapsPtr caps, +size_t virQEMUCapsGetCPUDefinitions(virQEMUCapsPtr qemuCaps, char ***names); -size_t virQEMUCapsGetMachineTypes(virQEMUCapsPtr caps, +size_t virQEMUCapsGetMachineTypes(virQEMUCapsPtr qemuCaps, char ***names); -const char *virQEMUCapsGetCanonicalMachine(virQEMUCapsPtr caps, +const char *virQEMUCapsGetCanonicalMachine(virQEMUCapsPtr qemuCaps, const char *name); -int virQEMUCapsGetMachineTypesCaps(virQEMUCapsPtr caps, +int virQEMUCapsGetMachineTypesCaps(virQEMUCapsPtr qemuCaps, size_t *nmachines, virCapsGuestMachinePtr **machines); -bool virQEMUCapsIsValid(virQEMUCapsPtr caps); +bool virQEMUCapsIsValid(virQEMUCapsPtr qemuCaps); virQEMUCapsCachePtr virQEMUCapsCacheNew(const char *libDir, @@ -236,15 +236,15 @@ int virQEMUCapsGetDefaultVersion(virCapsPtr caps, /* Only for use by test suite */ int virQEMUCapsParseHelpStr(const char *qemu, const char *str, - virQEMUCapsPtr caps, + virQEMUCapsPtr qemuCaps, unsigned int *version, unsigned int *is_kvm, unsigned int *kvm_version, bool check_yajl); /* Only for use by test suite */ -int virQEMUCapsParseDeviceStr(virQEMUCapsPtr caps, const char *str); +int virQEMUCapsParseDeviceStr(virQEMUCapsPtr qemuCaps, const char *str); VIR_ENUM_DECL(virQEMUCaps); -bool virQEMUCapsUsedQMP(virQEMUCapsPtr caps); +bool virQEMUCapsUsedQMP(virQEMUCapsPtr qemuCaps); #endif /* __QEMU_CAPABILITIES_H__*/