- Devel - libvirt List Archives

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

22 Feb '07

On Thu, Feb 22, 2007 at 11:04:20AM +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. That looks good now with the qemudIsActiveVM() helper function. Regards, 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 -=|

1 0

[Libvir] PATCH: Don't leave a 'braindead' Xen VM when device hotplug fails
by Daniel P. Berrange 22 Feb '07

22 Feb '07

Because of the way Xen guest creation works, the virDomainCreateLinux implementation for Xen is really a three stage process - first we create the raw domain, then we have to wait for device hotplug to complete, finally unpausing the domain. Currently if the device hotplug fails we error out, leaving a 'braindead' VM lying around in the paused state. This is rather confusing for users leading to people thinking everything was OK, and thus unpausing the guest manually, then filing bug reports when they find they've no devices in the guest VM ! The xm tool by comparison will tear down the VM if the device hotplug fails so the user doesn't see the paused domain after the failure. The attached patch re-arranges the Xen driver for creating new domains to do the same kind of thing - upon any failure we explicitly destroy the halfdead domain Regards, 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 2

[Libvir] [PATCH]Guard for Dom0 by virsh domain stop commands
by Kazuki　Mizushima 22 Feb '07

22 Feb '07

Hi, I think Domain0 should NOT stop by virsh domain stop commands. (like shutdown, reboot, destroy). But virsh shudown and reboot commands are still available for Dom0. This patch intends to disable these two commands for Dom0. Internal processing of these two commands is following 1)Send shutdown or reboot to Xend (Guard of xend) 2)If 1) is failed, shutdown/reboot is executed by xenstore. (Not Guard) This patch removes 2) ,that is as same as destroy processing. Signed-off-by: Kazuki Mizushima <mizushima.kazuk(a)jp.fujitsu.com> Thanks, Kazuki Mizushima Index: xs_internal.c (libvirt-0.2.0) ---------------------------------------------------------------------- --- xs_internal.c 2007-02-15 01:11:54.000000000 +0900 +++ xs_internal.c.guard 2007-02-22 00:31:55.000000000 +0900 @@ -54,8 +54,8 @@ static virDriver xenStoreDriver = { xenStoreDomainLookupByName, /* domainLookupByName */ NULL, /* domainSuspend */ NULL, /* domainResume */ - xenStoreDomainShutdown, /* domainShutdown */ - xenStoreDomainReboot, /* domainReboot */ + NULL, /* domainShutdown */ + NULL, /* domainReboot */ NULL, /* domainDestroy */ xenStoreDomainGetOSType, /* domainGetOSType */ xenStoreDomainGetMaxMemory, /* domainGetMaxMemory */ ----------------------------------------------------------------------

3 4

[Libvir] [patch 9/9] Actually autostart guests and networks
by Mark McLoughlin 22 Feb '07

22 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 @@ -1972,11 +1972,49 @@ 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 && + !qemudIsActiveNetwork(network) && + qemudStartNetworkDaemon(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 && + !qemudIsActiveVM(vm) && + qemudStartVMDaemon(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) { if (qemudScanConfigDir(server, server->configDir, server->autostartDir, 1) < 0) return -1; - return qemudScanConfigDir(server, server->networkConfigDir, server->networkAutostartDir, 0); + + if (qemudScanConfigDir(server, server->networkConfigDir, server->networkAutostartDir, 0) < 0) + return -1; + + qemudAutostartConfigs(server); + + return 0; } /* Simple grow-on-demand string buffer */ --

1 0

[Libvir] [patch 8/9] Cleanup configDir members
by Mark McLoughlin 22 Feb '07

22 Feb '07

qemudInitPaths() 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_CONFIG = 0, + QEMUD_DIR_AUTOSTART, + QEMUD_DIR_NETWORK_CONFIG, + QEMUD_DIR_NETWORK_AUTOSTART, + + QEMUD_N_CONFIG_DIRS +} qemudConfigDirType; + /* Different types of QEMU acceleration possible */ enum qemud_vm_virt_type { QEMUD_VIRT_QEMU, @@ -293,10 +302,11 @@ struct qemud_server { struct qemud_network *networks; brControl *brctl; iptablesContext *iptables; - char configDir[PATH_MAX]; - char networkConfigDir[PATH_MAX]; - char autostartDir[PATH_MAX]; - char networkAutostartDir[PATH_MAX]; + char configDirs[QEMUD_N_CONFIG_DIRS][PATH_MAX]; + char *configDir; + char *autostartDir; + char *networkConfigDir; + char *networkAutostartDir; 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 @@ -354,15 +354,22 @@ static int qemudListenUnix(struct qemud_ return 0; } -static int qemudInitPaths(int sys, - char *configDir, - char *networkConfigDir, - char *autostartDir, - char *networkAutostartDir, +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; + char base[PATH_MAX] = SYSCONF_DIR "/"; + 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(autostartDir, maxlen, "%s/libvirt/qemu/autostart", SYSCONF_DIR) >= maxlen) - goto snprintf_error; - - if (snprintf(networkAutostartDir, 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; @@ -394,29 +389,22 @@ static int qemudInitPaths(int sys, unlink(sockname); } else { - struct passwd *pw; - 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(autostartDir, 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(networkAutostartDir, maxlen, "%s/.libvirt/qemu/networks/autostart", pw->pw_dir) >= maxlen) + if (snprintf(base, PATH_MAX, "%s/.", pw->pw_dir) >= PATH_MAX) goto snprintf_error; + } - 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,11 +431,14 @@ static struct qemud_server *qemudInitial roSockname[0] = '\0'; - if (qemudInitPaths(sys, server->configDir, server->networkConfigDir, - server->autostartDir, server->networkAutostartDir, - sockname, roSockname, PATH_MAX) < 0) + if (qemudInitPaths(server, sys, sockname, roSockname, PATH_MAX) < 0) goto cleanup; + server->configDir = server->configDirs[QEMUD_DIR_CONFIG]; + server->autostartDir = server->configDirs[QEMUD_DIR_AUTOSTART]; + server->networkConfigDir = server->configDirs[QEMUD_DIR_NETWORK_CONFIG]; + server->networkAutostartDir = server->configDirs[QEMUD_DIR_NETWORK_AUTOSTART]; + if (qemudListenUnix(server, sockname, 0) < 0) goto cleanup; --

1 0

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

22 Feb '07

Actually implement the autostart API in qemud by creating symlinks in the autostart directories. Signed-off-by: Mark McLoughlin <markmc(a)redhat.com> Index: libvirt/qemud/internal.h =================================================================== --- libvirt.orig/qemud/internal.h +++ libvirt/qemud/internal.h @@ -205,6 +205,7 @@ struct qemud_vm { int ntapfds; char configFile[PATH_MAX]; + char autostartLink[PATH_MAX]; struct qemud_vm_def *def; /* The current definition */ struct qemud_vm_def *newDef; /* New definition to activate at shutdown */ @@ -241,6 +242,7 @@ struct qemud_network_def { /* Virtual Network runtime state */ struct qemud_network { char configFile[PATH_MAX]; + char autostartLink[PATH_MAX]; struct qemud_network_def *def; /* The current definition */ struct qemud_network_def *newDef; /* New definition to activate at shutdown */ @@ -293,6 +295,8 @@ struct qemud_server { iptablesContext *iptables; char configDir[PATH_MAX]; char networkConfigDir[PATH_MAX]; + char autostartDir[PATH_MAX]; + char networkAutostartDir[PATH_MAX]; char errorMessage[QEMUD_MAX_ERROR_LEN]; int errorCode; unsigned int shutdown : 1; Index: libvirt/qemud/conf.c =================================================================== --- libvirt.orig/qemud/conf.c +++ libvirt/qemud/conf.c @@ -137,7 +137,7 @@ qemudMakeConfigPath(const char *configDi return 0; } -static int +int qemudEnsureDir(const char *path) { struct stat st; @@ -1287,6 +1287,14 @@ qemudSaveVMDef(struct qemud_server *serv "cannot construct config file path"); return -1; } + + if (qemudMakeConfigPath(server->autostartDir, def->name, ".xml", + vm->autostartLink, PATH_MAX) < 0) { + qemudReportError(server, VIR_ERR_INTERNAL_ERROR, + "cannot construct autostart link path"); + vm->configFile[0] = '\0'; + return -1; + } } return qemudSaveConfig(server, vm, def); @@ -1666,6 +1674,14 @@ qemudSaveNetworkDef(struct qemud_server "cannot construct config file path"); return -1; } + + if (qemudMakeConfigPath(server->networkAutostartDir, def->name, ".xml", + network->autostartLink, PATH_MAX) < 0) { + qemudReportError(server, VIR_ERR_INTERNAL_ERROR, + "cannot construct autostart link path"); + network->configFile[0] = '\0'; + return -1; + } } return qemudSaveNetworkConfig(server, network, def); @@ -1735,11 +1751,105 @@ compareFileToNameSuffix(const char *file return 0; } +static int +checkLinkPointsTo(const char *checkLink, + const char *checkDest) +{ + char dest[PATH_MAX]; + char real[PATH_MAX]; + char checkReal[PATH_MAX]; + int n; + int passed = 0; + + /* read the link destination */ + if ((n = readlink(checkLink, dest, PATH_MAX)) < 0) { + switch (errno) { + case ENOENT: + case ENOTDIR: + break; + + case EINVAL: + qemudLog(QEMUD_WARN, "Autostart file '%s' is not a symlink", + checkLink); + break; + + default: + qemudLog(QEMUD_WARN, "Failed to read autostart symlink '%s': %s", + checkLink, strerror(errno)); + break; + } + + goto failed; + } else if (n >= PATH_MAX) { + qemudLog(QEMUD_WARN, "Symlink '%s' contents too long to fit in buffer", + checkLink); + goto failed; + } + + dest[n] = '\0'; + + /* make absolute */ + if (dest[0] != '/') { + char dir[PATH_MAX]; + char tmp[PATH_MAX]; + char *p; + + strncpy(dir, checkLink, PATH_MAX); + dir[PATH_MAX] = '\0'; + + if (!(p = strrchr(dir, '/'))) { + qemudLog(QEMUD_WARN, "Symlink path '%s' is not absolute", checkLink); + goto failed; + } + + if (p == dir) /* handle unlikely root dir case */ + p++; + + *p = '\0'; + + if (qemudMakeConfigPath(dir, dest, NULL, tmp, PATH_MAX) < 0) { + qemudLog(QEMUD_WARN, "Path '%s/%s' is too long", dir, dest); + goto failed; + } + + strncpy(dest, tmp, PATH_MAX); + dest[PATH_MAX] = '\0'; + } + + /* canonicalize both paths */ + if (!realpath(dest, real)) { + qemudLog(QEMUD_WARN, "Failed to expand path '%s' :%s", + dest, strerror(errno)); + strncpy(real, dest, PATH_MAX); + real[PATH_MAX] = '\0'; + } + + if (!realpath(checkDest, checkReal)) { + qemudLog(QEMUD_WARN, "Failed to expand path '%s' :%s", + checkDest, strerror(errno)); + strncpy(checkReal, checkDest, PATH_MAX); + checkReal[PATH_MAX] = '\0'; + } + + /* compare */ + if (strcmp(checkReal, real) != 0) { + qemudLog(QEMUD_WARN, "Autostart link '%s' is not a symlink to '%s', ignoring", + checkLink, checkReal); + goto failed; + } + + passed = 1; + + failed: + return passed; +} + static struct qemud_vm * qemudLoadConfig(struct qemud_server *server, const char *file, const char *path, - const char *xml) { + const char *xml, + const char *autostartLink) { struct qemud_vm_def *def; struct qemud_vm *vm; @@ -1765,6 +1875,11 @@ qemudLoadConfig(struct qemud_server *ser strncpy(vm->configFile, path, PATH_MAX); vm->configFile[PATH_MAX-1] = '\0'; + strncpy(vm->autostartLink, autostartLink, PATH_MAX); + vm->autostartLink[PATH_MAX-1] = '\0'; + + vm->autostart = checkLinkPointsTo(vm->autostartLink, vm->configFile); + return vm; } @@ -1772,7 +1887,8 @@ static struct qemud_network * qemudLoadNetworkConfig(struct qemud_server *server, const char *file, const char *path, - const char *xml) { + const char *xml, + const char *autostartLink) { struct qemud_network_def *def; struct qemud_network *network; @@ -1798,12 +1914,18 @@ qemudLoadNetworkConfig(struct qemud_serv strncpy(network->configFile, path, PATH_MAX); network->configFile[PATH_MAX-1] = '\0'; + strncpy(network->autostartLink, autostartLink, PATH_MAX); + network->autostartLink[PATH_MAX-1] = '\0'; + + network->autostart = checkLinkPointsTo(network->autostartLink, network->configFile); + return network; } static int qemudScanConfigDir(struct qemud_server *server, const char *configDir, + const char *autostartDir, int isGuest) { DIR *dir; struct dirent *entry; @@ -1819,6 +1941,7 @@ int qemudScanConfigDir(struct qemud_serv while ((entry = readdir(dir))) { char xml[QEMUD_MAX_XML_LEN]; char path[PATH_MAX]; + char autostartLink[PATH_MAX]; if (entry->d_name[0] == '.') continue; @@ -1829,13 +1952,19 @@ int qemudScanConfigDir(struct qemud_serv continue; } + if (qemudMakeConfigPath(autostartDir, entry->d_name, NULL, autostartLink, PATH_MAX) < 0) { + qemudLog(QEMUD_WARN, "Autostart link path '%s/%s' is too long", + autostartDir, entry->d_name); + continue; + } + if (!qemudReadFile(path, xml, QEMUD_MAX_XML_LEN)) continue; if (isGuest) - qemudLoadConfig(server, entry->d_name, path, xml); + qemudLoadConfig(server, entry->d_name, path, xml, autostartLink); else - qemudLoadNetworkConfig(server, entry->d_name, path, xml); + qemudLoadNetworkConfig(server, entry->d_name, path, xml, autostartLink); } closedir(dir); @@ -1845,9 +1974,9 @@ 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, server->autostartDir, 1) < 0) return -1; - return qemudScanConfigDir(server, server->networkConfigDir, 0); + return qemudScanConfigDir(server, server->networkConfigDir, server->networkAutostartDir, 0); } /* Simple grow-on-demand string buffer */ Index: libvirt/qemud/driver.c =================================================================== --- libvirt.orig/qemud/driver.c +++ libvirt/qemud/driver.c @@ -502,7 +502,12 @@ int qemudDomainUndefine(struct qemud_ser if (qemudDeleteConfig(server, vm->configFile, vm->def->name) < 0) return -1; + if (unlink(vm->autostartLink) < 0 && errno != ENOENT && errno != ENOTDIR) + qemudLog(QEMUD_WARN, "Failed to delete autostart link '%s': %s", + vm->autostartLink, strerror(errno)); + vm->configFile[0] = '\0'; + vm->autostartLink[0] = '\0'; qemudRemoveInactiveVM(server, vm); @@ -539,6 +544,31 @@ int qemudDomainSetAutostart(struct qemud if (vm->autostart == autostart) return 0; + if (autostart) { + int err; + + if ((err = qemudEnsureDir(server->autostartDir))) { + qemudReportError(server, VIR_ERR_INTERNAL_ERROR, + "cannot create autostart directory %s: %s", + server->autostartDir, strerror(err)); + return -1; + } + + if (symlink(vm->configFile, vm->autostartLink) < 0) { + qemudReportError(server, VIR_ERR_INTERNAL_ERROR, + "Failed to create symlink '%s' to '%s': %s", + vm->autostartLink, vm->configFile, strerror(errno)); + return -1; + } + } else { + if (unlink(vm->autostartLink) < 0 && errno != ENOENT && errno != ENOTDIR) { + qemudReportError(server, VIR_ERR_INTERNAL_ERROR, + "Failed to delete symlink '%s': %s", + vm->autostartLink, strerror(errno)); + return -1; + } + } + vm->autostart = autostart; return 0; @@ -657,7 +687,12 @@ int qemudNetworkUndefine(struct qemud_se if (qemudDeleteConfig(server, network->configFile, network->def->name) < 0) return -1; + if (unlink(network->autostartLink) < 0 && errno != ENOENT && errno != ENOTDIR) + qemudLog(QEMUD_WARN, "Failed to delete autostart link '%s': %s", + network->autostartLink, strerror(errno)); + network->configFile[0] = '\0'; + network->autostartLink[0] = '\0'; qemudRemoveInactiveNetwork(server, network); @@ -750,6 +785,31 @@ int qemudNetworkSetAutostart(struct qemu if (network->autostart == autostart) return 0; + if (autostart) { + int err; + + if ((err = qemudEnsureDir(server->networkAutostartDir))) { + qemudReportError(server, VIR_ERR_INTERNAL_ERROR, + "cannot create autostart directory %s: %s", + server->networkAutostartDir, strerror(err)); + return -1; + } + + if (symlink(network->configFile, network->autostartLink) < 0) { + qemudReportError(server, VIR_ERR_INTERNAL_ERROR, + "Failed to create symlink '%s' to '%s': %s", + network->autostartLink, network->configFile, strerror(errno)); + return -1; + } + } else { + if (unlink(network->autostartLink) < 0 && errno != ENOENT && errno != ENOTDIR) { + qemudReportError(server, VIR_ERR_INTERNAL_ERROR, + "Failed to delete symlink '%s': %s", + network->autostartLink, strerror(errno)); + return -1; + } + } + network->autostart = autostart; return 0; 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 *autostartDir, + char *networkAutostartDir, 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(autostartDir, maxlen, "%s/libvirt/qemu/autostart", SYSCONF_DIR) >= maxlen) + goto snprintf_error; + + if (snprintf(networkAutostartDir, 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(autostartDir, maxlen, "%s/.libvirt/qemu/autostart", pw->pw_dir) >= maxlen) + goto snprintf_error; + + if (snprintf(networkAutostartDir, 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->autostartDir, server->networkAutostartDir, sockname, roSockname, PATH_MAX) < 0) goto cleanup; Index: libvirt/qemud/conf.h =================================================================== --- libvirt.orig/qemud/conf.h +++ libvirt/qemud/conf.h @@ -34,6 +34,7 @@ int qemudScanConfigs int qemudDeleteConfig (struct qemud_server *server, const char *configFile, const char *name); +int qemudEnsureDir (const char *path); void qemudFreeVMDef (struct qemud_vm_def *vm); void qemudFreeVM (struct qemud_vm *vm); --

1 0

[Libvir] [patch 6/9] Add autostart QEMU stubs
by Mark McLoughlin 22 Feb '07

22 Feb '07

Add the obvious parts of the QEMU implementation of the autostart API. Signed-off-by: Mark McLoughlin <markmc(a)redhat.com> Index: libvirt/qemud/dispatch.c =================================================================== --- libvirt.orig/qemud/dispatch.c +++ libvirt/qemud/dispatch.c @@ -717,6 +717,97 @@ static int qemudDispatchNetworkGetBridge return 0; } +static int qemudDispatchDomainGetAutostart(struct qemud_server *server, struct qemud_client *client, + struct qemud_packet *in, struct qemud_packet *out) +{ + int ret; + int autostart; + + if (in->header.dataSize != sizeof(in->data.domainGetAutostartRequest)) + return -1; + + autostart = 0; + + ret = qemudDomainGetAutostart(server, + in->data.domainGetAutostartRequest.uuid, + &autostart); + if (ret < 0) { + if (qemudDispatchFailure(server, client, out) < 0) + return -1; + } else { + out->header.type = QEMUD_PKT_DOMAIN_GET_AUTOSTART; + out->header.dataSize = sizeof(out->data.networkGetAutostartReply); + out->data.networkGetAutostartReply.autostart = (autostart != 0); + } + return 0; +} + +static int qemudDispatchDomainSetAutostart(struct qemud_server *server, struct qemud_client *client, + struct qemud_packet *in, struct qemud_packet *out) +{ + int ret; + + if (in->header.dataSize != sizeof(in->data.domainSetAutostartRequest)) + return -1; + + ret = qemudDomainSetAutostart(server, + in->data.domainGetAutostartRequest.uuid, + in->data.domainSetAutostartRequest.autostart); + if (ret < 0) { + if (qemudDispatchFailure(server, client, out) < 0) + return -1; + } else { + out->header.type = QEMUD_PKT_DOMAIN_SET_AUTOSTART; + out->header.dataSize = 0; + } + return 0; +} + +static int qemudDispatchNetworkGetAutostart(struct qemud_server *server, struct qemud_client *client, + struct qemud_packet *in, struct qemud_packet *out) +{ + int ret; + int autostart; + + if (in->header.dataSize != sizeof(in->data.networkGetAutostartRequest)) + return -1; + + autostart = 0; + + ret = qemudNetworkGetAutostart(server, + in->data.networkGetAutostartRequest.uuid, + &autostart); + if (ret < 0) { + if (qemudDispatchFailure(server, client, out) < 0) + return -1; + } else { + out->header.type = QEMUD_PKT_NETWORK_GET_AUTOSTART; + out->header.dataSize = sizeof(out->data.networkGetAutostartReply); + out->data.networkGetAutostartReply.autostart = (autostart != 0); + } + return 0; +} + +static int qemudDispatchNetworkSetAutostart(struct qemud_server *server, struct qemud_client *client, + struct qemud_packet *in, struct qemud_packet *out) +{ + int ret; + + if (in->header.dataSize != sizeof(in->data.networkSetAutostartRequest)) + return -1; + + ret = qemudNetworkSetAutostart(server, + in->data.networkGetAutostartRequest.uuid, + in->data.networkSetAutostartRequest.autostart); + if (ret < 0) { + if (qemudDispatchFailure(server, client, out) < 0) + return -1; + } else { + out->header.type = QEMUD_PKT_NETWORK_SET_AUTOSTART; + out->header.dataSize = 0; + } + return 0; +} typedef int (*clientFunc)(struct qemud_server *server, struct qemud_client *client, struct qemud_packet *in, struct qemud_packet *out); @@ -759,6 +850,10 @@ clientFunc funcsTransmitRW[QEMUD_PKT_MAX qemudDispatchNetworkDestroy, qemudDispatchNetworkDumpXML, qemudDispatchNetworkGetBridgeName, + qemudDispatchDomainGetAutostart, + qemudDispatchDomainSetAutostart, + qemudDispatchNetworkGetAutostart, + qemudDispatchNetworkSetAutostart, }; clientFunc funcsTransmitRO[QEMUD_PKT_MAX] = { @@ -796,6 +891,10 @@ clientFunc funcsTransmitRO[QEMUD_PKT_MAX NULL, qemudDispatchNetworkDumpXML, qemudDispatchNetworkGetBridgeName, + qemudDispatchDomainGetAutostart, + NULL, + qemudDispatchNetworkGetAutostart, + NULL, }; /* Index: libvirt/qemud/driver.c =================================================================== --- libvirt.orig/qemud/driver.c +++ libvirt/qemud/driver.c @@ -509,6 +509,41 @@ int qemudDomainUndefine(struct qemud_ser return 0; } +int qemudDomainGetAutostart(struct qemud_server *server, + const unsigned char *uuid, + int *autostart) { + struct qemud_vm *vm = qemudFindVMByUUID(server, uuid); + + if (!vm) { + qemudReportError(server, VIR_ERR_INVALID_DOMAIN, "no domain with matching uuid"); + return -1; + } + + *autostart = vm->autostart; + + return 0; +} + +int qemudDomainSetAutostart(struct qemud_server *server, + const unsigned char *uuid, + int autostart) { + struct qemud_vm *vm = qemudFindVMByUUID(server, uuid); + + if (!vm) { + qemudReportError(server, VIR_ERR_INVALID_DOMAIN, "no domain with matching uuid"); + return -1; + } + + autostart = (autostart != 0); + + if (vm->autostart == autostart) + return 0; + + vm->autostart = autostart; + + return 0; +} + struct qemud_network *qemudFindNetworkByUUID(const struct qemud_server *server, const unsigned char *uuid) { struct qemud_network *network = server->networks; @@ -685,6 +720,41 @@ int qemudNetworkGetBridgeName(struct qem return 0; } +int qemudNetworkGetAutostart(struct qemud_server *server, + const unsigned char *uuid, + int *autostart) { + struct qemud_network *network = qemudFindNetworkByUUID(server, uuid); + + if (!network) { + qemudReportError(server, VIR_ERR_INVALID_NETWORK, "no network with matching uuid"); + return -1; + } + + *autostart = network->autostart; + + return 0; +} + +int qemudNetworkSetAutostart(struct qemud_server *server, + const unsigned char *uuid, + int autostart) { + struct qemud_network *network = qemudFindNetworkByUUID(server, uuid); + + if (!network) { + qemudReportError(server, VIR_ERR_INVALID_NETWORK, "no network with matching uuid"); + return -1; + } + + autostart = (autostart != 0); + + if (network->autostart == autostart) + return 0; + + network->autostart = autostart; + + return 0; +} + /* * Local variables: * indent-tabs-mode: nil Index: libvirt/qemud/driver.h =================================================================== --- libvirt.orig/qemud/driver.h +++ libvirt/qemud/driver.h @@ -85,6 +85,12 @@ struct qemud_vm *qemudDomainDefine(struc const char *xml); int qemudDomainUndefine(struct qemud_server *server, const unsigned char *uuid); +int qemudDomainGetAutostart(struct qemud_server *server, + const unsigned char *uuid, + int *autostart); +int qemudDomainSetAutostart(struct qemud_server *server, + const unsigned char *uuid, + int autostart); struct qemud_network *qemudFindNetworkByUUID(const struct qemud_server *server, const unsigned char *uuid); @@ -117,6 +123,12 @@ int qemudNetworkGetBridgeName(struct qem const unsigned char *uuid, char *ifname, int ifnamelen); +int qemudNetworkGetAutostart(struct qemud_server *server, + const unsigned char *uuid, + int *autostart); +int qemudNetworkSetAutostart(struct qemud_server *server, + const unsigned char *uuid, + int autostart); #endif Index: libvirt/qemud/internal.h =================================================================== --- libvirt.orig/qemud/internal.h +++ libvirt/qemud/internal.h @@ -209,6 +209,8 @@ struct qemud_vm { struct qemud_vm_def *def; /* The current definition */ struct qemud_vm_def *newDef; /* New definition to activate at shutdown */ + unsigned int autostart : 1; + struct qemud_vm *next; }; @@ -247,6 +249,7 @@ struct qemud_network { int dnsmasqPid; unsigned int active : 1; + unsigned int autostart : 1; struct qemud_network *next; }; Index: libvirt/qemud/protocol.h =================================================================== --- libvirt.orig/qemud/protocol.h +++ libvirt/qemud/protocol.h @@ -64,6 +64,10 @@ enum { QEMUD_PKT_NETWORK_DESTROY, QEMUD_PKT_NETWORK_DUMP_XML, QEMUD_PKT_NETWORK_GET_BRIDGE_NAME, + QEMUD_PKT_DOMAIN_GET_AUTOSTART, + QEMUD_PKT_DOMAIN_SET_AUTOSTART, + QEMUD_PKT_NETWORK_GET_AUTOSTART, + QEMUD_PKT_NETWORK_SET_AUTOSTART, QEMUD_PKT_MAX, } qemud_packet_type; @@ -279,6 +283,26 @@ union qemud_packet_data { struct { char ifname[QEMUD_MAX_IFNAME_LEN]; } networkGetBridgeNameReply; + struct { + unsigned char uuid[QEMUD_UUID_RAW_LEN]; + } domainGetAutostartRequest; + struct { + int autostart; + } domainGetAutostartReply; + struct { + unsigned char uuid[QEMUD_UUID_RAW_LEN]; + unsigned int autostart : 1; + } domainSetAutostartRequest; + struct { + unsigned char uuid[QEMUD_UUID_RAW_LEN]; + } networkGetAutostartRequest; + struct { + unsigned int autostart : 1; + } networkGetAutostartReply; + struct { + unsigned char uuid[QEMUD_UUID_RAW_LEN]; + unsigned int autostart : 1; + } networkSetAutostartRequest; }; /* Each packet has header & data */ Index: libvirt/src/qemu_internal.c =================================================================== --- libvirt.orig/src/qemu_internal.c +++ libvirt/src/qemu_internal.c @@ -806,6 +806,39 @@ static int qemuUndefine(virDomainPtr dom return ret; } +static int qemuDomainGetAutostart(virDomainPtr dom, + int *autostart) { + struct qemud_packet req, reply; + + req.header.type = QEMUD_PKT_DOMAIN_GET_AUTOSTART; + req.header.dataSize = sizeof(req.data.domainGetAutostartRequest); + memmove(req.data.domainGetAutostartRequest.uuid, dom->uuid, QEMUD_UUID_RAW_LEN); + + if (qemuProcessRequest(dom->conn, NULL, &req, &reply) < 0) { + return -1; + } + + *autostart = reply.data.domainGetAutostartReply.autostart; + + return 0; +} + +static int qemuDomainSetAutostart(virDomainPtr dom, + int autostart) { + struct qemud_packet req, reply; + + req.header.type = QEMUD_PKT_DOMAIN_SET_AUTOSTART; + req.header.dataSize = sizeof(req.data.domainSetAutostartRequest); + req.data.domainSetAutostartRequest.autostart = (autostart != 0); + memmove(req.data.domainSetAutostartRequest.uuid, dom->uuid, QEMUD_UUID_RAW_LEN); + + if (qemuProcessRequest(dom->conn, NULL, &req, &reply) < 0) { + return -1; + } + + return 0; +} + static int qemuNetworkOpen(virConnectPtr conn, const char *name, int flags) { @@ -1093,6 +1126,39 @@ static char * qemuNetworkGetBridgeName(v return strdup(reply.data.networkGetBridgeNameReply.ifname); } +static int qemuNetworkGetAutostart(virNetworkPtr network, + int *autostart) { + struct qemud_packet req, reply; + + req.header.type = QEMUD_PKT_NETWORK_GET_AUTOSTART; + req.header.dataSize = sizeof(req.data.networkGetAutostartRequest); + memmove(req.data.networkGetAutostartRequest.uuid, network->uuid, QEMUD_UUID_RAW_LEN); + + if (qemuProcessRequest(network->conn, NULL, &req, &reply) < 0) { + return -1; + } + + *autostart = reply.data.networkGetAutostartReply.autostart; + + return 0; +} + +static int qemuNetworkSetAutostart(virNetworkPtr network, + int autostart) { + struct qemud_packet req, reply; + + req.header.type = QEMUD_PKT_NETWORK_SET_AUTOSTART; + req.header.dataSize = sizeof(req.data.networkSetAutostartRequest); + req.data.networkSetAutostartRequest.autostart = (autostart != 0); + memmove(req.data.networkSetAutostartRequest.uuid, network->uuid, QEMUD_UUID_RAW_LEN); + + if (qemuProcessRequest(network->conn, NULL, &req, &reply) < 0) { + return -1; + } + + return 0; +} + static virDriver qemuDriver = { VIR_DRV_QEMU, "QEMU", @@ -1132,8 +1198,8 @@ static virDriver qemuDriver = { qemuUndefine, /* domainUndefine */ NULL, /* domainAttachDevice */ NULL, /* domainDetachDevice */ - NULL, /* domainGetAutostart */ - NULL, /* domainSetAutostart */ + qemuDomainGetAutostart, /* domainGetAutostart */ + qemuDomainSetAutostart, /* domainSetAutostart */ }; static virNetworkDriver qemuNetworkDriver = { @@ -1152,8 +1218,8 @@ static virNetworkDriver qemuNetworkDrive qemuNetworkDestroy, /* networkDestroy */ qemuNetworkDumpXML, /* networkDumpXML */ qemuNetworkGetBridgeName, /* networkGetBridgeName */ - NULL, /* networkGetAutostart */ - NULL, /* networkSetAutostart */ + qemuNetworkGetAutostart, /* networkGetAutostart */ + qemuNetworkSetAutostart, /* networkSetAutostart */ }; void qemuRegister(void) { --

1 0

[Libvir] [patch 5/9] Add autostart support to virsh
by Mark McLoughlin 22 Feb '07

22 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 4/9] Add autostart API
by Mark McLoughlin 22 Feb '07

22 Feb '07

Add virDomainGetAutostart(), virDomainSetAutostart(), virNetworkGetAutostart() and virNetworkSetAutostart(). Add the methods to the drivers' vtables, but don't actually implement it anywhere. Signed-off-by: Mark McLoughlin <markmc(a)redhat.com> Index: libvirt/include/libvirt/libvirt.h.in =================================================================== --- libvirt.orig/include/libvirt/libvirt.h.in +++ libvirt/include/libvirt/libvirt.h.in @@ -328,6 +328,11 @@ int virConnectListDefinedDomains (virC int maxnames); int virDomainCreate (virDomainPtr domain); +int virDomainGetAutostart (virDomainPtr domain, + int *autostart); +int virDomainSetAutostart (virDomainPtr domain, + int autostart); + /** * virVcpuInfo: structure for information about a virtual CPU in a domain. */ @@ -528,6 +533,11 @@ char * virNetworkGetXMLDesc (virNetwor int flags); char * virNetworkGetBridgeName (virNetworkPtr network); +int virNetworkGetAutostart (virNetworkPtr network, + int *autostart); +int virNetworkSetAutostart (virNetworkPtr network, + int autostart); + #ifdef __cplusplus } #endif Index: libvirt/src/libvirt.c =================================================================== --- libvirt.orig/src/libvirt.c +++ libvirt/src/libvirt.c @@ -1862,6 +1862,69 @@ virDomainCreate(virDomainPtr domain) { } /** + * virDomainGetAutostart: + * @domain: a domain object + * + * Return a boolean value indicating whether the domain + * configured to be automatically started when the host + * machine boots. + * + * Returns -1 in case of error, 0 in case of success + */ +int +virDomainGetAutostart(virDomainPtr domain, + int *autostart) { + int i; + + if (!VIR_IS_DOMAIN(domain)) { + virLibDomainError(domain, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); + return (-1); + } + if (!autostart) { + virLibDomainError(domain, VIR_ERR_INVALID_ARG, __FUNCTION__); + return (-1); + } + + for (i = 0;i < domain->conn->nb_drivers;i++) { + if ((domain->conn->drivers[i] != NULL) && + (domain->conn->drivers[i]->domainGetAutostart != NULL) && + (domain->conn->drivers[i]->domainGetAutostart(domain, autostart) == 0)) + return (0); + } + virLibConnError(domain->conn, VIR_ERR_CALL_FAILED, __FUNCTION__); + return (-1); +} + +/** + * virDomainSetAutostart: + * @domain: a domain object + * + * Configure the domain to be automatically started + * when the host machine boots. + * + * Returns -1 in case of error, 0 in case of success + */ +int +virDomainSetAutostart(virDomainPtr domain, + int autostart) { + int i; + + if (!VIR_IS_DOMAIN(domain)) { + virLibDomainError(domain, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); + return (-1); + } + + for (i = 0;i < domain->conn->nb_drivers;i++) { + if ((domain->conn->drivers[i] != NULL) && + (domain->conn->drivers[i]->domainSetAutostart != NULL) && + (domain->conn->drivers[i]->domainSetAutostart(domain, autostart) == 0)) + return (0); + } + virLibConnError(domain->conn, VIR_ERR_CALL_FAILED, __FUNCTION__); + return (-1); +} + +/** * virDomainSetVcpus: * @domain: pointer to domain object, or NULL for Domain0 * @nvcpus: the new number of virtual CPUs for this domain @@ -2766,3 +2829,66 @@ virNetworkGetBridgeName(virNetworkPtr ne } return(ret); } + +/** + * virNetworkGetAutostart: + * @network: a network object + * + * Return a boolean value indicating whether the network + * configured to be automatically started when the host + * machine boots. + * + * Returns -1 in case of error, 0 in case of success + */ +int +virNetworkGetAutostart(virNetworkPtr network, + int *autostart) { + int i; + + if (!VIR_IS_NETWORK(network)) { + virLibNetworkError(network, VIR_ERR_INVALID_NETWORK, __FUNCTION__); + return (-1); + } + if (!autostart) { + virLibNetworkError(network, VIR_ERR_INVALID_ARG, __FUNCTION__); + return (-1); + } + + for (i = 0;i < network->conn->nb_network_drivers;i++) { + if ((network->conn->networkDrivers[i] != NULL) && + (network->conn->networkDrivers[i]->networkGetAutostart != NULL) && + (network->conn->networkDrivers[i]->networkGetAutostart(network, autostart) == 0)) + return (0); + } + virLibConnError(network->conn, VIR_ERR_CALL_FAILED, __FUNCTION__); + return (-1); +} + +/** + * virNetworkSetAutostart: + * @network: a network object + * + * Configure the network to be automatically started + * when the host machine boots. + * + * Returns -1 in case of error, 0 in case of success + */ +int +virNetworkSetAutostart(virNetworkPtr network, + int autostart) { + int i; + + if (!VIR_IS_NETWORK(network)) { + virLibNetworkError(network, VIR_ERR_INVALID_NETWORK, __FUNCTION__); + return (-1); + } + + for (i = 0;i < network->conn->nb_network_drivers;i++) { + if ((network->conn->networkDrivers[i] != NULL) && + (network->conn->networkDrivers[i]->networkSetAutostart != NULL) && + (network->conn->networkDrivers[i]->networkSetAutostart(network, autostart) == 0)) + return (0); + } + virLibConnError(network->conn, VIR_ERR_CALL_FAILED, __FUNCTION__); + return (-1); +} Index: libvirt/src/driver.h =================================================================== --- libvirt.orig/src/driver.h +++ libvirt/src/driver.h @@ -134,6 +134,12 @@ typedef int typedef int (*virDrvDomainDetachDevice) (virDomainPtr domain, char *xml); +typedef int + (*virDrvDomainGetAutostart) (virDomainPtr domain, + int *autostart); +typedef int + (*virDrvDomainSetAutostart) (virDomainPtr domain, + int autostart); typedef struct _virDriver virDriver; typedef virDriver *virDriverPtr; @@ -183,6 +189,8 @@ struct _virDriver { virDrvDomainUndefine domainUndefine; virDrvDomainAttachDevice domainAttachDevice; virDrvDomainDetachDevice domainDetachDevice; + virDrvDomainGetAutostart domainGetAutostart; + virDrvDomainSetAutostart domainSetAutostart; }; typedef int @@ -219,6 +227,13 @@ typedef char * int flags); typedef char * (*virDrvNetworkGetBridgeName) (virNetworkPtr network); +typedef int + (*virDrvNetworkGetAutostart) (virNetworkPtr network, + int *autostart); +typedef int + (*virDrvNetworkSetAutostart) (virNetworkPtr network, + int autostart); + typedef struct _virNetworkDriver virNetworkDriver; typedef virNetworkDriver *virNetworkDriverPtr; @@ -245,6 +260,8 @@ struct _virNetworkDriver { virDrvNetworkDestroy networkDestroy; virDrvNetworkDumpXML networkDumpXML; virDrvNetworkGetBridgeName networkGetBridgeName; + virDrvNetworkGetAutostart networkGetAutostart; + virDrvNetworkSetAutostart networkSetAutostart; }; Index: libvirt/src/proxy_internal.c =================================================================== --- libvirt.orig/src/proxy_internal.c +++ libvirt/src/proxy_internal.c @@ -81,6 +81,8 @@ static virDriver xenProxyDriver = { NULL, /* domainUndefine */ NULL, /* domainAttachDevice */ NULL, /* domainDetachDevice */ + NULL, /* domainGetAutostart */ + NULL, /* domainSetAutostart */ }; /** Index: libvirt/src/qemu_internal.c =================================================================== --- libvirt.orig/src/qemu_internal.c +++ libvirt/src/qemu_internal.c @@ -1132,6 +1132,8 @@ static virDriver qemuDriver = { qemuUndefine, /* domainUndefine */ NULL, /* domainAttachDevice */ NULL, /* domainDetachDevice */ + NULL, /* domainGetAutostart */ + NULL, /* domainSetAutostart */ }; static virNetworkDriver qemuNetworkDriver = { @@ -1150,6 +1152,8 @@ static virNetworkDriver qemuNetworkDrive qemuNetworkDestroy, /* networkDestroy */ qemuNetworkDumpXML, /* networkDumpXML */ qemuNetworkGetBridgeName, /* networkGetBridgeName */ + NULL, /* networkGetAutostart */ + NULL, /* networkSetAutostart */ }; void qemuRegister(void) { Index: libvirt/src/test.c =================================================================== --- libvirt.orig/src/test.c +++ libvirt/src/test.c @@ -125,6 +125,8 @@ static virDriver testDriver = { testDomainUndefine, /* domainUndefine */ NULL, /* domainAttachDevice */ NULL, /* domainDetachDevice */ + NULL, /* domainGetAutostart */ + NULL, /* domainSetAutostart */ }; typedef struct _testDev { Index: libvirt/src/xen_internal.c =================================================================== --- libvirt.orig/src/xen_internal.c +++ libvirt/src/xen_internal.c @@ -454,6 +454,8 @@ static virDriver xenHypervisorDriver = { NULL, /* domainUndefine */ NULL, /* domainAttachDevice */ NULL, /* domainDetachDevice */ + NULL, /* domainGetAutostart */ + NULL, /* domainSetAutostart */ }; #endif /* !PROXY */ Index: libvirt/src/xend_internal.c =================================================================== --- libvirt.orig/src/xend_internal.c +++ libvirt/src/xend_internal.c @@ -96,7 +96,9 @@ static virDriver xenDaemonDriver = { xenDaemonDomainDefineXML, /* domainDefineXML */ xenDaemonDomainUndefine, /* domainUndefine */ xenDaemonAttachDevice, /* domainAttachDevice */ - xenDaemonDetachDevice /* domainDetachDevice */ + xenDaemonDetachDevice, /* domainDetachDevice */ + NULL, /* domainGetAutostart */ + NULL, /* domainSetAutostart */ }; /** Index: libvirt/src/xm_internal.c =================================================================== --- libvirt.orig/src/xm_internal.c +++ libvirt/src/xm_internal.c @@ -104,6 +104,8 @@ static virDriver xenXMDriver = { xenXMDomainUndefine, /* domainUndefine */ NULL, /* domainAttachDevice */ NULL, /* domainDetachDevice */ + NULL, /* domainGetAutostart */ + NULL, /* domainSetAutostart */ }; static void Index: libvirt/src/xs_internal.c =================================================================== --- libvirt.orig/src/xs_internal.c +++ libvirt/src/xs_internal.c @@ -75,6 +75,8 @@ static virDriver xenStoreDriver = { NULL, /* domainUndefine */ NULL, /* domainAttachDevice */ NULL, /* domainDetachDevice */ + NULL, /* domainGetAutostart */ + NULL, /* domainSetAutostart */ }; /** Index: libvirt/src/libvirt_sym.version =================================================================== --- libvirt.orig/src/libvirt_sym.version +++ libvirt/src/libvirt_sym.version @@ -37,6 +37,8 @@ virConnectListDefinedDomains; virConnectNumOfDefinedDomains; virDomainUndefine; + virDomainGetAutostart; + virDomainSetAutostart; virGetVersion; virCopyLastError; virConnSetErrorFunc; @@ -76,6 +78,8 @@ virNetworkGetUUIDString; virNetworkGetXMLDesc; virNetworkGetBridgeName; + virNetworkGetAutostart; + virNetworkSetAutostart; local: *; }; --

1 0

[Libvir] [patch 3/9] Re-factor chunks of qemuds config handling
by Mark McLoughlin 22 Feb '07

22 Feb '07

The easiest way to explain where I'm coming from with this patch is to look at the current qemudLoadConfigXML(). It carries out three distinct operations - (a) parse the supplied XML, (b) assign the def to a VM (creating one if needed) and (c) save the XML. It's used in three places: 1) Loading at startup - you want (a) and (b), but you want to check whether the name matches the filename before doing (b) 2) Create() - you want (a) and (b) 3) Define() - you want (a), (b) and (c) So, mostly I'm just splitting the function into three and making the logic above much more obvious. It should also make some of the autostart code much more straightforward. There are a number of misc. improvements lurking in here too: - The couple of places where we remove a VM or network from the list is co-alesced into qemudRemoveInactiveVM() and qemudRemoveInactiveNetwork() - In qemudDomainCreate() and qemudNetworkCreate(), if starting the VM/network failed, we were leaving it on the list - The compareFileToNameSuffix() stuff - When loading config files at startup, we were failing to log any errors Signed-off-by: Mark McLoughlin <markmc(a)redhat.c> Index: libvirt/qemud/conf.c =================================================================== --- libvirt.orig/qemud/conf.c +++ libvirt/qemud/conf.c @@ -1140,22 +1140,14 @@ 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, + struct qemud_vm_def *def) { char *xml; int fd = -1, ret = -1; int towrite; - int err; - if (!(xml = qemudGenerateXML(server, vm, 0))) { + if (!(xml = qemudGenerateXML(server, vm, def, 0))) return -1; - } - - if ((err = qemudEnsureDir(server->configDir))) { - qemudReportError(server, VIR_ERR_INTERNAL_ERROR, - "cannot create config directory %s: %s", - server->configDir, strerror(err)); - goto cleanup; - } if ((fd = open(vm->configFile, O_WRONLY | O_CREAT | O_TRUNC, @@ -1192,31 +1184,33 @@ static int qemudSaveConfig(struct qemud_ return ret; } - -/* Create a qemud_vm instance, populating it based on the data - * in a libvirt XML document describing the guest */ -struct qemud_vm *qemudLoadConfigXML(struct qemud_server *server, - const char *file, - const char *doc, - int save) { - struct qemud_vm_def *def = NULL; - struct qemud_vm *vm = NULL; +struct qemud_vm_def * +qemudParseVMDef(struct qemud_server *server, + const char *xmlStr, + const char *displayName) { xmlDocPtr xml; - int newVM = 0; + struct qemud_vm_def *def = NULL; - if (!(xml = xmlReadDoc(BAD_CAST doc, file ? file : "domain.xml", NULL, + if (!(xml = xmlReadDoc(BAD_CAST xmlStr, displayName ? displayName : "domain.xml", NULL, XML_PARSE_NOENT | XML_PARSE_NONET | XML_PARSE_NOERROR | XML_PARSE_NOWARNING))) { qemudReportError(server, VIR_ERR_XML_ERROR, NULL); return NULL; } - if (!(def = qemudParseXML(server, xml))) { - xmlFreeDoc(xml); - return NULL; - } + def = qemudParseXML(server, xml); + xmlFreeDoc(xml); + return def; +} + +struct qemud_vm * +qemudAssignVMDef(struct qemud_server *server, + struct qemud_vm_def *def) +{ + struct qemud_vm *vm = NULL; + if ((vm = qemudFindVMByName(server, def->name))) { if (!qemudIsActiveVM(vm)) { qemudFreeVMDef(vm->def); @@ -1226,63 +1220,87 @@ struct qemud_vm *qemudLoadConfigXML(stru qemudFreeVMDef(vm->newDef); vm->newDef = def; } - } else { - if (!(vm = calloc(1, sizeof(struct qemud_vm)))) { - qemudReportError(server, VIR_ERR_NO_MEMORY, "vm"); - qemudFreeVMDef(def); - return NULL; - } - - vm->stdout = -1; - vm->stderr = -1; - vm->monitor = -1; - vm->pid = -1; - vm->id = -1; - vm->def = def; - newVM = 1; - } - - 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) { - qemudReportError(server, VIR_ERR_INTERNAL_ERROR, - "cannot construct config file path"); - if (newVM) - qemudFreeVM(vm); - return NULL; - } - if (qemudSaveConfig(server, vm) < 0) { - if (newVM) - qemudFreeVM(vm); - return NULL; - } - } else { - vm->configFile[0] = '\0'; - } + return vm; } - if (newVM) { - vm->next = server->vms; - server->vms = vm; - server->ninactivevms++; + if (!(vm = calloc(1, sizeof(struct qemud_vm)))) { + qemudReportError(server, VIR_ERR_NO_MEMORY, "vm"); + return NULL; } + vm->stdout = -1; + vm->stderr = -1; + vm->monitor = -1; + vm->pid = -1; + vm->id = -1; + vm->def = def; + vm->next = server->vms; + + server->vms = vm; + server->ninactivevms++; + return vm; } +void +qemudRemoveInactiveVM(struct qemud_server *server, + struct qemud_vm *vm) +{ + struct qemud_vm *prev = NULL, *curr; + + curr = server->vms; + while (curr != vm) { + prev = curr; + curr = curr->next; + } + + if (curr) { + if (prev) + prev->next = curr->next; + else + server->vms = curr->next; + + server->ninactivevms--; + } + + qemudFreeVM(vm); +} + +int +qemudSaveVMDef(struct qemud_server *server, + struct qemud_vm *vm, + struct qemud_vm_def *def) { + if (vm->configFile[0] == '\0') { + int err; + + if ((err = qemudEnsureDir(server->configDir))) { + qemudReportError(server, VIR_ERR_INTERNAL_ERROR, + "cannot create config directory %s: %s", + server->configDir, strerror(err)); + return -1; + } + + if (qemudMakeConfigPath(server->configDir, def->name, ".xml", + vm->configFile, PATH_MAX) < 0) { + qemudReportError(server, VIR_ERR_INTERNAL_ERROR, + "cannot construct config file path"); + return -1; + } + } + + return qemudSaveConfig(server, vm, def); +} static int qemudSaveNetworkConfig(struct qemud_server *server, - struct qemud_network *network) { + struct qemud_network *network, + struct qemud_network_def *def) { char *xml; int fd, ret = -1; int towrite; int err; - if (!(xml = qemudGenerateNetworkXML(server, network, 0))) { + if (!(xml = qemudGenerateNetworkXML(server, network, def))) { return -1; } @@ -1550,28 +1568,32 @@ static struct qemud_network_def *qemudPa return NULL; } -struct qemud_network *qemudLoadNetworkConfigXML(struct qemud_server *server, - const char *file, - const char *doc, - int save) { - struct qemud_network_def *def = NULL; - struct qemud_network *network = NULL; +struct qemud_network_def * +qemudParseNetworkDef(struct qemud_server *server, + const char *xmlStr, + const char *displayName) { xmlDocPtr xml; - int newNetwork = 0; + struct qemud_network_def *def; - if (!(xml = xmlReadDoc(BAD_CAST doc, file ? file : "network.xml", NULL, + if (!(xml = xmlReadDoc(BAD_CAST xmlStr, displayName ? displayName : "network.xml", NULL, XML_PARSE_NOENT | XML_PARSE_NONET | XML_PARSE_NOERROR | XML_PARSE_NOWARNING))) { qemudReportError(server, VIR_ERR_XML_ERROR, NULL); return NULL; } - if (!(def = qemudParseNetworkXML(server, xml))) { - xmlFreeDoc(xml); - return NULL; - } + def = qemudParseNetworkXML(server, xml); + xmlFreeDoc(xml); + return def; +} + +struct qemud_network * +qemudAssignNetworkDef(struct qemud_server *server, + struct qemud_network_def *def) { + struct qemud_network *network; + if ((network = qemudFindNetworkByName(server, def->name))) { if (!qemudIsActiveNetwork(network)) { qemudFreeNetworkDef(network->def); @@ -1581,87 +1603,203 @@ struct qemud_network *qemudLoadNetworkCo qemudFreeNetworkDef(network->newDef); network->newDef = def; } - } else { - if (!(network = calloc(1, sizeof(struct qemud_network)))) { - qemudReportError(server, VIR_ERR_NO_MEMORY, "network"); - return NULL; - } - network->def = def; - newNetwork = 1; + return network; } - 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) { - qemudReportError(server, VIR_ERR_INTERNAL_ERROR, "cannot construct config file path"); - if (newNetwork) - qemudFreeNetwork(network); - return NULL; - } + if (!(network = calloc(1, sizeof(struct qemud_network)))) { + qemudReportError(server, VIR_ERR_NO_MEMORY, "network"); + return NULL; + } - if (qemudSaveNetworkConfig(server, network) < 0) { - if (newNetwork) - qemudFreeNetwork(network); - return NULL; - } - } else { - network->configFile[0] = '\0'; - } + network->def = def; + network->next = server->networks; + + server->networks = network; + server->ninactivenetworks++; + + return network; +} + +void +qemudRemoveInactiveNetwork(struct qemud_server *server, + struct qemud_network *network) +{ + struct qemud_network *prev = NULL, *curr; + + curr = server->networks; + while (curr != network) { + prev = curr; + curr = curr->next; } - if (newNetwork) { - network->next = server->networks; - server->networks = network; - server->ninactivenetworks++; + if (curr) { + if (prev) + prev->next = curr->next; + else + server->networks = curr->next; + + server->ninactivenetworks--; } - return network; + qemudFreeNetwork(network); } +int +qemudSaveNetworkDef(struct qemud_server *server, + struct qemud_network *network, + struct qemud_network_def *def) { + + if (network->configFile[0] == '\0') { + int err; + + if ((err = qemudEnsureDir(server->networkConfigDir))) { + qemudReportError(server, VIR_ERR_INTERNAL_ERROR, + "cannot create config directory %s: %s", + server->networkConfigDir, strerror(err)); + return -1; + } + + if (qemudMakeConfigPath(server->networkConfigDir, def->name, ".xml", + network->configFile, PATH_MAX) < 0) { + qemudReportError(server, VIR_ERR_INTERNAL_ERROR, + "cannot construct config file path"); + return -1; + } + } + + return qemudSaveNetworkConfig(server, network, def); +} -/* Load a guest from its persistent config file */ -static void qemudLoadConfig(struct qemud_server *server, - const char *file, - int isGuest) { +static int +qemudReadFile(const char *path, + char *buf, + int maxlen) { FILE *fh; struct stat st; - char xml[QEMUD_MAX_XML_LEN]; - int ret; + int ret = 0; - if (!(fh = fopen(file, "r"))) { - qemudReportError(server, VIR_ERR_INTERNAL_ERROR, "cannot open config file %s", file); - return; + if (!(fh = fopen(path, "r"))) { + qemudLog(QEMUD_WARN, "Failed to open file '%s': %s", + path, strerror(errno)); + goto error; } if (fstat(fileno(fh), &st) < 0) { - qemudReportError(server, VIR_ERR_INTERNAL_ERROR, "cannot stat config file %s", file); - goto cleanup; + qemudLog(QEMUD_WARN, "Failed to stat file '%s': %s", + path, strerror(errno)); + goto error; } - if (st.st_size >= QEMUD_MAX_XML_LEN) { - qemudReportError(server, VIR_ERR_INTERNAL_ERROR, "config too large in file %s", file); - goto cleanup; + if (S_ISDIR(st.st_mode)) { + qemudLog(QEMUD_DEBUG, "Ignoring directory '%s' - clearly not a config file", + path); + goto error; } - if ((ret = fread(xml, st.st_size, 1, fh)) != 1) { - qemudReportError(server, VIR_ERR_INTERNAL_ERROR, "cannot read config file %s", file); - goto cleanup; + if (st.st_size >= maxlen) { + qemudLog(QEMUD_WARN, "File '%s' is too large", path); + goto error; } - xml[st.st_size] = '\0'; - if (isGuest) { - qemudLoadConfigXML(server, file, xml, 1); - } else { - qemudLoadNetworkConfigXML(server, file, xml, 1); + if ((ret = fread(buf, st.st_size, 1, fh)) != 1) { + qemudLog(QEMUD_WARN, "Failed to read config file '%s': %s", + path, strerror(errno)); + goto error; } - cleanup: - fclose(fh); + + buf[st.st_size] = '\0'; + + ret = 1; + + error: + if (fh) + fclose(fh); + + return ret; } +static int +compareFileToNameSuffix(const char *file, + const char *name, + const char *suffix) { + int filelen = strlen(file); + int namelen = strlen(name); + int suffixlen = strlen(suffix); + + if (filelen == (namelen + suffixlen) && + !strncmp(file, name, namelen) && + !strncmp(file + namelen, suffix, suffixlen)) + return 1; + else + return 0; +} + +static struct qemud_vm * +qemudLoadConfig(struct qemud_server *server, + const char *file, + const char *path, + const char *xml) { + struct qemud_vm_def *def; + struct qemud_vm *vm; + + if (!(def = qemudParseVMDef(server, xml, file))) { + qemudLog(QEMUD_WARN, "Error parsing QEMU guest config '%s' : %s", + path, server->errorMessage); + return NULL; + } + + if (!compareFileToNameSuffix(file, def->name, ".xml")) { + qemudLog(QEMUD_WARN, "QEMU guest config filename '%s' does not match guest name '%s'", + path, def->name); + qemudFreeVMDef(def); + return NULL; + } + + if (!(vm = qemudAssignVMDef(server, def))) { + qemudLog(QEMUD_WARN, "Failed to load QEMU guest config '%s': out of memory", path); + qemudFreeVMDef(def); + return NULL; + } + + strncpy(vm->configFile, path, PATH_MAX); + vm->configFile[PATH_MAX-1] = '\0'; + + return vm; +} + +static struct qemud_network * +qemudLoadNetworkConfig(struct qemud_server *server, + const char *file, + const char *path, + const char *xml) { + struct qemud_network_def *def; + struct qemud_network *network; + + if (!(def = qemudParseNetworkDef(server, xml, file))) { + qemudLog(QEMUD_WARN, "Error parsing network config '%s' : %s", + path, server->errorMessage); + return NULL; + } + + if (!compareFileToNameSuffix(file, def->name, ".xml")) { + qemudLog(QEMUD_WARN, "Network config filename '%s' does not match network name '%s'", + path, def->name); + qemudFreeNetworkDef(def); + return NULL; + } + + if (!(network = qemudAssignNetworkDef(server, def))) { + qemudLog(QEMUD_WARN, "Failed to load network config '%s': out of memory", path); + qemudFreeNetworkDef(def); + return NULL; + } + + strncpy(network->configFile, path, PATH_MAX); + network->configFile[PATH_MAX-1] = '\0'; + + return network; +} static int qemudScanConfigDir(struct qemud_server *server, @@ -1679,14 +1817,25 @@ int qemudScanConfigDir(struct qemud_serv } while ((entry = readdir(dir))) { - char file[PATH_MAX]; + char xml[QEMUD_MAX_XML_LEN]; + char path[PATH_MAX]; + if (entry->d_name[0] == '.') continue; - if (qemudMakeConfigPath(configDir, entry->d_name, NULL, file, PATH_MAX) < 0) + if (qemudMakeConfigPath(configDir, entry->d_name, NULL, path, PATH_MAX) < 0) { + qemudLog(QEMUD_WARN, "Config filename '%s/%s' is too long", + configDir, entry->d_name); + continue; + } + + if (!qemudReadFile(path, xml, QEMUD_MAX_XML_LEN)) continue; - qemudLoadConfig(server, file, isGuest); + if (isGuest) + qemudLoadConfig(server, entry->d_name, path, xml); + else + qemudLoadNetworkConfig(server, entry->d_name, path, xml); } closedir(dir); @@ -1751,8 +1900,10 @@ int qemudBufferPrintf(struct qemudBuffer } /* Generate an XML document describing the guest's configuration */ -char *qemudGenerateXML(struct qemud_server *server, struct qemud_vm *vm, int live) { - struct qemud_vm_def *def = live ? vm->def : (vm->newDef ? vm->newDef : vm->def); +char *qemudGenerateXML(struct qemud_server *server, + struct qemud_vm *vm, + struct qemud_vm_def *def, + int live) { struct qemudBuffer buf; unsigned char *uuid; struct qemud_vm_disk_def *disk; @@ -1986,9 +2137,8 @@ char *qemudGenerateXML(struct qemud_serv char *qemudGenerateNetworkXML(struct qemud_server *server, - struct qemud_network *network, - int live) { - struct qemud_network_def *def = live ? network->def : (network->newDef ? network->newDef : network->def); + struct qemud_network *network ATTRIBUTE_UNUSED, + struct qemud_network_def *def) { struct qemudBuffer buf; unsigned char *uuid; Index: libvirt/qemud/conf.h =================================================================== --- libvirt.orig/qemud/conf.h +++ libvirt/qemud/conf.h @@ -26,33 +26,55 @@ #include "internal.h" -int qemudBuildCommandLine(struct qemud_server *server, - struct qemud_vm *vm, - char ***argv); - -int qemudScanConfigs(struct qemud_server *server); -int qemudDeleteConfig(struct qemud_server *server, - const char *configFile, - const char *name); - -void qemudFreeVMDef(struct qemud_vm_def *vm); -void qemudFreeVM(struct qemud_vm *vm); -struct qemud_vm *qemudLoadConfigXML(struct qemud_server *server, - const char *file, - const char *doc, - int persist); -char *qemudGenerateXML(struct qemud_server *server, - struct qemud_vm *vm, int live); - -void qemudFreeNetworkDef(struct qemud_network_def *def); -void qemudFreeNetwork(struct qemud_network *network); -struct qemud_network *qemudLoadNetworkConfigXML(struct qemud_server *server, - const char *file, - const char *doc, - int persist); -char *qemudGenerateNetworkXML(struct qemud_server *server, - struct qemud_network *network, - int live); +int qemudBuildCommandLine (struct qemud_server *server, + struct qemud_vm *vm, + char ***argv); + +int qemudScanConfigs (struct qemud_server *server); +int qemudDeleteConfig (struct qemud_server *server, + const char *configFile, + const char *name); + +void qemudFreeVMDef (struct qemud_vm_def *vm); +void qemudFreeVM (struct qemud_vm *vm); + +struct qemud_vm * + qemudAssignVMDef (struct qemud_server *server, + struct qemud_vm_def *def); +void qemudRemoveInactiveVM (struct qemud_server *server, + struct qemud_vm *vm); + +struct qemud_vm_def * + qemudParseVMDef (struct qemud_server *server, + const char *xmlStr, + const char *displayName); +int qemudSaveVMDef (struct qemud_server *server, + struct qemud_vm *vm, + struct qemud_vm_def *def); +char * qemudGenerateXML (struct qemud_server *server, + struct qemud_vm *vm, + struct qemud_vm_def *def, + int live); + +void qemudFreeNetworkDef (struct qemud_network_def *def); +void qemudFreeNetwork (struct qemud_network *network); + +struct qemud_network * + qemudAssignNetworkDef (struct qemud_server *server, + struct qemud_network_def *def); +void qemudRemoveInactiveNetwork (struct qemud_server *server, + struct qemud_network *network); + +struct qemud_network_def * + qemudParseNetworkDef (struct qemud_server *server, + const char *xmlStr, + const char *displayName); +int qemudSaveNetworkDef (struct qemud_server *server, + struct qemud_network *network, + struct qemud_network_def *def); +char * qemudGenerateNetworkXML (struct qemud_server *server, + struct qemud_network *network, + struct qemud_network_def *def); #endif Index: libvirt/qemud/driver.c =================================================================== --- libvirt.orig/qemud/driver.c +++ libvirt/qemud/driver.c @@ -279,14 +279,20 @@ int qemudNumDomains(struct qemud_server return server->nactivevms; } struct qemud_vm *qemudDomainCreate(struct qemud_server *server, const char *xml) { + + struct qemud_vm_def *def; struct qemud_vm *vm; - if (!(vm = qemudLoadConfigXML(server, NULL, xml, 0))) { + if (!(def = qemudParseVMDef(server, xml, NULL))) + return NULL; + + if (!(vm = qemudAssignVMDef(server, def))) { + qemudFreeVMDef(def); return NULL; } if (qemudStartVMDaemon(server, vm) < 0) { - qemudFreeVM(vm); + qemudRemoveInactiveVM(server, vm); return NULL; } @@ -416,7 +422,7 @@ int qemudDomainDumpXML(struct qemud_serv return -1; } - vmxml = qemudGenerateXML(server, vm, 1); + vmxml = qemudGenerateXML(server, vm, vm->def, 1); if (!vmxml) return -1; @@ -461,12 +467,27 @@ struct qemud_vm *qemudDomainStart(struct struct qemud_vm *qemudDomainDefine(struct qemud_server *server, const char *xml) { - return qemudLoadConfigXML(server, NULL, xml, 1); + struct qemud_vm_def *def; + struct qemud_vm *vm; + + if (!(def = qemudParseVMDef(server, xml, NULL))) + return NULL; + + if (!(vm = qemudAssignVMDef(server, def))) { + qemudFreeVMDef(def); + return NULL; + } + + if (qemudSaveVMDef(server, vm, def) < 0) { + qemudRemoveInactiveVM(server, vm); + return NULL; + } + + return vm; } int qemudDomainUndefine(struct qemud_server *server, const unsigned char *uuid) { struct qemud_vm *vm = qemudFindVMByUUID(server, uuid); - struct qemud_vm *prev = NULL, *curr = server->vms; if (!vm) { qemudReportError(server, VIR_ERR_INVALID_DOMAIN, "no domain with matching uuid"); @@ -483,22 +504,7 @@ int qemudDomainUndefine(struct qemud_ser vm->configFile[0] = '\0'; - while (curr) { - if (curr == vm) { - if (prev) { - prev->next = curr->next; - } else { - server->vms = curr->next; - } - server->ninactivevms--; - break; - } - - prev = curr; - curr = curr->next; - } - - qemudFreeVM(vm); + qemudRemoveInactiveVM(server, vm); return 0; } @@ -566,14 +572,19 @@ int qemudListDefinedNetworks(struct qemu } struct qemud_network *qemudNetworkCreate(struct qemud_server *server, const char *xml) { + struct qemud_network_def *def; struct qemud_network *network; - if (!(network = qemudLoadNetworkConfigXML(server, NULL, xml, 0))) { + if (!(def = qemudParseNetworkDef(server, xml, NULL))) + return NULL; + + if (!(network = qemudAssignNetworkDef(server, def))) { + qemudFreeNetworkDef(def); return NULL; } if (qemudStartNetworkDaemon(server, network) < 0) { - qemudFreeNetwork(network); + qemudRemoveInactiveNetwork(server, network); return NULL; } @@ -581,12 +592,27 @@ struct qemud_network *qemudNetworkCreate } struct qemud_network *qemudNetworkDefine(struct qemud_server *server, const char *xml) { - return qemudLoadNetworkConfigXML(server, NULL, xml, 1); + struct qemud_network_def *def; + struct qemud_network *network; + + if (!(def = qemudParseNetworkDef(server, xml, NULL))) + return NULL; + + if (!(network = qemudAssignNetworkDef(server, def))) { + qemudFreeNetworkDef(def); + return NULL; + } + + if (qemudSaveNetworkDef(server, network, def) < 0) { + qemudRemoveInactiveNetwork(server, network); + return NULL; + } + + return network; } int qemudNetworkUndefine(struct qemud_server *server, const unsigned char *uuid) { struct qemud_network *network = qemudFindNetworkByUUID(server, uuid); - struct qemud_network *prev = NULL, *curr = server->networks; if (!network) { qemudReportError(server, VIR_ERR_INVALID_DOMAIN, "no network with matching uuid"); @@ -598,22 +624,7 @@ int qemudNetworkUndefine(struct qemud_se network->configFile[0] = '\0'; - while (curr) { - if (curr == network) { - if (prev) { - prev->next = curr->next; - } else { - server->networks = curr->next; - } - server->ninactivenetworks--; - break; - } - - prev = curr; - curr = curr->next; - } - - qemudFreeNetwork(network); + qemudRemoveInactiveNetwork(server, network); return 0; } @@ -650,7 +661,7 @@ int qemudNetworkDumpXML(struct qemud_ser return -1; } - networkxml = qemudGenerateNetworkXML(server, network, 1); + networkxml = qemudGenerateNetworkXML(server, network, network->def); if (!networkxml) return -1; Index: libvirt/qemud/qemud.c =================================================================== --- libvirt.orig/qemud/qemud.c +++ libvirt/qemud/qemud.c @@ -1255,8 +1255,7 @@ static int qemudDispatchPoll(struct qemu struct qemud_socket *sock = server->sockets; struct qemud_client *client = server->clients; struct qemud_vm *vm; - struct qemud_vm *tmp; - struct qemud_network *network, *prevnet; + struct qemud_network *network; int ret = 0; int fd = 0; @@ -1336,42 +1335,24 @@ static int qemudDispatchPoll(struct qemu /* Cleanup any VMs which shutdown & dont have an associated config file */ vm = server->vms; - tmp = NULL; while (vm) { - if (!qemudIsActiveVM(vm) && !vm->configFile[0]) { - struct qemud_vm *next = vm->next; - if (tmp) { - tmp->next = next; - } else { - server->vms = next; - } - qemudFreeVM(vm); - server->ninactivevms--; - vm = next; - } else { - tmp = vm; - vm = vm->next; - } + struct qemud_vm *next = vm->next; + + if (!qemudIsActiveVM(vm) && !vm->configFile[0]) + qemudRemoveInactiveVM(server, vm); + + vm = next; } /* Cleanup any networks too */ network = server->networks; - prevnet = NULL; while (network) { - if (!qemudIsActiveNetwork(network) && !network->configFile[0]) { - struct qemud_network *next = network->next; - if (prevnet) { - prevnet->next = next; - } else { - server->networks = next; - } - qemudFreeNetwork(network); - server->ninactivenetworks--; - network = next; - } else { - prevnet = network; - network = network->next; - } + struct qemud_network *next = network->next; + + if (!qemudIsActiveNetwork(network) && !network->configFile[0]) + qemudRemoveInactiveNetwork(server, network); + + network = next; } return ret; --

1 0