[libvirt] [PATCH 03/20] drivers: prefer unsigned int for flags
Eric Blake
eblake at redhat.com
Wed Jul 6 23:23:46 UTC 2011
Now that the public APIs always use unsigned flags, the internal
driver callbacks might as well do likewise.
* src/driver.h (vrDrvOpen, virDrvDomainCoreDump)
(virDrvDomainGetXMLDesc, virDrvNetworkGetXMLDesc)
(virDrvNWFilterGetXMLDesc): Update type.
* src/remote/remote_protocol.x (remote_open_args)
(remote_domain_core_dump_args, remote_domain_get_xml_desc_args)
(remote_network_get_xml_desc_args)
(remote_nwfilter_get_xml_desc_args): Likewise.
* src/test/test_driver.c: Update clients.
* src/remote/remote_driver.c: Likewise.
* src/xen/xen_hypervisor.c: Likewise.
* src/xen/xen_hypervisor.h: Likewise.
* src/xen/xen_driver.c: Likewise.
* src/xen/xend_internal.c: Likewise.
* src/xen/xend_internal.h: Likewise.
* src/xen/xm_internal.c: Likewise.
* src/xen/xm_internal.h: Likewise.
* src/xen/xs_internal.c: Likewise.
* src/xen/xs_internal.h: Likewise.
* src/xen/xen_inotify.c: Likewise.
* src/xen/xen_inotify.h: Likewise.
* src/phyp/phyp_driver.c: Likewise.
* src/openvz/openvz_driver.c: Likewise.
* src/vmware/vmware_driver.c: Likewise.
* src/vbox/vbox_driver.c: Likewise.
* src/vbox/vbox_tmpl.c: Likewise.
* src/xenapi/xenapi_driver.c: Likewise.
* src/esx/esx_driver.c: Likewise.
* src/esx/esx_interface_driver.c: Likewise.
* src/esx/esx_network_driver.c: Likewise.
* src/esx/esx_storage_driver.c: Likewise.
* src/esx/esx_device_monitor.c: Likewise.
* src/esx/esx_secret_driver.c: Likewise.
* src/esx/esx_nwfilter_driver.c: Likewise.
* src/interface/netcf_driver.c: Likewise.
* src/nwfilter/nwfilter_driver.c: Likewise.
* src/libxl/libxl_driver.c: Likewise.
* src/qemu/qemu_driver.c: Likewise.
* src/lxc/lxc_driver.c: Likewise.
* src/uml/uml_driver.c: Likewise.
* src/network/bridge_driver.c: Likewise.
* src/secret/secret_driver.c: Likewise.
* src/storage/storage_driver.c: Likewise.
* src/node_device/node_device_hal.c: Likewise.
* src/node_device/node_device_udev.c: Likewise.
* src/remote_protocol-structs: Likewise.
---
src/driver.h | 10 +++++-----
src/esx/esx_device_monitor.c | 4 ++--
src/esx/esx_driver.c | 5 +++--
src/esx/esx_interface_driver.c | 4 ++--
src/esx/esx_network_driver.c | 4 ++--
src/esx/esx_nwfilter_driver.c | 3 ++-
src/esx/esx_secret_driver.c | 4 ++--
src/esx/esx_storage_driver.c | 4 ++--
src/interface/netcf_driver.c | 4 ++--
src/libxl/libxl_driver.c | 6 +++---
src/lxc/lxc_driver.c | 4 ++--
src/network/bridge_driver.c | 6 ++++--
src/node_device/node_device_hal.c | 3 ++-
src/node_device/node_device_udev.c | 2 +-
src/nwfilter/nwfilter_driver.c | 8 +++++---
src/openvz/openvz_driver.c | 4 ++--
src/phyp/phyp_driver.c | 6 +++---
src/qemu/qemu_driver.c | 8 +++++---
src/remote/remote_driver.c | 24 +++++++++++++++---------
src/remote/remote_protocol.x | 10 +++++-----
src/remote_protocol-structs | 10 +++++-----
src/secret/secret_driver.c | 2 +-
src/storage/storage_driver.c | 2 +-
src/test/test_driver.c | 24 +++++++++++++-----------
src/uml/uml_driver.c | 4 ++--
src/vbox/vbox_driver.c | 4 ++--
src/vbox/vbox_tmpl.c | 11 ++++++-----
src/vmware/vmware_driver.c | 4 ++--
src/xen/xen_driver.c | 6 +++---
src/xen/xen_hypervisor.c | 2 +-
src/xen/xen_hypervisor.h | 2 +-
src/xen/xen_inotify.c | 6 +++---
src/xen/xen_inotify.h | 3 ++-
src/xen/xend_internal.c | 4 ++--
src/xen/xend_internal.h | 5 +++--
src/xen/xm_internal.c | 2 +-
src/xen/xm_internal.h | 5 +++--
src/xen/xs_internal.c | 4 ++--
src/xen/xs_internal.h | 4 ++--
src/xenapi/xenapi_driver.c | 5 +++--
40 files changed, 127 insertions(+), 105 deletions(-)
diff --git a/src/driver.h b/src/driver.h
index 871a4ae..71a52c9 100644
--- a/src/driver.h
+++ b/src/driver.h
@@ -66,7 +66,7 @@ typedef enum {
typedef virDrvOpenStatus
(*virDrvOpen) (virConnectPtr conn,
virConnectAuthPtr auth,
- int flags);
+ unsigned int flags);
typedef int
(*virDrvClose) (virConnectPtr conn);
typedef int
@@ -183,7 +183,7 @@ typedef int
typedef int
(*virDrvDomainCoreDump) (virDomainPtr domain,
const char *to,
- int flags);
+ unsigned int flags);
typedef char *
(*virDrvDomainScreenshot) (virDomainPtr domain,
virStreamPtr stream,
@@ -191,7 +191,7 @@ typedef char *
unsigned int flags);
typedef char *
(*virDrvDomainGetXMLDesc) (virDomainPtr dom,
- int flags);
+ unsigned int flags);
typedef char *
(*virDrvConnectDomainXMLFromNative) (virConnectPtr conn,
const char *nativeFormat,
@@ -829,7 +829,7 @@ typedef int
(*virDrvNetworkDestroy) (virNetworkPtr network);
typedef char *
(*virDrvNetworkGetXMLDesc) (virNetworkPtr network,
- int flags);
+ unsigned int flags);
typedef char *
(*virDrvNetworkGetBridgeName) (virNetworkPtr network);
typedef int
@@ -1351,7 +1351,7 @@ typedef int
typedef char *
(*virDrvNWFilterGetXMLDesc) (virNWFilterPtr nwfilter,
- int flags);
+ unsigned int flags);
typedef struct _virNWFilterDriver virNWFilterDriver;
diff --git a/src/esx/esx_device_monitor.c b/src/esx/esx_device_monitor.c
index 4bc8e7f..51b2413 100644
--- a/src/esx/esx_device_monitor.c
+++ b/src/esx/esx_device_monitor.c
@@ -3,7 +3,7 @@
* esx_device_monitor.c: device monitor functions for managing VMware ESX
* host devices
*
- * Copyright (C) 2010 Red Hat, Inc.
+ * Copyright (C) 2010-2011 Red Hat, Inc.
* Copyright (C) 2010 Matthias Bolte <matthias.bolte at googlemail.com>
*
* This library is free software; you can redistribute it and/or
@@ -42,7 +42,7 @@
static virDrvOpenStatus
esxDeviceOpen(virConnectPtr conn,
virConnectAuthPtr auth ATTRIBUTE_UNUSED,
- int flags ATTRIBUTE_UNUSED)
+ unsigned int flags ATTRIBUTE_UNUSED)
{
if (conn->driver->no != VIR_DRV_ESX) {
return VIR_DRV_OPEN_DECLINED;
diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c
index a6e47a4..f68ede0 100644
--- a/src/esx/esx_driver.c
+++ b/src/esx/esx_driver.c
@@ -934,7 +934,8 @@ esxConnectToVCenter(esxPrivate *priv, virConnectAuthPtr auth,
* socks5. The optional <port> part allows to override the default port 1080.
*/
static virDrvOpenStatus
-esxOpen(virConnectPtr conn, virConnectAuthPtr auth, int flags ATTRIBUTE_UNUSED)
+esxOpen(virConnectPtr conn, virConnectAuthPtr auth,
+ unsigned int flags ATTRIBUTE_UNUSED)
{
virDrvOpenStatus result = VIR_DRV_OPEN_ERROR;
esxPrivate *priv = NULL;
@@ -2681,7 +2682,7 @@ esxDomainGetMaxVcpus(virDomainPtr domain)
static char *
-esxDomainGetXMLDesc(virDomainPtr domain, int flags)
+esxDomainGetXMLDesc(virDomainPtr domain, unsigned int flags)
{
esxPrivate *priv = domain->conn->privateData;
esxVI_String *propertyNameList = NULL;
diff --git a/src/esx/esx_interface_driver.c b/src/esx/esx_interface_driver.c
index a468976..3d23d0f 100644
--- a/src/esx/esx_interface_driver.c
+++ b/src/esx/esx_interface_driver.c
@@ -3,7 +3,7 @@
* esx_interface_driver.c: interface driver functions for managing VMware ESX
* host interfaces
*
- * Copyright (C) 2010 Red Hat, Inc.
+ * Copyright (C) 2010-2011 Red Hat, Inc.
* Copyright (C) 2010 Matthias Bolte <matthias.bolte at googlemail.com>
*
* This library is free software; you can redistribute it and/or
@@ -42,7 +42,7 @@
static virDrvOpenStatus
esxInterfaceOpen(virConnectPtr conn,
virConnectAuthPtr auth ATTRIBUTE_UNUSED,
- int flags ATTRIBUTE_UNUSED)
+ unsigned int flags ATTRIBUTE_UNUSED)
{
if (conn->driver->no != VIR_DRV_ESX) {
return VIR_DRV_OPEN_DECLINED;
diff --git a/src/esx/esx_network_driver.c b/src/esx/esx_network_driver.c
index 3c76fae..f8a3ede 100644
--- a/src/esx/esx_network_driver.c
+++ b/src/esx/esx_network_driver.c
@@ -3,7 +3,7 @@
* esx_network_driver.c: network driver functions for managing VMware ESX
* host networks
*
- * Copyright (C) 2010 Red Hat, Inc.
+ * Copyright (C) 2010-2011 Red Hat, Inc.
* Copyright (C) 2010 Matthias Bolte <matthias.bolte at googlemail.com>
*
* This library is free software; you can redistribute it and/or
@@ -42,7 +42,7 @@
static virDrvOpenStatus
esxNetworkOpen(virConnectPtr conn,
virConnectAuthPtr auth ATTRIBUTE_UNUSED,
- int flags ATTRIBUTE_UNUSED)
+ unsigned int flags ATTRIBUTE_UNUSED)
{
if (conn->driver->no != VIR_DRV_ESX) {
return VIR_DRV_OPEN_DECLINED;
diff --git a/src/esx/esx_nwfilter_driver.c b/src/esx/esx_nwfilter_driver.c
index 13cacd4..d7fa15a 100644
--- a/src/esx/esx_nwfilter_driver.c
+++ b/src/esx/esx_nwfilter_driver.c
@@ -3,6 +3,7 @@
* esx_nwfilter_driver.c: nwfilter driver functions for managing VMware ESX
* firewall rules
*
+ * Copyright (C) 2011 Red Hat, Inc.
* Copyright (C) 2010 Matthias Bolte <matthias.bolte at googlemail.com>
*
* This library is free software; you can redistribute it and/or
@@ -41,7 +42,7 @@
static virDrvOpenStatus
esxNWFilterOpen(virConnectPtr conn,
virConnectAuthPtr auth ATTRIBUTE_UNUSED,
- int flags ATTRIBUTE_UNUSED)
+ unsigned int flags ATTRIBUTE_UNUSED)
{
if (conn->driver->no != VIR_DRV_ESX) {
return VIR_DRV_OPEN_DECLINED;
diff --git a/src/esx/esx_secret_driver.c b/src/esx/esx_secret_driver.c
index 656224e..820f4b1 100644
--- a/src/esx/esx_secret_driver.c
+++ b/src/esx/esx_secret_driver.c
@@ -2,7 +2,7 @@
/*
* esx_secret_driver.c: secret driver functions for VMware ESX secret manipulation
*
- * Copyright (C) 2010 Red Hat, Inc.
+ * Copyright (C) 2010-2011 Red Hat, Inc.
* Copyright (C) 2010 Matthias Bolte <matthias.bolte at googlemail.com>
*
* This library is free software; you can redistribute it and/or
@@ -40,7 +40,7 @@
static virDrvOpenStatus
esxSecretOpen(virConnectPtr conn, virConnectAuthPtr auth ATTRIBUTE_UNUSED,
- int flags ATTRIBUTE_UNUSED)
+ unsigned int flags ATTRIBUTE_UNUSED)
{
if (conn->driver->no != VIR_DRV_ESX) {
return VIR_DRV_OPEN_DECLINED;
diff --git a/src/esx/esx_storage_driver.c b/src/esx/esx_storage_driver.c
index c7fc992..528159a 100644
--- a/src/esx/esx_storage_driver.c
+++ b/src/esx/esx_storage_driver.c
@@ -3,7 +3,7 @@
* esx_storage_driver.c: storage driver functions for managing VMware ESX
* host storage
*
- * Copyright (C) 2010 Red Hat, Inc.
+ * Copyright (C) 2010-2011 Red Hat, Inc.
* Copyright (C) 2010 Matthias Bolte <matthias.bolte at googlemail.com>
*
* This library is free software; you can redistribute it and/or
@@ -104,7 +104,7 @@ esxStoragePoolLookupType(esxVI_Context *ctx, const char *poolName,
static virDrvOpenStatus
esxStorageOpen(virConnectPtr conn,
virConnectAuthPtr auth ATTRIBUTE_UNUSED,
- int flags ATTRIBUTE_UNUSED)
+ unsigned int flags ATTRIBUTE_UNUSED)
{
if (conn->driver->no != VIR_DRV_ESX) {
return VIR_DRV_OPEN_DECLINED;
diff --git a/src/interface/netcf_driver.c b/src/interface/netcf_driver.c
index dd15c9d..8900722 100644
--- a/src/interface/netcf_driver.c
+++ b/src/interface/netcf_driver.c
@@ -2,7 +2,7 @@
* interface_driver.c: backend driver methods to handle physical
* interface configuration using the netcf library.
*
- * Copyright (C) 2006-2010 Red Hat, Inc.
+ * Copyright (C) 2006-2011 Red Hat, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -121,7 +121,7 @@ static struct netcf_if *interfaceDriverGetNetcfIF(struct netcf *ncf, virInterfac
static virDrvOpenStatus interfaceOpenInterface(virConnectPtr conn,
virConnectAuthPtr auth ATTRIBUTE_UNUSED,
- int flags ATTRIBUTE_UNUSED)
+ unsigned int flags ATTRIBUTE_UNUSED)
{
struct interface_driver *driverState;
diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c
index ade69d8..586d562 100644
--- a/src/libxl/libxl_driver.c
+++ b/src/libxl/libxl_driver.c
@@ -1059,7 +1059,7 @@ libxlActive(void)
static virDrvOpenStatus
libxlOpen(virConnectPtr conn,
virConnectAuthPtr auth ATTRIBUTE_UNUSED,
- int flags ATTRIBUTE_UNUSED)
+ unsigned int flags ATTRIBUTE_UNUSED)
{
if (conn->uri == NULL) {
if (libxl_driver == NULL)
@@ -1969,7 +1969,7 @@ cleanup:
}
static int
-libxlDomainCoreDump(virDomainPtr dom, const char *to, int flags)
+libxlDomainCoreDump(virDomainPtr dom, const char *to, unsigned int flags)
{
libxlDriverPrivatePtr driver = dom->conn->privateData;
libxlDomainObjPrivatePtr priv;
@@ -2479,7 +2479,7 @@ cleanup:
}
static char *
-libxlDomainGetXMLDesc(virDomainPtr dom, int flags)
+libxlDomainGetXMLDesc(virDomainPtr dom, unsigned int flags)
{
libxlDriverPrivatePtr driver = dom->conn->privateData;
virDomainObjPtr vm;
diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c
index ffcfe4d..799a5e7 100644
--- a/src/lxc/lxc_driver.c
+++ b/src/lxc/lxc_driver.c
@@ -110,7 +110,7 @@ static void lxcDomainEventQueue(lxc_driver_t *driver,
static virDrvOpenStatus lxcOpen(virConnectPtr conn,
virConnectAuthPtr auth ATTRIBUTE_UNUSED,
- int flags ATTRIBUTE_UNUSED)
+ unsigned int flags ATTRIBUTE_UNUSED)
{
/* Verify uri was specified */
if (conn->uri == NULL) {
@@ -953,7 +953,7 @@ cleanup:
}
static char *lxcDomainGetXMLDesc(virDomainPtr dom,
- int flags)
+ unsigned int flags)
{
lxc_driver_t *driver = dom->conn->privateData;
virDomainObjPtr vm;
diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c
index 9759ce8..554a8ac 100644
--- a/src/network/bridge_driver.c
+++ b/src/network/bridge_driver.c
@@ -2010,7 +2010,7 @@ cleanup:
static virDrvOpenStatus networkOpenNetwork(virConnectPtr conn,
virConnectAuthPtr auth ATTRIBUTE_UNUSED,
- int flags ATTRIBUTE_UNUSED) {
+ unsigned int flags ATTRIBUTE_UNUSED) {
if (!driverState)
return VIR_DRV_OPEN_DECLINED;
@@ -2415,7 +2415,9 @@ cleanup:
return ret;
}
-static char *networkGetXMLDesc(virNetworkPtr net, int flags ATTRIBUTE_UNUSED) {
+static char *networkGetXMLDesc(virNetworkPtr net,
+ unsigned int flags ATTRIBUTE_UNUSED)
+{
struct network_driver *driver = net->conn->networkPrivateData;
virNetworkObjPtr network;
char *ret = NULL;
diff --git a/src/node_device/node_device_hal.c b/src/node_device/node_device_hal.c
index 27fedc9..d1dedfe 100644
--- a/src/node_device/node_device_hal.c
+++ b/src/node_device/node_device_hal.c
@@ -1,6 +1,7 @@
/*
* node_device_hal.c: node device enumeration - HAL-based implementation
*
+ * Copyright (C) 2011 Red Hat, Inc.
* Copyright (C) 2008 Virtual Iron Software, Inc.
* Copyright (C) 2008 David F. Lively
*
@@ -861,7 +862,7 @@ static int halDeviceMonitorActive(void)
static virDrvOpenStatus halNodeDrvOpen(virConnectPtr conn,
virConnectAuthPtr auth ATTRIBUTE_UNUSED,
- int flags ATTRIBUTE_UNUSED)
+ unsigned int flags ATTRIBUTE_UNUSED)
{
if (driverState == NULL)
return VIR_DRV_OPEN_DECLINED;
diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c
index 2d4e078..db26c6b 100644
--- a/src/node_device/node_device_udev.c
+++ b/src/node_device/node_device_udev.c
@@ -1721,7 +1721,7 @@ static int udevDeviceMonitorActive(void)
static virDrvOpenStatus udevNodeDrvOpen(virConnectPtr conn,
virConnectAuthPtr auth ATTRIBUTE_UNUSED,
- int flags ATTRIBUTE_UNUSED)
+ unsigned int flags ATTRIBUTE_UNUSED)
{
if (driverState == NULL) {
return VIR_DRV_OPEN_DECLINED;
diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c
index 44327ae..bfe7f2f 100644
--- a/src/nwfilter/nwfilter_driver.c
+++ b/src/nwfilter/nwfilter_driver.c
@@ -271,8 +271,9 @@ cleanup:
static virDrvOpenStatus
nwfilterOpen(virConnectPtr conn,
- virConnectAuthPtr auth ATTRIBUTE_UNUSED,
- int flags ATTRIBUTE_UNUSED) {
+ virConnectAuthPtr auth ATTRIBUTE_UNUSED,
+ unsigned int flags ATTRIBUTE_UNUSED)
+{
if (!driverState)
return VIR_DRV_OPEN_DECLINED;
@@ -411,7 +412,8 @@ cleanup:
static char *
nwfilterGetXMLDesc(virNWFilterPtr obj,
- int flags) {
+ unsigned int flags)
+{
virNWFilterDriverStatePtr driver = obj->conn->nwfilterPrivateData;
virNWFilterObjPtr nwfilter;
char *ret = NULL;
diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c
index c13f346..2c6c870 100644
--- a/src/openvz/openvz_driver.c
+++ b/src/openvz/openvz_driver.c
@@ -456,7 +456,7 @@ static int openvzDomainIsUpdated(virDomainPtr dom ATTRIBUTE_UNUSED)
return 0;
}
-static char *openvzDomainGetXMLDesc(virDomainPtr dom, int flags) {
+static char *openvzDomainGetXMLDesc(virDomainPtr dom, unsigned int flags) {
struct openvz_driver *driver = dom->conn->privateData;
virDomainObjPtr vm;
char *ret = NULL;
@@ -1281,7 +1281,7 @@ openvzDomainSetVcpus(virDomainPtr dom, unsigned int nvcpus)
static virDrvOpenStatus openvzOpen(virConnectPtr conn,
virConnectAuthPtr auth ATTRIBUTE_UNUSED,
- int flags ATTRIBUTE_UNUSED)
+ unsigned int flags ATTRIBUTE_UNUSED)
{
struct openvz_driver *driver;
diff --git a/src/phyp/phyp_driver.c b/src/phyp/phyp_driver.c
index a9a9a21..d1ab5b4 100644
--- a/src/phyp/phyp_driver.c
+++ b/src/phyp/phyp_driver.c
@@ -1128,7 +1128,7 @@ exit:
static virDrvOpenStatus
phypOpen(virConnectPtr conn,
- virConnectAuthPtr auth, int flags ATTRIBUTE_UNUSED)
+ virConnectAuthPtr auth, unsigned int flags ATTRIBUTE_UNUSED)
{
LIBSSH2_SESSION *session = NULL;
ConnectionData *connection_data = NULL;
@@ -3307,7 +3307,7 @@ cleanup:
}
static char *
-phypDomainGetXMLDesc(virDomainPtr dom, int flags)
+phypDomainGetXMLDesc(virDomainPtr dom, unsigned int flags)
{
ConnectionData *connection_data = dom->conn->networkPrivateData;
phyp_driverPtr phyp_driver = dom->conn->privateData;
@@ -3725,7 +3725,7 @@ phypDomainSetCPU(virDomainPtr dom, unsigned int nvcpus)
static virDrvOpenStatus
phypVIOSDriverOpen(virConnectPtr conn,
virConnectAuthPtr auth ATTRIBUTE_UNUSED,
- int flags ATTRIBUTE_UNUSED)
+ unsigned int flags ATTRIBUTE_UNUSED)
{
if (conn->driver->no != VIR_DRV_PHYP)
return VIR_DRV_OPEN_DECLINED;
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 52b7dfd..4f12beb 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -800,7 +800,8 @@ static int qemuDomainSnapshotSetCurrentInactive(virDomainObjPtr vm,
static virDrvOpenStatus qemudOpen(virConnectPtr conn,
virConnectAuthPtr auth ATTRIBUTE_UNUSED,
- int flags ATTRIBUTE_UNUSED) {
+ unsigned int flags ATTRIBUTE_UNUSED)
+{
if (conn->uri == NULL) {
if (qemu_driver == NULL)
return VIR_DRV_OPEN_DECLINED;
@@ -2585,7 +2586,7 @@ getCompressionType(struct qemud_driver *driver)
static int qemudDomainCoreDump(virDomainPtr dom,
const char *path,
- int flags)
+ unsigned int flags)
{
struct qemud_driver *driver = dom->conn->privateData;
virDomainObjPtr vm;
@@ -3818,7 +3819,8 @@ cleanup:
static char *qemuDomainGetXMLDesc(virDomainPtr dom,
- int flags) {
+ unsigned int flags)
+{
struct qemud_driver *driver = dom->conn->privateData;
virDomainObjPtr vm;
char *ret = NULL;
diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
index f318740..199d8f8 100644
--- a/src/remote/remote_driver.c
+++ b/src/remote/remote_driver.c
@@ -286,7 +286,7 @@ static int
doRemoteOpen (virConnectPtr conn,
struct private_data *priv,
virConnectAuthPtr auth ATTRIBUTE_UNUSED,
- int flags)
+ unsigned int flags)
{
struct qparam_set *vars = NULL;
char *transport_str = NULL;
@@ -741,7 +741,7 @@ remoteOpenSecondaryDriver(virConnectPtr conn,
static virDrvOpenStatus
remoteOpen (virConnectPtr conn,
virConnectAuthPtr auth,
- int flags)
+ unsigned int flags)
{
struct private_data *priv;
int ret, rflags = 0;
@@ -1989,7 +1989,7 @@ done:
static virDrvOpenStatus ATTRIBUTE_NONNULL (1)
remoteGenericOpen(virConnectPtr conn, virConnectAuthPtr auth,
- int flags, void **genericPrivateData)
+ unsigned int flags, void **genericPrivateData)
{
if (inside_daemon)
return VIR_DRV_OPEN_DECLINED;
@@ -2048,7 +2048,8 @@ remoteGenericClose(virConnectPtr conn, void **genericPrivateData)
}
static virDrvOpenStatus ATTRIBUTE_NONNULL (1)
-remoteNetworkOpen(virConnectPtr conn, virConnectAuthPtr auth, int flags)
+remoteNetworkOpen(virConnectPtr conn, virConnectAuthPtr auth,
+ unsigned int flags)
{
return remoteGenericOpen(conn, auth, flags, &conn->networkPrivateData);
}
@@ -2062,7 +2063,8 @@ remoteNetworkClose(virConnectPtr conn)
/*----------------------------------------------------------------------*/
static virDrvOpenStatus ATTRIBUTE_NONNULL (1)
-remoteInterfaceOpen(virConnectPtr conn, virConnectAuthPtr auth, int flags)
+remoteInterfaceOpen(virConnectPtr conn, virConnectAuthPtr auth,
+ unsigned int flags)
{
return remoteGenericOpen(conn, auth, flags, &conn->interfacePrivateData);
}
@@ -2076,7 +2078,8 @@ remoteInterfaceClose(virConnectPtr conn)
/*----------------------------------------------------------------------*/
static virDrvOpenStatus ATTRIBUTE_NONNULL (1)
-remoteStorageOpen(virConnectPtr conn, virConnectAuthPtr auth, int flags)
+remoteStorageOpen(virConnectPtr conn, virConnectAuthPtr auth,
+ unsigned int flags)
{
return remoteGenericOpen(conn, auth, flags, &conn->storagePrivateData);
}
@@ -2135,7 +2138,8 @@ done:
/*----------------------------------------------------------------------*/
static virDrvOpenStatus ATTRIBUTE_NONNULL (1)
-remoteDevMonOpen(virConnectPtr conn, virConnectAuthPtr auth, int flags)
+remoteDevMonOpen(virConnectPtr conn, virConnectAuthPtr auth,
+ unsigned int flags)
{
return remoteGenericOpen(conn, auth, flags, &conn->devMonPrivateData);
}
@@ -2224,7 +2228,8 @@ done:
/* ------------------------------------------------------------- */
static virDrvOpenStatus ATTRIBUTE_NONNULL (1)
-remoteNWFilterOpen(virConnectPtr conn, virConnectAuthPtr auth, int flags)
+remoteNWFilterOpen(virConnectPtr conn, virConnectAuthPtr auth,
+ unsigned int flags)
{
return remoteGenericOpen(conn, auth, flags, &conn->nwfilterPrivateData);
}
@@ -3145,7 +3150,8 @@ remoteDomainBuildEventControlError(virNetClientProgramPtr prog ATTRIBUTE_UNUSED,
static virDrvOpenStatus ATTRIBUTE_NONNULL (1)
-remoteSecretOpen(virConnectPtr conn, virConnectAuthPtr auth, int flags)
+remoteSecretOpen(virConnectPtr conn, virConnectAuthPtr auth,
+ unsigned int flags)
{
return remoteGenericOpen(conn, auth, flags, &conn->secretPrivateData);
}
diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x
index 7c3539c..ee169fd 100644
--- a/src/remote/remote_protocol.x
+++ b/src/remote/remote_protocol.x
@@ -358,7 +358,7 @@ struct remote_open_args {
* yet do that using the remote_internal driver.
*/
remote_string name;
- int flags;
+ unsigned int flags;
};
struct remote_supports_feature_args {
@@ -732,7 +732,7 @@ struct remote_domain_restore_args {
struct remote_domain_core_dump_args {
remote_nonnull_domain dom;
remote_nonnull_string to;
- int flags;
+ unsigned int flags;
};
struct remote_domain_screenshot_args {
@@ -747,7 +747,7 @@ struct remote_domain_screenshot_ret {
struct remote_domain_get_xml_desc_args {
remote_nonnull_domain dom;
- int flags;
+ unsigned int flags;
};
struct remote_domain_get_xml_desc_ret {
@@ -1052,7 +1052,7 @@ struct remote_network_destroy_args {
struct remote_network_get_xml_desc_args {
remote_nonnull_network net;
- int flags;
+ unsigned int flags;
};
struct remote_network_get_xml_desc_ret {
@@ -1124,7 +1124,7 @@ struct remote_nwfilter_undefine_args {
struct remote_nwfilter_get_xml_desc_args {
remote_nonnull_nwfilter nwfilter;
- int flags;
+ unsigned int flags;
};
struct remote_nwfilter_get_xml_desc_ret {
diff --git a/src/remote_protocol-structs b/src/remote_protocol-structs
index 25979b4..b2de8e9 100644
--- a/src/remote_protocol-structs
+++ b/src/remote_protocol-structs
@@ -81,7 +81,7 @@ struct remote_node_get_memory_stats {
};
struct remote_open_args {
remote_string name;
- int flags;
+ u_int flags;
};
struct remote_supports_feature_args {
int feature;
@@ -422,7 +422,7 @@ struct remote_domain_restore_args {
struct remote_domain_core_dump_args {
remote_nonnull_domain dom;
remote_nonnull_string to;
- int flags;
+ u_int flags;
};
struct remote_domain_screenshot_args {
remote_nonnull_domain dom;
@@ -434,7 +434,7 @@ struct remote_domain_screenshot_ret {
};
struct remote_domain_get_xml_desc_args {
remote_nonnull_domain dom;
- int flags;
+ u_int flags;
};
struct remote_domain_get_xml_desc_ret {
remote_nonnull_string xml;
@@ -726,7 +726,7 @@ struct remote_network_destroy_args {
};
struct remote_network_get_xml_desc_args {
remote_nonnull_network net;
- int flags;
+ u_int flags;
};
struct remote_network_get_xml_desc_ret {
remote_nonnull_string xml;
@@ -782,7 +782,7 @@ struct remote_nwfilter_undefine_args {
};
struct remote_nwfilter_get_xml_desc_args {
remote_nonnull_nwfilter nwfilter;
- int flags;
+ u_int flags;
};
struct remote_nwfilter_get_xml_desc_ret {
remote_nonnull_string xml;
diff --git a/src/secret/secret_driver.c b/src/secret/secret_driver.c
index ee3c165..552b7e4 100644
--- a/src/secret/secret_driver.c
+++ b/src/secret/secret_driver.c
@@ -525,7 +525,7 @@ cleanup:
static virDrvOpenStatus
secretOpen(virConnectPtr conn, virConnectAuthPtr auth ATTRIBUTE_UNUSED,
- int flags ATTRIBUTE_UNUSED) {
+ unsigned int flags ATTRIBUTE_UNUSED) {
if (driverState == NULL)
return VIR_DRV_OPEN_DECLINED;
diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c
index a990118..d1fef92 100644
--- a/src/storage/storage_driver.c
+++ b/src/storage/storage_driver.c
@@ -322,7 +322,7 @@ storagePoolLookupByVolume(virStorageVolPtr vol) {
static virDrvOpenStatus
storageOpen(virConnectPtr conn,
virConnectAuthPtr auth ATTRIBUTE_UNUSED,
- int flags ATTRIBUTE_UNUSED) {
+ unsigned int flags ATTRIBUTE_UNUSED) {
if (!driverState)
return VIR_DRV_OPEN_DECLINED;
diff --git a/src/test/test_driver.c b/src/test/test_driver.c
index 18f6a52..98daca8 100644
--- a/src/test/test_driver.c
+++ b/src/test/test_driver.c
@@ -1098,8 +1098,8 @@ static int testOpenFromFile(virConnectPtr conn,
static virDrvOpenStatus testOpen(virConnectPtr conn,
- virConnectAuthPtr auth ATTRIBUTE_UNUSED,
- int flags ATTRIBUTE_UNUSED)
+ virConnectAuthPtr auth ATTRIBUTE_UNUSED,
+ unsigned int flags ATTRIBUTE_UNUSED)
{
int ret;
testConnPtr privconn;
@@ -1904,7 +1904,7 @@ cleanup:
static int testDomainCoreDump(virDomainPtr domain,
const char *to,
- int flags ATTRIBUTE_UNUSED)
+ unsigned int flags ATTRIBUTE_UNUSED)
{
testConnPtr privconn = domain->conn->privateData;
int fd = -1;
@@ -2350,7 +2350,7 @@ cleanup:
return ret;
}
-static char *testDomainGetXMLDesc(virDomainPtr domain, int flags)
+static char *testDomainGetXMLDesc(virDomainPtr domain, unsigned int flags)
{
testConnPtr privconn = domain->conn->privateData;
virDomainDefPtr def;
@@ -2843,7 +2843,7 @@ error:
static virDrvOpenStatus testOpenNetwork(virConnectPtr conn,
virConnectAuthPtr auth ATTRIBUTE_UNUSED,
- int flags ATTRIBUTE_UNUSED) {
+ unsigned int flags ATTRIBUTE_UNUSED) {
if (STRNEQ(conn->driver->name, "Test"))
return VIR_DRV_OPEN_DECLINED;
@@ -3177,7 +3177,9 @@ cleanup:
return ret;
}
-static char *testNetworkGetXMLDesc(virNetworkPtr network, int flags ATTRIBUTE_UNUSED) {
+static char *testNetworkGetXMLDesc(virNetworkPtr network,
+ unsigned int flags ATTRIBUTE_UNUSED)
+{
testConnPtr privconn = network->conn->privateData;
virNetworkObjPtr privnet;
char *ret = NULL;
@@ -3290,7 +3292,7 @@ cleanup:
static virDrvOpenStatus testOpenInterface(virConnectPtr conn,
virConnectAuthPtr auth ATTRIBUTE_UNUSED,
- int flags ATTRIBUTE_UNUSED)
+ unsigned int flags ATTRIBUTE_UNUSED)
{
if (STRNEQ(conn->driver->name, "Test"))
return VIR_DRV_OPEN_DECLINED;
@@ -3714,7 +3716,7 @@ static int testStoragePoolObjSetDefaults(virStoragePoolObjPtr pool) {
static virDrvOpenStatus testStorageOpen(virConnectPtr conn,
virConnectAuthPtr auth ATTRIBUTE_UNUSED,
- int flags ATTRIBUTE_UNUSED) {
+ unsigned int flags ATTRIBUTE_UNUSED) {
if (STRNEQ(conn->driver->name, "Test"))
return VIR_DRV_OPEN_DECLINED;
@@ -4940,7 +4942,7 @@ cleanup:
/* Node device implementations */
static virDrvOpenStatus testDevMonOpen(virConnectPtr conn,
virConnectAuthPtr auth ATTRIBUTE_UNUSED,
- int flags ATTRIBUTE_UNUSED) {
+ unsigned int flags ATTRIBUTE_UNUSED) {
if (STRNEQ(conn->driver->name, "Test"))
return VIR_DRV_OPEN_DECLINED;
@@ -5394,7 +5396,7 @@ static void testDomainEventQueue(testConnPtr driver,
static virDrvOpenStatus testSecretOpen(virConnectPtr conn,
virConnectAuthPtr auth ATTRIBUTE_UNUSED,
- int flags ATTRIBUTE_UNUSED) {
+ unsigned int flags ATTRIBUTE_UNUSED) {
if (STRNEQ(conn->driver->name, "Test"))
return VIR_DRV_OPEN_DECLINED;
@@ -5410,7 +5412,7 @@ static int testSecretClose(virConnectPtr conn) {
static virDrvOpenStatus testNWFilterOpen(virConnectPtr conn,
virConnectAuthPtr auth ATTRIBUTE_UNUSED,
- int flags ATTRIBUTE_UNUSED) {
+ unsigned int flags ATTRIBUTE_UNUSED) {
if (STRNEQ(conn->driver->name, "Test"))
return VIR_DRV_OPEN_DECLINED;
diff --git a/src/uml/uml_driver.c b/src/uml/uml_driver.c
index f0f053b..6a396e4 100644
--- a/src/uml/uml_driver.c
+++ b/src/uml/uml_driver.c
@@ -946,7 +946,7 @@ static void umlShutdownVMDaemon(virConnectPtr conn ATTRIBUTE_UNUSED,
static virDrvOpenStatus umlOpen(virConnectPtr conn,
virConnectAuthPtr auth ATTRIBUTE_UNUSED,
- int flags ATTRIBUTE_UNUSED) {
+ unsigned int flags ATTRIBUTE_UNUSED) {
if (conn->uri == NULL) {
if (uml_driver == NULL)
return VIR_DRV_OPEN_DECLINED;
@@ -1559,7 +1559,7 @@ cleanup:
static char *umlDomainGetXMLDesc(virDomainPtr dom,
- int flags ATTRIBUTE_UNUSED) {
+ unsigned int flags ATTRIBUTE_UNUSED) {
struct uml_driver *driver = dom->conn->privateData;
virDomainObjPtr vm;
char *ret = NULL;
diff --git a/src/vbox/vbox_driver.c b/src/vbox/vbox_driver.c
index eab4679..b20998a 100644
--- a/src/vbox/vbox_driver.c
+++ b/src/vbox/vbox_driver.c
@@ -3,7 +3,7 @@
*/
/*
- * Copyright (C) 2010 Red Hat, Inc.
+ * Copyright (C) 2010-2011 Red Hat, Inc.
* Copyright (C) 2008-2009 Sun Microsystems, Inc.
*
* This file is part of a free software library; you can redistribute
@@ -142,7 +142,7 @@ int vboxRegister(void) {
static virDrvOpenStatus vboxOpenDummy(virConnectPtr conn,
virConnectAuthPtr auth ATTRIBUTE_UNUSED,
- int flags ATTRIBUTE_UNUSED) {
+ unsigned int flags ATTRIBUTE_UNUSED) {
uid_t uid = getuid();
if (conn->uri == NULL ||
diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c
index 37fe248..4a0858f 100644
--- a/src/vbox/vbox_tmpl.c
+++ b/src/vbox/vbox_tmpl.c
@@ -961,7 +961,7 @@ static void vboxUninitialize(vboxGlobalData *data) {
static virDrvOpenStatus vboxOpen(virConnectPtr conn,
virConnectAuthPtr auth ATTRIBUTE_UNUSED,
- int flags ATTRIBUTE_UNUSED) {
+ unsigned int flags ATTRIBUTE_UNUSED) {
vboxGlobalData *data = NULL;
uid_t uid = getuid();
@@ -2130,7 +2130,7 @@ vboxDomainGetMaxVcpus(virDomainPtr dom)
VIR_DOMAIN_VCPU_MAXIMUM));
}
-static char *vboxDomainGetXMLDesc(virDomainPtr dom, int flags) {
+static char *vboxDomainGetXMLDesc(virDomainPtr dom, unsigned int flags) {
VBOX_OBJECT_CHECK(dom->conn, char *, NULL);
virDomainDefPtr def = NULL;
IMachine *machine = NULL;
@@ -6938,7 +6938,7 @@ static int vboxDomainEventDeregisterAny(virConnectPtr conn,
*/
static virDrvOpenStatus vboxNetworkOpen(virConnectPtr conn,
virConnectAuthPtr auth ATTRIBUTE_UNUSED,
- int flags ATTRIBUTE_UNUSED) {
+ unsigned int flags ATTRIBUTE_UNUSED) {
vboxGlobalData *data = conn->privateData;
if (STRNEQ(conn->driver->name, "VBOX"))
@@ -7574,7 +7574,8 @@ static int vboxNetworkDestroy(virNetworkPtr network) {
return vboxNetworkUndefineDestroy(network, false);
}
-static char *vboxNetworkGetXMLDesc(virNetworkPtr network, int flags ATTRIBUTE_UNUSED) {
+static char *vboxNetworkGetXMLDesc(virNetworkPtr network,
+ unsigned int flags ATTRIBUTE_UNUSED) {
VBOX_OBJECT_HOST_CHECK(network->conn, char *, NULL);
virNetworkDefPtr def = NULL;
virNetworkIpDefPtr ipdef = NULL;
@@ -7749,7 +7750,7 @@ cleanup:
static virDrvOpenStatus vboxStorageOpen (virConnectPtr conn,
virConnectAuthPtr auth ATTRIBUTE_UNUSED,
- int flags ATTRIBUTE_UNUSED) {
+ unsigned int flags ATTRIBUTE_UNUSED) {
vboxGlobalData *data = conn->privateData;
if (STRNEQ(conn->driver->name, "VBOX"))
diff --git a/src/vmware/vmware_driver.c b/src/vmware/vmware_driver.c
index 52582d6..3f0cfae 100644
--- a/src/vmware/vmware_driver.c
+++ b/src/vmware/vmware_driver.c
@@ -74,7 +74,7 @@ vmwareDataFreeFunc(void *data)
static virDrvOpenStatus
vmwareOpen(virConnectPtr conn,
virConnectAuthPtr auth ATTRIBUTE_UNUSED,
- int flags ATTRIBUTE_UNUSED)
+ unsigned int flags ATTRIBUTE_UNUSED)
{
struct vmware_driver *driver;
char * vmrun = NULL;
@@ -792,7 +792,7 @@ vmwareDomainIsPersistent(virDomainPtr dom)
static char *
-vmwareDomainGetXMLDesc(virDomainPtr dom, int flags)
+vmwareDomainGetXMLDesc(virDomainPtr dom, unsigned int flags)
{
struct vmware_driver *driver = dom->conn->privateData;
virDomainObjPtr vm;
diff --git a/src/xen/xen_driver.c b/src/xen/xen_driver.c
index 88febba..0f66395 100644
--- a/src/xen/xen_driver.c
+++ b/src/xen/xen_driver.c
@@ -248,7 +248,7 @@ xenUnifiedXendProbe (void)
#endif
static virDrvOpenStatus
-xenUnifiedOpen (virConnectPtr conn, virConnectAuthPtr auth, int flags)
+xenUnifiedOpen (virConnectPtr conn, virConnectAuthPtr auth, unsigned int flags)
{
int i, ret = VIR_DRV_OPEN_DECLINED;
xenUnifiedPrivatePtr priv;
@@ -1081,7 +1081,7 @@ xenUnifiedDomainRestore (virConnectPtr conn, const char *from)
}
static int
-xenUnifiedDomainCoreDump (virDomainPtr dom, const char *to, int flags)
+xenUnifiedDomainCoreDump (virDomainPtr dom, const char *to, unsigned int flags)
{
GET_PRIVATE(dom->conn);
int i;
@@ -1233,7 +1233,7 @@ xenUnifiedDomainGetMaxVcpus (virDomainPtr dom)
}
static char *
-xenUnifiedDomainGetXMLDesc(virDomainPtr dom, int flags)
+xenUnifiedDomainGetXMLDesc(virDomainPtr dom, unsigned int flags)
{
GET_PRIVATE(dom->conn);
diff --git a/src/xen/xen_hypervisor.c b/src/xen/xen_hypervisor.c
index 6a46a39..a92b743 100644
--- a/src/xen/xen_hypervisor.c
+++ b/src/xen/xen_hypervisor.c
@@ -2201,7 +2201,7 @@ xenHypervisorInit(void)
virDrvOpenStatus
xenHypervisorOpen(virConnectPtr conn,
virConnectAuthPtr auth ATTRIBUTE_UNUSED,
- int flags ATTRIBUTE_UNUSED)
+ unsigned int flags ATTRIBUTE_UNUSED)
{
int ret;
xenUnifiedPrivatePtr priv = (xenUnifiedPrivatePtr) conn->privateData;
diff --git a/src/xen/xen_hypervisor.h b/src/xen/xen_hypervisor.h
index 02ff63a..d522d5b 100644
--- a/src/xen/xen_hypervisor.h
+++ b/src/xen/xen_hypervisor.h
@@ -37,7 +37,7 @@ char *
virDrvOpenStatus
xenHypervisorOpen (virConnectPtr conn,
virConnectAuthPtr auth,
- int flags);
+ unsigned int flags);
int xenHypervisorClose (virConnectPtr conn);
int xenHypervisorGetVersion (virConnectPtr conn,
unsigned long *hvVer);
diff --git a/src/xen/xen_inotify.c b/src/xen/xen_inotify.c
index 24b4376..2d7207c 100644
--- a/src/xen/xen_inotify.c
+++ b/src/xen/xen_inotify.c
@@ -4,7 +4,7 @@
* /etc/xen
* /var/lib/xend/domains
*
- * Copyright (C) 2010 Red Hat, Inc.
+ * Copyright (C) 2010-2011 Red Hat, Inc.
* Copyright (C) 2008 VirtualIron
*
* This library is free software; you can redistribute it and/or
@@ -382,8 +382,8 @@ cleanup:
*/
virDrvOpenStatus
xenInotifyOpen(virConnectPtr conn,
- virConnectAuthPtr auth ATTRIBUTE_UNUSED,
- int flags ATTRIBUTE_UNUSED)
+ virConnectAuthPtr auth ATTRIBUTE_UNUSED,
+ unsigned int flags ATTRIBUTE_UNUSED)
{
DIR *dh;
struct dirent *ent;
diff --git a/src/xen/xen_inotify.h b/src/xen/xen_inotify.h
index 328fa5d..74f4dff 100644
--- a/src/xen/xen_inotify.h
+++ b/src/xen/xen_inotify.h
@@ -1,6 +1,7 @@
/*
* xen_inofify.h: Xen notification of xml files
*
+ * Copyright (C) 2011 Red Hat, Inc.
* Copyright (C) 2008 VirtualIron
*
* This library is free software; you can redistribute it and/or
@@ -29,7 +30,7 @@ extern struct xenUnifiedDriver xenInotifyDriver;
virDrvOpenStatus xenInotifyOpen (virConnectPtr conn,
virConnectAuthPtr auth,
- int flags);
+ unsigned int flags);
int xenInotifyClose (virConnectPtr conn);
#endif
diff --git a/src/xen/xend_internal.c b/src/xen/xend_internal.c
index d0eb32a0..6c2f051 100644
--- a/src/xen/xend_internal.c
+++ b/src/xen/xend_internal.c
@@ -1323,7 +1323,7 @@ error:
virDrvOpenStatus
xenDaemonOpen(virConnectPtr conn,
virConnectAuthPtr auth ATTRIBUTE_UNUSED,
- int flags ATTRIBUTE_UNUSED)
+ unsigned int flags ATTRIBUTE_UNUSED)
{
char *port = NULL;
int ret = VIR_DRV_OPEN_ERROR;
@@ -1629,7 +1629,7 @@ xenDaemonDomainSave(virDomainPtr domain, const char *filename)
*/
static int
xenDaemonDomainCoreDump(virDomainPtr domain, const char *filename,
- int flags ATTRIBUTE_UNUSED)
+ unsigned int flags ATTRIBUTE_UNUSED)
{
if ((domain == NULL) || (domain->conn == NULL) || (domain->name == NULL) ||
(filename == NULL)) {
diff --git a/src/xen/xend_internal.h b/src/xen/xend_internal.h
index 073dba2..5d324da 100644
--- a/src/xen/xend_internal.h
+++ b/src/xen/xend_internal.h
@@ -1,7 +1,7 @@
/*
* xend_internal.h
*
- * Copyright (C) 2006-2008, 2010 Red Hat, Inc.
+ * Copyright (C) 2006-2008, 2010-2011 Red Hat, Inc.
* Copyright (C) 2005,2006
*
* Anthony Liguori <aliguori at us.ibm.com>
@@ -95,7 +95,8 @@ xenDaemonDomainFetch(virConnectPtr xend,
/* refactored ones */
-virDrvOpenStatus xenDaemonOpen(virConnectPtr conn, virConnectAuthPtr auth, int flags);
+virDrvOpenStatus xenDaemonOpen(virConnectPtr conn, virConnectAuthPtr auth,
+ unsigned int flags);
int xenDaemonClose(virConnectPtr conn);
int xenDaemonGetVersion(virConnectPtr conn, unsigned long *hvVer);
int xenDaemonNodeGetInfo(virConnectPtr conn, virNodeInfoPtr info);
diff --git a/src/xen/xm_internal.c b/src/xen/xm_internal.c
index 530b0d4..01b9c4e 100644
--- a/src/xen/xm_internal.c
+++ b/src/xen/xm_internal.c
@@ -442,7 +442,7 @@ int xenXMConfigCacheRefresh (virConnectPtr conn) {
virDrvOpenStatus
xenXMOpen (virConnectPtr conn,
virConnectAuthPtr auth ATTRIBUTE_UNUSED,
- int flags ATTRIBUTE_UNUSED)
+ unsigned int flags ATTRIBUTE_UNUSED)
{
xenUnifiedPrivatePtr priv = conn->privateData;
diff --git a/src/xen/xm_internal.h b/src/xen/xm_internal.h
index 1251851..cf315cd 100644
--- a/src/xen/xm_internal.h
+++ b/src/xen/xm_internal.h
@@ -1,7 +1,7 @@
/*
* xm_internal.h: helper routines for dealing with inactive domains
*
- * Copyright (C) 2006-2007, 2010 Red Hat, Inc.
+ * Copyright (C) 2006-2007, 2010-2011 Red Hat, Inc.
* Copyright (C) 2006 Daniel P. Berrange
*
* This library is free software; you can redistribute it and/or
@@ -36,7 +36,8 @@ int xenXMConfigCacheRefresh (virConnectPtr conn);
int xenXMConfigCacheAddFile(virConnectPtr conn, const char *filename);
int xenXMConfigCacheRemoveFile(virConnectPtr conn, const char *filename);
-virDrvOpenStatus xenXMOpen(virConnectPtr conn, virConnectAuthPtr auth, int flags);
+virDrvOpenStatus xenXMOpen(virConnectPtr conn, virConnectAuthPtr auth,
+ unsigned int flags);
int xenXMClose(virConnectPtr conn);
const char *xenXMGetType(virConnectPtr conn);
int xenXMDomainGetInfo(virDomainPtr domain, virDomainInfoPtr info);
diff --git a/src/xen/xs_internal.c b/src/xen/xs_internal.c
index 04bf93a..48e450a 100644
--- a/src/xen/xs_internal.c
+++ b/src/xen/xs_internal.c
@@ -1,7 +1,7 @@
/*
* xs_internal.c: access to Xen Store
*
- * Copyright (C) 2006, 2009-2010 Red Hat, Inc.
+ * Copyright (C) 2006, 2009-2011 Red Hat, Inc.
*
* See COPYING.LIB for the License of this software
*
@@ -267,7 +267,7 @@ virDomainGetVMInfo(virDomainPtr domain, const char *vm, const char *name)
virDrvOpenStatus
xenStoreOpen(virConnectPtr conn,
virConnectAuthPtr auth ATTRIBUTE_UNUSED,
- int flags ATTRIBUTE_UNUSED)
+ unsigned int flags ATTRIBUTE_UNUSED)
{
xenUnifiedPrivatePtr priv = (xenUnifiedPrivatePtr) conn->privateData;
diff --git a/src/xen/xs_internal.h b/src/xen/xs_internal.h
index efc4f9f..0278799 100644
--- a/src/xen/xs_internal.h
+++ b/src/xen/xs_internal.h
@@ -1,7 +1,7 @@
/*
* xs_internal.h: internal API for access to XenStore
*
- * Copyright (C) 2006, 2010 Red Hat, Inc.
+ * Copyright (C) 2006, 2010-2011 Red Hat, Inc.
*
* See COPYING.LIB for the License of this software
*
@@ -19,7 +19,7 @@ int xenStoreInit (void);
virDrvOpenStatus xenStoreOpen (virConnectPtr conn,
virConnectAuthPtr auth,
- int flags);
+ unsigned int flags);
int xenStoreClose (virConnectPtr conn);
int xenStoreGetDomainInfo (virDomainPtr domain,
virDomainInfoPtr info);
diff --git a/src/xenapi/xenapi_driver.c b/src/xenapi/xenapi_driver.c
index 0a618ab..1c06f75 100644
--- a/src/xenapi/xenapi_driver.c
+++ b/src/xenapi/xenapi_driver.c
@@ -91,7 +91,8 @@ getCapsObject (void)
* Return VIR_DRV_OPEN_SUCCESS on success, else VIR_DRV_OPEN_ERROR
*/
static virDrvOpenStatus
-xenapiOpen (virConnectPtr conn, virConnectAuthPtr auth, int flags ATTRIBUTE_UNUSED)
+xenapiOpen (virConnectPtr conn, virConnectAuthPtr auth,
+ unsigned int flags ATTRIBUTE_UNUSED)
{
char *username = NULL;
char *password = NULL;
@@ -1294,7 +1295,7 @@ xenapiDomainGetMaxVcpus (virDomainPtr dom)
* Returns XML string of the domain configuration on success or -1 in case of error
*/
static char *
-xenapiDomainGetXMLDesc(virDomainPtr dom, int flags ATTRIBUTE_UNUSED)
+xenapiDomainGetXMLDesc(virDomainPtr dom, unsigned int flags ATTRIBUTE_UNUSED)
{
xen_vm vm=NULL;
xen_vm_set *vms;
--
1.7.4.4
More information about the libvir-list
mailing list