External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-23 11:52:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: Remove virQEMUDomainCapsCache code

Browse Source 
Now that the domCaps cache is history, this code is no longer
used and thus can be removed.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
This commit is contained in:
Michal Privoznik 2020-11-13 21:22:47 +01:00
parent 7db61843b0
commit 19c4c6f8fd
2 changed files with 0 additions and 139 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

129
src/qemu/qemu_capabilities.c
View File

@ -648,25 +648,6 @@ struct _virQEMUCapsAccel {
}; };
typedef struct _virQEMUDomainCapsCache virQEMUDomainCapsCache;
typedef virQEMUDomainCapsCache *virQEMUDomainCapsCachePtr;
struct _virQEMUDomainCapsCache {
virObjectLockable parent;
GHashTable *cache;
};
G_DEFINE_AUTOPTR_CLEANUP_FUNC(virQEMUDomainCapsCache, virObjectUnref);
static virClassPtr virQEMUDomainCapsCacheClass;
static void virQEMUDomainCapsCacheDispose(void *obj)
{
virQEMUDomainCapsCachePtr cache = obj;
virHashFree(cache->cache);
}
/* /*
* Update the XML parser/formatter when adding more * Update the XML parser/formatter when adding more
* information to this struct so that it gets cached * information to this struct so that it gets cached
@ -700,8 +681,6 @@ struct _virQEMUCaps {
virArch arch; virArch arch;
virQEMUDomainCapsCachePtr domCapsCache;
size_t ngicCapabilities; size_t ngicCapabilities;
virGICCapability *gicCapabilities; virGICCapability *gicCapabilities;
@ -726,9 +705,6 @@ static int virQEMUCapsOnceInit(void)
if (!VIR_CLASS_NEW(virQEMUCaps, virClassForObject())) if (!VIR_CLASS_NEW(virQEMUCaps, virClassForObject()))
return -1; return -1;
if (!(VIR_CLASS_NEW(virQEMUDomainCapsCache, virClassForObjectLockable())))
return -1;
return 0; return 0;
} }
@ -1774,24 +1750,6 @@ int virQEMUCapsGetDefaultVersion(virCapsPtr caps,
} }
static virQEMUDomainCapsCachePtr
virQEMUDomainCapsCacheNew(void)
{
g_autoptr(virQEMUDomainCapsCache) cache = NULL;
if (virQEMUCapsInitialize() < 0)
return NULL;
if (!(cache = virObjectLockableNew(virQEMUDomainCapsCacheClass)))
return NULL;
if (!(cache->cache = virHashNew(virObjectFreeHashData)))
return NULL;
return g_steal_pointer(&cache);
}
virQEMUCapsPtr virQEMUCapsPtr
virQEMUCapsNew(void) virQEMUCapsNew(void)
{ {
@ -1806,14 +1764,7 @@ virQEMUCapsNew(void)
qemuCaps->invalidation = true; qemuCaps->invalidation = true;
qemuCaps->flags = virBitmapNew(QEMU_CAPS_LAST); qemuCaps->flags = virBitmapNew(QEMU_CAPS_LAST);
if (!(qemuCaps->domCapsCache = virQEMUDomainCapsCacheNew()))
goto error;
return qemuCaps; return qemuCaps;
error:
virObjectUnref(qemuCaps);
return NULL;
} }
@ -1992,7 +1943,6 @@ void virQEMUCapsDispose(void *obj)
{ {
virQEMUCapsPtr qemuCaps = obj; virQEMUCapsPtr qemuCaps = obj;
virObjectUnref(qemuCaps->domCapsCache);
virBitmapFree(qemuCaps->flags); virBitmapFree(qemuCaps->flags);
VIR_FREE(qemuCaps->package); VIR_FREE(qemuCaps->package);
@ -2147,85 +2097,6 @@ const char *virQEMUCapsGetPackage(virQEMUCapsPtr qemuCaps)
} }
struct virQEMUCapsSearchDomcapsData {
const char *path;
const char *machine;
virArch arch;
virDomainVirtType virttype;
};
static int
virQEMUCapsSearchDomcaps(const void *payload,
const char *name G_GNUC_UNUSED,
const void *opaque)
{
virDomainCapsPtr domCaps = (virDomainCapsPtr) payload;
struct virQEMUCapsSearchDomcapsData *data = (struct virQEMUCapsSearchDomcapsData *) opaque;
if (STREQ_NULLABLE(data->path, domCaps->path) &&
STREQ_NULLABLE(data->machine, domCaps->machine) &&
data->arch == domCaps->arch &&
data->virttype == domCaps->virttype)
return 1;
return 0;
}
virDomainCapsPtr
virQEMUCapsGetDomainCapsCache(virQEMUCapsPtr qemuCaps,
const char *machine,
virArch arch,
virDomainVirtType virttype,
virArch hostarch,
bool privileged,
virFirmwarePtr *firmwares,
size_t nfirmwares)
{
virQEMUDomainCapsCachePtr cache = qemuCaps->domCapsCache;
virDomainCapsPtr domCaps = NULL;
const char *path = virQEMUCapsGetBinary(qemuCaps);
struct virQEMUCapsSearchDomcapsData data = {
.path = path,
.machine = machine,
.arch = arch,
.virttype = virttype,
};
virObjectLock(cache);
domCaps = virHashSearch(cache->cache, virQEMUCapsSearchDomcaps, &data, NULL);
if (!domCaps) {
g_autoptr(virDomainCaps) tempDomCaps = NULL;
g_autofree char *key = NULL;
/* hash miss, build new domcaps */
if (!(tempDomCaps = virDomainCapsNew(path, machine,
arch, virttype)))
goto cleanup;
if (virQEMUCapsFillDomainCaps(qemuCaps, hostarch, tempDomCaps,
privileged, firmwares, nfirmwares) < 0)
goto cleanup;
key = g_strdup_printf("%d:%d:%s:%s", arch, virttype,
NULLSTR(machine), path);
if (virHashAddEntry(cache->cache, key, tempDomCaps) < 0)
goto cleanup;
domCaps = g_steal_pointer(&tempDomCaps);
}
virObjectRef(domCaps);
cleanup:
virObjectUnlock(cache);
return domCaps;
}
int int
virQEMUCapsAddCPUDefinitions(virQEMUCapsPtr qemuCaps, virQEMUCapsAddCPUDefinitions(virQEMUCapsPtr qemuCaps,
virDomainVirtType type, virDomainVirtType type,

10
src/qemu/qemu_capabilities.h
View File

@ -620,16 +620,6 @@ virArch virQEMUCapsGetArch(virQEMUCapsPtr qemuCaps);
unsigned int virQEMUCapsGetVersion(virQEMUCapsPtr qemuCaps); unsigned int virQEMUCapsGetVersion(virQEMUCapsPtr qemuCaps);
const char *virQEMUCapsGetPackage(virQEMUCapsPtr qemuCaps); const char *virQEMUCapsGetPackage(virQEMUCapsPtr qemuCaps);
virDomainCapsPtr
virQEMUCapsGetDomainCapsCache(virQEMUCapsPtr qemuCaps,
const char *machine,
virArch arch,
virDomainVirtType virttype,
virArch hostarch,
bool privileged,
virFirmwarePtr *firmwares,
size_t nfirmwares);
unsigned int virQEMUCapsGetKVMVersion(virQEMUCapsPtr qemuCaps); unsigned int virQEMUCapsGetKVMVersion(virQEMUCapsPtr qemuCaps);
int virQEMUCapsAddCPUDefinitions(virQEMUCapsPtr qemuCaps, int virQEMUCapsAddCPUDefinitions(virQEMUCapsPtr qemuCaps,
virDomainVirtType type, virDomainVirtType type,