# HG changeset patch
# User Ewan Mellor <ewan@xxxxxxxxxxxxx>
# Node ID 0db0c19d338683fe08dd77054e1b7692e81b2190
# Parent 1697ee515e460bc90bdb4958aff4aeeb4ccd0856
Fix the handling of sets in the interface -- expecting a pointer to X to serve
as a list of them was too hopeful -- that's what the set structures are for.
Based upon a patch by Jim Fehlig.
Signed-off-by: Ewan Mellor <ewan@xxxxxxxxxxxxx>
---
tools/libxen/include/xen_host.h | 8 ++++----
tools/libxen/include/xen_network.h | 6 +++---
tools/libxen/include/xen_sr.h | 4 ++--
tools/libxen/include/xen_vdi.h | 4 ++--
tools/libxen/include/xen_vm.h | 8 ++++----
tools/libxen/src/xen_host.c | 8 ++++----
tools/libxen/src/xen_network.c | 6 +++---
tools/libxen/src/xen_sr.c | 4 ++--
tools/libxen/src/xen_vdi.c | 4 ++--
tools/libxen/src/xen_vm.c | 8 ++++----
10 files changed, 30 insertions(+), 30 deletions(-)
diff -r 1697ee515e46 -r 0db0c19d3386 tools/libxen/include/xen_host.h
--- a/tools/libxen/include/xen_host.h Sat Oct 28 11:41:55 2006 +0100
+++ b/tools/libxen/include/xen_host.h Sat Oct 28 11:50:35 2006 +0100
@@ -213,21 +213,21 @@ xen_host_get_software_version(xen_sessio
* Get the resident_VMs field of the given host.
*/
extern bool
-xen_host_get_resident_vms(xen_session *session, xen_vm *result, xen_host host);
+xen_host_get_resident_vms(xen_session *session, struct xen_vm_set **result,
xen_host host);
/**
* Get the PIFs field of the given host.
*/
extern bool
-xen_host_get_pifs(xen_session *session, xen_pif *result, xen_host host);
+xen_host_get_pifs(xen_session *session, struct xen_pif_set **result, xen_host
host);
/**
* Get the host_CPUs field of the given host.
*/
extern bool
-xen_host_get_host_cpus(xen_session *session, xen_host_cpu *result, xen_host
host);
+xen_host_get_host_cpus(xen_session *session, struct xen_host_cpu_set **result,
xen_host host);
/**
@@ -279,7 +279,7 @@ xen_host_reboot(xen_session *session, xe
* Return a list of all the hosts known to the system
*/
extern bool
-xen_host_get_all(xen_session *session, xen_host *result);
+xen_host_get_all(xen_session *session, struct xen_host_set **result);
#endif
diff -r 1697ee515e46 -r 0db0c19d3386 tools/libxen/include/xen_network.h
--- a/tools/libxen/include/xen_network.h Sat Oct 28 11:41:55 2006 +0100
+++ b/tools/libxen/include/xen_network.h Sat Oct 28 11:50:35 2006 +0100
@@ -204,14 +204,14 @@ xen_network_get_name_description(xen_ses
* Get the VIFs field of the given network.
*/
extern bool
-xen_network_get_vifs(xen_session *session, xen_vif *result, xen_network
network);
+xen_network_get_vifs(xen_session *session, struct xen_vif_set **result,
xen_network network);
/**
* Get the PIFs field of the given network.
*/
extern bool
-xen_network_get_pifs(xen_session *session, xen_pif *result, xen_network
network);
+xen_network_get_pifs(xen_session *session, struct xen_pif_set **result,
xen_network network);
/**
@@ -260,7 +260,7 @@ xen_network_set_default_netmask(xen_sess
* Return a list of all the networks known to the system
*/
extern bool
-xen_network_get_all(xen_session *session, xen_network *result);
+xen_network_get_all(xen_session *session, struct xen_network_set **result);
#endif
diff -r 1697ee515e46 -r 0db0c19d3386 tools/libxen/include/xen_sr.h
--- a/tools/libxen/include/xen_sr.h Sat Oct 28 11:41:55 2006 +0100
+++ b/tools/libxen/include/xen_sr.h Sat Oct 28 11:50:35 2006 +0100
@@ -205,7 +205,7 @@ xen_sr_get_name_description(xen_session
* Get the VDIs field of the given SR.
*/
extern bool
-xen_sr_get_vdis(xen_session *session, xen_vdi *result, xen_sr sr);
+xen_sr_get_vdis(xen_session *session, struct xen_vdi_set **result, xen_sr sr);
/**
@@ -269,7 +269,7 @@ xen_sr_clone(xen_session *session, xen_s
* Return a list of all the Storage Repositories known to the system
*/
extern bool
-xen_sr_get_all(xen_session *session, xen_sr *result);
+xen_sr_get_all(xen_session *session, struct xen_sr_set **result);
#endif
diff -r 1697ee515e46 -r 0db0c19d3386 tools/libxen/include/xen_vdi.h
--- a/tools/libxen/include/xen_vdi.h Sat Oct 28 11:41:55 2006 +0100
+++ b/tools/libxen/include/xen_vdi.h Sat Oct 28 11:50:35 2006 +0100
@@ -218,7 +218,7 @@ xen_vdi_get_sr(xen_session *session, xen
* Get the VBDs field of the given VDI.
*/
extern bool
-xen_vdi_get_vbds(xen_session *session, xen_vbd *result, xen_vdi vdi);
+xen_vdi_get_vbds(xen_session *session, struct xen_vbd_set **result, xen_vdi
vdi);
/**
@@ -260,7 +260,7 @@ xen_vdi_get_parent(xen_session *session,
* Get the children field of the given VDI.
*/
extern bool
-xen_vdi_get_children(xen_session *session, xen_vdi *result, xen_vdi vdi);
+xen_vdi_get_children(xen_session *session, struct xen_vdi_set **result,
xen_vdi vdi);
/**
diff -r 1697ee515e46 -r 0db0c19d3386 tools/libxen/include/xen_vm.h
--- a/tools/libxen/include/xen_vm.h Sat Oct 28 11:41:55 2006 +0100
+++ b/tools/libxen/include/xen_vm.h Sat Oct 28 11:50:35 2006 +0100
@@ -395,21 +395,21 @@ xen_vm_get_actions_after_crash(xen_sessi
* Get the VIFs field of the given VM.
*/
extern bool
-xen_vm_get_vifs(xen_session *session, xen_vif *result, xen_vm vm);
+xen_vm_get_vifs(xen_session *session, struct xen_vif_set **result, xen_vm vm);
/**
* Get the VBDs field of the given VM.
*/
extern bool
-xen_vm_get_vbds(xen_session *session, xen_vbd *result, xen_vm vm);
+xen_vm_get_vbds(xen_session *session, struct xen_vbd_set **result, xen_vm vm);
/**
* Get the VTPMs field of the given VM.
*/
extern bool
-xen_vm_get_vtpms(xen_session *session, xen_vtpm *result, xen_vm vm);
+xen_vm_get_vtpms(xen_session *session, struct xen_vtpm_set **result, xen_vm
vm);
/**
@@ -796,7 +796,7 @@ xen_vm_resume(xen_session *session, xen_
* Return a list of all the VMs known to the system.
*/
extern bool
-xen_vm_get_all(xen_session *session, xen_vm *result);
+xen_vm_get_all(xen_session *session, struct xen_vm_set **result);
#endif
diff -r 1697ee515e46 -r 0db0c19d3386 tools/libxen/src/xen_host.c
--- a/tools/libxen/src/xen_host.c Sat Oct 28 11:41:55 2006 +0100
+++ b/tools/libxen/src/xen_host.c Sat Oct 28 11:50:35 2006 +0100
@@ -214,7 +214,7 @@ xen_host_get_software_version(xen_sessio
bool
-xen_host_get_resident_vms(xen_session *session, xen_vm *result, xen_host host)
+xen_host_get_resident_vms(xen_session *session, struct xen_vm_set **result,
xen_host host)
{
abstract_value param_values[] =
{
@@ -231,7 +231,7 @@ xen_host_get_resident_vms(xen_session *s
bool
-xen_host_get_pifs(xen_session *session, xen_pif *result, xen_host host)
+xen_host_get_pifs(xen_session *session, struct xen_pif_set **result, xen_host
host)
{
abstract_value param_values[] =
{
@@ -248,7 +248,7 @@ xen_host_get_pifs(xen_session *session,
bool
-xen_host_get_host_cpus(xen_session *session, xen_host_cpu *result, xen_host
host)
+xen_host_get_host_cpus(xen_session *session, struct xen_host_cpu_set **result,
xen_host host)
{
abstract_value param_values[] =
{
@@ -353,7 +353,7 @@ xen_host_reboot(xen_session *session, xe
bool
-xen_host_get_all(xen_session *session, xen_host *result)
+xen_host_get_all(xen_session *session, struct xen_host_set **result)
{
abstract_type result_type = abstract_type_string_set;
diff -r 1697ee515e46 -r 0db0c19d3386 tools/libxen/src/xen_network.c
--- a/tools/libxen/src/xen_network.c Sat Oct 28 11:41:55 2006 +0100
+++ b/tools/libxen/src/xen_network.c Sat Oct 28 11:50:35 2006 +0100
@@ -195,7 +195,7 @@ xen_network_get_name_description(xen_ses
bool
-xen_network_get_vifs(xen_session *session, xen_vif *result, xen_network
network)
+xen_network_get_vifs(xen_session *session, struct xen_vif_set **result,
xen_network network)
{
abstract_value param_values[] =
{
@@ -212,7 +212,7 @@ xen_network_get_vifs(xen_session *sessio
bool
-xen_network_get_pifs(xen_session *session, xen_pif *result, xen_network
network)
+xen_network_get_pifs(xen_session *session, struct xen_pif_set **result,
xen_network network)
{
abstract_value param_values[] =
{
@@ -327,7 +327,7 @@ xen_network_set_default_netmask(xen_sess
bool
-xen_network_get_all(xen_session *session, xen_network *result)
+xen_network_get_all(xen_session *session, struct xen_network_set **result)
{
abstract_type result_type = abstract_type_string_set;
diff -r 1697ee515e46 -r 0db0c19d3386 tools/libxen/src/xen_sr.c
--- a/tools/libxen/src/xen_sr.c Sat Oct 28 11:41:55 2006 +0100
+++ b/tools/libxen/src/xen_sr.c Sat Oct 28 11:50:35 2006 +0100
@@ -199,7 +199,7 @@ xen_sr_get_name_description(xen_session
bool
-xen_sr_get_vdis(xen_session *session, xen_vdi *result, xen_sr sr)
+xen_sr_get_vdis(xen_session *session, struct xen_vdi_set **result, xen_sr sr)
{
abstract_value param_values[] =
{
@@ -351,7 +351,7 @@ xen_sr_clone(xen_session *session, xen_s
bool
-xen_sr_get_all(xen_session *session, xen_sr *result)
+xen_sr_get_all(xen_session *session, struct xen_sr_set **result)
{
abstract_type result_type = abstract_type_string_set;
diff -r 1697ee515e46 -r 0db0c19d3386 tools/libxen/src/xen_vdi.c
--- a/tools/libxen/src/xen_vdi.c Sat Oct 28 11:41:55 2006 +0100
+++ b/tools/libxen/src/xen_vdi.c Sat Oct 28 11:50:35 2006 +0100
@@ -231,7 +231,7 @@ xen_vdi_get_sr(xen_session *session, xen
bool
-xen_vdi_get_vbds(xen_session *session, xen_vbd *result, xen_vdi vdi)
+xen_vdi_get_vbds(xen_session *session, struct xen_vbd_set **result, xen_vdi
vdi)
{
abstract_value param_values[] =
{
@@ -330,7 +330,7 @@ xen_vdi_get_parent(xen_session *session,
bool
-xen_vdi_get_children(xen_session *session, xen_vdi *result, xen_vdi vdi)
+xen_vdi_get_children(xen_session *session, struct xen_vdi_set **result,
xen_vdi vdi)
{
abstract_value param_values[] =
{
diff -r 1697ee515e46 -r 0db0c19d3386 tools/libxen/src/xen_vm.c
--- a/tools/libxen/src/xen_vm.c Sat Oct 28 11:41:55 2006 +0100
+++ b/tools/libxen/src/xen_vm.c Sat Oct 28 11:50:35 2006 +0100
@@ -676,7 +676,7 @@ xen_vm_get_actions_after_crash(xen_sessi
bool
-xen_vm_get_vifs(xen_session *session, xen_vif *result, xen_vm vm)
+xen_vm_get_vifs(xen_session *session, struct xen_vif_set **result, xen_vm vm)
{
abstract_value param_values[] =
{
@@ -693,7 +693,7 @@ xen_vm_get_vifs(xen_session *session, xe
bool
-xen_vm_get_vbds(xen_session *session, xen_vbd *result, xen_vm vm)
+xen_vm_get_vbds(xen_session *session, struct xen_vbd_set **result, xen_vm vm)
{
abstract_value param_values[] =
{
@@ -710,7 +710,7 @@ xen_vm_get_vbds(xen_session *session, xe
bool
-xen_vm_get_vtpms(xen_session *session, xen_vtpm *result, xen_vm vm)
+xen_vm_get_vtpms(xen_session *session, struct xen_vtpm_set **result, xen_vm vm)
{
abstract_value param_values[] =
{
@@ -1559,7 +1559,7 @@ xen_vm_resume(xen_session *session, xen_
bool
-xen_vm_get_all(xen_session *session, xen_vm *result)
+xen_vm_get_all(xen_session *session, struct xen_vm_set **result)
{
abstract_type result_type = abstract_type_string_set;
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|