diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/internal/xi_build.c | 4 | ||||
| -rw-r--r-- | tools/internal/xi_create.c | 8 | ||||
| -rw-r--r-- | tools/internal/xi_destroy.c | 4 | ||||
| -rw-r--r-- | tools/internal/xi_list.c | 22 | ||||
| -rw-r--r-- | tools/internal/xi_usage.c | 6 | ||||
| -rw-r--r-- | tools/misc/xen_log.c | 4 |
6 files changed, 24 insertions, 24 deletions
diff --git a/tools/internal/xi_build.c b/tools/internal/xi_build.c index 81f8a94097..f18f994124 100644 --- a/tools/internal/xi_build.c +++ b/tools/internal/xi_build.c @@ -15,8 +15,8 @@ static long get_tot_pages(int domain_id) { dom0_op_t op; op.cmd = DOM0_GETDOMAININFO; - op.u.getdominfo.domain = domain_id; - return (do_dom0_op(&op) < 0) ? -1 : op.u.getdominfo.tot_pages; + op.u.getdomaininfo.domain = domain_id; + return (do_dom0_op(&op) < 0) ? -1 : op.u.getdomaininfo.tot_pages; } static int get_pfn_list( diff --git a/tools/internal/xi_create.c b/tools/internal/xi_create.c index b5e718caa9..bd1b31e7af 100644 --- a/tools/internal/xi_create.c +++ b/tools/internal/xi_create.c @@ -15,13 +15,13 @@ static int create_new_domain(long req_mem, char *name) dom0_op_t op; op.cmd = DOM0_CREATEDOMAIN; - op.u.newdomain.memory_kb = req_mem; - strncpy(op.u.newdomain.name, name, MAX_DOMAIN_NAME); - op.u.newdomain.name[MAX_DOMAIN_NAME-1] = '\0'; + op.u.createdomain.memory_kb = req_mem; + strncpy(op.u.createdomain.name, name, MAX_DOMAIN_NAME); + op.u.createdomain.name[MAX_DOMAIN_NAME-1] = '\0'; err = do_dom0_op(&op); - return (err < 0) ? err : op.u.newdomain.domain; + return (err < 0) ? err : op.u.createdomain.domain; } int main(int argc, char **argv) diff --git a/tools/internal/xi_destroy.c b/tools/internal/xi_destroy.c index bd91c7941a..16624b483c 100644 --- a/tools/internal/xi_destroy.c +++ b/tools/internal/xi_destroy.c @@ -10,8 +10,8 @@ static int kill_domain(int dom_id, int force) dom0_op_t op; op.cmd = DOM0_DESTROYDOMAIN; - op.u.killdomain.domain = dom_id; - op.u.killdomain.force = force; + op.u.destroydomain.domain = dom_id; + op.u.destroydomain.force = force; err = do_dom0_op(&op); diff --git a/tools/internal/xi_list.c b/tools/internal/xi_list.c index fc8f4ed73c..73df092b1d 100644 --- a/tools/internal/xi_list.c +++ b/tools/internal/xi_list.c @@ -55,20 +55,20 @@ int main(int argc, char **argv) } op.cmd = DOM0_GETDOMAININFO; - op.u.getdominfo.domain = 0; + op.u.getdomaininfo.domain = 0; while ( do_dom0_op(&op) >= 0 ) { printf("%8d %2d %1d %2d %s %08x %8ld %8d %s\n", - op.u.getdominfo.domain, - op.u.getdominfo.processor, - op.u.getdominfo.has_cpu, - op.u.getdominfo.state, - statestr(op.u.getdominfo.state), - op.u.getdominfo.hyp_events, - op.u.getdominfo.mcu_advance, - op.u.getdominfo.tot_pages, - op.u.getdominfo.name); - op.u.getdominfo.domain++; + op.u.getdomaininfo.domain, + op.u.getdomaininfo.processor, + op.u.getdomaininfo.has_cpu, + op.u.getdomaininfo.state, + statestr(op.u.getdomaininfo.state), + op.u.getdomaininfo.hyp_events, + op.u.getdomaininfo.mcu_advance, + op.u.getdomaininfo.tot_pages, + op.u.getdomaininfo.name); + op.u.getdomaininfo.domain++; } return 0; diff --git a/tools/internal/xi_usage.c b/tools/internal/xi_usage.c index 59d4f7648a..875a3eae9d 100644 --- a/tools/internal/xi_usage.c +++ b/tools/internal/xi_usage.c @@ -22,13 +22,13 @@ int main(int argc, char **argv) domain = atol(argv[1]); op.cmd = DOM0_GETDOMAININFO; - op.u.getdominfo.domain = domain; + op.u.getdomaininfo.domain = domain; if ( do_dom0_op(&op) < 0 ) return 1; printf("cpu%d: %lld\n", - op.u.getdominfo.processor, - op.u.getdominfo.cpu_time); + op.u.getdomaininfo.processor, + op.u.getdomaininfo.cpu_time); if ( mlock(vifs, sizeof(vifs)) != 0 ) { diff --git a/tools/misc/xen_log.c b/tools/misc/xen_log.c index 012b934030..39ed848722 100644 --- a/tools/misc/xen_log.c +++ b/tools/misc/xen_log.c @@ -85,14 +85,14 @@ void process(void) curport = ntohs(from.sin_port); if ( lastport != curport ) { - op.u.getdominfo.domain = (int)curport; + op.u.getdomaininfo.domain = (int)curport; if ( do_dom0_op(&op) < 0 ) log("Error resolving domain name\n"); else lastport = curport; } - sprintf(obuf, "[%s] %s", op.u.getdominfo.name, buf); + sprintf(obuf, "[%s] %s", op.u.getdomaininfo.name, buf); log(obuf); fromlen = sizeof(from); |