diff options
| author | emellor@ewan <emellor@ewan> | 2005-10-07 11:01:23 +0100 |
|---|---|---|
| committer | emellor@ewan <emellor@ewan> | 2005-10-07 11:01:23 +0100 |
| commit | c1a792dbf3ff50ae37a3e267e1834ee425feaa5b (patch) | |
| tree | 98070e81df4b2c5946517b7f8a914d82117fb1dc /tools | |
| parent | 1c7d85f77fa4994e9fa67679066e00985ae448b5 (diff) | |
| parent | f16cb294c517a54219dc95d1dea1ddab32a7fdea (diff) | |
| download | xen-c1a792dbf3ff50ae37a3e267e1834ee425feaa5b.tar.gz xen-c1a792dbf3ff50ae37a3e267e1834ee425feaa5b.tar.bz2 xen-c1a792dbf3ff50ae37a3e267e1834ee425feaa5b.zip | |
Merge.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/ioemu/vl.c | 2 | ||||
| -rw-r--r-- | tools/python/xen/lowlevel/xc/xc.c | 13 | ||||
| -rw-r--r-- | tools/python/xen/xend/XendDomainInfo.py | 1 |
3 files changed, 9 insertions, 7 deletions
diff --git a/tools/ioemu/vl.c b/tools/ioemu/vl.c index e09153f8b8..ae2761b813 100644 --- a/tools/ioemu/vl.c +++ b/tools/ioemu/vl.c @@ -2806,7 +2806,7 @@ int main(int argc, char **argv) case QEMU_OPTION_p: { - extern short ioreq_remote_port; + extern u16 ioreq_remote_port; ioreq_remote_port = atoi(optarg); printf("port: %d\n", ioreq_remote_port); } diff --git a/tools/python/xen/lowlevel/xc/xc.c b/tools/python/xen/lowlevel/xc/xc.c index f42dce8d4c..c78c5061ed 100644 --- a/tools/python/xen/lowlevel/xc/xc.c +++ b/tools/python/xen/lowlevel/xc/xc.c @@ -432,13 +432,13 @@ static PyObject *pyxc_evtchn_alloc_unbound(PyObject *self, { XcObject *xc = (XcObject *)self; - u32 dom = DOMID_SELF, remote_dom; + u32 dom, remote_dom; int port; - static char *kwd_list[] = { "remote_dom", "dom", NULL }; + static char *kwd_list[] = { "dom", "remote_dom", NULL }; - if ( !PyArg_ParseTupleAndKeywords(args, kwds, "i|i", kwd_list, - &remote_dom, &dom) ) + if ( !PyArg_ParseTupleAndKeywords(args, kwds, "ii", kwd_list, + &dom, &remote_dom) ) return NULL; if ( (port = xc_evtchn_alloc_unbound(xc->xc_handle, dom, remote_dom)) < 0 ) @@ -943,8 +943,9 @@ static PyMethodDef pyxc_methods[] = { { "evtchn_alloc_unbound", (PyCFunction)pyxc_evtchn_alloc_unbound, METH_VARARGS | METH_KEYWORDS, "\n" - "Allocate an unbound local port that will await a remote connection.\n" - " dom [int]: Remote domain to accept connections from.\n\n" + "Allocate an unbound port that will await a remote connection.\n" + " dom [int]: Domain whose port space to allocate from.\n" + " remote_dom [int]: Remote domain to accept connections from.\n\n" "Returns: [int] Unbound event-channel port.\n" }, { "evtchn_status", diff --git a/tools/python/xen/xend/XendDomainInfo.py b/tools/python/xen/xend/XendDomainInfo.py index 8327c5842d..be6b6fe89c 100644 --- a/tools/python/xen/xend/XendDomainInfo.py +++ b/tools/python/xen/xend/XendDomainInfo.py @@ -197,6 +197,7 @@ def recreate(xeninfo): log.info("Recreating domain %d with new UUID %s.", domid, uuid) vm = XendDomainInfo(uuid, xeninfo, domid, True) + vm.removeDom() vm.storeVmDetails() vm.storeDomDetails() |