- Devel - libvirt List Archives

[Libvir] [patch 2/9] Make Start() return an error message if uuid wasnt found
by Mark McLoughlin 22 Feb '07

22 Feb '07

qemudDispatchDomainStart() doesn't report an error if the uuid lookup fails. The patch not only fixes that, but also moves the uuid lookup into the driver so that it matches the way we do Destroy(). Signed-off-by: Mark McLoughlin <markmc(a)redhat.com> Index: libvirt/qemud/driver.c =================================================================== --- libvirt.orig/qemud/driver.c +++ libvirt/qemud/driver.c @@ -285,7 +285,7 @@ struct qemud_vm *qemudDomainCreate(struc return NULL; } - if (qemudDomainStart(server, vm) < 0) { + if (qemudStartVMDaemon(server, vm) < 0) { qemudFreeVM(vm); return NULL; } @@ -339,13 +339,14 @@ int qemudDomainResume(struct qemud_serve int qemudDomainDestroy(struct qemud_server *server, int id) { struct qemud_vm *vm = qemudFindVMByID(server, id); + if (!vm) { - qemudReportError(server, VIR_ERR_INVALID_DOMAIN, "no domain with matching id %d", id); + qemudReportError(server, VIR_ERR_INVALID_DOMAIN, + "no domain with matching id %d", id); return -1; } - if (qemudShutdownVMDaemon(server, vm) < 0) - return -1; - return 0; + + return qemudShutdownVMDaemon(server, vm); } @@ -446,8 +447,16 @@ int qemudNumDefinedDomains(struct qemud_ } -int qemudDomainStart(struct qemud_server *server, struct qemud_vm *vm) { - return qemudStartVMDaemon(server, vm); +struct qemud_vm *qemudDomainStart(struct qemud_server *server, const unsigned char *uuid) { + struct qemud_vm *vm = qemudFindVMByUUID(server, uuid); + + if (!vm) { + qemudReportError(server, VIR_ERR_INVALID_DOMAIN, + "no domain with matching uuid"); + return NULL; + } + + return qemudStartVMDaemon(server, vm) < 0 ? NULL : vm; } @@ -563,7 +572,7 @@ struct qemud_network *qemudNetworkCreate return NULL; } - if (qemudNetworkStart(server, network) < 0) { + if (qemudStartNetworkDaemon(server, network) < 0) { qemudFreeNetwork(network); return NULL; } @@ -609,21 +618,28 @@ int qemudNetworkUndefine(struct qemud_se return 0; } -int qemudNetworkStart(struct qemud_server *server, struct qemud_network *network) { - return qemudStartNetworkDaemon(server, network); +struct qemud_network *qemudNetworkStart(struct qemud_server *server, const unsigned char *uuid) { + struct qemud_network *network = qemudFindNetworkByUUID(server, uuid); + + if (!network) { + qemudReportError(server, VIR_ERR_INVALID_NETWORK, + "no network with matching uuid"); + return NULL; + } + + return qemudStartNetworkDaemon(server, network) < 0 ? NULL : network; } int qemudNetworkDestroy(struct qemud_server *server, const unsigned char *uuid) { struct qemud_network *network = qemudFindNetworkByUUID(server, uuid); + if (!network) { - qemudReportError(server, VIR_ERR_INVALID_NETWORK, "no network with matching uuid"); + qemudReportError(server, VIR_ERR_INVALID_NETWORK, + "no network with matching uuid"); return -1; } - if (qemudShutdownNetworkDaemon(server, network) < 0) - return -1; - - return 0; + return qemudShutdownNetworkDaemon(server, network); } int qemudNetworkDumpXML(struct qemud_server *server, const unsigned char *uuid, char *xml, int xmllen) { Index: libvirt/qemud/driver.h =================================================================== --- libvirt.orig/qemud/driver.h +++ libvirt/qemud/driver.h @@ -79,8 +79,8 @@ int qemudListDefinedDomains(struct qemud char *const*names, int nnames); int qemudNumDefinedDomains(struct qemud_server *server); -int qemudDomainStart(struct qemud_server *server, - struct qemud_vm *vm); +struct qemud_vm *qemudDomainStart(struct qemud_server *server, + const unsigned char *uuid); struct qemud_vm *qemudDomainDefine(struct qemud_server *server, const char *xml); int qemudDomainUndefine(struct qemud_server *server, @@ -103,10 +103,10 @@ struct qemud_network *qemudNetworkCreate const char *xml); struct qemud_network *qemudNetworkDefine(struct qemud_server *server, const char *xml); +struct qemud_network *qemudNetworkStart(struct qemud_server *server, + const unsigned char *uuid); int qemudNetworkUndefine(struct qemud_server *server, const unsigned char *uuid); -int qemudNetworkStart(struct qemud_server *server, - struct qemud_network *network); int qemudNetworkDestroy(struct qemud_server *server, const unsigned char *uuid); int qemudNetworkDumpXML(struct qemud_server *server, Index: libvirt/qemud/dispatch.c =================================================================== --- libvirt.orig/qemud/dispatch.c +++ libvirt/qemud/dispatch.c @@ -257,8 +257,7 @@ static int qemudDispatchDomainDestroy(st if (in->header.dataSize != sizeof(in->data.domainDestroyRequest)) return -1; - int ret = qemudDomainDestroy(server, in->data.domainDestroyRequest.id); - if (ret < 0) { + if (qemudDomainDestroy(server, in->data.domainDestroyRequest.id) < 0) { if (qemudDispatchFailure(server, client, out) < 0) return -1; } else { @@ -410,11 +409,12 @@ static int qemudDispatchNumDefinedDomain static int qemudDispatchDomainStart(struct qemud_server *server, struct qemud_client *client, struct qemud_packet *in, struct qemud_packet *out) { + struct qemud_vm *vm; + if (in->header.dataSize != sizeof(in->data.domainStartRequest)) return -1; - struct qemud_vm *vm = qemudFindVMByUUID(server, in->data.domainStartRequest.uuid); - if (!vm || qemudDomainStart(server, vm) < 0) { + if (!(vm = qemudDomainStart(server, in->data.domainStartRequest.uuid))) { if (qemudDispatchFailure(server, client, out) < 0) return -1; } else { @@ -651,11 +651,12 @@ static int qemudDispatchNetworkUndefine( static int qemudDispatchNetworkStart(struct qemud_server *server, struct qemud_client *client, struct qemud_packet *in, struct qemud_packet *out) { + struct qemud_network *network; + if (in->header.dataSize != sizeof(in->data.networkStartRequest)) return -1; - struct qemud_network *network = qemudFindNetworkByUUID(server, in->data.networkStartRequest.uuid); - if (!network || qemudNetworkStart(server, network) < 0) { + if (!(network = qemudNetworkStart(server, in->data.networkStartRequest.uuid))) { if (qemudDispatchFailure(server, client, out) < 0) return -1; } else { @@ -670,8 +671,7 @@ static int qemudDispatchNetworkDestroy(s if (in->header.dataSize != sizeof(in->data.networkDestroyRequest)) return -1; - int ret = qemudNetworkDestroy(server, in->data.networkDestroyRequest.uuid); - if (ret < 0) { + if (qemudNetworkDestroy(server, in->data.networkDestroyRequest.uuid) < 0) { if (qemudDispatchFailure(server, client, out) < 0) return -1; } else { --

1 0

[Libvir] [patch 1/9] Merge the active and inactive network/guest lists
by Mark McLoughlin 22 Feb '07

22 Feb '07

