Accepting request 38890 from Virtualization
checked in (request 38890) OBS-URL: https://build.opensuse.org/request/show/38890 OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=43
This commit is contained in:
committed by
Git OBS Bridge
parent
6891466418
commit
3c9f5b57ac
@@ -1,5 +1,7 @@
|
||||
--- a/tools/libxc/Makefile
|
||||
+++ b/tools/libxc/Makefile
|
||||
Index: xen-4.0.0-testing/tools/libxc/Makefile
|
||||
===================================================================
|
||||
--- xen-4.0.0-testing.orig/tools/libxc/Makefile
|
||||
+++ xen-4.0.0-testing/tools/libxc/Makefile
|
||||
@@ -8,6 +8,7 @@ CTRL_SRCS-y :=
|
||||
CTRL_SRCS-y += xc_core.c
|
||||
CTRL_SRCS-$(CONFIG_X86) += xc_core_x86.c
|
||||
@@ -8,8 +10,10 @@
|
||||
CTRL_SRCS-y += xc_domain.c
|
||||
CTRL_SRCS-y += xc_evtchn.c
|
||||
CTRL_SRCS-y += xc_misc.c
|
||||
Index: xen-4.0.0-testing/tools/libxc/xc_cpupool.c
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ b/tools/libxc/xc_cpupool.c
|
||||
+++ xen-4.0.0-testing/tools/libxc/xc_cpupool.c
|
||||
@@ -0,0 +1,154 @@
|
||||
+/******************************************************************************
|
||||
+ * xc_cpupool.c
|
||||
@@ -52,9 +56,9 @@
|
||||
+ return do_domctl_save(xc_handle, &domctl);
|
||||
+}
|
||||
+
|
||||
+int xc_cpupool_getinfo(int xc_handle,
|
||||
+int xc_cpupool_getinfo(int xc_handle,
|
||||
+ uint32_t first_poolid,
|
||||
+ uint32_t n_max,
|
||||
+ uint32_t n_max,
|
||||
+ xc_cpupoolinfo_t *info)
|
||||
+{
|
||||
+ int err = 0;
|
||||
@@ -165,9 +169,42 @@
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
--- a/tools/libxc/xc_domain.c
|
||||
+++ b/tools/libxc/xc_domain.c
|
||||
@@ -220,6 +220,7 @@ int xc_domain_getinfo(int xc_handle,
|
||||
Index: xen-4.0.0-testing/tools/libxc/xc_domain.c
|
||||
===================================================================
|
||||
--- xen-4.0.0-testing.orig/tools/libxc/xc_domain.c
|
||||
+++ xen-4.0.0-testing/tools/libxc/xc_domain.c
|
||||
@@ -6,6 +6,7 @@
|
||||
* Copyright (c) 2003, K A Fraser.
|
||||
*/
|
||||
|
||||
+#include <stdarg.h>
|
||||
#include "xc_private.h"
|
||||
#include "xg_save_restore.h"
|
||||
#include <xen/memory.h>
|
||||
@@ -15,15 +16,21 @@ int xc_domain_create(int xc_handle,
|
||||
uint32_t ssidref,
|
||||
xen_domain_handle_t handle,
|
||||
uint32_t flags,
|
||||
- uint32_t *pdomid)
|
||||
+ uint32_t *pdomid, ...)
|
||||
{
|
||||
int err;
|
||||
+ va_list ap;
|
||||
DECLARE_DOMCTL;
|
||||
|
||||
domctl.cmd = XEN_DOMCTL_createdomain;
|
||||
domctl.domain = (domid_t)*pdomid;
|
||||
domctl.u.createdomain.ssidref = ssidref;
|
||||
domctl.u.createdomain.flags = flags;
|
||||
+ if ( flags & XEN_DOMCTL_CDF_pool ) {
|
||||
+ va_start(ap, pdomid);
|
||||
+ domctl.u.createdomain.cpupool = va_arg(ap, uint32_t);
|
||||
+ va_end(ap);
|
||||
+ }
|
||||
memcpy(domctl.u.createdomain.handle, handle, sizeof(xen_domain_handle_t));
|
||||
if ( (err = do_domctl(xc_handle, &domctl)) != 0 )
|
||||
return err;
|
||||
@@ -220,6 +227,7 @@ int xc_domain_getinfo(int xc_handle,
|
||||
info->cpu_time = domctl.u.getdomaininfo.cpu_time;
|
||||
info->nr_online_vcpus = domctl.u.getdomaininfo.nr_online_vcpus;
|
||||
info->max_vcpu_id = domctl.u.getdomaininfo.max_vcpu_id;
|
||||
@@ -175,8 +212,10 @@
|
||||
|
||||
memcpy(info->handle, domctl.u.getdomaininfo.handle,
|
||||
sizeof(xen_domain_handle_t));
|
||||
--- a/tools/libxc/xc_private.h
|
||||
+++ b/tools/libxc/xc_private.h
|
||||
Index: xen-4.0.0-testing/tools/libxc/xc_private.h
|
||||
===================================================================
|
||||
--- xen-4.0.0-testing.orig/tools/libxc/xc_private.h
|
||||
+++ xen-4.0.0-testing/tools/libxc/xc_private.h
|
||||
@@ -164,6 +164,19 @@ static inline int do_domctl(int xc_handl
|
||||
return ret;
|
||||
}
|
||||
@@ -197,8 +236,10 @@
|
||||
static inline int do_sysctl(int xc_handle, struct xen_sysctl *sysctl)
|
||||
{
|
||||
int ret = -1;
|
||||
--- a/tools/libxc/xenctrl.h
|
||||
+++ b/tools/libxc/xenctrl.h
|
||||
Index: xen-4.0.0-testing/tools/libxc/xenctrl.h
|
||||
===================================================================
|
||||
--- xen-4.0.0-testing.orig/tools/libxc/xenctrl.h
|
||||
+++ xen-4.0.0-testing/tools/libxc/xenctrl.h
|
||||
@@ -171,6 +171,7 @@ typedef struct xc_dominfo {
|
||||
unsigned int nr_online_vcpus;
|
||||
unsigned int max_vcpu_id;
|
||||
@@ -207,6 +248,15 @@
|
||||
} xc_dominfo_t;
|
||||
|
||||
typedef xen_domctl_getdomaininfo_t xc_domaininfo_t;
|
||||
@@ -207,7 +208,7 @@ int xc_domain_create(int xc_handle,
|
||||
uint32_t ssidref,
|
||||
xen_domain_handle_t handle,
|
||||
uint32_t flags,
|
||||
- uint32_t *pdomid);
|
||||
+ uint32_t *pdomid, ...);
|
||||
|
||||
|
||||
/* Functions to produce a dump of a given domain
|
||||
@@ -502,6 +503,100 @@ int xc_domain_setdebugging(int xc_handle
|
||||
unsigned int enable);
|
||||
|
||||
|
Reference in New Issue
Block a user