mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2025-03-07 17:28:15 +00:00
virStorageFileGetMetadataRecurse: Use virHashHasEntry instead of fake pointers
Replacing virHashLookup by virHashHasEntry allows us to use NULL as the payload of the hash table rather than putting a fake '1' pointer into the table. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com>
This commit is contained in:
parent
157b8722cb
commit
e3960f4b6d
@ -4992,14 +4992,14 @@ virStorageFileGetMetadataRecurse(virStorageSourcePtr src,
|
||||
if (!(uniqueName = virStorageFileGetUniqueIdentifier(src)))
|
||||
goto cleanup;
|
||||
|
||||
if (virHashLookup(cycle, uniqueName)) {
|
||||
if (virHashHasEntry(cycle, uniqueName)) {
|
||||
virReportError(VIR_ERR_INTERNAL_ERROR,
|
||||
_("backing store for %s (%s) is self-referential"),
|
||||
NULLSTR(src->path), uniqueName);
|
||||
goto cleanup;
|
||||
}
|
||||
|
||||
if (virHashAddEntry(cycle, uniqueName, (void *)1) < 0)
|
||||
if (virHashAddEntry(cycle, uniqueName, NULL) < 0)
|
||||
goto cleanup;
|
||||
|
||||
if ((headerLen = virStorageFileRead(src, 0, VIR_STORAGE_MAX_HEADER,
|
||||
|
Loading…
x
Reference in New Issue
Block a user