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

Simplify the Xen driver define domain driver methods

Browse Source 
Directly call either XenD or the XM driver for handling
domain define operations.

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrange 2013-04-30 17:31:40 +01:00
parent 69b8c55714
commit f53ffba6aa
5 changed files with 17 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/xen/xen_driver.c
View File

@ -1320,32 +1320,24 @@ xenUnifiedConnectListDefinedDomains(virConnectPtr conn, char **const names,
int maxnames) int maxnames)
{ {
xenUnifiedPrivatePtr priv = conn->privateData; xenUnifiedPrivatePtr priv = conn->privateData;
int i;
int ret;
for (i = 0; i < XEN_UNIFIED_NR_DRIVERS; ++i) if (priv->xendConfigVersion < XEND_CONFIG_VERSION_3_0_4) {
if (priv->opened[i] && drivers[i]->xenListDefinedDomains) { return xenXMListDefinedDomains(conn, names, maxnames);
ret = drivers[i]->xenListDefinedDomains(conn, names, maxnames); } else {
if (ret >= 0) return ret; return xenDaemonListDefinedDomains(conn, names, maxnames);
} }
return -1;
} }
static int static int
xenUnifiedConnectNumOfDefinedDomains(virConnectPtr conn) xenUnifiedConnectNumOfDefinedDomains(virConnectPtr conn)
{ {
xenUnifiedPrivatePtr priv = conn->privateData; xenUnifiedPrivatePtr priv = conn->privateData;
int i;
int ret;
for (i = 0; i < XEN_UNIFIED_NR_DRIVERS; ++i) if (priv->xendConfigVersion < XEND_CONFIG_VERSION_3_0_4) {
if (priv->opened[i] && drivers[i]->xenNumOfDefinedDomains) { return xenXMNumOfDefinedDomains(conn);
ret = drivers[i]->xenNumOfDefinedDomains(conn); } else {
if (ret >= 0) return ret; return xenDaemonNumOfDefinedDomains(conn);
} }
return -1;
} }
static int static int

2
src/xen/xen_driver.h
View File

@ -93,8 +93,6 @@ extern int xenRegister (void);
* structure with direct calls in xen_unified.c. * structure with direct calls in xen_unified.c.
*/ */
struct xenUnifiedDriver { struct xenUnifiedDriver {
virDrvConnectListDefinedDomains xenListDefinedDomains;
virDrvConnectNumOfDefinedDomains xenNumOfDefinedDomains;
virDrvDomainCreate xenDomainCreate; virDrvDomainCreate xenDomainCreate;
virDrvDomainDefineXML xenDomainDefineXML; virDrvDomainDefineXML xenDomainDefineXML;
virDrvDomainUndefine xenDomainUndefine; virDrvDomainUndefine xenDomainUndefine;

17
src/xen/xend_internal.c
View File

@ -2937,19 +2937,12 @@ xenDaemonDomainUndefine(virDomainPtr domain)
* *
* Returns the number of domain found or -1 in case of error * Returns the number of domain found or -1 in case of error
*/ */
static int int
xenDaemonNumOfDefinedDomains(virConnectPtr conn) xenDaemonNumOfDefinedDomains(virConnectPtr conn)
{ {
struct sexpr *root = NULL; struct sexpr *root = NULL;
int ret = -1; int ret = -1;
struct sexpr *_for_i, *node; struct sexpr *_for_i, *node;
xenUnifiedPrivatePtr priv = conn->privateData;
/* xm_internal.c (the support for defined domains from /etc/xen
* config files used by old Xen) will handle this.
*/
if (priv->xendConfigVersion < XEND_CONFIG_VERSION_3_0_4)
return -1;
root = sexpr_get(conn, "/xend/domain?state=halted"); root = sexpr_get(conn, "/xend/domain?state=halted");
if (root == NULL) if (root == NULL)
@ -2970,7 +2963,7 @@ error:
return ret; return ret;
} }
static int int
xenDaemonListDefinedDomains(virConnectPtr conn, xenDaemonListDefinedDomains(virConnectPtr conn,
char **const names, char **const names,
int maxnames) int maxnames)
@ -2978,10 +2971,6 @@ xenDaemonListDefinedDomains(virConnectPtr conn,
struct sexpr *root = NULL; struct sexpr *root = NULL;
int i, ret = -1; int i, ret = -1;
struct sexpr *_for_i, *node; struct sexpr *_for_i, *node;
xenUnifiedPrivatePtr priv = conn->privateData;
if (priv->xendConfigVersion < XEND_CONFIG_VERSION_3_0_4)
return -1;
if (maxnames == 0) if (maxnames == 0)
return 0; return 0;
@ -3387,8 +3376,6 @@ xenDaemonDomainBlockPeek(virDomainPtr domain,
} }
struct xenUnifiedDriver xenDaemonDriver = { struct xenUnifiedDriver xenDaemonDriver = {
.xenListDefinedDomains = xenDaemonListDefinedDomains,
.xenNumOfDefinedDomains = xenDaemonNumOfDefinedDomains,
.xenDomainCreate = xenDaemonDomainCreate, .xenDomainCreate = xenDaemonDomainCreate,
.xenDomainDefineXML = xenDaemonDomainDefineXML, .xenDomainDefineXML = xenDaemonDomainDefineXML,
.xenDomainUndefine = xenDaemonDomainUndefine, .xenDomainUndefine = xenDaemonDomainUndefine,

5
src/xen/xend_internal.h
View File

@ -109,6 +109,11 @@ char **xenDaemonListDomainsOld(virConnectPtr xend);
char *xenDaemonDomainGetOSType(virDomainPtr domain); char *xenDaemonDomainGetOSType(virDomainPtr domain);
int xenDaemonNumOfDefinedDomains(virConnectPtr conn);
int xenDaemonListDefinedDomains(virConnectPtr conn,
char **const names,
int maxnames);
virDomainPtr xenDaemonDomainDefineXML(virConnectPtr xend, const char *sexpr); virDomainPtr xenDaemonDomainDefineXML(virConnectPtr xend, const char *sexpr);
int xenDaemonDomainCreate(virDomainPtr domain); int xenDaemonDomainCreate(virDomainPtr domain);
int xenDaemonDomainUndefine(virDomainPtr domain); int xenDaemonDomainUndefine(virDomainPtr domain);

2
src/xen/xm_internal.c
View File

@ -81,8 +81,6 @@ static int xenXMDomainDetachDeviceFlags(virDomainPtr domain, const char *xml,
#define XM_XML_ERROR "Invalid xml" #define XM_XML_ERROR "Invalid xml"
struct xenUnifiedDriver xenXMDriver = { struct xenUnifiedDriver xenXMDriver = {
.xenListDefinedDomains = xenXMListDefinedDomains,
.xenNumOfDefinedDomains = xenXMNumOfDefinedDomains,
.xenDomainCreate = xenXMDomainCreate, .xenDomainCreate = xenXMDomainCreate,
.xenDomainDefineXML = xenXMDomainDefineXML, .xenDomainDefineXML = xenXMDomainDefineXML,
.xenDomainUndefine = xenXMDomainUndefine, .xenDomainUndefine = xenXMDomainUndefine,