mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2025-02-01 17:35:17 +00:00
Replace virDomainSnapshotFree with virObjectUnref
Since virDomainSnapshotFree will call virObjectUnref anyway, let's just use that directly so as to avoid the possibility that we inadvertently clear out a pending error message when using the public API.
This commit is contained in:
parent
c56a591a84
commit
c8230c4ded
4
cfg.mk
4
cfg.mk
@ -992,7 +992,7 @@ sc_prohibit_system_error_with_vir_err:
|
|||||||
# functions. There's a corresponding exclude to allow usage within tests,
|
# functions. There's a corresponding exclude to allow usage within tests,
|
||||||
# docs, examples, tools, src/libvirt-*.c, and include/libvirt/libvirt-*.h
|
# docs, examples, tools, src/libvirt-*.c, and include/libvirt/libvirt-*.h
|
||||||
sc_prohibit_virXXXFree:
|
sc_prohibit_virXXXFree:
|
||||||
@prohibit='\bvir(Domain|Network|NodeDevice|StorageVol|StoragePool|Stream|Secret|NWFilter|Interface)Free\b' \
|
@prohibit='\bvir(Domain|Network|NodeDevice|StorageVol|StoragePool|Stream|Secret|NWFilter|Interface|DomainSnapshot)Free\b' \
|
||||||
exclude='sc_prohibit_virXXXFree' \
|
exclude='sc_prohibit_virXXXFree' \
|
||||||
halt='avoid using 'virXXXFree', use 'virObjectUnref' instead' \
|
halt='avoid using 'virXXXFree', use 'virObjectUnref' instead' \
|
||||||
$(_sc_search_regexp)
|
$(_sc_search_regexp)
|
||||||
@ -1186,4 +1186,4 @@ exclude_file_name_regexp--sc_prohibit_devname = \
|
|||||||
^(tools/virsh.pod|cfg.mk|docs/.*)$$
|
^(tools/virsh.pod|cfg.mk|docs/.*)$$
|
||||||
|
|
||||||
exclude_file_name_regexp--sc_prohibit_virXXXFree = \
|
exclude_file_name_regexp--sc_prohibit_virXXXFree = \
|
||||||
^(docs/|tests/|examples/|tools/|cfg.mk|src/test/test_driver.c|src/libvirt_public.syms|include/libvirt/libvirt-(domain|network|nodedev|storage|stream|secret|nwfilter|interface).h|src/libvirt-(domain|qemu|network|nodedev|storage|stream|secret|nwfilter|interface).c$$)
|
^(docs/|tests/|examples/|tools/|cfg.mk|src/test/test_driver.c|src/libvirt_public.syms|include/libvirt/libvirt-(domain|network|nodedev|storage|stream|secret|nwfilter|interface|domain-snapshot).h|src/libvirt-(domain|qemu|network|nodedev|storage|stream|secret|nwfilter|interface|domain-snapshot).c$$)
|
||||||
|
@ -4535,7 +4535,7 @@ remoteDispatchDomainListAllSnapshots(virNetServerPtr server ATTRIBUTE_UNUSED,
|
|||||||
virObjectUnref(dom);
|
virObjectUnref(dom);
|
||||||
if (snaps && nsnaps > 0) {
|
if (snaps && nsnaps > 0) {
|
||||||
for (i = 0; i < nsnaps; i++)
|
for (i = 0; i < nsnaps; i++)
|
||||||
virDomainSnapshotFree(snaps[i]);
|
virObjectUnref(snaps[i]);
|
||||||
VIR_FREE(snaps);
|
VIR_FREE(snaps);
|
||||||
}
|
}
|
||||||
return rv;
|
return rv;
|
||||||
@ -4600,12 +4600,11 @@ remoteDispatchDomainSnapshotListAllChildren(virNetServerPtr server ATTRIBUTE_UNU
|
|||||||
cleanup:
|
cleanup:
|
||||||
if (rv < 0)
|
if (rv < 0)
|
||||||
virNetMessageSaveError(rerr);
|
virNetMessageSaveError(rerr);
|
||||||
if (snapshot)
|
virObjectUnref(snapshot);
|
||||||
virDomainSnapshotFree(snapshot);
|
|
||||||
virObjectUnref(dom);
|
virObjectUnref(dom);
|
||||||
if (snaps && nsnaps > 0) {
|
if (snaps && nsnaps > 0) {
|
||||||
for (i = 0; i < nsnaps; i++)
|
for (i = 0; i < nsnaps; i++)
|
||||||
virDomainSnapshotFree(snaps[i]);
|
virObjectUnref(snaps[i]);
|
||||||
VIR_FREE(snaps);
|
VIR_FREE(snaps);
|
||||||
}
|
}
|
||||||
return rv;
|
return rv;
|
||||||
|
@ -14079,7 +14079,7 @@ qemuDomainSnapshotCreateXML(virDomainPtr domain,
|
|||||||
cfg->snapshotDir) < 0) {
|
cfg->snapshotDir) < 0) {
|
||||||
/* if writing of metadata fails, error out rather than trying
|
/* if writing of metadata fails, error out rather than trying
|
||||||
* to silently carry on without completing the snapshot */
|
* to silently carry on without completing the snapshot */
|
||||||
virDomainSnapshotFree(snapshot);
|
virObjectUnref(snapshot);
|
||||||
snapshot = NULL;
|
snapshot = NULL;
|
||||||
virReportError(VIR_ERR_INTERNAL_ERROR,
|
virReportError(VIR_ERR_INTERNAL_ERROR,
|
||||||
_("unable to save metadata for snapshot %s"),
|
_("unable to save metadata for snapshot %s"),
|
||||||
|
@ -6766,8 +6766,7 @@ remoteDomainListAllSnapshots(virDomainPtr dom,
|
|||||||
cleanup:
|
cleanup:
|
||||||
if (snaps) {
|
if (snaps) {
|
||||||
for (i = 0; i < ret.snapshots.snapshots_len; i++)
|
for (i = 0; i < ret.snapshots.snapshots_len; i++)
|
||||||
if (snaps[i])
|
virObjectUnref(snaps[i]);
|
||||||
virDomainSnapshotFree(snaps[i]);
|
|
||||||
VIR_FREE(snaps);
|
VIR_FREE(snaps);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -6833,8 +6832,7 @@ remoteDomainSnapshotListAllChildren(virDomainSnapshotPtr parent,
|
|||||||
cleanup:
|
cleanup:
|
||||||
if (snaps) {
|
if (snaps) {
|
||||||
for (i = 0; i < ret.snapshots.snapshots_len; i++)
|
for (i = 0; i < ret.snapshots.snapshots_len; i++)
|
||||||
if (snaps[i])
|
virObjectUnref(snaps[i]);
|
||||||
virDomainSnapshotFree(snaps[i]);
|
|
||||||
VIR_FREE(snaps);
|
VIR_FREE(snaps);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user