mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-10-16 11:09:24 +00:00
a6d822cee3
This reverts commit 6b90a84738.
It turns out gcc -O2 is not happy with it, complaining:
/home/pipo/libvirt/src/qemu/qemu_driver.c: In function 'qemuDomainSnapshotCreateXML':
/home/pipo/libvirt/src/qemu/qemu_driver.c:15389:26: error: potential null pointer dereference [-Werror=null-dereference]
bool memory = snapdef->memory == VIR_DOMAIN_SNAPSHOT_LOCATION_EXTERNAL;
~~~~~~~^~~~~~~~
/home/pipo/libvirt/src/qemu/qemu_driver.c:15389:26: error: potential null pointer dereference [-Werror=null-dereference]
In file included from /home/pipo/libvirt/src/util/virbuffer.h:27,
from /home/pipo/libvirt/src/conf/capabilities.h:27,
from /home/pipo/libvirt/src/conf/domain_conf.h:32,
from /home/pipo/libvirt/src/qemu/qemu_agent.h:26,
from /home/pipo/libvirt/src/qemu/qemu_driver.c:40:
/home/pipo/libvirt/src/util/viralloc.h:125:34: error: potential null pointer dereference [-Werror=null-dereference]
# define VIR_ALLOC_N(ptr, count) virAllocN(&(ptr), sizeof(*(ptr)), (count), true, \
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
VIR_FROM_THIS, __FILE__, __FUNCTION__, __LINE__)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/home/pipo/libvirt/src/qemu/qemu_driver.c:15103:9: note: in expansion of macro 'VIR_ALLOC_N'
if (VIR_ALLOC_N(ret, snapdef->ndisks) < 0)
^~~~~~~~~~~
/home/pipo/libvirt/src/qemu/qemu_driver.c:15798:45: error: null pointer dereference [-Werror=null-dereference]
virDomainSnapshotObjGetDef(snap)->memory == VIR_DOMAIN_SNAPSHOT_LOCATION_EXTERNAL) {
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~
As the patch simplified one or two callers at the risk of making
many other callers now candidates to trigger aggressive compiler
warnings, it isn't worth it.
Signed-off-by: Eric Blake <eblake@redhat.com>
94 lines
4.2 KiB
C
94 lines
4.2 KiB
C
/*
|
|
* virdomainsnapshotobjlist.h: handle a tree of snapshot objects
|
|
* (derived from snapshot_conf.h)
|
|
*
|
|
* Copyright (C) 2006-2019 Red Hat, Inc.
|
|
* Copyright (C) 2006-2008 Daniel P. Berrange
|
|
*
|
|
* This library is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2.1 of the License, or (at your option) any later version.
|
|
*
|
|
* This library is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with this library. If not, see
|
|
* <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#ifndef LIBVIRT_VIRDOMAINSNAPSHOTOBJLIST_H
|
|
# define LIBVIRT_VIRDOMAINSNAPSHOTOBJLIST_H
|
|
|
|
# include "internal.h"
|
|
# include "virdomainmomentobjlist.h"
|
|
# include "virbuffer.h"
|
|
|
|
virDomainSnapshotObjListPtr virDomainSnapshotObjListNew(void);
|
|
void virDomainSnapshotObjListFree(virDomainSnapshotObjListPtr snapshots);
|
|
|
|
virDomainMomentObjPtr virDomainSnapshotAssignDef(virDomainSnapshotObjListPtr snapshots,
|
|
virDomainSnapshotDefPtr def);
|
|
|
|
int virDomainSnapshotObjListGetNames(virDomainSnapshotObjListPtr snapshots,
|
|
virDomainMomentObjPtr from,
|
|
char **const names, int maxnames,
|
|
unsigned int flags);
|
|
int virDomainSnapshotObjListNum(virDomainSnapshotObjListPtr snapshots,
|
|
virDomainMomentObjPtr from,
|
|
unsigned int flags);
|
|
virDomainMomentObjPtr virDomainSnapshotFindByName(virDomainSnapshotObjListPtr snapshots,
|
|
const char *name);
|
|
virDomainMomentObjPtr virDomainSnapshotGetCurrent(virDomainSnapshotObjListPtr snapshots);
|
|
const char *virDomainSnapshotGetCurrentName(virDomainSnapshotObjListPtr snapshots);
|
|
void virDomainSnapshotSetCurrent(virDomainSnapshotObjListPtr snapshots,
|
|
virDomainMomentObjPtr snapshot);
|
|
bool virDomainSnapshotObjListRemove(virDomainSnapshotObjListPtr snapshots,
|
|
virDomainMomentObjPtr snapshot);
|
|
void virDomainSnapshotObjListRemoveAll(virDomainSnapshotObjListPtr snapshots);
|
|
int virDomainSnapshotForEach(virDomainSnapshotObjListPtr snapshots,
|
|
virHashIterator iter,
|
|
void *data);
|
|
int virDomainSnapshotUpdateRelations(virDomainSnapshotObjListPtr snapshots);
|
|
|
|
# define VIR_DOMAIN_SNAPSHOT_FILTERS_METADATA \
|
|
(VIR_DOMAIN_SNAPSHOT_LIST_METADATA | \
|
|
VIR_DOMAIN_SNAPSHOT_LIST_NO_METADATA)
|
|
|
|
# define VIR_DOMAIN_SNAPSHOT_FILTERS_LEAVES \
|
|
(VIR_DOMAIN_SNAPSHOT_LIST_LEAVES | \
|
|
VIR_DOMAIN_SNAPSHOT_LIST_NO_LEAVES)
|
|
|
|
# define VIR_DOMAIN_SNAPSHOT_FILTERS_STATUS \
|
|
(VIR_DOMAIN_SNAPSHOT_LIST_INACTIVE | \
|
|
VIR_DOMAIN_SNAPSHOT_LIST_ACTIVE | \
|
|
VIR_DOMAIN_SNAPSHOT_LIST_DISK_ONLY)
|
|
|
|
# define VIR_DOMAIN_SNAPSHOT_FILTERS_LOCATION \
|
|
(VIR_DOMAIN_SNAPSHOT_LIST_INTERNAL | \
|
|
VIR_DOMAIN_SNAPSHOT_LIST_EXTERNAL)
|
|
|
|
# define VIR_DOMAIN_SNAPSHOT_FILTERS_ALL \
|
|
(VIR_DOMAIN_SNAPSHOT_FILTERS_METADATA | \
|
|
VIR_DOMAIN_SNAPSHOT_FILTERS_LEAVES | \
|
|
VIR_DOMAIN_SNAPSHOT_FILTERS_STATUS | \
|
|
VIR_DOMAIN_SNAPSHOT_FILTERS_LOCATION)
|
|
|
|
int virDomainListSnapshots(virDomainSnapshotObjListPtr snapshots,
|
|
virDomainMomentObjPtr from,
|
|
virDomainPtr dom,
|
|
virDomainSnapshotPtr **snaps,
|
|
unsigned int flags);
|
|
|
|
/* Access the snapshot-specific definition from a given list member. */
|
|
static inline virDomainSnapshotDefPtr
|
|
virDomainSnapshotObjGetDef(virDomainMomentObjPtr obj)
|
|
{
|
|
return (virDomainSnapshotDefPtr) obj->def;
|
|
}
|
|
|
|
#endif /* LIBVIRT_VIRDOMAINSNAPSHOTOBJLIST_H */
|