- Devel - libvirt List Archives

[libvirt] [PATCH 0/4] Virsh: Extend command arguments completion
by Michal Privoznik 06 Jul '11

06 Jul '11

This patchset extends arguments completion for virsh commands. Currently only for domain related (start, destroy, etc.) and 'help'. But if community is satisfied with this little part I'll write follow up patches for other commands as well. This means that for command start not only pre-defined options will be generated (autodestroy, console, paused) but names of inactive domains too. However, this requires virsh to be already connected to daemon. Completers for commands can be easily defined as they follow readline logic. Basically, completer returns on each call one string (=possible argument/option) and it's called repeatedly until NULL is returned. To generate only corresponding values for given prefix, there is @text variable in function prototype. There is also @state variable that is set to zero on the 1st call and to non-zero on any subsequent calls, so completer can set it internal structures. Michal Privoznik (4): virsh: make conn global virsh: Extend virsh commands definition with completer virsh: Create completer for commands related to domains virsh: Create completer for help command tools/virsh.c | 1108 ++++++++++++++++++++++++++++++++++----------------------- 1 files changed, 660 insertions(+), 448 deletions(-) -- 1.7.5.rc3

2 8

[libvirt] [PATCH] Fix usage of virFileMakePath, it doesn't set errno but returns it
by Matthias Bolte 05 Jul '11

05 Jul '11