Merge the ->activevms and ->inactivevms into a single ->vms list where each VM has a "active" flag in order to make things easier to manage. Likewise for networks. Signed-off-by: Mark McLoughlin <markmc(a)redhat.com> Index: libvirt/qemud/conf.c =================================================================== --- libvirt.orig/qemud/conf.c +++ libvirt/qemud/conf.c @@ -1215,7 +1215,7 @@ struct qemud_vm *qemudLoadConfigXML(stru xmlFreeDoc(xml); if ((vm = qemudFindVMByName(server, def->name))) { - if (vm->id == -1) { + if (!qemudIsActiveVM(vm)) { qemudFreeVMDef(vm->def); vm->def = def; } else { @@ -1263,8 +1263,8 @@ struct qemud_vm *qemudLoadConfigXML(stru } if (newVM) { - vm->next = server->inactivevms; - server->inactivevms = vm; + vm->next = server->vms; + server->vms = vm; server->ninactivevms++; } @@ -1570,7 +1570,7 @@ struct qemud_network *qemudLoadNetworkCo xmlFreeDoc(xml); if ((network = qemudFindNetworkByName(server, def->name))) { - if (!network->active) { + if (!qemudIsActiveNetwork(network)) { qemudFreeNetworkDef(network->def); network->def = def; } else { @@ -1611,8 +1611,8 @@ struct qemud_network *qemudLoadNetworkCo } if (newNetwork) { - network->next = server->inactivenetworks; - server->inactivenetworks = network; + network->next = server->networks; + server->networks = network; server->ninactivenetworks++; } @@ -1777,7 +1777,7 @@ char *qemudGenerateXML(struct qemud_serv goto cleanup; } - if (vm->id >= 0 && live) { + if (qemudIsActiveVM(vm) && live) { if (qemudBufferPrintf(&buf, "<domain type='%s' id='%d'>\n", type, vm->id) < 0) goto no_memory; } else { @@ -1945,7 +1945,7 @@ char *qemudGenerateXML(struct qemud_serv if (def->vncPort && qemudBufferPrintf(&buf, " port='%d'", - vm->id >= 0 && live ? def->vncActivePort : def->vncPort) < 0) + qemudIsActiveVM(vm) && live ? def->vncActivePort : def->vncPort) < 0) goto no_memory; if (qemudBufferAdd(&buf, "/>\n") < 0) Index: libvirt/qemud/driver.c =================================================================== --- libvirt.orig/qemud/driver.c +++ libvirt/qemud/driver.c @@ -222,10 +222,10 @@ static int qemudGetProcessInfo(unsigned } struct qemud_vm *qemudFindVMByID(const struct qemud_server *server, int id) { - struct qemud_vm *vm = server->activevms; + struct qemud_vm *vm = server->vms; while (vm) { - if (vm->id == id) + if (qemudIsActiveVM(vm) && vm->id == id) return vm; vm = vm->next; } @@ -235,7 +235,7 @@ struct qemud_vm *qemudFindVMByID(const s struct qemud_vm *qemudFindVMByUUID(const struct qemud_server *server, const unsigned char *uuid) { - struct qemud_vm *vm = server->activevms; + struct qemud_vm *vm = server->vms; while (vm) { if (!memcmp(vm->def->uuid, uuid, QEMUD_UUID_RAW_LEN)) @@ -243,19 +243,12 @@ struct qemud_vm *qemudFindVMByUUID(const vm = vm->next; } - vm = server->inactivevms; - while (vm) { - if (!memcmp(vm->def->uuid, uuid, QEMUD_UUID_RAW_LEN)) - return vm; - vm = vm->next; - } - return NULL; } struct qemud_vm *qemudFindVMByName(const struct qemud_server *server, const char *name) { - struct qemud_vm *vm = server->activevms; + struct qemud_vm *vm = server->vms; while (vm) { if (!strcmp(vm->def->name, name)) @@ -263,13 +256,6 @@ struct qemud_vm *qemudFindVMByName(const vm = vm->next; } - vm = server->inactivevms; - while (vm) { - if (!strcmp(vm->def->name, name)) - return vm; - vm = vm->next; - } - return NULL; } @@ -278,12 +264,14 @@ int qemudGetVersion(struct qemud_server } int qemudListDomains(struct qemud_server *server, int *ids, int nids) { - struct qemud_vm *vm = server->activevms; + struct qemud_vm *vm = server->vms; int got = 0; while (vm && got < nids) { - ids[got] = vm->id; + if (qemudIsActiveVM(vm)) { + ids[got] = vm->id; + got++; + } vm = vm->next; - got++; } return got; } @@ -313,7 +301,7 @@ int qemudDomainSuspend(struct qemud_serv qemudReportError(server, VIR_ERR_INVALID_DOMAIN, "no domain with matching id %d", id); return -1; } - if (vm->pid == -1) { + if (!qemudIsActiveVM(vm)) { qemudReportError(server, VIR_ERR_OPERATION_FAILED, "domain is not running"); return -1; } @@ -335,7 +323,7 @@ int qemudDomainResume(struct qemud_serve qemudReportError(server, VIR_ERR_INVALID_DOMAIN, "no domain with matching id %d", id); return -1; } - if (vm->pid == -1) { + if (!qemudIsActiveVM(vm)) { qemudReportError(server, VIR_ERR_OPERATION_FAILED, "domain is not running"); return -1; } @@ -355,11 +343,6 @@ int qemudDomainDestroy(struct qemud_serv qemudReportError(server, VIR_ERR_INVALID_DOMAIN, "no domain with matching id %d", id); return -1; } - if (vm->pid == -1) { - qemudReportError(server, VIR_ERR_OPERATION_FAILED, "domain is not running"); - return -1; - } - if (qemudShutdownVMDaemon(server, vm) < 0) return -1; return 0; @@ -378,14 +361,14 @@ int qemudDomainGetInfo(struct qemud_serv return -1; } - if (vm->pid == -1) { + if (!qemudIsActiveVM(vm)) { *runstate = QEMUD_STATE_STOPPED; } else { /* XXX in future need to add PAUSED */ *runstate = QEMUD_STATE_RUNNING; } - if (vm->pid == -1) { + if (!qemudIsActiveVM(vm)) { *cputime = 0; } else { if (qemudGetProcessInfo(cputime, vm->pid) < 0) { @@ -408,7 +391,7 @@ int qemudDomainSave(struct qemud_server qemudReportError(server, VIR_ERR_INVALID_DOMAIN, "no domain with matching id %d", id); return -1; } - if (vm->pid == -1) { + if (!qemudIsActiveVM(vm)) { qemudReportError(server, VIR_ERR_OPERATION_FAILED, "domain is not running"); return -1; } @@ -444,13 +427,15 @@ int qemudDomainDumpXML(struct qemud_serv int qemudListDefinedDomains(struct qemud_server *server, char *const*names, int nnames) { - struct qemud_vm *vm = server->inactivevms; + struct qemud_vm *vm = server->vms; int got = 0; while (vm && got < nnames) { - strncpy(names[got], vm->def->name, QEMUD_MAX_NAME_LEN-1); - names[got][QEMUD_MAX_NAME_LEN-1] = '\0'; + if (!qemudIsActiveVM(vm)) { + strncpy(names[got], vm->def->name, QEMUD_MAX_NAME_LEN-1); + names[got][QEMUD_MAX_NAME_LEN-1] = '\0'; + got++; + } vm = vm->next; - got++; } return got; } @@ -462,30 +447,7 @@ int qemudNumDefinedDomains(struct qemud_ int qemudDomainStart(struct qemud_server *server, struct qemud_vm *vm) { - struct qemud_vm *prev = NULL, *curr = server->inactivevms; - if (qemudStartVMDaemon(server, vm) < 0) { - return 1; - } - - while (curr) { - if (curr == vm) { - if (prev) - prev->next = curr->next; - else - server->inactivevms = curr->next; - server->ninactivevms--; - break; - } - prev = curr; - curr = curr->next; - } - - vm->next = server->activevms; - server->activevms = vm; - server->nactivevms++; - server->nvmfds += 2; - - return 0; + return qemudStartVMDaemon(server, vm); } @@ -495,14 +457,14 @@ struct qemud_vm *qemudDomainDefine(struc int qemudDomainUndefine(struct qemud_server *server, const unsigned char *uuid) { struct qemud_vm *vm = qemudFindVMByUUID(server, uuid); - struct qemud_vm *prev = NULL, *curr = server->inactivevms; + struct qemud_vm *prev = NULL, *curr = server->vms; if (!vm) { qemudReportError(server, VIR_ERR_INVALID_DOMAIN, "no domain with matching uuid"); return -1; } - if (vm->pid != -1) { + if (qemudIsActiveVM(vm)) { qemudReportError(server, VIR_ERR_INTERNAL_ERROR, "cannot delete active domain"); return -1; } @@ -517,7 +479,7 @@ int qemudDomainUndefine(struct qemud_ser if (prev) { prev->next = curr->next; } else { - server->inactivevms = curr->next; + server->vms = curr->next; } server->ninactivevms--; break; @@ -534,15 +496,8 @@ int qemudDomainUndefine(struct qemud_ser struct qemud_network *qemudFindNetworkByUUID(const struct qemud_server *server, const unsigned char *uuid) { - struct qemud_network *network = server->activenetworks; - - while (network) { - if (!memcmp(network->def->uuid, uuid, QEMUD_UUID_RAW_LEN)) - return network; - network = network->next; - } + struct qemud_network *network = server->networks; - network = server->inactivenetworks; while (network) { if (!memcmp(network->def->uuid, uuid, QEMUD_UUID_RAW_LEN)) return network; @@ -554,7 +509,7 @@ struct qemud_network *qemudFindNetworkBy struct qemud_network *qemudFindNetworkByName(const struct qemud_server *server, const char *name) { - struct qemud_network *network = server->activenetworks; + struct qemud_network *network = server->networks; while (network) { if (!strcmp(network->def->name, name)) @@ -562,13 +517,6 @@ struct qemud_network *qemudFindNetworkBy network = network->next; } - network = server->inactivenetworks; - while (network) { - if (!strcmp(network->def->name, name)) - return network; - network = network->next; - } - return NULL; } @@ -577,13 +525,15 @@ int qemudNumNetworks(struct qemud_server } int qemudListNetworks(struct qemud_server *server, char *const*names, int nnames) { - struct qemud_network *network = server->activenetworks; + struct qemud_network *network = server->networks; int got = 0; while (network && got < nnames) { - strncpy(names[got], network->def->name, QEMUD_MAX_NAME_LEN-1); - names[got][QEMUD_MAX_NAME_LEN-1] = '\0'; + if (qemudIsActiveNetwork(network)) { + strncpy(names[got], network->def->name, QEMUD_MAX_NAME_LEN-1); + names[got][QEMUD_MAX_NAME_LEN-1] = '\0'; + got++; + } network = network->next; - got++; } return got; } @@ -593,13 +543,15 @@ int qemudNumDefinedNetworks(struct qemud } int qemudListDefinedNetworks(struct qemud_server *server, char *const*names, int nnames) { - struct qemud_network *network = server->inactivenetworks; + struct qemud_network *network = server->networks; int got = 0; while (network && got < nnames) { - strncpy(names[got], network->def->name, QEMUD_MAX_NAME_LEN-1); - names[got][QEMUD_MAX_NAME_LEN-1] = '\0'; + if (!qemudIsActiveNetwork(network)) { + strncpy(names[got], network->def->name, QEMUD_MAX_NAME_LEN-1); + names[got][QEMUD_MAX_NAME_LEN-1] = '\0'; + got++; + } network = network->next; - got++; } return got; } @@ -625,7 +577,7 @@ struct qemud_network *qemudNetworkDefine int qemudNetworkUndefine(struct qemud_server *server, const unsigned char *uuid) { struct qemud_network *network = qemudFindNetworkByUUID(server, uuid); - struct qemud_network *prev = NULL, *curr = server->inactivenetworks; + struct qemud_network *prev = NULL, *curr = server->networks; if (!network) { qemudReportError(server, VIR_ERR_INVALID_DOMAIN, "no network with matching uuid"); @@ -642,7 +594,7 @@ int qemudNetworkUndefine(struct qemud_se if (prev) { prev->next = curr->next; } else { - server->inactivenetworks = curr->next; + server->networks = curr->next; } server->ninactivenetworks--; break; @@ -658,29 +610,7 @@ int qemudNetworkUndefine(struct qemud_se } int qemudNetworkStart(struct qemud_server *server, struct qemud_network *network) { - struct qemud_network *prev = NULL, *curr = server->inactivenetworks; - if (qemudStartNetworkDaemon(server, network) < 0) { - return 1; - } - - while (curr) { - if (curr == network) { - if (prev) - prev->next = curr->next; - else - server->inactivenetworks = curr->next; - server->ninactivenetworks--; - break; - } - prev = curr; - curr = curr->next; - } - - network->next = server->activenetworks; - server->activenetworks = network; - server->nactivenetworks++; - - return 0; + return qemudStartNetworkDaemon(server, network); } int qemudNetworkDestroy(struct qemud_server *server, const unsigned char *uuid) { Index: libvirt/qemud/internal.h =================================================================== --- libvirt.orig/qemud/internal.h +++ libvirt/qemud/internal.h @@ -280,14 +280,12 @@ struct qemud_server { int sigread; int nvmfds; int nactivevms; - struct qemud_vm *activevms; int ninactivevms; - struct qemud_vm *inactivevms; + struct qemud_vm *vms; int nextvmid; int nactivenetworks; - struct qemud_network *activenetworks; int ninactivenetworks; - struct qemud_network *inactivenetworks; + struct qemud_network *networks; brControl *brctl; iptablesContext *iptables; char configDir[PATH_MAX]; @@ -317,6 +315,18 @@ void qemudLog(int priority, const char * #define qemudDebug(fmt, ...) do { } while(0); #endif +static inline int +qemudIsActiveVM(struct qemud_vm *vm) +{ + return vm->id != -1; +} + +static inline int +qemudIsActiveNetwork(struct qemud_network *network) +{ + return network->active; +} + #endif /* Index: libvirt/qemud/qemud.c =================================================================== --- libvirt.orig/qemud/qemud.c +++ libvirt/qemud/qemud.c @@ -95,39 +95,43 @@ static int qemudDispatchSignal(struct qe qemudLog(QEMUD_WARN, "Shutting down on signal %d", sigc); /* shutdown active VMs */ - vm = server->activevms; + vm = server->vms; while (vm) { struct qemud_vm *next = vm->next; - qemudShutdownVMDaemon(server, vm); + if (qemudIsActiveVM(vm)) + qemudShutdownVMDaemon(server, vm); vm = next; } /* free inactive VMs */ - vm = server->inactivevms; + vm = server->vms; while (vm) { struct qemud_vm *next = vm->next; qemudFreeVM(vm); vm = next; } - server->inactivevms = NULL; + server->vms = NULL; + server->nactivevms = 0; server->ninactivevms = 0; /* shutdown active networks */ - network = server->activenetworks; + network = server->networks; while (network) { struct qemud_network *next = network->next; - qemudShutdownNetworkDaemon(server, network); + if (qemudIsActiveNetwork(network)) + qemudShutdownNetworkDaemon(server, network); network = next; } /* free inactive networks */ - network = server->inactivenetworks; + network = server->networks; while (network) { struct qemud_network *next = network->next; qemudFreeNetwork(network); network = next; } - server->inactivenetworks = NULL; + server->networks = NULL; + server->nactivenetworks = 0; server->ninactivenetworks = 0; server->shutdown = 1; @@ -576,6 +580,12 @@ int qemudStartVMDaemon(struct qemud_serv char **argv = NULL; int i, ret = -1; + if (qemudIsActiveVM(vm)) { + qemudReportError(server, VIR_ERR_INTERNAL_ERROR, + "VM is already active"); + return -1; + } + if (vm->def->vncPort < 0) vm->def->vncActivePort = 5900 + server->nextvmid; else @@ -586,6 +596,11 @@ int qemudStartVMDaemon(struct qemud_serv if (qemudExec(server, argv, &vm->pid, &vm->stdout, &vm->stderr) == 0) { vm->id = server->nextvmid++; + + server->ninactivevms--; + server->nactivevms++; + server->nvmfds += 2; + ret = 0; } @@ -805,50 +820,24 @@ qemudNetworkIfaceDisconnect(struct qemud } int qemudShutdownVMDaemon(struct qemud_server *server, struct qemud_vm *vm) { - struct qemud_vm *prev = NULL, *curr = server->activevms; struct qemud_vm_net_def *net; - qemudLog(QEMUD_INFO, "Shutting down VM '%s'", vm->def->name); - - /* Already cleaned-up */ - if (vm->pid < 0) + if (!qemudIsActiveVM(vm)) return 0; - kill(vm->pid, SIGTERM); - - /* Move it to inactive vm list */ - while (curr) { - if (curr == vm) { - if (prev) { - prev->next = curr->next; - } else { - server->activevms = curr->next; - } - server->nactivevms--; - - curr->next = server->inactivevms; - server->inactivevms = curr; - server->ninactivevms++; - break; - } - prev = curr; - curr = curr->next; - } + qemudLog(QEMUD_INFO, "Shutting down VM '%s'", vm->def->name); - if (!curr) { - qemudDebug("Could not find VM to shutdown"); - return 0; - } + kill(vm->pid, SIGTERM); - qemudVMData(server, vm, curr->stdout); - qemudVMData(server, vm, curr->stderr); - close(curr->stdout); - close(curr->stderr); - if (curr->monitor != -1) - close(curr->monitor); - curr->stdout = -1; - curr->stderr = -1; - curr->monitor = -1; + qemudVMData(server, vm, vm->stdout); + qemudVMData(server, vm, vm->stderr); + close(vm->stdout); + close(vm->stderr); + if (vm->monitor != -1) + close(vm->monitor); + vm->stdout = -1; + vm->stderr = -1; + vm->monitor = -1; server->nvmfds -= 2; net = vm->def->nets; @@ -874,6 +863,9 @@ int qemudShutdownVMDaemon(struct qemud_s vm->newDef = NULL; } + server->nactivevms--; + server->ninactivevms++; + return 0; } @@ -1121,7 +1113,7 @@ int qemudStartNetworkDaemon(struct qemud const char *name; int err; - if (network->active) { + if (qemudIsActiveNetwork(network)) { qemudReportError(server, VIR_ERR_INTERNAL_ERROR, "network is already active"); return -1; @@ -1185,6 +1177,9 @@ int qemudStartNetworkDaemon(struct qemud network->active = 1; + server->ninactivenetworks--; + server->nactivenetworks++; + return 0; err_delbr2: @@ -1209,12 +1204,11 @@ int qemudStartNetworkDaemon(struct qemud int qemudShutdownNetworkDaemon(struct qemud_server *server, struct qemud_network *network) { - struct qemud_network *prev, *curr; int err; qemudLog(QEMUD_INFO, "Shutting down network '%s'", network->def->name); - if (!network->active) + if (!qemudIsActiveNetwork(network)) return 0; if (network->dnsmasqPid > 0) @@ -1233,27 +1227,6 @@ int qemudShutdownNetworkDaemon(struct qe network->bridge, strerror(err)); } - /* Move it to inactive networks list */ - prev = NULL; - curr = server->activenetworks; - while (curr) { - if (curr == network) { - if (prev) { - prev->next = curr->next; - } else { - server->activenetworks = curr->next; - } - server->nactivenetworks--; - - curr->next = server->inactivenetworks; - server->inactivenetworks = curr; - server->ninactivenetworks++; - break; - } - prev = curr; - curr = curr->next; - } - if (network->dnsmasqPid > 0 && waitpid(network->dnsmasqPid, NULL, WNOHANG) != network->dnsmasqPid) { kill(network->dnsmasqPid, SIGKILL); @@ -1271,6 +1244,9 @@ int qemudShutdownNetworkDaemon(struct qe network->newDef = NULL; } + server->nactivenetworks--; + server->ninactivenetworks++; + return 0; } @@ -1278,7 +1254,7 @@ int qemudShutdownNetworkDaemon(struct qe static int qemudDispatchPoll(struct qemud_server *server, struct pollfd *fds) { struct qemud_socket *sock = server->sockets; struct qemud_client *client = server->clients; - struct qemud_vm *vm = server->activevms; + struct qemud_vm *vm; struct qemud_vm *tmp; struct qemud_network *network, *prevnet; int ret = 0; @@ -1314,12 +1290,18 @@ static int qemudDispatchPoll(struct qemu fd++; client = next; } + vm = server->vms; while (vm) { struct qemud_vm *next = vm->next; int failed = 0, stdoutfd = vm->stdout, stderrfd = vm->stderr; + if (!qemudIsActiveVM(vm)) { + vm = next; + continue; + } + if (stdoutfd != -1) { if (fds[fd].revents) { if (fds[fd].revents == POLLIN) { @@ -1353,17 +1335,18 @@ static int qemudDispatchPoll(struct qemu /* Cleanup any VMs which shutdown & dont have an associated config file */ - vm = server->inactivevms; + vm = server->vms; tmp = NULL; while (vm) { - if (!vm->configFile[0]) { + if (!qemudIsActiveVM(vm) && !vm->configFile[0]) { struct qemud_vm *next = vm->next; if (tmp) { tmp->next = next; } else { - server->inactivevms = next; + server->vms = next; } qemudFreeVM(vm); + server->ninactivevms--; vm = next; } else { tmp = vm; @@ -1372,17 +1355,18 @@ static int qemudDispatchPoll(struct qemu } /* Cleanup any networks too */ - network = server->inactivenetworks; + network = server->networks; prevnet = NULL; while (network) { - if (!network->configFile[0]) { + if (!qemudIsActiveNetwork(network) && !network->configFile[0]) { struct qemud_network *next = network->next; if (prevnet) { prevnet->next = next; } else { - server->inactivenetworks = next; + server->networks = next; } qemudFreeNetwork(network); + server->ninactivenetworks--; network = next; } else { prevnet = network; @@ -1419,7 +1403,9 @@ static void qemudPreparePoll(struct qemu fds[fd].events = POLLIN | POLLERR | POLLHUP; fd++; } - for (vm = server->activevms ; vm ; vm = vm->next) { + for (vm = server->vms ; vm ; vm = vm->next) { + if (!qemudIsActiveVM(vm)) + continue; if (vm->stdout != -1) { fds[fd].fd = vm->stdout; fds[fd].events = POLLIN | POLLERR | POLLHUP; --

1 0

[Libvir] [patch 0/9] Revised autostart patches
by Mark McLoughlin 22 Feb '07

22 Feb '07

Hey, Here's the autostart patches again. If you're just looking for what's changed, it's probably fine to just look at patch 3 (some heavy re-factoring to make the autostart stuff easier) and patch 7 (maintains symlinks in the autostart dirs instead of config files). Cheers, Mark. --

1 0

Re: [Libvir] [patch 5/7] Cleanup configDir members
by Daniel P. Berrange 20 Feb '07

20 Feb '07

On Tue, Feb 20, 2007 at 07:26:39PM +0000, Mark McLoughlin wrote: > server->autostartNetworkConfigDir etc. is starting to > get a little unwieldly so put the config directory > paths in an array. > + const char *paths[] = { > + "libvirt/qemu", /* QEMUD_DIR_DOMAINS */ > + "libvirt/qemu/autostart", /* QEMUD_DIR_AUTO_DOMAINS */ > + "libvirt/qemu/networks", /* QEMUD_DIR_NETWORKS */ > + "libvirt/qemu/networks/autostart", /* QEMUD_DIR_AUTO_NETWORKS */ > + }; > + > - if (snprintf(autostartNetworkConfigDir, maxlen, "%s/.libvirt/qemu/networks/autostart", pw->pw_dir) >= maxlen) > - goto snprintf_error; > + base = pw->pw_dir; > + } > > - if (snprintf(sockname, maxlen, "@%s/.libvirt/qemud-sock", pw->pw_dir) >= maxlen) > + for (i = 0; i < QEMUD_N_CONFIG_DIRS; i++) > + if (snprintf(server->configDirs[i], PATH_MAX, "%s/%s", base, paths[i]) >= PATH_MAX) > goto snprintf_error; > - } I could be reading this wrong, but it looks as if this is going to make the per-user daemon write its config files into $HOME/libvirt Instead of $HOME/.libvirt Dan. -- |=- Red Hat, Engineering, Emerging Technologies, Boston. +1 978 392 2496 -=| |=- Perl modules: http://search.cpan.org/~danberr/ -=| |=- Projects: http://freshmeat.net/~danielpb/ -=| |=- GnuPG: 7D3B9505 F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 -=|

2 1

Re: [Libvir] [patch 1/7] Merge the active and inactive network/guest lists
by Daniel P. Berrange 20 Feb '07

20 Feb '07

On Tue, Feb 20, 2007 at 07:26:03PM +0000, Mark McLoughlin wrote: > Merge the ->activevms and ->inactivevms into a single > ->vms list where each VM has a "active" flag in order > to make things easier to manage. I'm sure I had some interesting reason for keeping the lists separate when i wrote this. Damned if I can think of what it was now :-) The patch does seem to make things simpler. Having an explicit 'active' flag though is redundant. Simply check for 'vm->id == -1' or equivalently the 'vm->pid == -1'. We don't need a 3rd flag to mark inactivity :-) > net = vm->def->nets; > @@ -867,6 +846,7 @@ int qemudShutdownVMDaemon(struct qemud_s > > vm->pid = -1; > vm->id = -1; > + vm->active = 0; > Dan. -- |=- Red Hat, Engineering, Emerging Technologies, Boston. +1 978 392 2496 -=| |=- Perl modules: http://search.cpan.org/~danberr/ -=| |=- Projects: http://freshmeat.net/~danielpb/ -=| |=- GnuPG: 7D3B9505 F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 -=|

2 1

Re: [Libvir] [patch 4/7] Add autostart QEMU implementation
by Daniel P. Berrange 20 Feb '07

20 Feb '07

On Tue, Feb 20, 2007 at 07:26:31PM +0000, Mark McLoughlin wrote: > Actually implement the autostart API in qemud by saving > autostart configs to a specific directory. I think its desirable to keep all the master config files in the same directory, because it gives a sanity check of name uniqueness for files. Instead just create a symlink into the autostart directory in the same way the XenD recommendation works. So setting/getting autostart flag is just a matter of stat()'ing the symlink or using symlink()/unlink() to change it. Dan. -- |=- Red Hat, Engineering, Emerging Technologies, Boston. +1 978 392 2496 -=| |=- Perl modules: http://search.cpan.org/~danberr/ -=| |=- Projects: http://freshmeat.net/~danielpb/ -=| |=- GnuPG: 7D3B9505 F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 -=|

2 1

[Libvir] [patch 7/7] Add autostart support to virsh
by Mark McLoughlin 20 Feb '07

20 Feb '07

Add "autostart" and "net-autostart" commands Also, cleanup the "list" and "net-list" commands a bit and add autostart info to them Signed-off-by: Mark McLoughlin <markmc(a)redhat.com> Index: libvirt/src/virsh.c =================================================================== --- libvirt.orig/src/virsh.c +++ libvirt/src/virsh.c @@ -292,6 +292,51 @@ cmdHelp(vshControl * ctl, vshCmd * cmd) } /* + * "autostart" command + */ +static vshCmdInfo info_autostart[] = { + {"syntax", "autostart [--disable] <domain>"}, + {"help", gettext_noop("autostart a domain")}, + {"desc", + gettext_noop("Configure a domain to be automatically started at boot.")}, + {NULL, NULL} +}; + +static vshCmdOptDef opts_autostart[] = { + {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("domain name, id or uuid")}, + {"disable", VSH_OT_BOOL, 0, gettext_noop("disable autostarting")}, + {NULL, 0, 0, NULL} +}; + +static int +cmdAutostart(vshControl * ctl, vshCmd * cmd) +{ + virDomainPtr dom; + char *name; + int autostart; + + if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) + return FALSE; + + if (!(dom = vshCommandOptDomain(ctl, cmd, "domain", &name))) + return FALSE; + + autostart = !vshCommandOptBool(cmd, "disable"); + + if (virDomainSetAutostart(dom, autostart) < 0) { + vshError(ctl, FALSE, _("Failed to %smark domain %s as autostarted"), + autostart ? "" : "un", name); + virDomainFree(dom); + return FALSE; + } + + vshPrint(ctl, _("Domain %s %smarked as autostarted\n"), + name, autostart ? "" : "un"); + + return TRUE; +} + +/* * "connect" command */ static vshCmdInfo info_connect[] = { @@ -473,53 +518,59 @@ cmdList(vshControl * ctl, vshCmd * cmd A qsort(&names[0], maxname, sizeof(char*), namesorter); } } - vshPrintExtra(ctl, "%3s %-20s %s\n", _("Id"), _("Name"), _("State")); - vshPrintExtra(ctl, "----------------------------------\n"); + vshPrintExtra(ctl, "%3s %-20s %-10s %-10s\n", _("Id"), _("Name"), _("State"), _("Autostart")); + vshPrintExtra(ctl, "---------------------------------------------\n"); for (i = 0; i < maxid; i++) { - int ret; virDomainInfo info; virDomainPtr dom = virDomainLookupByID(ctl->conn, ids[i]); + const char *state, *autostartStr; + int autostart = 0; /* this kind of work with domains is not atomic operation */ if (!dom) continue; - ret = virDomainGetInfo(dom, &info); - vshPrint(ctl, "%3d %-20s %s\n", + if (virDomainGetInfo(dom, &info) < 0) + state = _("no state"); + else + state = _N(vshDomainStateToString(info.state)); + + if (virDomainGetAutostart(dom, &autostart) < 0) + autostartStr = _("no autostart"); + else + autostartStr = autostart ? "yes" : "no"; + + vshPrint(ctl, "%3d %-20s %-10s %-10s\n", virDomainGetID(dom), virDomainGetName(dom), - ret < - 0 ? _("no state") : _N(vshDomainStateToString(info.state))); + state, + autostartStr); virDomainFree(dom); } for (i = 0; i < maxname; i++) { - int ret; - unsigned int id; virDomainInfo info; virDomainPtr dom = virDomainLookupByName(ctl->conn, names[i]); + const char *state, *autostartStr; + int autostart = 0; /* this kind of work with domains is not atomic operation */ if (!dom) { free(names[i]); continue; } - ret = virDomainGetInfo(dom, &info); - id = virDomainGetID(dom); - if (id == ((unsigned int)-1)) { - vshPrint(ctl, "%3s %-20s %s\n", - "-", - names[i], - ret < - 0 ? "no state" : vshDomainStateToString(info.state)); - } else { - vshPrint(ctl, "%3d %-20s %s\n", - id, - names[i], - ret < - 0 ? "no state" : vshDomainStateToString(info.state)); - } + if (virDomainGetInfo(dom, &info) < 0) + state = _("no state"); + else + state = _N(vshDomainStateToString(info.state)); + + if (virDomainGetAutostart(dom, &autostart) < 0) + autostartStr = _("no autostart"); + else + autostartStr = autostart ? "yes" : "no"; + + vshPrint(ctl, "%3s %-20s %s %s\n", "-", names[i], state, autostartStr); virDomainFree(dom); free(names[i]); @@ -1632,6 +1683,50 @@ cmdDomuuid(vshControl * ctl, vshCmd * cm return TRUE; } +/* + * "net-autostart" command + */ +static vshCmdInfo info_network_autostart[] = { + {"syntax", "net-autostart [--disable] <network>"}, + {"help", gettext_noop("autostart a network")}, + {"desc", + gettext_noop("Configure a network to be automatically started at boot.")}, + {NULL, NULL} +}; + +static vshCmdOptDef opts_network_autostart[] = { + {"network", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("network name or uuid")}, + {"disable", VSH_OT_BOOL, 0, gettext_noop("disable autostarting")}, + {NULL, 0, 0, NULL} +}; + +static int +cmdNetworkAutostart(vshControl * ctl, vshCmd * cmd) +{ + virNetworkPtr network; + char *name; + int autostart; + + if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) + return FALSE; + + if (!(network = vshCommandOptNetwork(ctl, cmd, "network", &name))) + return FALSE; + + autostart = !vshCommandOptBool(cmd, "disable"); + + if (virNetworkSetAutostart(network, autostart) < 0) { + vshError(ctl, FALSE, _("Failed to %smark network %s as autostarted"), + autostart ? "" : "un", name); + virNetworkFree(network); + return FALSE; + } + + vshPrint(ctl, _("Network %s %smarked as autostarted\n"), + name, autostart ? "" : "un"); + + return TRUE; +} /* * "net-create" command @@ -1895,11 +1990,13 @@ cmdNetworkList(vshControl * ctl, vshCmd qsort(&inactiveNames[0], maxinactive, sizeof(char*), namesorter); } } - vshPrintExtra(ctl, "%-20s\n", _("Name")); - vshPrintExtra(ctl, "----------------------------------\n"); + vshPrintExtra(ctl, "%-20s %-10s %-10s\n", _("Name"), _("State"), _("Autostart")); + vshPrintExtra(ctl, "-----------------------------------------\n"); for (i = 0; i < maxactive; i++) { virNetworkPtr network = virNetworkLookupByName(ctl->conn, activeNames[i]); + const char *autostartStr; + int autostart = 0; /* this kind of work with networks is not atomic operation */ if (!network) { @@ -1907,13 +2004,22 @@ cmdNetworkList(vshControl * ctl, vshCmd continue; } - vshPrint(ctl, "%-20s\n", - virNetworkGetName(network)); + if (virNetworkGetAutostart(network, &autostart) < 0) + autostartStr = _("no autostart"); + else + autostartStr = autostart ? "yes" : "no"; + + vshPrint(ctl, "%-20s %-10s %-10s\n", + virNetworkGetName(network), + _("active"), + autostartStr); virNetworkFree(network); free(activeNames[i]); } for (i = 0; i < maxinactive; i++) { virNetworkPtr network = virNetworkLookupByName(ctl->conn, inactiveNames[i]); + const char *autostartStr; + int autostart = 0; /* this kind of work with networks is not atomic operation */ if (!network) { @@ -1921,8 +2027,15 @@ cmdNetworkList(vshControl * ctl, vshCmd continue; } - vshPrint(ctl, "%-20s\n", - inactiveNames[i]); + if (virNetworkGetAutostart(network, &autostart) < 0) + autostartStr = _("no autostart"); + else + autostartStr = autostart ? "yes" : "no"; + + vshPrint(ctl, "%-20s %s %s\n", + inactiveNames[i], + _("inactive"), + autostartStr); virNetworkFree(network); free(inactiveNames[i]); @@ -2268,6 +2381,7 @@ cmdQuit(vshControl * ctl, vshCmd * cmd A * Commands */ static vshCmdDef commands[] = { + {"autostart", cmdAutostart, opts_autostart, info_autostart}, {"connect", cmdConnect, opts_connect, info_connect}, {"console", cmdConsole, opts_console, info_console}, {"create", cmdCreate, opts_create, info_create}, @@ -2282,6 +2396,7 @@ static vshCmdDef commands[] = { {"dumpxml", cmdDumpXML, opts_dumpxml, info_dumpxml}, {"help", cmdHelp, opts_help, info_help}, {"list", cmdList, opts_list, info_list}, + {"net-autostart", cmdNetworkAutostart, opts_network_autostart, info_network_autostart}, {"net-create", cmdNetworkCreate, opts_network_create, info_network_create}, {"net-define", cmdNetworkDefine, opts_network_define, info_network_define}, {"net-destroy", cmdNetworkDestroy, opts_network_destroy, info_network_destroy}, --

1 0

[Libvir] [patch 6/7] Actually autostart guests and networks
by Mark McLoughlin 20 Feb '07

20 Feb '07

Add qemudAutostartConfigs() to autostart guests and networks. Signed-off-by: Mark McLoughlin <markmc(a)redhat.com> Index: libvirt/qemud/conf.c =================================================================== --- libvirt.orig/qemud/conf.c +++ libvirt/qemud/conf.c @@ -1705,6 +1705,37 @@ int qemudScanConfigDir(struct qemud_serv return 0; } +static +void qemudAutostartConfigs(struct qemud_server *server) { + struct qemud_network *network; + struct qemud_vm *vm; + + network = server->networks; + while (network != NULL) { + struct qemud_network *next = network->next; + if (network->autostart && + !network->active && + qemudNetworkStart(server, network) < 0) + qemudLog(QEMUD_ERR, "Failed to autostart network '%s'", + network->def->name); + + network = next; + } + + vm = server->vms; + while (vm != NULL) { + struct qemud_vm *next = vm->next; + + if (vm->autostart && + !vm->active && + qemudDomainStart(server, vm) < 0) + qemudLog(QEMUD_ERR, "Failed to autostart VM '%s'", + vm->def->name); + + vm = next; + } +} + /* Scan for all guest and network config files */ int qemudScanConfigs(struct qemud_server *server) { int i; @@ -1721,6 +1752,8 @@ int qemudScanConfigs(struct qemud_server return -1; } + qemudAutostartConfigs(server); + return 0; } --

1 0

[Libvir] [patch 5/7] Cleanup configDir members
by Mark McLoughlin 20 Feb '07

20 Feb '07

server->autostartNetworkConfigDir etc. is starting to get a little unwieldly so put the config directory paths in an array. Signed-off-by: Mark McLoughlin <markmc(a)redhat.com> Index: libvirt/qemud/internal.h =================================================================== --- libvirt.orig/qemud/internal.h +++ libvirt/qemud/internal.h @@ -54,6 +54,15 @@ typedef enum { #endif } qemudLogPriority; +typedef enum { + QEMUD_DIR_DOMAINS = 0, + QEMUD_DIR_AUTO_DOMAINS, + QEMUD_DIR_NETWORKS, + QEMUD_DIR_AUTO_NETWORKS, + + QEMUD_N_CONFIG_DIRS +} qemudConfigDirType; + /* Different types of QEMU acceleration possible */ enum qemud_vm_virt_type { QEMUD_VIRT_QEMU, @@ -292,14 +301,15 @@ struct qemud_server { struct qemud_network *networks; brControl *brctl; iptablesContext *iptables; - char configDir[PATH_MAX]; - char networkConfigDir[PATH_MAX]; - char autostartConfigDir[PATH_MAX]; - char autostartNetworkConfigDir[PATH_MAX]; + char configDirs[QEMUD_N_CONFIG_DIRS][PATH_MAX]; char errorMessage[QEMUD_MAX_ERROR_LEN]; int errorCode; unsigned int shutdown : 1; }; +#define domainsDir configDirs[QEMUD_DIR_DOMAINS] +#define autoDomainsDir configDirs[QEMUD_DIR_AUTO_DOMAINS] +#define networksDir configDirs[QEMUD_DIR_NETWORKS] +#define autoNetworksDir configDirs[QEMUD_DIR_AUTO_NETWORKS] int qemudStartVMDaemon(struct qemud_server *server, struct qemud_vm *vm); Index: libvirt/qemud/qemud.c =================================================================== --- libvirt.orig/qemud/qemud.c +++ libvirt/qemud/qemud.c @@ -354,15 +354,22 @@ static int qemudListenUnix(struct qemud_ return 0; } -static int qemudInitPaths(int sys, - char *configDir, - char *networkConfigDir, - char *autostartConfigDir, - char *autostartNetworkConfigDir, +static int qemudInitPaths(struct qemud_server *server, + int sys, char *sockname, char *roSockname, int maxlen) { + const char *paths[] = { + "libvirt/qemu", /* QEMUD_DIR_DOMAINS */ + "libvirt/qemu/autostart", /* QEMUD_DIR_AUTO_DOMAINS */ + "libvirt/qemu/networks", /* QEMUD_DIR_NETWORKS */ + "libvirt/qemu/networks/autostart", /* QEMUD_DIR_AUTO_NETWORKS */ + }; + uid_t uid; + struct passwd *pw; + const char *base = NULL; + int i; uid = geteuid(); @@ -372,18 +379,6 @@ static int qemudInitPaths(int sys, return -1; } - if (snprintf(configDir, maxlen, "%s/libvirt/qemu", SYSCONF_DIR) >= maxlen) - goto snprintf_error; - - if (snprintf(networkConfigDir, maxlen, "%s/libvirt/qemu/networks", SYSCONF_DIR) >= maxlen) - goto snprintf_error; - - if (snprintf(autostartConfigDir, maxlen, "%s/libvirt/qemu/autostart", SYSCONF_DIR) >= maxlen) - goto snprintf_error; - - if (snprintf(autostartNetworkConfigDir, maxlen, "%s/libvirt/qemu/networks/autostart", SYSCONF_DIR) >= maxlen) - goto snprintf_error; - if (snprintf(sockname, maxlen, "%s/run/libvirt/qemud-sock", LOCAL_STATE_DIR) >= maxlen) goto snprintf_error; @@ -393,30 +388,24 @@ static int qemudInitPaths(int sys, goto snprintf_error; unlink(sockname); - } else { - struct passwd *pw; + base = SYSCONF_DIR; + } else { if (!(pw = getpwuid(uid))) { qemudLog(QEMUD_ERR, "Failed to find user record for uid '%d': %s", uid, strerror(errno)); return -1; } - if (snprintf(configDir, maxlen, "%s/.libvirt/qemu", pw->pw_dir) >= maxlen) - goto snprintf_error; - - if (snprintf(networkConfigDir, maxlen, "%s/.libvirt/qemu/networks", pw->pw_dir) >= maxlen) - goto snprintf_error; - - if (snprintf(autostartConfigDir, maxlen, "%s/.libvirt/qemu/autostart", pw->pw_dir) >= maxlen) + if (snprintf(sockname, maxlen, "@%s/.libvirt/qemud-sock", pw->pw_dir) >= maxlen) goto snprintf_error; - if (snprintf(autostartNetworkConfigDir, maxlen, "%s/.libvirt/qemu/networks/autostart", pw->pw_dir) >= maxlen) - goto snprintf_error; + base = pw->pw_dir; + } - if (snprintf(sockname, maxlen, "@%s/.libvirt/qemud-sock", pw->pw_dir) >= maxlen) + for (i = 0; i < QEMUD_N_CONFIG_DIRS; i++) + if (snprintf(server->configDirs[i], PATH_MAX, "%s/%s", base, paths[i]) >= PATH_MAX) goto snprintf_error; - } return 0; @@ -443,9 +432,7 @@ static struct qemud_server *qemudInitial roSockname[0] = '\0'; - if (qemudInitPaths(sys, server->configDir, server->networkConfigDir, - server->autostartConfigDir, server->autostartNetworkConfigDir, - sockname, roSockname, PATH_MAX) < 0) + if (qemudInitPaths(server, sys, sockname, roSockname, PATH_MAX) < 0) goto cleanup; if (qemudListenUnix(server, sockname, 0) < 0) Index: libvirt/qemud/conf.c =================================================================== --- libvirt.orig/qemud/conf.c +++ libvirt/qemud/conf.c @@ -1137,7 +1137,8 @@ int qemudBuildCommandLine(struct qemud_s /* Save a guest's config data into a persistent file */ static int qemudSaveConfig(struct qemud_server *server, - struct qemud_vm *vm) { + struct qemud_vm *vm, + const char *configDir) { char *xml; int fd = -1, ret = -1; int towrite; @@ -1147,10 +1148,10 @@ static int qemudSaveConfig(struct qemud_ return -1; } - if ((err = qemudEnsureDir(!vm->autostart ? server->configDir : server->autostartConfigDir))) { + if ((err = qemudEnsureDir(configDir))) { qemudReportError(server, VIR_ERR_INTERNAL_ERROR, "cannot create config directory %s: %s", - server->configDir, strerror(err)); + configDir, strerror(err)); goto cleanup; } @@ -1247,7 +1248,7 @@ struct qemud_vm *qemudLoadConfigXML(stru vm->configFile[PATH_MAX-1] = '\0'; } else { if (save) { - if (qemudMakeConfigPath(!vm->autostart ? server->configDir : server->autostartConfigDir, + if (qemudMakeConfigPath(!vm->autostart ? server->domainsDir : server->autoDomainsDir, vm->def->name, ".xml", vm->configFile, PATH_MAX) < 0) { qemudReportError(server, VIR_ERR_INTERNAL_ERROR, "cannot construct config file path"); @@ -1256,7 +1257,8 @@ struct qemud_vm *qemudLoadConfigXML(stru return NULL; } - if (qemudSaveConfig(server, vm) < 0) { + if (qemudSaveConfig(server, vm, + !vm->autostart ? server->domainsDir : server->autoDomainsDir) < 0) { if (newVM) qemudFreeVM(vm); return NULL; @@ -1277,7 +1279,8 @@ struct qemud_vm *qemudLoadConfigXML(stru static int qemudSaveNetworkConfig(struct qemud_server *server, - struct qemud_network *network) { + struct qemud_network *network, + const char *configDir) { char *xml; int fd, ret = -1; int towrite; @@ -1287,10 +1290,10 @@ static int qemudSaveNetworkConfig(struct return -1; } - if ((err = qemudEnsureDir(!network->autostart ? server->networkConfigDir : server->autostartNetworkConfigDir))) { + if ((err = qemudEnsureDir(configDir))) { qemudReportError(server, VIR_ERR_INTERNAL_ERROR, "cannot create config directory %s: %s", - server->networkConfigDir, strerror(err)); + configDir, strerror(err)); goto cleanup; } @@ -1600,7 +1603,7 @@ struct qemud_network *qemudLoadNetworkCo network->configFile[PATH_MAX-1] = '\0'; } else { if (save) { - if (qemudMakeConfigPath(!network->autostart ? server->networkConfigDir : server->autostartNetworkConfigDir, + if (qemudMakeConfigPath(!network->autostart ? server->networksDir : server->autoNetworksDir, network->def->name, ".xml", network->configFile, PATH_MAX) < 0) { qemudReportError(server, VIR_ERR_INTERNAL_ERROR, "cannot construct config file path"); if (newNetwork) @@ -1608,7 +1611,8 @@ struct qemud_network *qemudLoadNetworkCo return NULL; } - if (qemudSaveNetworkConfig(server, network) < 0) { + if (qemudSaveNetworkConfig(server, network, + !network->autostart ? server->networksDir : server->autoNetworksDir) < 0) { if (newNetwork) qemudFreeNetwork(network); return NULL; @@ -1703,12 +1707,20 @@ int qemudScanConfigDir(struct qemud_serv /* Scan for all guest and network config files */ int qemudScanConfigs(struct qemud_server *server) { - if (qemudScanConfigDir(server, server->configDir, 1, 0) < 0 || - qemudScanConfigDir(server, server->autostartConfigDir, 1, 1) < 0) - return -1; - if (qemudScanConfigDir(server, server->networkConfigDir, 0, 0) < 0 || - qemudScanConfigDir(server, server->autostartNetworkConfigDir, 0, 1) < 0) - return -1; + int i; + + for (i = 0; i < QEMUD_N_CONFIG_DIRS; i++) { + int isGuest = 0, isAutostart = 0; + + if (i == QEMUD_DIR_DOMAINS || i == QEMUD_DIR_AUTO_DOMAINS) + isGuest = 1; + if (i == QEMUD_DIR_AUTO_DOMAINS || i == QEMUD_DIR_AUTO_NETWORKS) + isAutostart = 1; + + if (qemudScanConfigDir(server, server->configDirs[i], isGuest, isAutostart) < 0) + return -1; + } + return 0; } --

1 0

[Libvir] [patch 4/7] Add autostart QEMU implementation
by Mark McLoughlin 20 Feb '07

20 Feb '07

Actually implement the autostart API in qemud by saving autostart configs to a specific directory. Signed-off-by: Mark McLoughlin <markmc(a)redhat.com> Index: libvirt/qemud/conf.c =================================================================== --- libvirt.orig/qemud/conf.c +++ libvirt/qemud/conf.c @@ -1147,7 +1147,7 @@ static int qemudSaveConfig(struct qemud_ return -1; } - if ((err = qemudEnsureDir(server->configDir))) { + if ((err = qemudEnsureDir(!vm->autostart ? server->configDir : server->autostartConfigDir))) { qemudReportError(server, VIR_ERR_INTERNAL_ERROR, "cannot create config directory %s: %s", server->configDir, strerror(err)); @@ -1195,7 +1195,8 @@ static int qemudSaveConfig(struct qemud_ struct qemud_vm *qemudLoadConfigXML(struct qemud_server *server, const char *file, const char *doc, - int save) { + int save, + int isAutostart) { struct qemud_vm_def *def = NULL; struct qemud_vm *vm = NULL; xmlDocPtr xml; @@ -1239,12 +1240,15 @@ struct qemud_vm *qemudLoadConfigXML(stru newVM = 1; } + vm->autostart = (isAutostart != 0); + if (file) { strncpy(vm->configFile, file, PATH_MAX); vm->configFile[PATH_MAX-1] = '\0'; } else { if (save) { - if (qemudMakeConfigPath(server->configDir, vm->def->name, ".xml", vm->configFile, PATH_MAX) < 0) { + if (qemudMakeConfigPath(!vm->autostart ? server->configDir : server->autostartConfigDir, + vm->def->name, ".xml", vm->configFile, PATH_MAX) < 0) { qemudReportError(server, VIR_ERR_INTERNAL_ERROR, "cannot construct config file path"); if (newVM) @@ -1283,7 +1287,7 @@ static int qemudSaveNetworkConfig(struct return -1; } - if ((err = qemudEnsureDir(server->networkConfigDir))) { + if ((err = qemudEnsureDir(!network->autostart ? server->networkConfigDir : server->autostartNetworkConfigDir))) { qemudReportError(server, VIR_ERR_INTERNAL_ERROR, "cannot create config directory %s: %s", server->networkConfigDir, strerror(err)); @@ -1550,7 +1554,8 @@ static struct qemud_network_def *qemudPa struct qemud_network *qemudLoadNetworkConfigXML(struct qemud_server *server, const char *file, const char *doc, - int save) { + int save, + int isAutostart) { struct qemud_network_def *def = NULL; struct qemud_network *network = NULL; xmlDocPtr xml; @@ -1588,12 +1593,15 @@ struct qemud_network *qemudLoadNetworkCo newNetwork = 1; } + network->autostart = (isAutostart != 0); + if (file) { strncpy(network->configFile, file, PATH_MAX); network->configFile[PATH_MAX-1] = '\0'; } else { if (save) { - if (qemudMakeConfigPath(server->networkConfigDir, network->def->name, ".xml", network->configFile, PATH_MAX) < 0) { + if (qemudMakeConfigPath(!network->autostart ? server->networkConfigDir : server->autostartNetworkConfigDir, + network->def->name, ".xml", network->configFile, PATH_MAX) < 0) { qemudReportError(server, VIR_ERR_INTERNAL_ERROR, "cannot construct config file path"); if (newNetwork) qemudFreeNetwork(network); @@ -1623,7 +1631,8 @@ struct qemud_network *qemudLoadNetworkCo /* Load a guest from its persistent config file */ static void qemudLoadConfig(struct qemud_server *server, const char *file, - int isGuest) { + int isGuest, + int isAutostart) { FILE *fh; struct stat st; char xml[QEMUD_MAX_XML_LEN]; @@ -1651,9 +1660,9 @@ static void qemudLoadConfig(struct qemud xml[st.st_size] = '\0'; if (isGuest) { - qemudLoadConfigXML(server, file, xml, 1); + qemudLoadConfigXML(server, file, xml, 1, isAutostart); } else { - qemudLoadNetworkConfigXML(server, file, xml, 1); + qemudLoadNetworkConfigXML(server, file, xml, 1, isAutostart); } cleanup: fclose(fh); @@ -1663,7 +1672,8 @@ static void qemudLoadConfig(struct qemud static int qemudScanConfigDir(struct qemud_server *server, const char *configDir, - int isGuest) { + int isGuest, + int isAutostart) { DIR *dir; struct dirent *entry; @@ -1683,7 +1693,7 @@ int qemudScanConfigDir(struct qemud_serv if (qemudMakeConfigPath(configDir, entry->d_name, NULL, file, PATH_MAX) < 0) continue; - qemudLoadConfig(server, file, isGuest); + qemudLoadConfig(server, file, isGuest, isAutostart); } closedir(dir); @@ -1693,9 +1703,13 @@ int qemudScanConfigDir(struct qemud_serv /* Scan for all guest and network config files */ int qemudScanConfigs(struct qemud_server *server) { - if (qemudScanConfigDir(server, server->configDir, 1) < 0) + if (qemudScanConfigDir(server, server->configDir, 1, 0) < 0 || + qemudScanConfigDir(server, server->autostartConfigDir, 1, 1) < 0) return -1; - return qemudScanConfigDir(server, server->networkConfigDir, 0); + if (qemudScanConfigDir(server, server->networkConfigDir, 0, 0) < 0 || + qemudScanConfigDir(server, server->autostartNetworkConfigDir, 0, 1) < 0) + return -1; + return 0; } /* Simple grow-on-demand string buffer */ Index: libvirt/qemud/conf.h =================================================================== --- libvirt.orig/qemud/conf.h +++ libvirt/qemud/conf.h @@ -40,7 +40,8 @@ void qemudFreeVM(struct qemud_vm *vm); struct qemud_vm *qemudLoadConfigXML(struct qemud_server *server, const char *file, const char *doc, - int persist); + int persist, + int isAutostart); char *qemudGenerateXML(struct qemud_server *server, struct qemud_vm *vm, int live); @@ -49,7 +50,8 @@ void qemudFreeNetwork(struct qemud_netwo struct qemud_network *qemudLoadNetworkConfigXML(struct qemud_server *server, const char *file, const char *doc, - int persist); + int persist, + int isAutostart); char *qemudGenerateNetworkXML(struct qemud_server *server, struct qemud_network *network, int live); Index: libvirt/qemud/internal.h =================================================================== --- libvirt.orig/qemud/internal.h +++ libvirt/qemud/internal.h @@ -294,6 +294,8 @@ struct qemud_server { iptablesContext *iptables; char configDir[PATH_MAX]; char networkConfigDir[PATH_MAX]; + char autostartConfigDir[PATH_MAX]; + char autostartNetworkConfigDir[PATH_MAX]; char errorMessage[QEMUD_MAX_ERROR_LEN]; int errorCode; unsigned int shutdown : 1; Index: libvirt/qemud/qemud.c =================================================================== --- libvirt.orig/qemud/qemud.c +++ libvirt/qemud/qemud.c @@ -357,6 +357,8 @@ static int qemudListenUnix(struct qemud_ static int qemudInitPaths(int sys, char *configDir, char *networkConfigDir, + char *autostartConfigDir, + char *autostartNetworkConfigDir, char *sockname, char *roSockname, int maxlen) { @@ -376,6 +378,12 @@ static int qemudInitPaths(int sys, if (snprintf(networkConfigDir, maxlen, "%s/libvirt/qemu/networks", SYSCONF_DIR) >= maxlen) goto snprintf_error; + if (snprintf(autostartConfigDir, maxlen, "%s/libvirt/qemu/autostart", SYSCONF_DIR) >= maxlen) + goto snprintf_error; + + if (snprintf(autostartNetworkConfigDir, maxlen, "%s/libvirt/qemu/networks/autostart", SYSCONF_DIR) >= maxlen) + goto snprintf_error; + if (snprintf(sockname, maxlen, "%s/run/libvirt/qemud-sock", LOCAL_STATE_DIR) >= maxlen) goto snprintf_error; @@ -400,6 +408,12 @@ static int qemudInitPaths(int sys, if (snprintf(networkConfigDir, maxlen, "%s/.libvirt/qemu/networks", pw->pw_dir) >= maxlen) goto snprintf_error; + if (snprintf(autostartConfigDir, maxlen, "%s/.libvirt/qemu/autostart", pw->pw_dir) >= maxlen) + goto snprintf_error; + + if (snprintf(autostartNetworkConfigDir, maxlen, "%s/.libvirt/qemu/networks/autostart", pw->pw_dir) >= maxlen) + goto snprintf_error; + if (snprintf(sockname, maxlen, "@%s/.libvirt/qemud-sock", pw->pw_dir) >= maxlen) goto snprintf_error; } @@ -430,6 +444,7 @@ static struct qemud_server *qemudInitial roSockname[0] = '\0'; if (qemudInitPaths(sys, server->configDir, server->networkConfigDir, + server->autostartConfigDir, server->autostartNetworkConfigDir, sockname, roSockname, PATH_MAX) < 0) goto cleanup; Index: libvirt/qemud/driver.c =================================================================== --- libvirt.orig/qemud/driver.c +++ libvirt/qemud/driver.c @@ -281,7 +281,7 @@ int qemudNumDomains(struct qemud_server struct qemud_vm *qemudDomainCreate(struct qemud_server *server, const char *xml) { struct qemud_vm *vm; - if (!(vm = qemudLoadConfigXML(server, NULL, xml, 0))) { + if (!(vm = qemudLoadConfigXML(server, NULL, xml, 0, 0))) { return NULL; } @@ -464,7 +464,7 @@ int qemudDomainStart(struct qemud_server struct qemud_vm *qemudDomainDefine(struct qemud_server *server, const char *xml) { - return qemudLoadConfigXML(server, NULL, xml, 1); + return qemudLoadConfigXML(server, NULL, xml, 1, 0); } int qemudDomainUndefine(struct qemud_server *server, const unsigned char *uuid) { @@ -525,6 +525,9 @@ int qemudDomainSetAutostart(struct qemud const unsigned char *uuid, int autostart) { struct qemud_vm *vm = qemudFindVMByUUID(server, uuid); + char oldConfig[PATH_MAX]; + char *xml; + int ret = -1; if (!vm) { qemudReportError(server, VIR_ERR_INVALID_DOMAIN, "no domain with matching uuid"); @@ -536,9 +539,35 @@ int qemudDomainSetAutostart(struct qemud if (vm->autostart == autostart) return 0; + if (!(xml = qemudGenerateXML(server, vm, 0))) + goto error; + + strncpy(oldConfig, vm->configFile, PATH_MAX); + oldConfig[PATH_MAX-1] = '\0'; + + if (!qemudLoadConfigXML(server, NULL, xml, 1, autostart)) + goto error; + + if (oldConfig[0] && qemudDeleteConfig(server, oldConfig, vm->def->name) < 0) { + if (unlink(vm->configFile) < 0) + qemudLog(QEMUD_ERR, "Failed to unlink '%s' in order to roll " + "back in qemudDomainSetAutostart(): %s", strerror(errno)); + + strncpy(vm->configFile, oldConfig, PATH_MAX); + vm->configFile[PATH_MAX-1] = '\0'; + + goto error; + } + vm->autostart = autostart; - return 0; + ret = 0; + + error: + if (xml) + free(xml); + + return ret; } struct qemud_network *qemudFindNetworkByUUID(const struct qemud_server *server, @@ -606,7 +635,7 @@ int qemudListDefinedNetworks(struct qemu struct qemud_network *qemudNetworkCreate(struct qemud_server *server, const char *xml) { struct qemud_network *network; - if (!(network = qemudLoadNetworkConfigXML(server, NULL, xml, 0))) { + if (!(network = qemudLoadNetworkConfigXML(server, NULL, xml, 0, 0))) { return NULL; } @@ -619,7 +648,7 @@ struct qemud_network *qemudNetworkCreate } struct qemud_network *qemudNetworkDefine(struct qemud_server *server, const char *xml) { - return qemudLoadNetworkConfigXML(server, NULL, xml, 1); + return qemudLoadNetworkConfigXML(server, NULL, xml, 1, 0); } int qemudNetworkUndefine(struct qemud_server *server, const unsigned char *uuid) { @@ -730,6 +759,9 @@ int qemudNetworkSetAutostart(struct qemu const unsigned char *uuid, int autostart) { struct qemud_network *network = qemudFindNetworkByUUID(server, uuid); + char oldConfig[PATH_MAX]; + char *xml; + int ret = -1; if (!network) { qemudReportError(server, VIR_ERR_INVALID_NETWORK, "no network with matching uuid"); @@ -741,9 +773,35 @@ int qemudNetworkSetAutostart(struct qemu if (network->autostart == autostart) return 0; + if (!(xml = qemudGenerateNetworkXML(server, network, 0))) + goto error; + + strncpy(oldConfig, network->configFile, PATH_MAX); + oldConfig[PATH_MAX-1] = '\0'; + + if (!qemudLoadNetworkConfigXML(server, NULL, xml, 1, autostart)) + goto error; + + if (oldConfig[0] && qemudDeleteConfig(server, oldConfig, network->def->name) < 0) { + if (unlink(network->configFile) < 0) + qemudLog(QEMUD_ERR, "Failed to unlink '%s' in order to roll " + "back in qemudNetworkSetAutostart(): %s", strerror(errno)); + + strncpy(network->configFile, oldConfig, PATH_MAX); + network->configFile[PATH_MAX-1] = '\0'; + + goto error; + } + network->autostart = autostart; - return 0; + ret = 0; + + error: + if (xml) + free(xml); + + return ret; } /* --

1 0