2008-11-04 23:22:06 +00:00
|
|
|
/*
|
|
|
|
* datatypes.h: management of structs for public data types
|
|
|
|
*
|
2011-06-22 19:51:32 +00:00
|
|
|
* Copyright (C) 2006-2008, 2010-2011 Red Hat, Inc.
|
2008-11-04 23:22:06 +00:00
|
|
|
*
|
|
|
|
* 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
|
2012-09-20 22:30:55 +00:00
|
|
|
* License along with this library. If not, see
|
2012-07-21 10:06:23 +00:00
|
|
|
* <http://www.gnu.org/licenses/>.
|
2008-11-04 23:22:06 +00:00
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
Convert public datatypes to inherit from virObject
This converts the following public API datatypes to use the
virObject infrastructure:
virConnectPtr
virDomainPtr
virDomainSnapshotPtr
virInterfacePtr
virNetworkPtr
virNodeDevicePtr
virNWFilterPtr
virSecretPtr
virStreamPtr
virStorageVolPtr
virStoragePoolPtr
The code is significantly simplified, since the mutex in the
virConnectPtr object now only needs to be held when accessing
the per-connection virError object instance. All other operations
are completely lock free.
* src/datatypes.c, src/datatypes.h, src/libvirt.c: Convert
public datatypes to use virObject
* src/conf/domain_event.c, src/phyp/phyp_driver.c,
src/qemu/qemu_command.c, src/qemu/qemu_migration.c,
src/qemu/qemu_process.c, src/storage/storage_driver.c,
src/vbox/vbox_tmpl.c, src/xen/xend_internal.c,
tests/qemuxml2argvtest.c, tests/qemuxmlnstest.c,
tests/sexpr2xmltest.c, tests/xmconfigtest.c: Convert
to use virObjectUnref/virObjectRef
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
2012-07-31 16:55:36 +00:00
|
|
|
#ifndef __VIR_DATATYPES_H_
|
|
|
|
# define __VIR_DATATYPES_H_
|
2008-11-04 23:22:06 +00:00
|
|
|
|
2010-03-09 18:22:22 +00:00
|
|
|
# include "internal.h"
|
2008-11-04 23:22:06 +00:00
|
|
|
|
2010-03-09 18:22:22 +00:00
|
|
|
# include "driver.h"
|
2012-12-13 15:49:48 +00:00
|
|
|
# include "virthread.h"
|
Convert public datatypes to inherit from virObject
This converts the following public API datatypes to use the
virObject infrastructure:
virConnectPtr
virDomainPtr
virDomainSnapshotPtr
virInterfacePtr
virNetworkPtr
virNodeDevicePtr
virNWFilterPtr
virSecretPtr
virStreamPtr
virStorageVolPtr
virStoragePoolPtr
The code is significantly simplified, since the mutex in the
virConnectPtr object now only needs to be held when accessing
the per-connection virError object instance. All other operations
are completely lock free.
* src/datatypes.c, src/datatypes.h, src/libvirt.c: Convert
public datatypes to use virObject
* src/conf/domain_event.c, src/phyp/phyp_driver.c,
src/qemu/qemu_command.c, src/qemu/qemu_migration.c,
src/qemu/qemu_process.c, src/storage/storage_driver.c,
src/vbox/vbox_tmpl.c, src/xen/xend_internal.c,
tests/qemuxml2argvtest.c, tests/qemuxmlnstest.c,
tests/sexpr2xmltest.c, tests/xmconfigtest.c: Convert
to use virObjectUnref/virObjectRef
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
2012-07-31 16:55:36 +00:00
|
|
|
# include "virobject.h"
|
|
|
|
|
|
|
|
extern virClassPtr virConnectClass;
|
|
|
|
extern virClassPtr virDomainClass;
|
|
|
|
extern virClassPtr virDomainSnapshotClass;
|
|
|
|
extern virClassPtr virInterfaceClass;
|
|
|
|
extern virClassPtr virNetworkClass;
|
|
|
|
extern virClassPtr virNodeDeviceClass;
|
|
|
|
extern virClassPtr virNWFilterClass;
|
|
|
|
extern virClassPtr virSecretClass;
|
|
|
|
extern virClassPtr virStreamClass;
|
|
|
|
extern virClassPtr virStorageVolClass;
|
|
|
|
extern virClassPtr virStoragePoolClass;
|
|
|
|
|
|
|
|
# define VIR_IS_CONNECT(obj) \
|
|
|
|
(virObjectIsClass((obj), virConnectClass))
|
|
|
|
|
|
|
|
# define VIR_IS_DOMAIN(obj) \
|
|
|
|
(virObjectIsClass((obj), virDomainClass))
|
|
|
|
# define VIR_IS_CONNECTED_DOMAIN(obj) \
|
|
|
|
(VIR_IS_DOMAIN(obj) && VIR_IS_CONNECT((obj)->conn))
|
|
|
|
|
|
|
|
# define VIR_IS_NETWORK(obj) \
|
|
|
|
(virObjectIsClass((obj), virNetworkClass))
|
|
|
|
# define VIR_IS_CONNECTED_NETWORK(obj) \
|
|
|
|
(VIR_IS_NETWORK(obj) && VIR_IS_CONNECT((obj)->conn))
|
|
|
|
|
|
|
|
# define VIR_IS_INTERFACE(obj) \
|
|
|
|
(virObjectIsClass((obj), virInterfaceClass))
|
|
|
|
# define VIR_IS_CONNECTED_INTERFACE(obj) \
|
|
|
|
(VIR_IS_INTERFACE(obj) && VIR_IS_CONNECT((obj)->conn))
|
|
|
|
|
|
|
|
# define VIR_IS_STORAGE_POOL(obj) \
|
|
|
|
(virObjectIsClass((obj), virStoragePoolClass))
|
|
|
|
# define VIR_IS_CONNECTED_STORAGE_POOL(obj) \
|
|
|
|
(VIR_IS_STORAGE_POOL(obj) && VIR_IS_CONNECT((obj)->conn))
|
|
|
|
|
|
|
|
# define VIR_IS_STORAGE_VOL(obj) \
|
|
|
|
(virObjectIsClass((obj), virStorageVolClass))
|
|
|
|
# define VIR_IS_CONNECTED_STORAGE_VOL(obj) \
|
|
|
|
(VIR_IS_STORAGE_VOL(obj) && VIR_IS_CONNECT((obj)->conn))
|
|
|
|
|
|
|
|
# define VIR_IS_NODE_DEVICE(obj) \
|
|
|
|
(virObjectIsClass((obj), virNodeDeviceClass))
|
|
|
|
# define VIR_IS_CONNECTED_NODE_DEVICE(obj) \
|
|
|
|
(VIR_IS_NODE_DEVICE(obj) && VIR_IS_CONNECT((obj)->conn))
|
|
|
|
|
|
|
|
# define VIR_IS_SECRET(obj) \
|
|
|
|
(virObjectIsClass((obj), virSecretClass))
|
|
|
|
# define VIR_IS_CONNECTED_SECRET(obj) \
|
|
|
|
(VIR_IS_SECRET(obj) && VIR_IS_CONNECT((obj)->conn))
|
|
|
|
|
|
|
|
# define VIR_IS_STREAM(obj) \
|
|
|
|
(virObjectIsClass((obj), virStreamClass))
|
|
|
|
# define VIR_IS_CONNECTED_STREAM(obj) \
|
|
|
|
(VIR_IS_STREAM(obj) && VIR_IS_CONNECT((obj)->conn))
|
|
|
|
|
|
|
|
# define VIR_IS_NWFILTER(obj) \
|
|
|
|
(virObjectIsClass((obj), virNWFilterClass))
|
|
|
|
# define VIR_IS_CONNECTED_NWFILTER(obj) \
|
|
|
|
(VIR_IS_NWFILTER(obj) && VIR_IS_CONNECT((obj)->conn))
|
|
|
|
|
|
|
|
# define VIR_IS_SNAPSHOT(obj) \
|
|
|
|
(virObjectIsClass((obj), virDomainSnapshotClass))
|
|
|
|
# define VIR_IS_DOMAIN_SNAPSHOT(obj) \
|
|
|
|
(VIR_IS_SNAPSHOT(obj) && VIR_IS_DOMAIN((obj)->domain))
|
2010-03-25 17:46:02 +00:00
|
|
|
|
2008-11-04 23:22:06 +00:00
|
|
|
/**
|
|
|
|
* _virConnect:
|
|
|
|
*
|
|
|
|
* Internal structure associated to a connection
|
|
|
|
*/
|
|
|
|
struct _virConnect {
|
Convert public datatypes to inherit from virObject
This converts the following public API datatypes to use the
virObject infrastructure:
virConnectPtr
virDomainPtr
virDomainSnapshotPtr
virInterfacePtr
virNetworkPtr
virNodeDevicePtr
virNWFilterPtr
virSecretPtr
virStreamPtr
virStorageVolPtr
virStoragePoolPtr
The code is significantly simplified, since the mutex in the
virConnectPtr object now only needs to be held when accessing
the per-connection virError object instance. All other operations
are completely lock free.
* src/datatypes.c, src/datatypes.h, src/libvirt.c: Convert
public datatypes to use virObject
* src/conf/domain_event.c, src/phyp/phyp_driver.c,
src/qemu/qemu_command.c, src/qemu/qemu_migration.c,
src/qemu/qemu_process.c, src/storage/storage_driver.c,
src/vbox/vbox_tmpl.c, src/xen/xend_internal.c,
tests/qemuxml2argvtest.c, tests/qemuxmlnstest.c,
tests/sexpr2xmltest.c, tests/xmconfigtest.c: Convert
to use virObjectUnref/virObjectRef
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
2012-07-31 16:55:36 +00:00
|
|
|
virObject object;
|
2009-01-20 12:01:45 +00:00
|
|
|
/* All the variables from here, until the 'lock' declaration
|
|
|
|
* are setup at time of connection open, and never changed
|
|
|
|
* since. Thus no need to lock when accessing them
|
|
|
|
*/
|
2011-07-07 23:29:42 +00:00
|
|
|
unsigned int flags; /* a set of connection flags */
|
2012-02-24 18:48:55 +00:00
|
|
|
virURIPtr uri; /* connection URI */
|
2008-11-04 23:22:06 +00:00
|
|
|
|
|
|
|
/* The underlying hypervisor driver and network driver. */
|
|
|
|
virDriverPtr driver;
|
|
|
|
virNetworkDriverPtr networkDriver;
|
2009-05-20 14:26:49 +00:00
|
|
|
virInterfaceDriverPtr interfaceDriver;
|
2008-11-04 23:22:06 +00:00
|
|
|
virStorageDriverPtr storageDriver;
|
2008-11-21 12:19:22 +00:00
|
|
|
virDeviceMonitorPtr deviceMonitor;
|
2009-08-14 19:42:19 +00:00
|
|
|
virSecretDriverPtr secretDriver;
|
2010-03-25 17:46:02 +00:00
|
|
|
virNWFilterDriverPtr nwfilterDriver;
|
2008-11-04 23:22:06 +00:00
|
|
|
|
|
|
|
/* Private data pointer which can be used by driver and
|
|
|
|
* network driver as they wish.
|
|
|
|
* NB: 'private' is a reserved word in C++.
|
|
|
|
*/
|
|
|
|
void * privateData;
|
|
|
|
void * networkPrivateData;
|
2009-05-20 14:26:49 +00:00
|
|
|
void * interfacePrivateData;
|
2008-11-04 23:22:06 +00:00
|
|
|
void * storagePrivateData;
|
2008-11-21 12:19:22 +00:00
|
|
|
void * devMonPrivateData;
|
2009-07-28 02:46:01 +00:00
|
|
|
void * secretPrivateData;
|
2010-03-25 17:46:02 +00:00
|
|
|
void * nwfilterPrivateData;
|
2008-11-04 23:22:06 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* The lock mutex must be acquired before accessing/changing
|
|
|
|
* any of members following this point, or changing the ref
|
|
|
|
* count of any virDomain/virNetwork object associated with
|
|
|
|
* this connection
|
|
|
|
*/
|
2009-01-15 19:56:05 +00:00
|
|
|
virMutex lock;
|
2009-01-20 12:01:45 +00:00
|
|
|
|
|
|
|
/* Per-connection error. */
|
|
|
|
virError err; /* the last error */
|
|
|
|
virErrorFunc handler; /* associated handlet */
|
|
|
|
void *userData; /* the user data */
|
|
|
|
|
2012-07-19 10:01:07 +00:00
|
|
|
/* Per-connection close callback */
|
|
|
|
virConnectCloseFunc closeCallback;
|
|
|
|
void *closeOpaque;
|
|
|
|
virFreeCallback closeFreeCallback;
|
2012-07-19 14:58:38 +00:00
|
|
|
bool closeDispatch;
|
|
|
|
unsigned closeUnregisterCount;
|
2008-11-04 23:22:06 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
/**
|
|
|
|
* _virDomain:
|
|
|
|
*
|
|
|
|
* Internal structure associated to a domain
|
|
|
|
*/
|
|
|
|
struct _virDomain {
|
Convert public datatypes to inherit from virObject
This converts the following public API datatypes to use the
virObject infrastructure:
virConnectPtr
virDomainPtr
virDomainSnapshotPtr
virInterfacePtr
virNetworkPtr
virNodeDevicePtr
virNWFilterPtr
virSecretPtr
virStreamPtr
virStorageVolPtr
virStoragePoolPtr
The code is significantly simplified, since the mutex in the
virConnectPtr object now only needs to be held when accessing
the per-connection virError object instance. All other operations
are completely lock free.
* src/datatypes.c, src/datatypes.h, src/libvirt.c: Convert
public datatypes to use virObject
* src/conf/domain_event.c, src/phyp/phyp_driver.c,
src/qemu/qemu_command.c, src/qemu/qemu_migration.c,
src/qemu/qemu_process.c, src/storage/storage_driver.c,
src/vbox/vbox_tmpl.c, src/xen/xend_internal.c,
tests/qemuxml2argvtest.c, tests/qemuxmlnstest.c,
tests/sexpr2xmltest.c, tests/xmconfigtest.c: Convert
to use virObjectUnref/virObjectRef
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
2012-07-31 16:55:36 +00:00
|
|
|
virObject object;
|
2008-11-04 23:22:06 +00:00
|
|
|
virConnectPtr conn; /* pointer back to the connection */
|
|
|
|
char *name; /* the domain external name */
|
|
|
|
int id; /* the domain ID */
|
|
|
|
unsigned char uuid[VIR_UUID_BUFLEN]; /* the domain unique identifier */
|
|
|
|
};
|
|
|
|
|
|
|
|
/**
|
|
|
|
* _virNetwork:
|
|
|
|
*
|
|
|
|
* Internal structure associated to a domain
|
|
|
|
*/
|
|
|
|
struct _virNetwork {
|
Convert public datatypes to inherit from virObject
This converts the following public API datatypes to use the
virObject infrastructure:
virConnectPtr
virDomainPtr
virDomainSnapshotPtr
virInterfacePtr
virNetworkPtr
virNodeDevicePtr
virNWFilterPtr
virSecretPtr
virStreamPtr
virStorageVolPtr
virStoragePoolPtr
The code is significantly simplified, since the mutex in the
virConnectPtr object now only needs to be held when accessing
the per-connection virError object instance. All other operations
are completely lock free.
* src/datatypes.c, src/datatypes.h, src/libvirt.c: Convert
public datatypes to use virObject
* src/conf/domain_event.c, src/phyp/phyp_driver.c,
src/qemu/qemu_command.c, src/qemu/qemu_migration.c,
src/qemu/qemu_process.c, src/storage/storage_driver.c,
src/vbox/vbox_tmpl.c, src/xen/xend_internal.c,
tests/qemuxml2argvtest.c, tests/qemuxmlnstest.c,
tests/sexpr2xmltest.c, tests/xmconfigtest.c: Convert
to use virObjectUnref/virObjectRef
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
2012-07-31 16:55:36 +00:00
|
|
|
virObject object;
|
2008-11-04 23:22:06 +00:00
|
|
|
virConnectPtr conn; /* pointer back to the connection */
|
|
|
|
char *name; /* the network external name */
|
|
|
|
unsigned char uuid[VIR_UUID_BUFLEN]; /* the network unique identifier */
|
|
|
|
};
|
|
|
|
|
2009-05-20 14:26:49 +00:00
|
|
|
/**
|
|
|
|
* _virInterface:
|
|
|
|
*
|
|
|
|
* Internal structure associated to a physical host interface
|
|
|
|
*/
|
|
|
|
struct _virInterface {
|
Convert public datatypes to inherit from virObject
This converts the following public API datatypes to use the
virObject infrastructure:
virConnectPtr
virDomainPtr
virDomainSnapshotPtr
virInterfacePtr
virNetworkPtr
virNodeDevicePtr
virNWFilterPtr
virSecretPtr
virStreamPtr
virStorageVolPtr
virStoragePoolPtr
The code is significantly simplified, since the mutex in the
virConnectPtr object now only needs to be held when accessing
the per-connection virError object instance. All other operations
are completely lock free.
* src/datatypes.c, src/datatypes.h, src/libvirt.c: Convert
public datatypes to use virObject
* src/conf/domain_event.c, src/phyp/phyp_driver.c,
src/qemu/qemu_command.c, src/qemu/qemu_migration.c,
src/qemu/qemu_process.c, src/storage/storage_driver.c,
src/vbox/vbox_tmpl.c, src/xen/xend_internal.c,
tests/qemuxml2argvtest.c, tests/qemuxmlnstest.c,
tests/sexpr2xmltest.c, tests/xmconfigtest.c: Convert
to use virObjectUnref/virObjectRef
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
2012-07-31 16:55:36 +00:00
|
|
|
virObject object;
|
2009-05-20 14:26:49 +00:00
|
|
|
virConnectPtr conn; /* pointer back to the connection */
|
|
|
|
char *name; /* the network external name */
|
|
|
|
char *mac; /* the interface MAC address */
|
|
|
|
};
|
|
|
|
|
2008-11-04 23:22:06 +00:00
|
|
|
/**
|
|
|
|
* _virStoragePool:
|
|
|
|
*
|
|
|
|
* Internal structure associated to a storage pool
|
|
|
|
*/
|
|
|
|
struct _virStoragePool {
|
Convert public datatypes to inherit from virObject
This converts the following public API datatypes to use the
virObject infrastructure:
virConnectPtr
virDomainPtr
virDomainSnapshotPtr
virInterfacePtr
virNetworkPtr
virNodeDevicePtr
virNWFilterPtr
virSecretPtr
virStreamPtr
virStorageVolPtr
virStoragePoolPtr
The code is significantly simplified, since the mutex in the
virConnectPtr object now only needs to be held when accessing
the per-connection virError object instance. All other operations
are completely lock free.
* src/datatypes.c, src/datatypes.h, src/libvirt.c: Convert
public datatypes to use virObject
* src/conf/domain_event.c, src/phyp/phyp_driver.c,
src/qemu/qemu_command.c, src/qemu/qemu_migration.c,
src/qemu/qemu_process.c, src/storage/storage_driver.c,
src/vbox/vbox_tmpl.c, src/xen/xend_internal.c,
tests/qemuxml2argvtest.c, tests/qemuxmlnstest.c,
tests/sexpr2xmltest.c, tests/xmconfigtest.c: Convert
to use virObjectUnref/virObjectRef
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
2012-07-31 16:55:36 +00:00
|
|
|
virObject object;
|
2008-11-04 23:22:06 +00:00
|
|
|
virConnectPtr conn; /* pointer back to the connection */
|
|
|
|
char *name; /* the storage pool external name */
|
|
|
|
unsigned char uuid[VIR_UUID_BUFLEN]; /* the storage pool unique identifier */
|
2012-11-10 07:18:07 +00:00
|
|
|
|
|
|
|
/* Private data pointer which can be used by driver as they wish.
|
|
|
|
* Cleanup function pointer can be hooked to provide custom cleanup
|
|
|
|
* operation.
|
|
|
|
*/
|
|
|
|
void *privateData;
|
|
|
|
virFreeCallback privateDataFreeFunc;
|
2008-11-04 23:22:06 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
/**
|
|
|
|
* _virStorageVol:
|
|
|
|
*
|
|
|
|
* Internal structure associated to a storage volume
|
|
|
|
*/
|
|
|
|
struct _virStorageVol {
|
Convert public datatypes to inherit from virObject
This converts the following public API datatypes to use the
virObject infrastructure:
virConnectPtr
virDomainPtr
virDomainSnapshotPtr
virInterfacePtr
virNetworkPtr
virNodeDevicePtr
virNWFilterPtr
virSecretPtr
virStreamPtr
virStorageVolPtr
virStoragePoolPtr
The code is significantly simplified, since the mutex in the
virConnectPtr object now only needs to be held when accessing
the per-connection virError object instance. All other operations
are completely lock free.
* src/datatypes.c, src/datatypes.h, src/libvirt.c: Convert
public datatypes to use virObject
* src/conf/domain_event.c, src/phyp/phyp_driver.c,
src/qemu/qemu_command.c, src/qemu/qemu_migration.c,
src/qemu/qemu_process.c, src/storage/storage_driver.c,
src/vbox/vbox_tmpl.c, src/xen/xend_internal.c,
tests/qemuxml2argvtest.c, tests/qemuxmlnstest.c,
tests/sexpr2xmltest.c, tests/xmconfigtest.c: Convert
to use virObjectUnref/virObjectRef
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
2012-07-31 16:55:36 +00:00
|
|
|
virObject object;
|
2008-11-04 23:22:06 +00:00
|
|
|
virConnectPtr conn; /* pointer back to the connection */
|
|
|
|
char *pool; /* Pool name of owner */
|
|
|
|
char *name; /* the storage vol external name */
|
2011-06-22 19:51:32 +00:00
|
|
|
char *key; /* unique key for storage vol */
|
2012-11-10 07:18:07 +00:00
|
|
|
|
|
|
|
/* Private data pointer which can be used by driver as they wish.
|
|
|
|
* Cleanup function pointer can be hooked to provide custom cleanup
|
|
|
|
* operation.
|
|
|
|
*/
|
|
|
|
void *privateData;
|
|
|
|
virFreeCallback privateDataFreeFunc;
|
2008-11-04 23:22:06 +00:00
|
|
|
};
|
|
|
|
|
2008-11-21 12:19:22 +00:00
|
|
|
/**
|
|
|
|
* _virNodeDevice:
|
|
|
|
*
|
|
|
|
* Internal structure associated with a node device
|
|
|
|
*/
|
|
|
|
struct _virNodeDevice {
|
Convert public datatypes to inherit from virObject
This converts the following public API datatypes to use the
virObject infrastructure:
virConnectPtr
virDomainPtr
virDomainSnapshotPtr
virInterfacePtr
virNetworkPtr
virNodeDevicePtr
virNWFilterPtr
virSecretPtr
virStreamPtr
virStorageVolPtr
virStoragePoolPtr
The code is significantly simplified, since the mutex in the
virConnectPtr object now only needs to be held when accessing
the per-connection virError object instance. All other operations
are completely lock free.
* src/datatypes.c, src/datatypes.h, src/libvirt.c: Convert
public datatypes to use virObject
* src/conf/domain_event.c, src/phyp/phyp_driver.c,
src/qemu/qemu_command.c, src/qemu/qemu_migration.c,
src/qemu/qemu_process.c, src/storage/storage_driver.c,
src/vbox/vbox_tmpl.c, src/xen/xend_internal.c,
tests/qemuxml2argvtest.c, tests/qemuxmlnstest.c,
tests/sexpr2xmltest.c, tests/xmconfigtest.c: Convert
to use virObjectUnref/virObjectRef
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
2012-07-31 16:55:36 +00:00
|
|
|
virObject object;
|
2008-11-21 12:19:22 +00:00
|
|
|
virConnectPtr conn; /* pointer back to the connection */
|
|
|
|
char *name; /* device name (unique on node) */
|
2008-12-04 21:46:34 +00:00
|
|
|
char *parent; /* parent device name */
|
2008-11-21 12:19:22 +00:00
|
|
|
};
|
|
|
|
|
2009-08-14 19:42:19 +00:00
|
|
|
/**
|
|
|
|
* _virSecret:
|
|
|
|
*
|
|
|
|
* Internal structure associated with a secret
|
|
|
|
*/
|
|
|
|
struct _virSecret {
|
Convert public datatypes to inherit from virObject
This converts the following public API datatypes to use the
virObject infrastructure:
virConnectPtr
virDomainPtr
virDomainSnapshotPtr
virInterfacePtr
virNetworkPtr
virNodeDevicePtr
virNWFilterPtr
virSecretPtr
virStreamPtr
virStorageVolPtr
virStoragePoolPtr
The code is significantly simplified, since the mutex in the
virConnectPtr object now only needs to be held when accessing
the per-connection virError object instance. All other operations
are completely lock free.
* src/datatypes.c, src/datatypes.h, src/libvirt.c: Convert
public datatypes to use virObject
* src/conf/domain_event.c, src/phyp/phyp_driver.c,
src/qemu/qemu_command.c, src/qemu/qemu_migration.c,
src/qemu/qemu_process.c, src/storage/storage_driver.c,
src/vbox/vbox_tmpl.c, src/xen/xend_internal.c,
tests/qemuxml2argvtest.c, tests/qemuxmlnstest.c,
tests/sexpr2xmltest.c, tests/xmconfigtest.c: Convert
to use virObjectUnref/virObjectRef
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
2012-07-31 16:55:36 +00:00
|
|
|
virObject object;
|
2009-08-14 19:42:19 +00:00
|
|
|
virConnectPtr conn; /* pointer back to the connection */
|
Fix UUID handling in secrets/storage encryption APIs
Convert all the secret/storage encryption APIs / wire format to
handle UUIDs in raw format instead of non-canonical printable
format. Guarentees data format correctness.
* docs/schemas/storageencryption.rng: Make UUID mandatory for a secret
and validate fully
* docs/schemas/secret.rng: Fully validate UUID
* include/libvirt/libvirt.h, include/libvirt/libvirt.h.in, Add
virSecretLookupByUUID and virSecretGetUUID. Make
virSecretGetUUIDString follow normal API design pattern
* python/generator.py: Skip generation of virSecretGetUUID,
virSecretGetUUIDString and virSecretLookupByUUID
* python/libvir.c, python/libvirt-python-api.xml: Manual impl
of virSecretGetUUID,virSecretGetUUIDString and virSecretLookupByUUID
* qemud/remote.c: s/virSecretLookupByUUIDString/virSecretLookupByUUID/
Fix get_nonnull_secret/make_nonnull_secret to use unsigned char
* qemud/remote_protocol.x: Fix remote_nonnull_secret to use a
remote_uuid instead of remote_nonnull_string for UUID field.
Rename REMOTE_PROC_SECRET_LOOKUP_BY_UUID_STRING to
REMOTE_PROC_SECRET_LOOKUP_BY_UUID_STRING and make it take an
remote_uuid value
* qemud/remote_dispatch_args.h, qemud/remote_dispatch_prototypes.h,
qemud/remote_dispatch_ret.h, qemud/remote_dispatch_table.h,
qemud/remote_protocol.c, qemud/remote_protocol.h: Re-generate
* src/datatypes.h, src/datatypes.c: Store UUID in raw format instead
of printable. Change virGetSecret to use raw format UUID
* src/driver.h: Rename virDrvSecretLookupByUUIDString to
virDrvSecretLookupByUUID and use raw format UUID
* src/libvirt.c: Add virSecretLookupByUUID and virSecretGetUUID
and re-implement virSecretLookupByUUIDString and
virSecretGetUUIDString in terms of those
* src/libvirt_public.syms: Add virSecretLookupByUUID and
virSecretGetUUID
* src/remote_internal.c: Rename remoteSecretLookupByUUIDString
to remoteSecretLookupByUUID. Fix typo in args for
remoteSecretDefineXML impl. Use raw UUID format for
get_nonnull_secret and make_nonnull_secret
* src/storage_encryption_conf.c, src/storage_encryption_conf.h:
Storage UUID in raw format, and require it to be present in
XML. Use UUID parser to validate.
* secret_conf.h, secret_conf.c: Generate a UUID if none is provided.
Storage UUID in raw format.
* src/secret_driver.c: Adjust to deal with raw UUIDs. Save secrets
in a filed with printable UUID, instead of base64 UUID.
* src/virsh.c: Adjust for changed public API contract of
virSecretGetUUIDString.
* src/storage_Backend.c: DOn't undefine secret we just generated
upon successful volume creation. Fix to handle raw UUIDs. Generate
a non-clashing UUID
* src/qemu_driver.c: Change to use lookupByUUID instead of
lookupByUUIDString
2009-09-10 16:44:12 +00:00
|
|
|
unsigned char uuid[VIR_UUID_BUFLEN]; /* the domain unique identifier */
|
Add usage type/id as a public API property of virSecret
* include/libvirt/libvirt.h, include/libvirt/libvirt.h.in: Add
virSecretGetUsageType, virSecretGetUsageID and virLookupSecretByUsage
* python/generator.py: Mark virSecretGetUsageType, virSecretGetUsageID
as not throwing exceptions
* qemud/remote.c: Implement dispatch for virLookupSecretByUsage
* qemud/remote_protocol.x: Add usage type & ID as attributes of
remote_nonnull_secret. Add RPC calls for new public APIs
* qemud/remote_dispatch_args.h, qemud/remote_dispatch_prototypes.h,
qemud/remote_dispatch_ret.h, qemud/remote_dispatch_table.h,
qemud/remote_protocol.c, qemud/remote_protocol.h: Re-generate
* src/datatypes.c, src/datatypes.h: Add usageType and usageID as
properties of virSecretPtr
* src/driver.h: Add virLookupSecretByUsage driver entry point
* src/libvirt.c: Implement virSecretGetUsageType, virSecretGetUsageID
and virLookupSecretByUsage
* src/libvirt_public.syms: Export virSecretGetUsageType, virSecretGetUsageID
and virLookupSecretByUsage
* src/remote_internal.c: Implement virLookupSecretByUsage entry
* src/secret_conf.c, src/secret_conf.h: Remove the
virSecretUsageType enum, now in public API. Make volume
path mandatory when parsing XML
* src/secret_driver.c: Enforce usage uniqueness when defining secrets.
Implement virSecretLookupByUsage api method
* src/virsh.c: Include usage for secret-list command
2009-09-11 13:06:15 +00:00
|
|
|
int usageType; /* the type of usage */
|
|
|
|
char *usageID; /* the usage's unique identifier */
|
2009-08-14 19:42:19 +00:00
|
|
|
};
|
|
|
|
|
2008-11-21 12:19:22 +00:00
|
|
|
|
2009-07-10 11:18:12 +00:00
|
|
|
typedef int (*virStreamAbortFunc)(virStreamPtr, void *opaque);
|
|
|
|
typedef int (*virStreamFinishFunc)(virStreamPtr, void *opaque);
|
|
|
|
|
|
|
|
/**
|
|
|
|
* _virStream:
|
|
|
|
*
|
|
|
|
* Internal structure associated with an input stream
|
|
|
|
*/
|
|
|
|
struct _virStream {
|
Convert public datatypes to inherit from virObject
This converts the following public API datatypes to use the
virObject infrastructure:
virConnectPtr
virDomainPtr
virDomainSnapshotPtr
virInterfacePtr
virNetworkPtr
virNodeDevicePtr
virNWFilterPtr
virSecretPtr
virStreamPtr
virStorageVolPtr
virStoragePoolPtr
The code is significantly simplified, since the mutex in the
virConnectPtr object now only needs to be held when accessing
the per-connection virError object instance. All other operations
are completely lock free.
* src/datatypes.c, src/datatypes.h, src/libvirt.c: Convert
public datatypes to use virObject
* src/conf/domain_event.c, src/phyp/phyp_driver.c,
src/qemu/qemu_command.c, src/qemu/qemu_migration.c,
src/qemu/qemu_process.c, src/storage/storage_driver.c,
src/vbox/vbox_tmpl.c, src/xen/xend_internal.c,
tests/qemuxml2argvtest.c, tests/qemuxmlnstest.c,
tests/sexpr2xmltest.c, tests/xmconfigtest.c: Convert
to use virObjectUnref/virObjectRef
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
2012-07-31 16:55:36 +00:00
|
|
|
virObject object;
|
2009-07-10 11:18:12 +00:00
|
|
|
virConnectPtr conn;
|
2011-07-07 23:29:42 +00:00
|
|
|
unsigned int flags;
|
2009-07-10 11:18:12 +00:00
|
|
|
|
|
|
|
virStreamDriverPtr driver;
|
|
|
|
void *privateData;
|
|
|
|
};
|
|
|
|
|
2010-03-31 20:33:13 +00:00
|
|
|
/**
|
|
|
|
* _virDomainSnapshot
|
|
|
|
*
|
|
|
|
* Internal structure associated with a domain snapshot
|
|
|
|
*/
|
|
|
|
struct _virDomainSnapshot {
|
Convert public datatypes to inherit from virObject
This converts the following public API datatypes to use the
virObject infrastructure:
virConnectPtr
virDomainPtr
virDomainSnapshotPtr
virInterfacePtr
virNetworkPtr
virNodeDevicePtr
virNWFilterPtr
virSecretPtr
virStreamPtr
virStorageVolPtr
virStoragePoolPtr
The code is significantly simplified, since the mutex in the
virConnectPtr object now only needs to be held when accessing
the per-connection virError object instance. All other operations
are completely lock free.
* src/datatypes.c, src/datatypes.h, src/libvirt.c: Convert
public datatypes to use virObject
* src/conf/domain_event.c, src/phyp/phyp_driver.c,
src/qemu/qemu_command.c, src/qemu/qemu_migration.c,
src/qemu/qemu_process.c, src/storage/storage_driver.c,
src/vbox/vbox_tmpl.c, src/xen/xend_internal.c,
tests/qemuxml2argvtest.c, tests/qemuxmlnstest.c,
tests/sexpr2xmltest.c, tests/xmconfigtest.c: Convert
to use virObjectUnref/virObjectRef
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
2012-07-31 16:55:36 +00:00
|
|
|
virObject object;
|
2010-03-31 20:33:13 +00:00
|
|
|
char *name;
|
|
|
|
virDomainPtr domain;
|
|
|
|
};
|
2009-07-10 11:18:12 +00:00
|
|
|
|
Convert public datatypes to inherit from virObject
This converts the following public API datatypes to use the
virObject infrastructure:
virConnectPtr
virDomainPtr
virDomainSnapshotPtr
virInterfacePtr
virNetworkPtr
virNodeDevicePtr
virNWFilterPtr
virSecretPtr
virStreamPtr
virStorageVolPtr
virStoragePoolPtr
The code is significantly simplified, since the mutex in the
virConnectPtr object now only needs to be held when accessing
the per-connection virError object instance. All other operations
are completely lock free.
* src/datatypes.c, src/datatypes.h, src/libvirt.c: Convert
public datatypes to use virObject
* src/conf/domain_event.c, src/phyp/phyp_driver.c,
src/qemu/qemu_command.c, src/qemu/qemu_migration.c,
src/qemu/qemu_process.c, src/storage/storage_driver.c,
src/vbox/vbox_tmpl.c, src/xen/xend_internal.c,
tests/qemuxml2argvtest.c, tests/qemuxmlnstest.c,
tests/sexpr2xmltest.c, tests/xmconfigtest.c: Convert
to use virObjectUnref/virObjectRef
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
2012-07-31 16:55:36 +00:00
|
|
|
/**
|
|
|
|
* _virNWFilter:
|
|
|
|
*
|
|
|
|
* Internal structure associated to a network filter
|
|
|
|
*/
|
|
|
|
struct _virNWFilter {
|
|
|
|
virObject object;
|
|
|
|
virConnectPtr conn; /* pointer back to the connection */
|
|
|
|
char *name; /* the network filter external name */
|
|
|
|
unsigned char uuid[VIR_UUID_BUFLEN]; /* the network filter unique identifier */
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Helper APIs for allocating new object instances
|
|
|
|
*/
|
2008-11-04 23:22:06 +00:00
|
|
|
|
|
|
|
virConnectPtr virGetConnect(void);
|
2008-11-17 11:03:25 +00:00
|
|
|
virDomainPtr virGetDomain(virConnectPtr conn,
|
2012-07-20 14:24:51 +00:00
|
|
|
const char *name,
|
|
|
|
const unsigned char *uuid);
|
2008-11-17 11:03:25 +00:00
|
|
|
virNetworkPtr virGetNetwork(virConnectPtr conn,
|
2012-07-20 14:24:51 +00:00
|
|
|
const char *name,
|
|
|
|
const unsigned char *uuid);
|
2009-05-20 14:26:49 +00:00
|
|
|
virInterfacePtr virGetInterface(virConnectPtr conn,
|
|
|
|
const char *name,
|
|
|
|
const char *mac);
|
2008-11-17 11:03:25 +00:00
|
|
|
virStoragePoolPtr virGetStoragePool(virConnectPtr conn,
|
2012-11-10 07:18:07 +00:00
|
|
|
const char *name,
|
|
|
|
const unsigned char *uuid,
|
|
|
|
void *privateData,
|
|
|
|
virFreeCallback freeFunc);
|
2008-11-17 11:03:25 +00:00
|
|
|
virStorageVolPtr virGetStorageVol(virConnectPtr conn,
|
Convert public datatypes to inherit from virObject
This converts the following public API datatypes to use the
virObject infrastructure:
virConnectPtr
virDomainPtr
virDomainSnapshotPtr
virInterfacePtr
virNetworkPtr
virNodeDevicePtr
virNWFilterPtr
virSecretPtr
virStreamPtr
virStorageVolPtr
virStoragePoolPtr
The code is significantly simplified, since the mutex in the
virConnectPtr object now only needs to be held when accessing
the per-connection virError object instance. All other operations
are completely lock free.
* src/datatypes.c, src/datatypes.h, src/libvirt.c: Convert
public datatypes to use virObject
* src/conf/domain_event.c, src/phyp/phyp_driver.c,
src/qemu/qemu_command.c, src/qemu/qemu_migration.c,
src/qemu/qemu_process.c, src/storage/storage_driver.c,
src/vbox/vbox_tmpl.c, src/xen/xend_internal.c,
tests/qemuxml2argvtest.c, tests/qemuxmlnstest.c,
tests/sexpr2xmltest.c, tests/xmconfigtest.c: Convert
to use virObjectUnref/virObjectRef
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
2012-07-31 16:55:36 +00:00
|
|
|
const char *pool,
|
|
|
|
const char *name,
|
2012-11-10 07:18:07 +00:00
|
|
|
const char *key,
|
|
|
|
void *privateData,
|
|
|
|
virFreeCallback freeFunc);
|
2008-11-21 12:19:22 +00:00
|
|
|
virNodeDevicePtr virGetNodeDevice(virConnectPtr conn,
|
|
|
|
const char *name);
|
2009-08-14 19:42:19 +00:00
|
|
|
virSecretPtr virGetSecret(virConnectPtr conn,
|
Add usage type/id as a public API property of virSecret
* include/libvirt/libvirt.h, include/libvirt/libvirt.h.in: Add
virSecretGetUsageType, virSecretGetUsageID and virLookupSecretByUsage
* python/generator.py: Mark virSecretGetUsageType, virSecretGetUsageID
as not throwing exceptions
* qemud/remote.c: Implement dispatch for virLookupSecretByUsage
* qemud/remote_protocol.x: Add usage type & ID as attributes of
remote_nonnull_secret. Add RPC calls for new public APIs
* qemud/remote_dispatch_args.h, qemud/remote_dispatch_prototypes.h,
qemud/remote_dispatch_ret.h, qemud/remote_dispatch_table.h,
qemud/remote_protocol.c, qemud/remote_protocol.h: Re-generate
* src/datatypes.c, src/datatypes.h: Add usageType and usageID as
properties of virSecretPtr
* src/driver.h: Add virLookupSecretByUsage driver entry point
* src/libvirt.c: Implement virSecretGetUsageType, virSecretGetUsageID
and virLookupSecretByUsage
* src/libvirt_public.syms: Export virSecretGetUsageType, virSecretGetUsageID
and virLookupSecretByUsage
* src/remote_internal.c: Implement virLookupSecretByUsage entry
* src/secret_conf.c, src/secret_conf.h: Remove the
virSecretUsageType enum, now in public API. Make volume
path mandatory when parsing XML
* src/secret_driver.c: Enforce usage uniqueness when defining secrets.
Implement virSecretLookupByUsage api method
* src/virsh.c: Include usage for secret-list command
2009-09-11 13:06:15 +00:00
|
|
|
const unsigned char *uuid,
|
|
|
|
int usageType,
|
|
|
|
const char *usageID);
|
2009-07-10 11:18:12 +00:00
|
|
|
virStreamPtr virGetStream(virConnectPtr conn);
|
2010-03-25 17:46:02 +00:00
|
|
|
virNWFilterPtr virGetNWFilter(virConnectPtr conn,
|
2012-07-20 14:24:51 +00:00
|
|
|
const char *name,
|
|
|
|
const unsigned char *uuid);
|
2010-03-31 20:33:13 +00:00
|
|
|
virDomainSnapshotPtr virGetDomainSnapshot(virDomainPtr domain,
|
|
|
|
const char *name);
|
|
|
|
|
Convert public datatypes to inherit from virObject
This converts the following public API datatypes to use the
virObject infrastructure:
virConnectPtr
virDomainPtr
virDomainSnapshotPtr
virInterfacePtr
virNetworkPtr
virNodeDevicePtr
virNWFilterPtr
virSecretPtr
virStreamPtr
virStorageVolPtr
virStoragePoolPtr
The code is significantly simplified, since the mutex in the
virConnectPtr object now only needs to be held when accessing
the per-connection virError object instance. All other operations
are completely lock free.
* src/datatypes.c, src/datatypes.h, src/libvirt.c: Convert
public datatypes to use virObject
* src/conf/domain_event.c, src/phyp/phyp_driver.c,
src/qemu/qemu_command.c, src/qemu/qemu_migration.c,
src/qemu/qemu_process.c, src/storage/storage_driver.c,
src/vbox/vbox_tmpl.c, src/xen/xend_internal.c,
tests/qemuxml2argvtest.c, tests/qemuxmlnstest.c,
tests/sexpr2xmltest.c, tests/xmconfigtest.c: Convert
to use virObjectUnref/virObjectRef
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
2012-07-31 16:55:36 +00:00
|
|
|
#endif /* __VIR_DATATYPES_H__ */
|