Also be explicity about the != 0 check in the few places that weren't. --- src/conf/domain_conf.c | 6 +++--- src/conf/network_conf.c | 2 +- src/conf/nwfilter_conf.c | 4 ++-- src/conf/storage_conf.c | 2 +- src/libxl/libxl_driver.c | 20 ++++++++++---------- src/lxc/lxc_container.c | 16 ++++++++-------- src/lxc/lxc_controller.c | 6 +++--- src/lxc/lxc_driver.c | 2 +- src/network/bridge_driver.c | 6 +++--- src/qemu/qemu_driver.c | 28 ++++++++++++++-------------- src/qemu/qemu_process.c | 6 +++--- src/storage/storage_driver.c | 2 +- src/uml/uml_driver.c | 13 +++++++------ src/util/dnsmasq.c | 2 +- src/util/util.c | 2 +- 15 files changed, 59 insertions(+), 58 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 109a947..2467fcf 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -9980,14 +9980,14 @@ int virDomainSaveXML(const char *configDir, const char *xml) { char *configFile = NULL; - int fd = -1, ret = -1; + int fd = -1, ret = -1, err; size_t towrite; if ((configFile = virDomainConfigFile(configDir, def->name)) == NULL) goto cleanup; - if (virFileMakePath(configDir)) { - virReportSystemError(errno, + if ((err = virFileMakePath(configDir)) != 0) { + virReportSystemError(err, _("cannot create config directory '%s'"), configDir); goto cleanup; diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index 45ddee2..b0dbd43 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -1119,7 +1119,7 @@ int virNetworkSaveXML(const char *configDir, if ((configFile = virNetworkConfigFile(configDir, def->name)) == NULL) goto cleanup; - if ((err = virFileMakePath(configDir))) { + if ((err = virFileMakePath(configDir)) != 0) { virReportSystemError(err, _("cannot create config directory '%s'"), configDir); diff --git a/src/conf/nwfilter_conf.c b/src/conf/nwfilter_conf.c index 127d4be..bd03f67 100644 --- a/src/conf/nwfilter_conf.c +++ b/src/conf/nwfilter_conf.c @@ -2189,7 +2189,7 @@ int virNWFilterSaveXML(const char *configDir, if ((configFile = virNWFilterConfigFile(configDir, def->name)) == NULL) goto cleanup; - if ((err = virFileMakePath(configDir))) { + if ((err = virFileMakePath(configDir)) != 0) { virReportSystemError(err, _("cannot create config directory '%s'"), configDir); @@ -2576,7 +2576,7 @@ virNWFilterObjSaveDef(virNWFilterDriverStatePtr driver, if (!nwfilter->configFile) { int err; - if ((err = virFileMakePath(driver->configDir))) { + if ((err = virFileMakePath(driver->configDir)) != 0) { virReportSystemError(err, _("cannot create config directory %s"), driver->configDir); diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index ca86f19..8ccfc8c 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -1514,7 +1514,7 @@ virStoragePoolObjSaveDef(virStorageDriverStatePtr driver, if (!pool->configFile) { int err; - if ((err = virFileMakePath(driver->configDir))) { + if ((err = virFileMakePath(driver->configDir)) != 0) { virReportSystemError(err, _("cannot create config directory %s"), driver->configDir); diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 7fd257d..0a5ea07 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -854,7 +854,7 @@ libxlStartup(int privileged) { const libxl_version_info *ver_info; char *log_file = NULL; virCommandPtr cmd; - int status, ret = 0; + int status, ret = 0, err; /* Disable libxl driver if non-root */ if (!privileged) { @@ -914,28 +914,28 @@ libxlStartup(int privileged) { "%s", LIBXL_SAVE_DIR) == -1) goto out_of_memory; - if (virFileMakePath(libxl_driver->logDir) != 0) { + if ((err = virFileMakePath(libxl_driver->logDir)) != 0) { char ebuf[1024]; VIR_ERROR(_("Failed to create log dir '%s': %s"), - libxl_driver->logDir, virStrerror(errno, ebuf, sizeof ebuf)); + libxl_driver->logDir, virStrerror(err, ebuf, sizeof ebuf)); goto error; } - if (virFileMakePath(libxl_driver->stateDir) != 0) { + if ((err = virFileMakePath(libxl_driver->stateDir)) != 0) { char ebuf[1024]; VIR_ERROR(_("Failed to create state dir '%s': %s"), - libxl_driver->stateDir, virStrerror(errno, ebuf, sizeof ebuf)); + libxl_driver->stateDir, virStrerror(err, ebuf, sizeof ebuf)); goto error; } - if (virFileMakePath(libxl_driver->libDir) != 0) { + if ((err = virFileMakePath(libxl_driver->libDir)) != 0) { char ebuf[1024]; VIR_ERROR(_("Failed to create lib dir '%s': %s"), - libxl_driver->libDir, virStrerror(errno, ebuf, sizeof ebuf)); + libxl_driver->libDir, virStrerror(err, ebuf, sizeof ebuf)); goto error; } - if (virFileMakePath(libxl_driver->saveDir) != 0) { + if ((err = virFileMakePath(libxl_driver->saveDir)) != 0) { char ebuf[1024]; VIR_ERROR(_("Failed to create save dir '%s': %s"), - libxl_driver->saveDir, virStrerror(errno, ebuf, sizeof ebuf)); + libxl_driver->saveDir, virStrerror(err, ebuf, sizeof ebuf)); goto error; } @@ -3391,7 +3391,7 @@ libxlDomainSetAutostart(virDomainPtr dom, int autostart) if (autostart) { int err; - if ((err = virFileMakePath(driver->autostartDir))) { + if ((err = virFileMakePath(driver->autostartDir)) != 0) { virReportSystemError(err, _("cannot create autostart directory %s"), driver->autostartDir); diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 7924858..b4138c4 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -406,7 +406,7 @@ static int lxcContainerMountBasicFS(virDomainFSDefPtr root) { "none", "/selinux", "selinuxfs" }, #endif }; - int i, rc = -1; + int i, rc = -1, err; char *devpts; if (virAsprintf(&devpts, "/.oldroot%s/dev/pts", root->src) < 0) { @@ -415,8 +415,8 @@ static int lxcContainerMountBasicFS(virDomainFSDefPtr root) } for (i = 0 ; i < ARRAY_CARDINALITY(mnts) ; i++) { - if (virFileMakePath(mnts[i].dst) != 0) { - virReportSystemError(errno, + if ((err = virFileMakePath(mnts[i].dst)) != 0) { + virReportSystemError(err, _("Failed to mkdir %s"), mnts[i].src); goto cleanup; @@ -429,8 +429,8 @@ static int lxcContainerMountBasicFS(virDomainFSDefPtr root) } } - if ((rc = virFileMakePath("/dev/pts") != 0)) { - virReportSystemError(rc, "%s", + if ((err = virFileMakePath("/dev/pts") != 0)) { + virReportSystemError(err, "%s", _("Cannot create /dev/pts")); goto cleanup; } @@ -515,7 +515,7 @@ static int lxcContainerPopulateDevices(void) static int lxcContainerMountNewFS(virDomainDefPtr vmDef) { - int i; + int i, err; /* Pull in rest of container's mounts */ for (i = 0 ; i < vmDef->nfss ; i++) { @@ -531,8 +531,8 @@ static int lxcContainerMountNewFS(virDomainDefPtr vmDef) return -1; } - if (virFileMakePath(vmDef->fss[i]->dst) != 0) { - virReportSystemError(errno, + if ((err = virFileMakePath(vmDef->fss[i]->dst)) != 0) { + virReportSystemError(err, _("Failed to create %s"), vmDef->fss[i]->dst); VIR_FREE(src); diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index 7d60090..db3ef21 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -615,7 +615,7 @@ lxcControllerRun(virDomainDefPtr def, int appPty, int handshakefd) { - int rc = -1; + int rc = -1, err; int control[2] = { -1, -1}; int containerhandshake[2] = { -1, -1 }; int containerPty = -1; @@ -690,8 +690,8 @@ lxcControllerRun(virDomainDefPtr def, goto cleanup; } - if (virFileMakePath(devpts) != 0) { - virReportSystemError(errno, + if ((err = virFileMakePath(devpts)) != 0) { + virReportSystemError(err, _("Failed to make path %s"), devpts); goto cleanup; diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 7220a9b..2222365 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -2541,7 +2541,7 @@ static int lxcDomainSetAutostart(virDomainPtr dom, if (autostart) { int err; - if ((err = virFileMakePath(driver->autostartDir))) { + if ((err = virFileMakePath(driver->autostartDir)) != 0) { virReportSystemError(err, _("Cannot create autostart directory %s"), driver->autostartDir); diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 660dd65..517f03d 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -2500,7 +2500,7 @@ static int networkSetAutostart(virNetworkPtr net, struct network_driver *driver = net->conn->networkPrivateData; virNetworkObjPtr network; char *configFile = NULL, *autostartLink = NULL; - int ret = -1; + int ret = -1, err; networkDriverLock(driver); network = virNetworkFindByUUID(&driver->networks, net->uuid); @@ -2526,8 +2526,8 @@ static int networkSetAutostart(virNetworkPtr net, goto cleanup; if (autostart) { - if (virFileMakePath(driver->networkAutostartDir)) { - virReportSystemError(errno, + if ((err = virFileMakePath(driver->networkAutostartDir)) != 0) { + virReportSystemError(err, _("cannot create autostart directory '%s'"), driver->networkAutostartDir); goto cleanup; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index aab3ab9..835e3e1 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -372,7 +372,7 @@ static int qemudStartup(int privileged) { char *base = NULL; char *driverConf = NULL; - int rc; + int rc, err; virConnectPtr conn = NULL; if (VIR_ALLOC(qemu_driver) < 0) @@ -469,40 +469,40 @@ qemudStartup(int privileged) { goto out_of_memory; } - if (virFileMakePath(qemu_driver->stateDir) != 0) { + if ((err = virFileMakePath(qemu_driver->stateDir)) != 0) { char ebuf[1024]; VIR_ERROR(_("Failed to create state dir '%s': %s"), - qemu_driver->stateDir, virStrerror(errno, ebuf, sizeof ebuf)); + qemu_driver->stateDir, virStrerror(err, ebuf, sizeof ebuf)); goto error; } - if (virFileMakePath(qemu_driver->libDir) != 0) { + if ((err = virFileMakePath(qemu_driver->libDir)) != 0) { char ebuf[1024]; VIR_ERROR(_("Failed to create lib dir '%s': %s"), - qemu_driver->libDir, virStrerror(errno, ebuf, sizeof ebuf)); + qemu_driver->libDir, virStrerror(err, ebuf, sizeof ebuf)); goto error; } - if (virFileMakePath(qemu_driver->cacheDir) != 0) { + if ((err = virFileMakePath(qemu_driver->cacheDir)) != 0) { char ebuf[1024]; VIR_ERROR(_("Failed to create cache dir '%s': %s"), - qemu_driver->cacheDir, virStrerror(errno, ebuf, sizeof ebuf)); + qemu_driver->cacheDir, virStrerror(err, ebuf, sizeof ebuf)); goto error; } - if (virFileMakePath(qemu_driver->saveDir) != 0) { + if ((err = virFileMakePath(qemu_driver->saveDir)) != 0) { char ebuf[1024]; VIR_ERROR(_("Failed to create save dir '%s': %s"), - qemu_driver->saveDir, virStrerror(errno, ebuf, sizeof ebuf)); + qemu_driver->saveDir, virStrerror(err, ebuf, sizeof ebuf)); goto error; } - if (virFileMakePath(qemu_driver->snapshotDir) != 0) { + if ((err = virFileMakePath(qemu_driver->snapshotDir)) != 0) { char ebuf[1024]; VIR_ERROR(_("Failed to create save dir '%s': %s"), - qemu_driver->snapshotDir, virStrerror(errno, ebuf, sizeof ebuf)); + qemu_driver->snapshotDir, virStrerror(err, ebuf, sizeof ebuf)); goto error; } - if (virFileMakePath(qemu_driver->autoDumpPath) != 0) { + if ((err = virFileMakePath(qemu_driver->autoDumpPath)) != 0) { char ebuf[1024]; VIR_ERROR(_("Failed to create dump dir '%s': %s"), - qemu_driver->autoDumpPath, virStrerror(errno, ebuf, sizeof ebuf)); + qemu_driver->autoDumpPath, virStrerror(err, ebuf, sizeof ebuf)); goto error; } @@ -5019,7 +5019,7 @@ static int qemudDomainSetAutostart(virDomainPtr dom, if (autostart) { int err; - if ((err = virFileMakePath(driver->autostartDir))) { + if ((err = virFileMakePath(driver->autostartDir)) != 0) { virReportSystemError(err, _("cannot create autostart directory %s"), driver->autostartDir); diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index f2c439b..d52b0ad 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -2336,7 +2336,7 @@ int qemuProcessStart(virConnectPtr conn, const char *stdin_path, enum virVMOperationType vmop) { - int ret; + int ret, err; off_t pos = -1; char ebuf[1024]; char *pidfile = NULL; @@ -2448,8 +2448,8 @@ int qemuProcessStart(virConnectPtr conn, } } - if (virFileMakePath(driver->logDir) != 0) { - virReportSystemError(errno, + if ((err = virFileMakePath(driver->logDir)) != 0) { + virReportSystemError(err, _("cannot create log directory %s"), driver->logDir); goto cleanup; diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index f9652f8..7b95340 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -1021,7 +1021,7 @@ storagePoolSetAutostart(virStoragePoolPtr obj, if (autostart) { int err; - if ((err = virFileMakePath(driver->autostartDir))) { + if ((err = virFileMakePath(driver->autostartDir)) != 0) { virReportSystemError(err, _("cannot create autostart directory %s"), driver->autostartDir); diff --git a/src/uml/uml_driver.c b/src/uml/uml_driver.c index a71ea21..fbd8bca 100644 --- a/src/uml/uml_driver.c +++ b/src/uml/uml_driver.c @@ -350,6 +350,7 @@ umlStartup(int privileged) uid_t uid = geteuid(); char *base = NULL; char *userdir = NULL; + int err; if (VIR_ALLOC(uml_driver) < 0) return -1; @@ -420,10 +421,10 @@ umlStartup(int privileged) goto error; } - if (virFileMakePath(uml_driver->monitorDir) != 0) { + if ((err = virFileMakePath(uml_driver->monitorDir)) != 0) { char ebuf[1024]; VIR_ERROR(_("Failed to create monitor directory %s: %s"), - uml_driver->monitorDir, virStrerror(errno, ebuf, sizeof ebuf)); + uml_driver->monitorDir, virStrerror(err, ebuf, sizeof ebuf)); goto error; } @@ -811,7 +812,7 @@ static int umlCleanupTapDevices(virConnectPtr conn ATTRIBUTE_UNUSED, static int umlStartVMDaemon(virConnectPtr conn, struct uml_driver *driver, virDomainObjPtr vm) { - int ret; + int ret, err; char *logfile; int logfd = -1; umlDomainObjPrivatePtr priv = vm->privateData; @@ -839,8 +840,8 @@ static int umlStartVMDaemon(virConnectPtr conn, return -1; } - if (virFileMakePath(driver->logDir) != 0) { - virReportSystemError(errno, + if ((err = virFileMakePath(driver->logDir)) != 0) { + virReportSystemError(err, _("cannot create log directory %s"), driver->logDir); return -1; @@ -2006,7 +2007,7 @@ static int umlDomainSetAutostart(virDomainPtr dom, if (autostart) { int err; - if ((err = virFileMakePath(driver->autostartDir))) { + if ((err = virFileMakePath(driver->autostartDir)) != 0) { virReportSystemError(err, _("cannot create autostart directory %s"), driver->autostartDir); diff --git a/src/util/dnsmasq.c b/src/util/dnsmasq.c index aadca10..27b1dcb 100644 --- a/src/util/dnsmasq.c +++ b/src/util/dnsmasq.c @@ -526,7 +526,7 @@ dnsmasqSave(const dnsmasqContext *ctx) int err; int ret = 0; - if ((err = virFileMakePath(ctx->config_dir))) { + if ((err = virFileMakePath(ctx->config_dir)) != 0) { virReportSystemError(err, _("cannot create config directory '%s'"), ctx->config_dir); return -1; diff --git a/src/util/util.c b/src/util/util.c index 13973c3..e0c625f 100644 --- a/src/util/util.c +++ b/src/util/util.c @@ -1182,7 +1182,7 @@ int virFileWritePid(const char *dir, goto cleanup; } - if ((rc = virFileMakePath(dir))) + if ((rc = virFileMakePath(dir)) != 0) goto cleanup; if (!(pidfile = virFilePid(dir, name))) { -- 1.7.4.1

2 2

[libvirt] [PATCH] fix the failure of nodedev-reattach caused by the variables from nodedev-attach
by Guannan Ren 05 Jul '11

05 Jul '11

the "virsh nodedev-reattch" command could return successfully, but the pci device is still bound to pci-stub driver. The reason is noddev-reattach trys to use the variables set by nodedev-dettach commands. Becuase these variables is not persistent, this is not we expected. the patch try to fix it. --- src/util/pci.c | 74 +++++++++++++++++++------------------------------------ 1 files changed, 26 insertions(+), 48 deletions(-) diff --git a/src/util/pci.c b/src/util/pci.c index 46a3a83..d345c3e 100644 --- a/src/util/pci.c +++ b/src/util/pci.c @@ -67,9 +67,6 @@ struct _pciDevice { unsigned managed : 1; /* used by reattach function */ - unsigned unbind_from_stub : 1; - unsigned remove_slot : 1; - unsigned reprobe : 1; }; struct _pciDeviceList { @@ -882,14 +879,23 @@ pciUnbindDeviceFromStub(pciDevice *dev, const char *driver) if (pciDriverDir(&drvdir, driver) < 0) goto cleanup; - if (!dev->unbind_from_stub) - goto remove_slot; - - /* If the device is bound to stub, unbind it. - */ if (pciDeviceFile(&path, dev->name, "driver") < 0) goto cleanup; + /* If the device is bound to a driver instead of pci-stub, do nothing. + */ + if (virFileExists(path) && ! virFileLinkPointsTo(path, drvdir)){ + result = 0; + goto cleanup; + } + + /* If the device is not bound to any driver, reprobe it. + */ + if (!virFileExists(path)) + goto reprobe; + + /* If the device is bound to stub, unbind it. + */ if (virFileExists(drvdir) && virFileLinkPointsTo(path, drvdir)) { if (pciDriverFile(&path, driver, "unbind") < 0) { goto cleanup; @@ -902,11 +908,6 @@ pciUnbindDeviceFromStub(pciDevice *dev, const char *driver) goto cleanup; } } - dev->unbind_from_stub = 0; - -remove_slot: - if (!dev->remove_slot) - goto reprobe; /* Xen's pciback.ko wants you to use remove_slot on the specific device */ if (pciDriverFile(&path, driver, "remove_slot") < 0) { @@ -919,14 +920,8 @@ remove_slot: dev->name, driver); goto cleanup; } - dev->remove_slot = 0; reprobe: - if (!dev->reprobe) { - result = 0; - goto cleanup; - } - /* Trigger a re-probe of the device is not in the stub's dynamic * ID table. If the stub is available, but 'remove_id' isn't * available, then re-probing would just cause the device to be @@ -935,6 +930,12 @@ reprobe: if (pciDriverFile(&path, driver, "remove_id") < 0) { goto cleanup; } + + /* If the device is still in stub's dynamic ID table,remove it, + * otherwise, ignore the error. + */ + if (virFileExists(path) && virFileWriteStr(path, dev->name, 0) < 0){ + } if (!virFileExists(drvdir) || virFileExists(path)) { if (virFileWriteStr(PCI_SYSFS "drivers_probe", dev->name, 0) < 0) { @@ -948,11 +949,6 @@ reprobe: result = 0; cleanup: - /* do not do it again */ - dev->unbind_from_stub = 0; - dev->remove_slot = 0; - dev->reprobe = 0; - VIR_FREE(drvdir); VIR_FREE(path); @@ -966,7 +962,6 @@ pciBindDeviceToStub(pciDevice *dev, const char *driver) int result = -1; char *drvdir = NULL; char *path = NULL; - int reprobe = 0; /* check whether the device is already bound to a driver */ if (pciDriverDir(&drvdir, driver) < 0 || @@ -980,7 +975,6 @@ pciBindDeviceToStub(pciDevice *dev, const char *driver) result = 0; goto cleanup; } - reprobe = 1; } /* Add the PCI device ID to the stub's dynamic ID table; @@ -1011,8 +1005,7 @@ pciBindDeviceToStub(pciDevice *dev, const char *driver) } if (virFileLinkPointsTo(path, drvdir)) { - dev->unbind_from_stub = 1; - dev->remove_slot = 1; + result = 0; goto remove_id; } @@ -1022,7 +1015,7 @@ pciBindDeviceToStub(pciDevice *dev, const char *driver) * your root filesystem. */ if (pciDeviceFile(&path, dev->name, "driver/unbind") < 0) { - goto cleanup; + goto remove_id; } if (virFileExists(path)) { @@ -1030,9 +1023,8 @@ pciBindDeviceToStub(pciDevice *dev, const char *driver) virReportSystemError(errno, _("Failed to unbind PCI device '%s'"), dev->name); - goto cleanup; + goto remove_id; } - dev->reprobe = reprobe; } /* If the device isn't already bound to pci-stub, try binding it now. @@ -1054,7 +1046,6 @@ pciBindDeviceToStub(pciDevice *dev, const char *driver) dev->name, driver); goto remove_id; } - dev->remove_slot = 1; if (pciDriverFile(&path, driver, "bind") < 0) { goto remove_id; @@ -1066,20 +1057,15 @@ pciBindDeviceToStub(pciDevice *dev, const char *driver) dev->name, driver); goto remove_id; } - dev->unbind_from_stub = 1; } + result = 0; remove_id: /* If 'remove_id' exists, remove the device id from pci-stub's dynamic * ID table so that 'drivers_probe' works below. */ if (pciDriverFile(&path, driver, "remove_id") < 0) { - /* We do not remove PCI ID from pci-stub, and we cannot reprobe it */ - if (dev->reprobe) { - VIR_WARN("Could not remove PCI ID '%s' from %s, and the device " - "cannot be probed again.", dev->id, driver); - } - dev->reprobe = 0; + result = -1; goto cleanup; } @@ -1087,18 +1073,10 @@ remove_id: virReportSystemError(errno, _("Failed to remove PCI ID '%s' from %s"), dev->id, driver); - - /* remove PCI ID from pci-stub failed, and we cannot reprobe it */ - if (dev->reprobe) { - VIR_WARN("Failed to remove PCI ID '%s' from %s, and the device " - "cannot be probed again.", dev->id, driver); - } - dev->reprobe = 0; + result = -1; goto cleanup; } - result = 0; - cleanup: VIR_FREE(drvdir); VIR_FREE(path); -- 1.7.1

5 8

[libvirt] offline migration / vm cloning with libvirt/virsh
by Sethuraman Subbiah 05 Jul '11

05 Jul '11

Hi , I am trying to perform offline migration (i.e) Create an incremental image using the qcow format, transfer the vm memory state to a state fie.Use the image and statefile together as a template. Now create a new vm using the template. I can successfully do it using the following commands : Save phase : stop migrate "exec:gzip -c > STATEFILE.gz" qemu-img qemu-img create -b BASE_img -f qcow2 INCRE_img Restore phase : qemu-kvm -m 1024 -hda INCRE_img -incoming "exec: gzip -c -d STATEFILE.gz" And it works fine. But I am not able to find the vm with virt-manager or other libvirt based tools. If I use : virsh save <dom_id> STATEFILE I can restore using "virsh restore STATEFILE" but I want to associate this with the incremental image that I created, but I dont know how. I think it saves the existing vm's xml file along with the STATEFILE, thus I am not able to change the disk image to the incremental image. Thus , 1. Either I should find a way to make vms created using qemu-kvm appear in libvirt-based tools. OR 2. Find a way to associate the virsh save STATEFILE with a incremental image. Any help or hint with respect to these will be very helpful. I am try to do cloning with minimal cost. This takes only 25 seconds ( to create STATEFILE) and creating incremental image is instantatenous . But I want to use the vm monitoring code based on libvirt. And it makes life difficult. Thanks for your help. - Regards, Sethuraman Subbiah Graduate Student - NC state University M.S in Computer Science

2 1

[libvirt] [PATCH] build: fix virBufferVasprintf on mingw
by Eric Blake 05 Jul '11

05 Jul '11

Gnulib documents that mingw [v]snprintf is broken (it returns -1 on out-of-space, instead of the count of what would have been printed); but while we were using the snprintf wrapper, we had not yet been using the vsnprintf wrapper. * bootstrap.conf (gnulib_modules): Add vsnprintf. Reported by Matthias Bolte. --- bootstrap.conf | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/bootstrap.conf b/bootstrap.conf index 581d60b..302cce8 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -97,6 +97,7 @@ usleep vasprintf verify vc-list-files +vsnprintf waitpid warnings ' -- 1.7.4.4

2 8

[libvirt] [PATCH] Fix default value of security label 'relabel' attribute
by Daniel P. Berrange 05 Jul '11

05 Jul '11

From: "Daniel P. Berrange" <berrange(a)redhat.com> When no <seclabel> is present in the XML, the virDomainSeclabelDef struct is left as all zeros. Unfortunately, this means it gets setup as type=dynamic, with relabel=no, which is an illegal combination. Change the 'bool relabel' attribute in virDomainSeclabelDef to the inverse 'bool norelabel' so that the default initialization is sensible * src/conf/domain_conf.c, src/conf/domain_conf.h, src/security/security_apparmor.c, src/security/security_selinux.c: Replace 'relabel' with 'norelabel' --- src/conf/domain_conf.c | 18 +++++++++--------- src/conf/domain_conf.h | 2 +- src/security/security_apparmor.c | 8 ++++---- src/security/security_selinux.c | 20 ++++++++++---------- 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 109a947..b74ab4d 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -5076,25 +5076,25 @@ virSecurityLabelDefParseXML(const virDomainDefPtr def, VIR_SECURITY_LABEL_BUFLEN-1, ctxt); if (p != NULL) { if (STREQ(p, "yes")) { - def->seclabel.relabel = true; + def->seclabel.norelabel = false; } else if (STREQ(p, "no")) { - def->seclabel.relabel = false; + def->seclabel.norelabel = true; } else { virDomainReportError(VIR_ERR_XML_ERROR, _("invalid security relabel value %s"), p); goto error; } if (def->seclabel.type == VIR_DOMAIN_SECLABEL_DYNAMIC && - !def->seclabel.relabel) { + def->seclabel.norelabel) { virDomainReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("dynamic label type must use resource relabeling")); goto error; } } else { if (def->seclabel.type == VIR_DOMAIN_SECLABEL_STATIC) - def->seclabel.relabel = false; + def->seclabel.norelabel = true; else - def->seclabel.relabel = true; + def->seclabel.norelabel = false; } /* Only parse label, if using static labels, or @@ -5114,7 +5114,7 @@ virSecurityLabelDefParseXML(const virDomainDefPtr def, } /* Only parse imagelabel, if requested live XML with relabeling */ - if (def->seclabel.relabel && + if (!def->seclabel.norelabel && !(flags & VIR_DOMAIN_XML_INACTIVE)) { p = virXPathStringLimit("string(./seclabel/imagelabel[1])", VIR_SECURITY_LABEL_BUFLEN-1, ctxt); @@ -9890,15 +9890,15 @@ char *virDomainDefFormat(virDomainDefPtr def, (flags & VIR_DOMAIN_XML_INACTIVE)) { virBufferAsprintf(&buf, " <seclabel type='%s' model='%s' relabel='%s'/>\n", sectype, def->seclabel.model, - def->seclabel.relabel ? "yes" : "no"); + def->seclabel.norelabel ? "no" : "yes"); } else { virBufferAsprintf(&buf, " <seclabel type='%s' model='%s' relabel='%s'>\n", sectype, def->seclabel.model, - def->seclabel.relabel ? "yes" : "no"); + def->seclabel.norelabel ? "no" : "yes"); if (def->seclabel.label) virBufferEscapeString(&buf, " <label>%s</label>\n", def->seclabel.label); - if (def->seclabel.relabel && def->seclabel.imagelabel) + if (!def->seclabel.norelabel && def->seclabel.imagelabel) virBufferEscapeString(&buf, " <imagelabel>%s</imagelabel>\n", def->seclabel.imagelabel); if (def->seclabel.baselabel && diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 258289a..44d5bcd 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -960,7 +960,7 @@ struct _virSecurityLabelDef { char *imagelabel; /* security image label string */ char *baselabel; /* base name of label string */ int type; /* virDomainSeclabelType */ - bool relabel; + bool norelabel; }; enum virDomainTimerNameType { diff --git a/src/security/security_apparmor.c b/src/security/security_apparmor.c index 98995a8..76c6e3d 100644 --- a/src/security/security_apparmor.c +++ b/src/security/security_apparmor.c @@ -265,7 +265,7 @@ reload_profile(virSecurityManagerPtr mgr, int rc = -1; char *profile_name = NULL; - if (!secdef->relabel) + if (secdef->norelabel) return 0; if ((profile_name = get_profile_name(vm)) == NULL) @@ -610,7 +610,7 @@ AppArmorSetSecurityImageLabel(virSecurityManagerPtr mgr, int rc = -1; char *profile_name; - if (!secdef->relabel) + if (secdef->norelabel) return 0; if (!disk->src || disk->type == VIR_DOMAIN_DISK_TYPE_NETWORK) @@ -682,7 +682,7 @@ AppArmorSetSecurityHostdevLabel(virSecurityManagerPtr mgr, struct SDPDOP *ptr; int ret = -1; - if (!secdef->relabel) + if (secdef->norelabel) return 0; if (dev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS) @@ -741,7 +741,7 @@ AppArmorRestoreSecurityHostdevLabel(virSecurityManagerPtr mgr, { const virSecurityLabelDefPtr secdef = &vm->def->seclabel; - if (!secdef->relabel) + if (secdef->norelabel) return 0; return reload_profile(mgr, vm, NULL, false); diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c index 44e770e..50e1978 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -537,7 +537,7 @@ SELinuxRestoreSecurityImageLabelInt(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, { const virSecurityLabelDefPtr secdef = &vm->def->seclabel; - if (!secdef->relabel) + if (secdef->norelabel) return 0; /* Don't restore labels on readoly/shared disks, because @@ -621,7 +621,7 @@ SELinuxSetSecurityImageLabel(virSecurityManagerPtr mgr, const virSecurityLabelDefPtr secdef = &vm->def->seclabel; bool allowDiskFormatProbing = virSecurityManagerGetAllowDiskFormatProbing(mgr); - if (!secdef->relabel) + if (secdef->norelabel) return 0; return virDomainDiskDefForeachPath(disk, @@ -661,7 +661,7 @@ SELinuxSetSecurityHostdevLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, const virSecurityLabelDefPtr secdef = &vm->def->seclabel; int ret = -1; - if (!secdef->relabel) + if (secdef->norelabel) return 0; if (dev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS) @@ -730,7 +730,7 @@ SELinuxRestoreSecurityHostdevLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, const virSecurityLabelDefPtr secdef = &vm->def->seclabel; int ret = -1; - if (!secdef->relabel) + if (secdef->norelabel) return 0; if (dev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS) @@ -784,7 +784,7 @@ SELinuxSetSecurityChardevLabel(virDomainObjPtr vm, char *in = NULL, *out = NULL; int ret = -1; - if (!secdef->relabel) + if (secdef->norelabel) return 0; switch (dev->type) { @@ -830,7 +830,7 @@ SELinuxRestoreSecurityChardevLabel(virDomainObjPtr vm, char *in = NULL, *out = NULL; int ret = -1; - if (!secdef->relabel) + if (secdef->norelabel) return 0; switch (dev->type) { @@ -918,7 +918,7 @@ SELinuxRestoreSecurityAllLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, VIR_DEBUG("Restoring security label on %s", vm->def->name); - if (!secdef->relabel) + if (secdef->norelabel) return 0; for (i = 0 ; i < vm->def->nhostdevs ; i++) { @@ -989,7 +989,7 @@ SELinuxSetSavedStateLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, { const virSecurityLabelDefPtr secdef = &vm->def->seclabel; - if (!secdef->relabel) + if (secdef->norelabel) return 0; return SELinuxSetFilecon(savefile, secdef->imagelabel); @@ -1003,7 +1003,7 @@ SELinuxRestoreSavedStateLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, { const virSecurityLabelDefPtr secdef = &vm->def->seclabel; - if (!secdef->relabel) + if (secdef->norelabel) return 0; return SELinuxRestoreSecurityFileLabel(savefile); @@ -1218,7 +1218,7 @@ SELinuxSetSecurityAllLabel(virSecurityManagerPtr mgr, const virSecurityLabelDefPtr secdef = &vm->def->seclabel; int i; - if (!secdef->relabel) + if (secdef->norelabel) return 0; for (i = 0 ; i < vm->def->ndisks ; i++) { -- 1.7.6

2 1

[libvirt] networkxml2argvtest fails to compile
by Ruben Kerkhof 05 Jul '11

05 Jul '11

Hi all, Building libvirt 0.9.3 from source with --without-network, make check fails with: CC networkxml2xmltest.o CCLD networkxml2xmltest CC networkxml2argvtest.o make[2]: *** No rule to make target `../src/libvirt_driver_network.la', needed by `networkxml2argvtest'. Stop. make[2]: Leaving directory `/home/ruben/src/libvirt/libvirt-0.9.3/tests' make[1]: *** [check-am] Error 2 make[1]: Leaving directory `/home/ruben/src/libvirt/libvirt-0.9.3/tests' make: *** [check-recursive] Error 1 Kind regards, Ruben

3 4

[libvirt] [PATCH] qemu: Fix virFileMakePath error handling in snapshot creation
by Matthias Bolte 05 Jul '11

05 Jul '11

virFileMakePath returns an errno value on error, that will never be negative. So a virFileMakePath error whould have been ignored here. --- src/qemu/qemu_driver.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 363a361..aab3ab9 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -7498,7 +7498,7 @@ static int qemuDomainSnapshotWriteMetadata(virDomainObjPtr vm, goto cleanup; } err = virFileMakePath(snapDir); - if (err < 0) { + if (err != 0) { virReportSystemError(err, _("cannot create snapshot directory '%s'"), snapDir); goto cleanup; -- 1.7.4.1

2 2

[libvirt] problems with <seclabel> when restarting libvirtd
by Laine Stump 05 Jul '11

05 Jul '11

I had libvirtd build from 0.9.2+something running on my test machine. There was a single guest running on it. I grabbed the latest libvirt from git (0.9.3+??), built an rpm, and installed it. My guest reconnected with no problems, but I was unable to start new guests due to an selinux problem with the labeling of the image file. Interestingly, I found that I could shutdown and restart the one guest that had been running at the time of the upgrade. *Until* I restarted libvirtd again while the guest was stopped. After this point, I could no longer start that guest either. I then set selinux to permissive mode and was able to start my original guest. Then I restarted libvirtd and found that, although the qemu-kvm process was still running, libvirtd couldn't reconnect to the guest. When I looked at the logs, I saw this: error: virSecurityLabelDefParseXML:5073 : unsupported configuration: dynamic label type must use resource relabeling In the domain state file, I see this: | <seclabel type='dynamic' model='selinux' relabel='no'> | <label>system_u:system_r:svirt_t:s-:c419,c955</label> | </seclabel> The data in the state file was written by the same version of libvirtd that wrote it. So why did it write something it knows it doesn't support?

2 1

[libvirt] Duplicate symbol error with 0.9.3 on OSX
by Justin Clift 05 Jul '11

05 Jul '11

Hi all, Just went to update the OSX libvirt build for 0.9.3, but it's giving a duplicate symbol error: ld: duplicate symbol _virNetworkDNSHostsDef in ./.libs/libvirt_driver_test.a(libvirt_driver_test_la-test_driver.o) and ./.libs/libvirt_conf.a(libvirt_conf_la-network_conf.o) "virNetworkDNSHostsDef" is definitely in src/conf/network_conf.*, but not seeing it anywhere in src/test/test_driver.*. Anyone have suggestions on what to look at? Regards and best wishes, Justin Clift -- Aeolus Community Manager http://www.aeolusproject.org

2 4