From a62116de3259b3826a53fd146fdd89f792bd69c0 Mon Sep 17 00:00:00 2001 From: Dmitry Guryanov Date: Wed, 12 Sep 2012 16:40:54 +0400 Subject: [PATCH] parallels: implement containers creation Add separate function parallelsCreateCt, which creates container. Also add example xml configuration domain-parallels-ct-simple.xml. Signed-off-by: Dmitry Guryanov --- src/parallels/parallels_driver.c | 41 ++++++++++++++++++- .../domain-parallels-ct-simple.xml | 27 ++++++++++++ 2 files changed, 67 insertions(+), 1 deletion(-) create mode 100644 tests/domainschemadata/domain-parallels-ct-simple.xml diff --git a/src/parallels/parallels_driver.c b/src/parallels/parallels_driver.c index 3bfd3f2e0e..52b12b597c 100644 --- a/src/parallels/parallels_driver.c +++ b/src/parallels/parallels_driver.c @@ -1663,6 +1663,36 @@ parallelsCreateVm(virConnectPtr conn, virDomainDefPtr def) return -1; } +static int +parallelsCreateCt(virConnectPtr conn ATTRIBUTE_UNUSED, virDomainDefPtr def) +{ + char uuidstr[VIR_UUID_STRING_BUFLEN]; + + virUUIDFormat(def->uuid, uuidstr); + + if (def->nfss != 1 || + def->fss[0]->type != VIR_DOMAIN_FS_TYPE_TEMPLATE) { + + virReportError(VIR_ERR_INVALID_ARG, "%s", + _("There must be only 1 template FS for " + "container creation")); + goto error; + } + + if (parallelsCmdRun(PRLCTL, "create", def->name, "--vmtype", "ct", + "--uuid", uuidstr, + "--ostemplate", def->fss[0]->src, NULL) < 0) + goto error; + + if (parallelsCmdRun(PRLCTL, "set", def->name, "--vnc-mode", "auto", NULL) < 0) + goto error; + + return 0; + +error: + return -1; +} + static virDomainPtr parallelsDomainDefineXML(virConnectPtr conn, const char *xml) { @@ -1703,8 +1733,17 @@ parallelsDomainDefineXML(virConnectPtr conn, const char *xml) def = NULL; } else { - if (parallelsCreateVm(conn, def)) + if (STREQ(def->os.type, "hvm")) { + if (parallelsCreateVm(conn, def)) + goto cleanup; + } else if (STREQ(def->os.type, "exe")) { + if (parallelsCreateCt(conn, def)) + goto cleanup; + } else { + virReportError(VIR_ERR_INVALID_ARG, + _("Unsupported OS type: %s"), def->os.type); goto cleanup; + } if (parallelsLoadDomains(privconn, def->name)) goto cleanup; dom = virDomainFindByName(&privconn->domains, def->name); diff --git a/tests/domainschemadata/domain-parallels-ct-simple.xml b/tests/domainschemadata/domain-parallels-ct-simple.xml new file mode 100644 index 0000000000..a2b87ce851 --- /dev/null +++ b/tests/domainschemadata/domain-parallels-ct-simple.xml @@ -0,0 +1,27 @@ + + 1010 + 88576506-d611-41c2-b6b6-c9043704a0dd + + 262144 + 262144 + 8 + + exe + /sbin/init + + + destroy + destroy + destroy + + + + + + + +