Re: [libvirt] Re: OpenVZ : The restriction of domain name should be addressed

Hi Daniel Fixed patch according to your comments in openvzDomainDefineCmd func. --- a/src/openvz_driver.c +++ b/src/openvz_driver.c @@ -101,6 +101,9 @@ static int openvzDomainDefineCmd(virConnectPtr conn, virDomainDefPtr vmdef) { int narg; + int veid; + int max_veid; + FILE *fp; for (narg = 0; narg < maxarg; narg++) args[narg] = NULL; @@ -130,6 +133,38 @@ static int openvzDomainDefineCmd(virConnectPtr conn, ADD_ARG_LIT(VZCTL); ADD_ARG_LIT("--quiet"); ADD_ARG_LIT("create"); + + if ((fp = popen(VZLIST " -a -ovpsid -H 2>/dev/null", "r")) == NULL) { + openvzError(NULL, VIR_ERR_INTERNAL_ERROR, "%s", _("popen failed")); + return -1; + } + max_veid = 0; + while(!feof(fp)) { + if (fscanf(fp, "%d\n", &veid ) != 1) { + if (feof(fp)) + break; + + openvzError(NULL, VIR_ERR_INTERNAL_ERROR, + "%s", _("Failed to parse vzlist output")); + goto cleanup; + } + if(veid > max_veid){ + max_veid = veid; + } + } + fclose(fp); + + if(max_veid == 0){ + max_veid = 100; + }else{ + max_veid++; + } + + char str_id[10]; + sprintf( str_id, "%d", max_veid++ ); + ADD_ARG_LIT(str_id); + + ADD_ARG_LIT("--name"); ADD_ARG_LIT(vmdef->name); if (vmdef->nfss == 1 && @@ -151,6 +186,11 @@ static int openvzDomainDefineCmd(virConnectPtr conn, openvzError(conn, VIR_ERR_INTERNAL_ERROR, _("Could not put argument to %s"), VZCTL); return -1; + + cleanup: + fclose(fp); + return -1; + #undef ADD_ARG #undef ADD_ARG_LIT } ----- Yuji Nishida nishidy(a)nict.go.jp On 2009/09/15, at 18:59, Daniel P. Berrange wrote: