- Devel - libvirt List Archives

[libvirt] [RFC PATCH v1 0/4] Add cpu hotplug support to libvirt.
by Tang Chen 03 Sep '12

03 Sep '12

It seems that libvirt is not cpu hotplug aware. Please refer to the following problem. 1. At first, we have 2 cpus. # cat /cgroup/cpuset/cpuset.cpus 0-1 # cat /cgroup/cpuset/libvirt/qemu/cpuset.cpus 0-1 2. And we have a vm1 with following configuration. <cputune> <vcpupin vcpu='0' cpuset='1'/> <hypervisorpin cpuset='1'/> </cputune> 3. Offline cpu1. # echo 0 > /sys/devices/system/cpu/cpu1/online # cat /sys/devices/system/cpu/cpu1/online 0 # cat /cgroup/cpuset/cpuset.cpus 0 # cat /cgroup/cpuset/libvirt/qemu/cpuset.cpus 0 # cat /cgroup/cpuset/libvirt/lxc/cpuset.cpus 0 4. Online cpu1. # echo 1 > /sys/devices/system/cpu/cpu1/online # cat /sys/devices/system/cpu/cpu1/online 1 # cat /cgroup/cpuset/cpuset.cpus 0-1 # cat /cgroup/cpuset/libvirt/cpuset.cpus 0 # cat /cgroup/cpuset/libvirt/qemu/cpuset.cpus 0 # cat /cgroup/cpuset/libvirt/lxc/cpuset.cpus 0 Here，cgroup updated cpuset.cpus，but not for libvirt directory，and also qemu and lxc directory. vm1 cannot be started again. # virsh start vm1 error: Failed to start domain vm1 error: Unable to set cpuset.cpus: Permission denied And libvird gave the following errors. 2012-07-17 07:30:22.478+0000: 3118: error : qemuSetupCgroupVcpuPin:498 : Unable to set cpuset.cpus: Permission denied These patches resolves this problem by listening on the netlink for cpu hotplug event. When the netlink service gets the cpu hotplug event, it will attract the cpuid in the message, and add it into cpuset.cpus in: /cgroup/cpuset/libvirt /cgroup/cpuset/libvirt/qemu /cgroup/cpuset/libvirt/lxc Tang Chen (4): Add cpu hotplug handler for netlink service. Register cpu hotplug netlink handler for libvirtd. Register cpu hotplug netlink handler for qemu driver. Register cpu hotplug netlink handler for lxc driver. daemon/libvirtd.c | 11 +++ include/libvirt/virterror.h | 2 + src/Makefile.am | 1 + src/libvirt_private.syms | 5 + src/lxc/lxc_driver.c | 8 ++ src/qemu/qemu_driver.c | 8 ++ src/util/cgroup.c | 6 +- src/util/cgroup.h | 4 + src/util/hotplug.c | 221 +++++++++++++++++++++++++++++++++++++++++++ src/util/hotplug.h | 32 +++++++ src/util/virterror.c | 3 +- 11 files changed, 297 insertions(+), 4 deletions(-) create mode 100644 src/util/hotplug.c create mode 100644 src/util/hotplug.h -- 1.7.10.1

2 6

[libvirt] [PATCH] pci: Read bridge control register from the bridge
by Osier Yang 03 Sep '12

03 Sep '12

Though I don't quite understand it well enough, but it looks wrong to read the control register from the device, and then write to its parent twice, while doing the secondary bus reset. --- src/util/pci.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/util/pci.c b/src/util/pci.c index 0742d07..c3f1b2b 100644 --- a/src/util/pci.c +++ b/src/util/pci.c @@ -642,7 +642,7 @@ pciTrySecondaryBusReset(pciDevice *dev, /* Read the control register, set the reset flag, wait 200ms, * unset the reset flag and wait 200ms. */ - ctl = pciRead16(dev, PCI_BRIDGE_CONTROL); + ctl = pciRead16(parent, PCI_BRIDGE_CONTROL); pciWrite16(parent, PCI_BRIDGE_CONTROL, ctl | PCI_BRIDGE_CTL_RESET); -- 1.7.7.3

2 2

[libvirt] Heads up 0.10.1 release on Friday
by Daniel Veillard 03 Sep '12

03 Sep '12

I was a bit afraid of the .0 effect on release name, but we really have a number of problem with 0.10.0 that ought to be fixed in a "brown paper bag" release. I would urge people to report and try to fix the problem being raised in 0.10.0, let's try to get them fixed today or tomorrow and I will cut a new release on Friday, Sorry about that, but somehow we didn't managed to catch even serious problem during the freeze, at some point we need to fix the problem of testing the code that we push on git on a daily basis, we have many tools but we lack at doing the continuous testing :-\ Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

3 6

[libvirt] [PATCH v4 0/3] Per-guest S3/S4 configuration
by Martin Kletzander 03 Sep '12

03 Sep '12

There is a way to tell qemu how (not) to advertise S3/S4 ACPI sleep state capability to the guest OS. This series includes the capability to set this in the XML and also covers all the handling from qemu point of view including checking for the support, parameter parsing, command building, checking before sending the signals through guest agent and also tests and documentation. -- Even though the patches were half-acked, I rather send them again with the changes made after Michal's suggestions. v4: - Changed the XML config to subelements - Minor fixes and optimalizations v3: - Option names are change according to Eric and Doug - Added docs (formatdomain) v2: - Modified the patch to reflect danpb's notes (according to qemu people the setting the disable_s[34] parameter to 0/1 ensures that the states will be enabled/disabled respectively) Martin Kletzander (3): Add per-guest S3/S4 state configuration qemu: Add support for S3/S4 state configuration tests: Add tests for qemu S3/S4 state configuration docs/formatdomain.html.in | 24 +++++++++ docs/schemas/domaincommon.rng | 39 ++++++++++++++ src/conf/domain_conf.c | 50 +++++++++++++++++ src/conf/domain_conf.h | 15 ++++++ src/libvirt_private.syms | 2 + src/qemu/qemu_capabilities.c | 7 +++ src/qemu/qemu_capabilities.h | 2 + src/qemu/qemu_command.c | 62 ++++++++++++++++++++++ src/qemu/qemu_driver.c | 17 ++++++ tests/qemuargv2xmltest.c | 3 ++ .../qemuxml2argv-misc-disable-s3.args | 4 ++ .../qemuxml2argv-misc-disable-s3.xml | 29 ++++++++++ .../qemuxml2argv-misc-disable-suspends.args | 4 ++ .../qemuxml2argv-misc-disable-suspends.xml | 30 +++++++++++ .../qemuxml2argv-misc-enable-s4.args | 4 ++ .../qemuxml2argv-misc-enable-s4.xml | 29 ++++++++++ tests/qemuxml2argvtest.c | 4 ++ tests/qemuxml2xmltest.c | 3 ++ 18 files changed, 328 insertions(+) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-misc-disable-s3.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-misc-disable-s3.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-misc-disable-suspends.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-misc-disable-suspends.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-misc-enable-s4.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-misc-enable-s4.xml -- 1.7.12

2 9

[libvirt] [PATCH V4] implement offline migration
by liguang 03 Sep '12

03 Sep '12

allow migration even domain isn't active by inserting some stubs to tunnel migration path. Signed-off-by: liguang <lig.fnst(a)cn.fujitsu.com> --- src/qemu/qemu_driver.c | 2 +- src/qemu/qemu_migration.c | 181 +++++++++++++++++++++++++++++++++++++++++++-- src/qemu/qemu_migration.h | 3 +- 3 files changed, 178 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index d74bf52..00ca211 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -9779,7 +9779,7 @@ qemuDomainMigratePrepareTunnel3(virConnectPtr dconn, virCheckFlags(QEMU_MIGRATION_FLAGS, -1); - if (!dom_xml) { + if (!dom_xml && !(flags & VIR_MIGRATE_OFFLINE)) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("no domain XML passed")); goto cleanup; diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 1b21ef6..991bcc5 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -70,6 +70,7 @@ enum qemuMigrationCookieFlags { QEMU_MIGRATION_COOKIE_FLAG_GRAPHICS, QEMU_MIGRATION_COOKIE_FLAG_LOCKSTATE, QEMU_MIGRATION_COOKIE_FLAG_PERSISTENT, + QEMU_MIGRATION_COOKIE_FLAG_OFFLINE, QEMU_MIGRATION_COOKIE_FLAG_LAST }; @@ -77,12 +78,13 @@ enum qemuMigrationCookieFlags { VIR_ENUM_DECL(qemuMigrationCookieFlag); VIR_ENUM_IMPL(qemuMigrationCookieFlag, QEMU_MIGRATION_COOKIE_FLAG_LAST, - "graphics", "lockstate", "persistent"); + "graphics", "lockstate", "persistent", "offline"); enum qemuMigrationCookieFeatures { QEMU_MIGRATION_COOKIE_GRAPHICS = (1 << QEMU_MIGRATION_COOKIE_FLAG_GRAPHICS), QEMU_MIGRATION_COOKIE_LOCKSTATE = (1 << QEMU_MIGRATION_COOKIE_FLAG_LOCKSTATE), QEMU_MIGRATION_COOKIE_PERSISTENT = (1 << QEMU_MIGRATION_COOKIE_FLAG_PERSISTENT), + QEMU_MIGRATION_COOKIE_OFFLINE = (1 << QEMU_MIGRATION_COOKIE_FLAG_OFFLINE), }; typedef struct _qemuMigrationCookieGraphics qemuMigrationCookieGraphics; @@ -101,6 +103,10 @@ struct _qemuMigrationCookie { unsigned int flags; unsigned int flagsMandatory; + /*offline migration flag*/ + int offline; + char *mig_file; + /* Host properties */ unsigned char localHostuuid[VIR_UUID_BUFLEN]; unsigned char remoteHostuuid[VIR_UUID_BUFLEN]; @@ -139,6 +145,8 @@ static void qemuMigrationCookieFree(qemuMigrationCookiePtr mig) if (mig->flags & QEMU_MIGRATION_COOKIE_GRAPHICS) qemuMigrationCookieGraphicsFree(mig->graphics); + if (mig->flags & QEMU_MIGRATION_COOKIE_GRAPHICS) + VIR_FREE(mig->mig_file); VIR_FREE(mig->localHostname); VIR_FREE(mig->remoteHostname); @@ -439,6 +447,12 @@ qemuMigrationCookieXMLFormat(struct qemud_driver *driver, virBufferAdjustIndent(buf, -2); } + if (mig->flags & QEMU_MIGRATION_COOKIE_OFFLINE) { + virBufferAsprintf(buf, " <offline mig_ol='%d' mig_file='%s'>\n", + mig->offline, mig->mig_file); + virBufferAddLit(buf, " </offline>\n"); + } + virBufferAddLit(buf, "</qemu-migration>\n"); return 0; } @@ -662,6 +676,18 @@ qemuMigrationCookieXMLParse(qemuMigrationCookiePtr mig, VIR_FREE(nodes); } + if ((flags & QEMU_MIGRATION_COOKIE_OFFLINE) && + virXPathBoolean("count(./offline) > 0", ctxt)) { + if (virXPathInt("string(./offline/@mig_ol)", ctxt, &mig->offline) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + "%s", _("missing mig_ol attribute in migration data")); + goto error; + } + mig->mig_file = virXPathString("string(./offline/@mig_file)", ctxt); + if (mig->mig_file && STREQ(mig->mig_file, "")) + VIR_FREE(mig->mig_file); + } + return 0; error: @@ -721,6 +747,12 @@ qemuMigrationBakeCookie(qemuMigrationCookiePtr mig, qemuMigrationCookieAddPersistent(mig, dom) < 0) return -1; + if (flags & QEMU_MIGRATION_COOKIE_OFFLINE) { + mig->flags |= QEMU_MIGRATION_COOKIE_OFFLINE; + mig->offline = 1; + } + + if (!(*cookieout = qemuMigrationCookieXMLFormatStr(driver, mig))) return -1; @@ -1307,6 +1339,27 @@ qemuMigrationPrepareAny(struct qemud_driver *driver, /* Domain starts inactive, even if the domain XML had an id field. */ vm->def->id = -1; + if (tunnel) { + if (!(mig = qemuMigrationEatCookie(driver, vm, cookiein, cookieinlen, + QEMU_MIGRATION_COOKIE_OFFLINE))) + return ret; + else if (mig->offline) { + char *file, *str, *tmp = NULL; + ret = 0; + for (str = mig->mig_file; ; str = NULL) { + file = strtok_r(str, " ", &tmp); + if (file == NULL) + break; + if (virFDStreamCreateFile(st, file, 0, 0, O_WRONLY, 0) < 0) { + virReportSystemError(errno, "%s", + _("cannot setup stream for tunnelled migration\n")); + ret = -1; + } + } + goto endjob; + } + } + if (tunnel && (pipe(dataFD) < 0 || virSetCloseExec(dataFD[1]) < 0)) { virReportSystemError(errno, "%s", @@ -2303,6 +2356,117 @@ cleanup: return ret; } +static int +doReadFile(virStreamPtr st ATTRIBUTE_UNUSED, + char *buf, size_t nbytes, void *opaque) +{ + int *fd = opaque; + + return saferead(*fd, buf, nbytes); +} + + +/* + * do offline migration + */ +static int doMigrateOffline(struct qemud_driver *driver, + virConnectPtr dconn, + virDomainObjPtr vm, + const char *cookiein, + int cookieinlen, + char **cookieout, + int *cookieoutlen, + unsigned long flags, + const char *dom_xml, + const char *dname, + virStreamPtr st, + unsigned long resource) +{ + xmlDocPtr xml = NULL; + xmlXPathContextPtr ctxt = NULL; + xmlNodePtr *disks = NULL; + qemuMigrationCookiePtr mig = NULL; + virBuffer buf = VIR_BUFFER_INITIALIZER; + int i = 0, cn = 0, fd = -1, ret = -1; + char *src[] = {NULL}, *files = NULL; + + VIR_DEBUG("driver=%p, vm=%p, st=%p, cookiein=%s, cookieinlen=%d, " + "cookieout=%p, cookieoutlen=%p, dom_xml=%s," + "dname=%s, flags=%lx, resource=%lu", + driver, vm, st, NULLSTR(cookiein), cookieinlen, + cookieout, cookieoutlen, dom_xml, dname, flags, resource); + + xml = virXMLParseStringCtxt(dom_xml, _("(domain_definition)"), &ctxt); + if (!xml) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("can't parse dom_xml for offline migration\n")); + goto cleanup; + } + cn = virXPathNodeSet("./devices/disk", ctxt, &disks); + if (cn < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Fail to get disk node\n")); + goto cleanup; + } + cn = 1; + + for (i = 0 ; i < cn ; i++) { + ctxt->node = disks[i]; + src[i] = virXPathString("string(./source/@file" + "|./source/@dir" + "|./source/@name)", ctxt); + virBufferAsprintf(&buf, "%s ", src[i]); + } + + files = virBufferContentAndReset(&buf); + + if (!(mig = qemuMigrationEatCookie(driver, vm, NULL, 0, 0))) + goto cleanup; + + mig->mig_file = files; + + if (qemuMigrationBakeCookie(mig, driver, vm, + cookieout, cookieoutlen, + QEMU_MIGRATION_COOKIE_OFFLINE) < 0) + goto cleanup; + + cookiein = *cookieout; + cookieinlen = *cookieoutlen; + cookieout = NULL; + cookieoutlen = 0; + + qemuDomainObjEnterRemoteWithDriver(driver, vm); + ret = dconn->driver->domainMigratePrepareTunnel3 + (dconn, st, cookiein, cookieinlen, + cookieout, cookieoutlen, + flags, dname, resource, dom_xml); + qemuDomainObjExitRemoteWithDriver(driver, vm); + if (ret == -1) + goto cleanup; + + for (i = 0; i < cn; i++) { + if ((fd = open(src[i], O_RDONLY)) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s %s", + _("Fail to open file for offline migration\n"), src[i]); + goto cleanup; + } + if (virStreamSendAll(st, doReadFile, &fd) < 0) + goto cleanup; + if (VIR_CLOSE(fd) < 0) + goto cleanup; + } + + if (virStreamFinish(st) < 0) + goto cleanup; + + ret = 0; + +cleanup: + VIR_FREE(files); + xmlXPathFreeContext(ctxt); + xmlFreeDoc(xml); + return ret; +} /* This is essentially a re-impl of virDomainMigrateVersion3 * from libvirt.c, but running in source libvirtd context, @@ -2357,7 +2521,13 @@ static int doPeer2PeerMigrate3(struct qemud_driver *driver, if (flags & VIR_MIGRATE_TUNNELLED) { if (!(st = virStreamNew(dconn, 0))) goto cleanup; - + if (flags & VIR_MIGRATE_OFFLINE) { + if (doMigrateOffline(driver, dconn, vm, cookiein, cookieinlen, + &cookieout, &cookieoutlen, flags, dom_xml, + dname, st, resource) != -1) + ret = 0; + goto cleanup; + } qemuDomainObjEnterRemoteWithDriver(driver, vm); ret = dconn->driver->domainMigratePrepareTunnel3 (dconn, st, cookiein, cookieinlen, @@ -2477,7 +2647,7 @@ finish: vm->def->name); cleanup: - if (ddomain) { + if (ddomain || (flags & VIR_MIGRATE_OFFLINE)) { virObjectUnref(ddomain); ret = 0; } else { @@ -2557,7 +2727,7 @@ static int doPeer2PeerMigrate(struct qemud_driver *driver, if (!virDomainObjIsActive(vm)) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("guest unexpectedly quit")); - goto cleanup; + flags |= VIR_MIGRATE_OFFLINE; } /* Change protection is only required on the source side (us), and @@ -2573,7 +2743,6 @@ static int doPeer2PeerMigrate(struct qemud_driver *driver, else ret = doPeer2PeerMigrate2(driver, sconn, dconn, vm, dconnuri, flags, dname, resource); - cleanup: orig_err = virSaveLastError(); qemuDomainObjEnterRemoteWithDriver(driver, vm); @@ -2620,7 +2789,7 @@ qemuMigrationPerformJob(struct qemud_driver *driver, if (!virDomainObjIsActive(vm)) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("domain is not running")); - goto endjob; + flags |= VIR_MIGRATE_OFFLINE; } if (!qemuMigrationIsAllowed(driver, vm, NULL)) diff --git a/src/qemu/qemu_migration.h b/src/qemu/qemu_migration.h index 1740204..2bcaea0 100644 --- a/src/qemu/qemu_migration.h +++ b/src/qemu/qemu_migration.h @@ -36,7 +36,8 @@ VIR_MIGRATE_NON_SHARED_DISK | \ VIR_MIGRATE_NON_SHARED_INC | \ VIR_MIGRATE_CHANGE_PROTECTION | \ - VIR_MIGRATE_UNSAFE) + VIR_MIGRATE_UNSAFE | \ + VIR_MIGRATE_OFFLINE) enum qemuMigrationJobPhase { QEMU_MIGRATION_PHASE_NONE = 0, -- 1.7.2.5

1 0

[libvirt] [PATCH V4] implement offline migration
by liguang 03 Sep '12

03 Sep '12

allow migration even domain isn't active by inserting some stubs to tunnel migration path. Signed-off-by: liguang <lig.fnst(a)cn.fujitsu.com> --- src/qemu/qemu_driver.c | 2 +- src/qemu/qemu_migration.c | 181 +++++++++++++++++++++++++++++++++++++++++++-- src/qemu/qemu_migration.h | 3 +- 3 files changed, 178 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index d74bf52..00ca211 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -9779,7 +9779,7 @@ qemuDomainMigratePrepareTunnel3(virConnectPtr dconn, virCheckFlags(QEMU_MIGRATION_FLAGS, -1); - if (!dom_xml) { + if (!dom_xml && !(flags & VIR_MIGRATE_OFFLINE)) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("no domain XML passed")); goto cleanup; diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 1b21ef6..991bcc5 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -70,6 +70,7 @@ enum qemuMigrationCookieFlags { QEMU_MIGRATION_COOKIE_FLAG_GRAPHICS, QEMU_MIGRATION_COOKIE_FLAG_LOCKSTATE, QEMU_MIGRATION_COOKIE_FLAG_PERSISTENT, + QEMU_MIGRATION_COOKIE_FLAG_OFFLINE, QEMU_MIGRATION_COOKIE_FLAG_LAST }; @@ -77,12 +78,13 @@ enum qemuMigrationCookieFlags { VIR_ENUM_DECL(qemuMigrationCookieFlag); VIR_ENUM_IMPL(qemuMigrationCookieFlag, QEMU_MIGRATION_COOKIE_FLAG_LAST, - "graphics", "lockstate", "persistent"); + "graphics", "lockstate", "persistent", "offline"); enum qemuMigrationCookieFeatures { QEMU_MIGRATION_COOKIE_GRAPHICS = (1 << QEMU_MIGRATION_COOKIE_FLAG_GRAPHICS), QEMU_MIGRATION_COOKIE_LOCKSTATE = (1 << QEMU_MIGRATION_COOKIE_FLAG_LOCKSTATE), QEMU_MIGRATION_COOKIE_PERSISTENT = (1 << QEMU_MIGRATION_COOKIE_FLAG_PERSISTENT), + QEMU_MIGRATION_COOKIE_OFFLINE = (1 << QEMU_MIGRATION_COOKIE_FLAG_OFFLINE), }; typedef struct _qemuMigrationCookieGraphics qemuMigrationCookieGraphics; @@ -101,6 +103,10 @@ struct _qemuMigrationCookie { unsigned int flags; unsigned int flagsMandatory; + /*offline migration flag*/ + int offline; + char *mig_file; + /* Host properties */ unsigned char localHostuuid[VIR_UUID_BUFLEN]; unsigned char remoteHostuuid[VIR_UUID_BUFLEN]; @@ -139,6 +145,8 @@ static void qemuMigrationCookieFree(qemuMigrationCookiePtr mig) if (mig->flags & QEMU_MIGRATION_COOKIE_GRAPHICS) qemuMigrationCookieGraphicsFree(mig->graphics); + if (mig->flags & QEMU_MIGRATION_COOKIE_GRAPHICS) + VIR_FREE(mig->mig_file); VIR_FREE(mig->localHostname); VIR_FREE(mig->remoteHostname); @@ -439,6 +447,12 @@ qemuMigrationCookieXMLFormat(struct qemud_driver *driver, virBufferAdjustIndent(buf, -2); } + if (mig->flags & QEMU_MIGRATION_COOKIE_OFFLINE) { + virBufferAsprintf(buf, " <offline mig_ol='%d' mig_file='%s'>\n", + mig->offline, mig->mig_file); + virBufferAddLit(buf, " </offline>\n"); + } + virBufferAddLit(buf, "</qemu-migration>\n"); return 0; } @@ -662,6 +676,18 @@ qemuMigrationCookieXMLParse(qemuMigrationCookiePtr mig, VIR_FREE(nodes); } + if ((flags & QEMU_MIGRATION_COOKIE_OFFLINE) && + virXPathBoolean("count(./offline) > 0", ctxt)) { + if (virXPathInt("string(./offline/@mig_ol)", ctxt, &mig->offline) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + "%s", _("missing mig_ol attribute in migration data")); + goto error; + } + mig->mig_file = virXPathString("string(./offline/@mig_file)", ctxt); + if (mig->mig_file && STREQ(mig->mig_file, "")) + VIR_FREE(mig->mig_file); + } + return 0; error: @@ -721,6 +747,12 @@ qemuMigrationBakeCookie(qemuMigrationCookiePtr mig, qemuMigrationCookieAddPersistent(mig, dom) < 0) return -1; + if (flags & QEMU_MIGRATION_COOKIE_OFFLINE) { + mig->flags |= QEMU_MIGRATION_COOKIE_OFFLINE; + mig->offline = 1; + } + + if (!(*cookieout = qemuMigrationCookieXMLFormatStr(driver, mig))) return -1; @@ -1307,6 +1339,27 @@ qemuMigrationPrepareAny(struct qemud_driver *driver, /* Domain starts inactive, even if the domain XML had an id field. */ vm->def->id = -1; + if (tunnel) { + if (!(mig = qemuMigrationEatCookie(driver, vm, cookiein, cookieinlen, + QEMU_MIGRATION_COOKIE_OFFLINE))) + return ret; + else if (mig->offline) { + char *file, *str, *tmp = NULL; + ret = 0; + for (str = mig->mig_file; ; str = NULL) { + file = strtok_r(str, " ", &tmp); + if (file == NULL) + break; + if (virFDStreamCreateFile(st, file, 0, 0, O_WRONLY, 0) < 0) { + virReportSystemError(errno, "%s", + _("cannot setup stream for tunnelled migration\n")); + ret = -1; + } + } + goto endjob; + } + } + if (tunnel && (pipe(dataFD) < 0 || virSetCloseExec(dataFD[1]) < 0)) { virReportSystemError(errno, "%s", @@ -2303,6 +2356,117 @@ cleanup: return ret; } +static int +doReadFile(virStreamPtr st ATTRIBUTE_UNUSED, + char *buf, size_t nbytes, void *opaque) +{ + int *fd = opaque; + + return saferead(*fd, buf, nbytes); +} + + +/* + * do offline migration + */ +static int doMigrateOffline(struct qemud_driver *driver, + virConnectPtr dconn, + virDomainObjPtr vm, + const char *cookiein, + int cookieinlen, + char **cookieout, + int *cookieoutlen, + unsigned long flags, + const char *dom_xml, + const char *dname, + virStreamPtr st, + unsigned long resource) +{ + xmlDocPtr xml = NULL; + xmlXPathContextPtr ctxt = NULL; + xmlNodePtr *disks = NULL; + qemuMigrationCookiePtr mig = NULL; + virBuffer buf = VIR_BUFFER_INITIALIZER; + int i = 0, cn = 0, fd = -1, ret = -1; + char *src[] = {NULL}, *files = NULL; + + VIR_DEBUG("driver=%p, vm=%p, st=%p, cookiein=%s, cookieinlen=%d, " + "cookieout=%p, cookieoutlen=%p, dom_xml=%s," + "dname=%s, flags=%lx, resource=%lu", + driver, vm, st, NULLSTR(cookiein), cookieinlen, + cookieout, cookieoutlen, dom_xml, dname, flags, resource); + + xml = virXMLParseStringCtxt(dom_xml, _("(domain_definition)"), &ctxt); + if (!xml) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("can't parse dom_xml for offline migration\n")); + goto cleanup; + } + cn = virXPathNodeSet("./devices/disk", ctxt, &disks); + if (cn < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Fail to get disk node\n")); + goto cleanup; + } + cn = 1; + + for (i = 0 ; i < cn ; i++) { + ctxt->node = disks[i]; + src[i] = virXPathString("string(./source/@file" + "|./source/@dir" + "|./source/@name)", ctxt); + virBufferAsprintf(&buf, "%s ", src[i]); + } + + files = virBufferContentAndReset(&buf); + + if (!(mig = qemuMigrationEatCookie(driver, vm, NULL, 0, 0))) + goto cleanup; + + mig->mig_file = files; + + if (qemuMigrationBakeCookie(mig, driver, vm, + cookieout, cookieoutlen, + QEMU_MIGRATION_COOKIE_OFFLINE) < 0) + goto cleanup; + + cookiein = *cookieout; + cookieinlen = *cookieoutlen; + cookieout = NULL; + cookieoutlen = 0; + + qemuDomainObjEnterRemoteWithDriver(driver, vm); + ret = dconn->driver->domainMigratePrepareTunnel3 + (dconn, st, cookiein, cookieinlen, + cookieout, cookieoutlen, + flags, dname, resource, dom_xml); + qemuDomainObjExitRemoteWithDriver(driver, vm); + if (ret == -1) + goto cleanup; + + for (i = 0; i < cn; i++) { + if ((fd = open(src[i], O_RDONLY)) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s %s", + _("Fail to open file for offline migration\n"), src[i]); + goto cleanup; + } + if (virStreamSendAll(st, doReadFile, &fd) < 0) + goto cleanup; + if (VIR_CLOSE(fd) < 0) + goto cleanup; + } + + if (virStreamFinish(st) < 0) + goto cleanup; + + ret = 0; + +cleanup: + VIR_FREE(files); + xmlXPathFreeContext(ctxt); + xmlFreeDoc(xml); + return ret; +} /* This is essentially a re-impl of virDomainMigrateVersion3 * from libvirt.c, but running in source libvirtd context, @@ -2357,7 +2521,13 @@ static int doPeer2PeerMigrate3(struct qemud_driver *driver, if (flags & VIR_MIGRATE_TUNNELLED) { if (!(st = virStreamNew(dconn, 0))) goto cleanup; - + if (flags & VIR_MIGRATE_OFFLINE) { + if (doMigrateOffline(driver, dconn, vm, cookiein, cookieinlen, + &cookieout, &cookieoutlen, flags, dom_xml, + dname, st, resource) != -1) + ret = 0; + goto cleanup; + } qemuDomainObjEnterRemoteWithDriver(driver, vm); ret = dconn->driver->domainMigratePrepareTunnel3 (dconn, st, cookiein, cookieinlen, @@ -2477,7 +2647,7 @@ finish: vm->def->name); cleanup: - if (ddomain) { + if (ddomain || (flags & VIR_MIGRATE_OFFLINE)) { virObjectUnref(ddomain); ret = 0; } else { @@ -2557,7 +2727,7 @@ static int doPeer2PeerMigrate(struct qemud_driver *driver, if (!virDomainObjIsActive(vm)) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("guest unexpectedly quit")); - goto cleanup; + flags |= VIR_MIGRATE_OFFLINE; } /* Change protection is only required on the source side (us), and @@ -2573,7 +2743,6 @@ static int doPeer2PeerMigrate(struct qemud_driver *driver, else ret = doPeer2PeerMigrate2(driver, sconn, dconn, vm, dconnuri, flags, dname, resource); - cleanup: orig_err = virSaveLastError(); qemuDomainObjEnterRemoteWithDriver(driver, vm); @@ -2620,7 +2789,7 @@ qemuMigrationPerformJob(struct qemud_driver *driver, if (!virDomainObjIsActive(vm)) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("domain is not running")); - goto endjob; + flags |= VIR_MIGRATE_OFFLINE; } if (!qemuMigrationIsAllowed(driver, vm, NULL)) diff --git a/src/qemu/qemu_migration.h b/src/qemu/qemu_migration.h index 1740204..2bcaea0 100644 --- a/src/qemu/qemu_migration.h +++ b/src/qemu/qemu_migration.h @@ -36,7 +36,8 @@ VIR_MIGRATE_NON_SHARED_DISK | \ VIR_MIGRATE_NON_SHARED_INC | \ VIR_MIGRATE_CHANGE_PROTECTION | \ - VIR_MIGRATE_UNSAFE) + VIR_MIGRATE_UNSAFE | \ + VIR_MIGRATE_OFFLINE) enum qemuMigrationJobPhase { QEMU_MIGRATION_PHASE_NONE = 0, -- 1.7.2.5

1 0

[libvirt] Compiling a simple code which include libvirt
by Rahul Bansal 02 Sep '12

02 Sep '12

I am trying to compile this code by two methods but it shows error 1) Without -lvirt option */tmp/ccHGRn8q.o: In function `main': ex1.c:(.text+0x15): undefined reference to `virConnectOpen' ex1.c:(.text+0x57): undefined reference to `virConnectClose'* 2) with -lvirt option */usr/bin/ld: cannot find -lvirt collect2: ld returned 1 exit status* Someone help me!

2 1

[libvirt] [libvirt-perl PATCH v2] Virt.xs: fix flag issue on set_scheduler_parameters
by Alex Jia 02 Sep '12

02 Sep '12

From: Alex Jia <Alex Jia ajia(a)redhat.com> The default flags are inconsistent on both qemuSetSchedulerParameters() and qemuGetSchedulerParameters() in libvirt, the qemuGetSchedulerParameters() always passes 'VIR_DOMAIN_AFFECT_CURRENT' flag to the qemuGetSchedulerParametersFlags(), it should be a expected behavior, but the qemuSetSchedulerParameters() always passes 'VIR_DOMAIN_AFFECT_LIVE' flag to the qemuSetSchedulerParametersFlags(), if users use default flag=0 or explicitly give a 'VIR_DOMAIN_AFFECT_CURRENT' flag to the set_scheduler_parameters() in perl-Sys-Virt, because the flag value is 0, the result is the virDomainSetSchedulerParameters() is called incorrectly. In fact, it's enough to call the qemuSetSchedulerParametersFlags() regardless of what flag is like 'virsh schedinfo' command. How to reproduce? # cat test.pl #!/usr/bin/env perl use warnings; use strict; use Sys::Virt; my $uri = "qemu:///system"; my $domname = "foo"; # change your guest name my $con = Sys::Virt->new(address => $uri, readonly => 0); my $dom = $con->get_domain_by_name($domname); my %sched_param = (Sys::Virt::Domain::SCHEDULER_CPU_SHARES=>1); $dom->set_scheduler_parameters(\%sched_param, Sys::Virt::Domain::AFFECT_CURRENT); # perl test.pl libvirt error code: 55, message: Requested operation is not valid: domain is not running Signed-off-by: Alex Jia <Alex Jia ajia(a)redhat.com> --- Virt.xs | 10 +++------- 1 files changed, 3 insertions(+), 7 deletions(-) diff --git a/Virt.xs b/Virt.xs index 2b8d74c..fa58cc6 100644 --- a/Virt.xs +++ b/Virt.xs @@ -2833,13 +2833,9 @@ set_scheduler_parameters(dom, newparams, flags=0) } } vir_typed_param_from_hv(newparams, params, nparams); - if (flags) { - if (virDomainSetSchedulerParametersFlags(dom, params, nparams, flags) < 0) - _croak_error(); - } else { - if (virDomainSetSchedulerParameters(dom, params, nparams) < 0) - _croak_error(); - } + + if (virDomainSetSchedulerParametersFlags(dom, params, nparams, flags) < 0) + _croak_error(); Safefree(params); -- 1.7.1

3 3

[libvirt] Release of libvirt-0.10.1
by Daniel Veillard 01 Sep '12

01 Sep '12

As promised there is a fixup release since 0.10.0 is catastrophic, and I should probably wear a brown paper bag ... The tarball is being pushed as I write this and should be available soon at the usual place: ftp://libvirt.org/libvirt/ There are still known issues, count 2 weeks of developments and a new week of freeze before 0.10.2, hopefully we will get those fixed by then ! Without surprize it's a nearly only bug fixes release: Bug Fixes: - conf: Avoid formatting auto-generated DAC labels (Marcelo Cerri) - conf: Fix parsing of seclabels without model (Marcelo Cerri) - virsh: fixed incorrect timing report (Viktor Mihajlovski) - qemu: Don't ignore CPU tuning config if required cgroups are missing (Jiri Denemark) - cgroup: fix libvirtd crash caused by messed memory (Guannan Ren) - cgroup: fix a typo on extracting data from vcpu cgroup (Guannan Ren) - cgroup: read more data from cgroup cpuacct.usage_percpu (Guannan Ren) - nwfilter: adapt IP learning for broadcasted DHCP replies (Stefan Berger) - nwfilter: accept broadcasted DHCP replies in DHCP snooping code (Stefan Berger) - Fix adding ports to OVS bridges without VLAN tags (Kyle Mestery) - Fix xen driver following changes to make it stateful (Jim Fehlig) - Fix issue of PF brought down if VF is 8021.Qbh and pci passthrough (Nishank Trivedi) - nwfilter: loop generated too many rules (Stefan Berger) - security: Re-apply commit ce53382ba28179d3a504b29b4f888b6e130d53f0 (Peter Krempa) - vcpupin: Fix returning of arrays from virDomainVcpuPinAdd (Peter Krempa) - qemu: Fix possible infinite loop and segfault on error path. (Peter Krempa) - qemu: Clean up security driver initialisation and config file (Peter Krempa) - qemu: Revert to blocking behavior of qemuAgentCommand (Jiri Denemark) - qemu: Remove redundant parameter from qemuAgentSend (Jiri Denemark) - network: get vlan info for Open vSwitch interfaces from proper source (Laine Stump) - Small cleanup on previous patch (Daniel Veillard) - Fix a crash when using Open vSwitch virtual ports (Kyle Mestery) - qemu: Sort the numa params only when it affects the live config (Osier Yang) - Fix configuration of QEMU security drivers (Daniel P. Berrange) - qemu: Refactor initialisation of security drivers. (Peter Krempa) - Revert "security: Add DAC to security_drivers" (Peter Krempa) - qemu: Fix starting domains with no cpu cgroup (Jiri Denemark) Documentation: - virsh: Document subdriver option of attach-disk (Jiri Denemark) - update option force to subcommand change-media (Guannan Ren) - Fix typo in CPU tuning (Jiri Denemark) - Fix emulator pinning example in formatdomain.html (Peter Krempa) Improvement: - Implement virMacAddrIsBroadcastRaw (Stefan Berger) Cleanup: - security: remove dead code from virSecurityDACGenLabel (Alex Jia) Thanks to everybody for those 2 days frenetically chasing bugs and trying to fix them ! Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

2 1

[libvirt] [PATCH] python: don't mask libvirt errors
by Eric Blake 01 Sep '12

01 Sep '12

A user reported this crash when using python bindings: File "/home/nox/workspace/NOX/src/NOX/hooks.py", line 134, in trigger hook.trigger(event) File "/home/nox/workspace/NOX/src/NOX/hooks.py", line 33, in trigger self.handlers[event]() File "/home/nox/workspace/NOX/hooks/volatility.py", line 81, in memory_dump for block in Memory(self.ctx): File "/home/see/workspace/NOX/src/NOX/lib/libtools.py", line 179, in next libvirt.VIR_MEMORY_PHYSICAL) File "/usr/lib/python2.7/dist-packages/libvirt.py", line 1759, in memoryPeek ret = libvirtmod.virDomainMemoryPeek(self._o, start, size, flags) SystemError: error return without exception set In the python bindings, returning NULL makes python think an exception was thrown, while returning the None object lets the wrappers know that a libvirt error exists. Reported by Nox DaFox, fix suggested by Dan Berrange. * python/libvirt-override.c (libvirt_virDomainBlockPeek) (libvirt_virDomainMemoryPeek): Return python's None object, so wrapper knows to check libvirt error. --- python/libvirt-override.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/python/libvirt-override.c b/python/libvirt-override.c index 8b41dff..65e8c69 100644 --- a/python/libvirt-override.c +++ b/python/libvirt-override.c @@ -5763,8 +5763,10 @@ libvirt_virDomainBlockPeek(PyObject *self ATTRIBUTE_UNUSED, c_retval = virDomainBlockPeek(domain, disk, offset, size, buf, flags); LIBVIRT_END_ALLOW_THREADS; - if (c_retval < 0) + if (c_retval < 0) { + py_retval = VIR_PY_NONE; goto cleanup; + } py_retval = PyString_FromStringAndSize(buf, size); @@ -5798,8 +5800,10 @@ libvirt_virDomainMemoryPeek(PyObject *self ATTRIBUTE_UNUSED, c_retval = virDomainMemoryPeek(domain, start, size, buf, flags); LIBVIRT_END_ALLOW_THREADS; - if (c_retval < 0) + if (c_retval < 0) { + py_retval = VIR_PY_NONE; goto cleanup; + } py_retval = PyString_FromStringAndSize(buf, size); -- 1.7.11.4

2 2

[libvirt] [PATCH] build: define WITH_INTERFACE for the driver
by Doug Goldstein 01 Sep '12

01 Sep '12

<not part of the commit> Really just looking for feedback if this an acceptable update to the previous work. My plan is to add a 'udev' backend that will provide just some basic read-only host interface information. Basically I've been seeing postings to libvirt-users and virt-tools where people are on distros that don't support netcf and are noticing that virt-manager uses HAL or they use libvir APIs and can configure everything for the virtual machine respecting the host except for the network. </not part of the commit> Based exclusively on work by Eric Blake in a patch posted with the same subject. However some modifications related to comments and my plans to add another backend. Added WITH_INTERFACE as the only automake variable deciding whether to build the driver and using WITH_NETCF to identify that we're wanting to use the netcf library as the backend. * configure.ac: Added with_interface and enhanced with_netcf to respect with_interface. * src/interface/netcf_driver.c: Renamed.. * src/interface/interface_backend_netcf.c: ..to this to match storage. * src/interface/netcf_driver.h: Renamed.. * src/interface/interface_driver.h: ..to this. * daemon/Makefile.am: Respect WITH_INTERFACE and WITH_NETCF. --- configure.ac | 44 ++- daemon/Makefile.am | 2 +- daemon/libvirtd.c | 8 +- src/Makefile.am | 24 +- src/interface/interface_backend_netcf.c | 663 +++++++++++++++++++++++++++++++ src/interface/interface_driver.h | 29 ++ src/interface/netcf_driver.c | 663 ------------------------------- src/interface/netcf_driver.h | 29 -- src/util/util.c | 21 +- tests/virdrivermoduletest.c | 2 +- tools/virsh.c | 4 +- 11 files changed, 776 insertions(+), 713 deletions(-) create mode 100644 src/interface/interface_backend_netcf.c create mode 100644 src/interface/interface_driver.h delete mode 100644 src/interface/netcf_driver.c delete mode 100644 src/interface/netcf_driver.h diff --git a/configure.ac b/configure.ac index df39df2..2d7a55e 100644 --- a/configure.ac +++ b/configure.ac @@ -1963,9 +1963,6 @@ if test "$with_netcf" = "yes" || test "$with_netcf" = "check"; then fi fi fi -AM_CONDITIONAL([WITH_NETCF], [test "$with_netcf" = "yes"]) -AC_SUBST([NETCF_CFLAGS]) -AC_SUBST([NETCF_LIBS]) AC_ARG_WITH([secrets], @@ -2806,6 +2803,46 @@ if test "$with_nwfilter" = "yes" ; then fi AM_CONDITIONAL([WITH_NWFILTER], [test "$with_nwfilter" = "yes"]) +dnl check if the interface driver should be compiled +AC_ARG_WITH([interface], + AC_HELP_STRING([--with-interface], + [with host interface driver @<:@default=check@:>@]), [], + [with_interface=check]) + +dnl Don't compile the interface driver without libvirtd +if test "$with_libvirtd" = "no" ; then + with_interface=no +fi + +dnl The interface driver depends on the netcf library +if test "$with_interface:$with_netcf" = "check:yes" ; then + with_interface=yes +fi + +if test "$with_interface:$with_netcf" = "check:no" ; then + with_interface=no +fi + +if test "$with_interface:$with_netcf" = "yes:no" ; then + AC_MSG_ERROR([Requested the Interface driver without netcf support]) +fi + +if test "$with_interface" = "yes" ; then + AC_DEFINE_UNQUOTED([WITH_INTERFACE], [1], + [whether the interface driver is enabled]) +fi +AM_CONDITIONAL([WITH_INTERFACE], [test "$with_interface" = "yes"]) + +dnl If the interface driver is off disable netcf +if test "$with_interface" = "no" ; then + with_netcf=no +fi + +dnl We only use netcf for the interface driver so only enable it then +AM_CONDITIONAL([WITH_NETCF], [test "$with_netcf" = "yes"]) +AC_SUBST([NETCF_CFLAGS]) +AC_SUBST([NETCF_LIBS]) + dnl libblkid is used by several storage drivers; therefore we probe dnl for it unconditionally. AC_ARG_WITH([libblkid], @@ -3018,6 +3055,7 @@ AC_MSG_NOTICE([ Remote: $with_remote]) AC_MSG_NOTICE([ Network: $with_network]) AC_MSG_NOTICE([ Libvirtd: $with_libvirtd]) AC_MSG_NOTICE([ netcf: $with_netcf]) +AC_MSG_NOTICE([Interface: $with_interface]) AC_MSG_NOTICE([ macvtap: $with_macvtap]) AC_MSG_NOTICE([ virtport: $with_virtualport]) AC_MSG_NOTICE([]) diff --git a/daemon/Makefile.am b/daemon/Makefile.am index b00fc13..fbd5a5e 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -147,7 +147,7 @@ if WITH_NETWORK libvirtd_LDADD += ../src/libvirt_driver_network.la endif -if WITH_NETCF +if WITH_INTERFACE libvirtd_LDADD += ../src/libvirt_driver_interface.la endif diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index 19dd26b..c2923d5 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -75,8 +75,8 @@ # ifdef WITH_NETWORK # include "network/bridge_driver.h" # endif -# ifdef WITH_NETCF -# include "interface/netcf_driver.h" +# ifdef WITH_INTERFACE +# include "interface/interface_driver.h" # endif # ifdef WITH_STORAGE # include "storage/storage_driver.h" @@ -379,7 +379,7 @@ static void daemonInitialize(void) # ifdef WITH_NWFILTER virDriverLoadModule("nwfilter"); # endif -# ifdef WITH_NETCF +# ifdef WITH_INTERFACE virDriverLoadModule("interface"); # endif # ifdef WITH_QEMU @@ -401,7 +401,7 @@ static void daemonInitialize(void) # ifdef WITH_NETWORK networkRegister(); # endif -# ifdef WITH_NETCF +# ifdef WITH_INTERFACE interfaceRegister(); # endif # ifdef WITH_STORAGE diff --git a/src/Makefile.am b/src/Makefile.am index 95e1bea..72c4d6c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -548,8 +548,17 @@ PARALLELS_DRIVER_SOURCES = \ NETWORK_DRIVER_SOURCES = \ network/bridge_driver.h network/bridge_driver.c -INTERFACE_DRIVER_SOURCES = \ - interface/netcf_driver.h interface/netcf_driver.c +INTERFACE_DRIVER_SOURCES = + +if WITH_INTERFACE +INTERFACE_DRIVER_SOURCES += \ + interface/interface_driver.h +endif + +if WITH_NETCF +INTERFACE_DRIVER_SOURCES += \ + interface/interface_backend_netcf.c +endif SECRET_DRIVER_SOURCES = \ secret/secret_driver.h secret/secret_driver.c @@ -1017,7 +1026,7 @@ endif EXTRA_DIST += network/default.xml -if WITH_NETCF +if WITH_INTERFACE if WITH_DRIVER_MODULES mod_LTLIBRARIES += libvirt_driver_interface.la else @@ -1025,10 +1034,13 @@ noinst_LTLIBRARIES += libvirt_driver_interface.la # Stateful, so linked to daemon instead #libvirt_la_BUILT_LIBADD += libvirt_driver_interface.la endif -libvirt_driver_interface_la_CFLAGS = $(NETCF_CFLAGS) \ - -I$(top_srcdir)/src/conf $(AM_CFLAGS) +libvirt_driver_interface_la_CFLAGS = -I$(top_srcdir)/src/conf $(AM_CFLAGS) libvirt_driver_interface_la_LDFLAGS = $(AM_LDFLAGS) -libvirt_driver_interface_la_LIBADD = $(NETCF_LIBS) +libvirt_driver_interface_la_LIBADD = +if WITH_NETCF +libvirt_driver_interface_la_CFLAGS += $(NETCF_CFLAGS) +libvirt_driver_interface_la_LIBADD += $(NETCF_LIBS) +endif if WITH_DRIVER_MODULES libvirt_driver_interface_la_LIBADD += ../gnulib/lib/libgnu.la libvirt_driver_interface_la_LDFLAGS += -module -avoid-version diff --git a/src/interface/interface_backend_netcf.c b/src/interface/interface_backend_netcf.c new file mode 100644 index 0000000..9285b08 --- /dev/null +++ b/src/interface/interface_backend_netcf.c @@ -0,0 +1,663 @@ +/* + * interface_driver.c: backend driver methods to handle physical + * interface configuration using the netcf library. + * + * Copyright (C) 2006-2011 Red Hat, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. + * + * Author: Laine Stump <laine(a)redhat.com> + */ + +#include <config.h> + +#include <netcf.h> + +#include "virterror_internal.h" +#include "datatypes.h" +#include "interface_driver.h" +#include "interface_conf.h" +#include "memory.h" + +#define VIR_FROM_THIS VIR_FROM_INTERFACE + +/* Main driver state */ +struct interface_driver +{ + virMutex lock; + struct netcf *netcf; +}; + + +static void interfaceDriverLock(struct interface_driver *driver) +{ + virMutexLock(&driver->lock); +} + +static void interfaceDriverUnlock(struct interface_driver *driver) +{ + virMutexUnlock(&driver->lock); +} + +static int netcf_to_vir_err(int netcf_errcode) +{ + switch (netcf_errcode) + { + case NETCF_NOERROR: + /* no error, everything ok */ + return VIR_ERR_OK; + case NETCF_EINTERNAL: + /* internal error, aka bug */ + return VIR_ERR_INTERNAL_ERROR; + case NETCF_EOTHER: + /* other error, copout for being more specific */ + return VIR_ERR_INTERNAL_ERROR; + case NETCF_ENOMEM: + /* + * allocation failed return VIR ERR NO MEMORY + * though it should not be used now. + */ + return 2; + case NETCF_EXMLPARSER: + /* XML parser choked */ + return VIR_ERR_XML_ERROR; + case NETCF_EXMLINVALID: + /* XML invalid in some form */ + return VIR_ERR_XML_ERROR; + case NETCF_ENOENT: + /* Required entry in a tree is missing */ + return VIR_ERR_INTERNAL_ERROR; + case NETCF_EEXEC: + /* external program execution failed or returned non-0 */ + return VIR_ERR_INTERNAL_ERROR; +#ifdef NETCF_EINVALIDOP + case NETCF_EINVALIDOP: + /* attempted operation is invalid while the system is in the current state. */ + return VIR_ERR_OPERATION_INVALID; +#endif + default: + return VIR_ERR_INTERNAL_ERROR; + } +} + +static struct netcf_if *interfaceDriverGetNetcfIF(struct netcf *ncf, virInterfacePtr ifinfo) +{ + /* 1) caller already has lock, + * 2) caller cleans up iface on return + */ + struct netcf_if *iface = ncf_lookup_by_name(ncf, ifinfo->name); + if (!iface) { + const char *errmsg, *details; + int errcode = ncf_error(ncf, &errmsg, &details); + if (errcode != NETCF_NOERROR) { + virReportError(netcf_to_vir_err(errcode), + _("couldn't find interface named '%s': %s%s%s"), + ifinfo->name, errmsg, details ? " - " : "", + details ? details : ""); + } else { + virReportError(VIR_ERR_NO_INTERFACE, + _("couldn't find interface named '%s'"), + ifinfo->name); + } + } + return iface; +} + +static virDrvOpenStatus interfaceOpenInterface(virConnectPtr conn, + virConnectAuthPtr auth ATTRIBUTE_UNUSED, + unsigned int flags) +{ + struct interface_driver *driverState; + + virCheckFlags(VIR_CONNECT_RO, VIR_DRV_OPEN_ERROR); + + if (VIR_ALLOC(driverState) < 0) + { + virReportOOMError(); + goto alloc_error; + } + + /* initialize non-0 stuff in driverState */ + if (virMutexInit(&driverState->lock) < 0) + { + /* what error to report? */ + goto mutex_error; + } + + /* open netcf */ + if (ncf_init(&driverState->netcf, NULL) != 0) + { + /* what error to report? */ + goto netcf_error; + } + + conn->interfacePrivateData = driverState; + return VIR_DRV_OPEN_SUCCESS; + +netcf_error: + if (driverState->netcf) + { + ncf_close(driverState->netcf); + } + virMutexDestroy (&driverState->lock); +mutex_error: + VIR_FREE(driverState); +alloc_error: + return VIR_DRV_OPEN_ERROR; +} + +static int interfaceCloseInterface(virConnectPtr conn) +{ + + if (conn->interfacePrivateData != NULL) + { + struct interface_driver *driver = conn->interfacePrivateData; + + /* close netcf instance */ + ncf_close(driver->netcf); + /* destroy lock */ + virMutexDestroy(&driver->lock); + /* free driver state */ + VIR_FREE(driver); + } + conn->interfacePrivateData = NULL; + return 0; +} + +static int interfaceNumOfInterfaces(virConnectPtr conn) +{ + int count; + struct interface_driver *driver = conn->interfacePrivateData; + + interfaceDriverLock(driver); + count = ncf_num_of_interfaces(driver->netcf, NETCF_IFACE_ACTIVE); + if (count < 0) { + const char *errmsg, *details; + int errcode = ncf_error(driver->netcf, &errmsg, &details); + virReportError(netcf_to_vir_err(errcode), + _("failed to get number of interfaces on host: %s%s%s"), + errmsg, details ? " - " : "", details ? details : ""); + } + + interfaceDriverUnlock(driver); + return count; +} + +static int interfaceListInterfaces(virConnectPtr conn, char **const names, int nnames) +{ + struct interface_driver *driver = conn->interfacePrivateData; + int count; + + interfaceDriverLock(driver); + + count = ncf_list_interfaces(driver->netcf, nnames, names, NETCF_IFACE_ACTIVE); + if (count < 0) { + const char *errmsg, *details; + int errcode = ncf_error(driver->netcf, &errmsg, &details); + virReportError(netcf_to_vir_err(errcode), + _("failed to list host interfaces: %s%s%s"), + errmsg, details ? " - " : "", + details ? details : ""); + } + + interfaceDriverUnlock(driver); + return count; + +} + +static int interfaceNumOfDefinedInterfaces(virConnectPtr conn) +{ + int count; + struct interface_driver *driver = conn->interfacePrivateData; + + interfaceDriverLock(driver); + count = ncf_num_of_interfaces(driver->netcf, NETCF_IFACE_INACTIVE); + if (count < 0) { + const char *errmsg, *details; + int errcode = ncf_error(driver->netcf, &errmsg, &details); + virReportError(netcf_to_vir_err(errcode), + _("failed to get number of defined interfaces on host: %s%s%s"), + errmsg, details ? " - " : "", + details ? details : ""); + } + + interfaceDriverUnlock(driver); + return count; +} + +static int interfaceListDefinedInterfaces(virConnectPtr conn, char **const names, int nnames) +{ + struct interface_driver *driver = conn->interfacePrivateData; + int count; + + interfaceDriverLock(driver); + + count = ncf_list_interfaces(driver->netcf, nnames, names, NETCF_IFACE_INACTIVE); + if (count < 0) { + const char *errmsg, *details; + int errcode = ncf_error(driver->netcf, &errmsg, &details); + virReportError(netcf_to_vir_err(errcode), + _("failed to list host defined interfaces: %s%s%s"), + errmsg, details ? " - " : "", + details ? details : ""); + } + + interfaceDriverUnlock(driver); + return count; + +} + +static virInterfacePtr interfaceLookupByName(virConnectPtr conn, + const char *name) +{ + struct interface_driver *driver = conn->interfacePrivateData; + struct netcf_if *iface; + virInterfacePtr ret = NULL; + + interfaceDriverLock(driver); + iface = ncf_lookup_by_name(driver->netcf, name); + if (!iface) { + const char *errmsg, *details; + int errcode = ncf_error(driver->netcf, &errmsg, &details); + if (errcode != NETCF_NOERROR) { + virReportError(netcf_to_vir_err(errcode), + _("couldn't find interface named '%s': %s%s%s"), + name, errmsg, + details ? " - " : "", details ? details : ""); + } else { + virReportError(VIR_ERR_NO_INTERFACE, + _("couldn't find interface named '%s'"), name); + } + goto cleanup; + } + + ret = virGetInterface(conn, ncf_if_name(iface), ncf_if_mac_string(iface)); + +cleanup: + ncf_if_free(iface); + interfaceDriverUnlock(driver); + return ret; +} + +static virInterfacePtr interfaceLookupByMACString(virConnectPtr conn, + const char *macstr) +{ + struct interface_driver *driver = conn->interfacePrivateData; + struct netcf_if *iface; + int niface; + virInterfacePtr ret = NULL; + + interfaceDriverLock(driver); + niface = ncf_lookup_by_mac_string(driver->netcf, macstr, 1, &iface); + + if (niface < 0) { + const char *errmsg, *details; + int errcode = ncf_error(driver->netcf, &errmsg, &details); + virReportError(netcf_to_vir_err(errcode), + _("couldn't find interface with MAC address '%s': %s%s%s"), + macstr, errmsg, details ? " - " : "", + details ? details : ""); + goto cleanup; + } + if (niface == 0) { + virReportError(VIR_ERR_NO_INTERFACE, + _("couldn't find interface with MAC address '%s'"), + macstr); + goto cleanup; + } + if (niface > 1) { + virReportError(VIR_ERR_MULTIPLE_INTERFACES, + "%s", _("multiple interfaces with matching MAC address")); + goto cleanup; + } + + ret = virGetInterface(conn, ncf_if_name(iface), ncf_if_mac_string(iface)); + +cleanup: + ncf_if_free(iface); + interfaceDriverUnlock(driver); + return ret; +} + +static char *interfaceGetXMLDesc(virInterfacePtr ifinfo, + unsigned int flags) +{ + struct interface_driver *driver = ifinfo->conn->interfacePrivateData; + struct netcf_if *iface = NULL; + char *xmlstr = NULL; + virInterfaceDefPtr ifacedef = NULL; + char *ret = NULL; + + virCheckFlags(VIR_INTERFACE_XML_INACTIVE, NULL); + + interfaceDriverLock(driver); + + iface = interfaceDriverGetNetcfIF(driver->netcf, ifinfo); + if (!iface) { + /* helper already reported error */ + goto cleanup; + } + + if ((flags & VIR_INTERFACE_XML_INACTIVE)) { + xmlstr = ncf_if_xml_desc(iface); + } else { + xmlstr = ncf_if_xml_state(iface); + } + if (!xmlstr) { + const char *errmsg, *details; + int errcode = ncf_error(driver->netcf, &errmsg, &details); + virReportError(netcf_to_vir_err(errcode), + _("could not get interface XML description: %s%s%s"), + errmsg, details ? " - " : "", + details ? details : ""); + goto cleanup; + } + + ifacedef = virInterfaceDefParseString(xmlstr); + if (!ifacedef) { + /* error was already reported */ + goto cleanup; + } + + ret = virInterfaceDefFormat(ifacedef); + if (!ret) { + /* error was already reported */ + goto cleanup; + } + +cleanup: + ncf_if_free(iface); + VIR_FREE(xmlstr); + virInterfaceDefFree(ifacedef); + interfaceDriverUnlock(driver); + return ret; +} + +static virInterfacePtr interfaceDefineXML(virConnectPtr conn, + const char *xml, + unsigned int flags) +{ + struct interface_driver *driver = conn->interfacePrivateData; + struct netcf_if *iface = NULL; + char *xmlstr = NULL; + virInterfaceDefPtr ifacedef = NULL; + virInterfacePtr ret = NULL; + + virCheckFlags(0, NULL); + + interfaceDriverLock(driver); + + ifacedef = virInterfaceDefParseString(xml); + if (!ifacedef) { + /* error was already reported */ + goto cleanup; + } + + xmlstr = virInterfaceDefFormat(ifacedef); + if (!xmlstr) { + /* error was already reported */ + goto cleanup; + } + + iface = ncf_define(driver->netcf, xmlstr); + if (!iface) { + const char *errmsg, *details; + int errcode = ncf_error(driver->netcf, &errmsg, &details); + virReportError(netcf_to_vir_err(errcode), + _("could not get interface XML description: %s%s%s"), + errmsg, details ? " - " : "", + details ? details : ""); + goto cleanup; + } + + ret = virGetInterface(conn, ncf_if_name(iface), ncf_if_mac_string(iface)); + +cleanup: + ncf_if_free(iface); + VIR_FREE(xmlstr); + virInterfaceDefFree(ifacedef); + interfaceDriverUnlock(driver); + return ret; +} + +static int interfaceUndefine(virInterfacePtr ifinfo) { + struct interface_driver *driver = ifinfo->conn->interfacePrivateData; + struct netcf_if *iface = NULL; + int ret = -1; + + interfaceDriverLock(driver); + + iface = interfaceDriverGetNetcfIF(driver->netcf, ifinfo); + if (!iface) { + /* helper already reported error */ + goto cleanup; + } + + ret = ncf_if_undefine(iface); + if (ret < 0) { + const char *errmsg, *details; + int errcode = ncf_error(driver->netcf, &errmsg, &details); + virReportError(netcf_to_vir_err(errcode), + _("failed to undefine interface %s: %s%s%s"), + ifinfo->name, errmsg, details ? " - " : "", + details ? details : ""); + goto cleanup; + } + +cleanup: + ncf_if_free(iface); + interfaceDriverUnlock(driver); + return ret; +} + +static int interfaceCreate(virInterfacePtr ifinfo, + unsigned int flags) +{ + struct interface_driver *driver = ifinfo->conn->interfacePrivateData; + struct netcf_if *iface = NULL; + int ret = -1; + + virCheckFlags(0, -1); + + interfaceDriverLock(driver); + + iface = interfaceDriverGetNetcfIF(driver->netcf, ifinfo); + if (!iface) { + /* helper already reported error */ + goto cleanup; + } + + ret = ncf_if_up(iface); + if (ret < 0) { + const char *errmsg, *details; + int errcode = ncf_error(driver->netcf, &errmsg, &details); + virReportError(netcf_to_vir_err(errcode), + _("failed to create (start) interface %s: %s%s%s"), + ifinfo->name, errmsg, details ? " - " : "", + details ? details : ""); + goto cleanup; + } + +cleanup: + ncf_if_free(iface); + interfaceDriverUnlock(driver); + return ret; +} + +static int interfaceDestroy(virInterfacePtr ifinfo, + unsigned int flags) +{ + struct interface_driver *driver = ifinfo->conn->interfacePrivateData; + struct netcf_if *iface = NULL; + int ret = -1; + + virCheckFlags(0, -1); + + interfaceDriverLock(driver); + + iface = interfaceDriverGetNetcfIF(driver->netcf, ifinfo); + if (!iface) { + /* helper already reported error */ + goto cleanup; + } + + ret = ncf_if_down(iface); + if (ret < 0) { + const char *errmsg, *details; + int errcode = ncf_error(driver->netcf, &errmsg, &details); + virReportError(netcf_to_vir_err(errcode), + _("failed to destroy (stop) interface %s: %s%s%s"), + ifinfo->name, errmsg, details ? " - " : "", + details ? details : ""); + goto cleanup; + } + +cleanup: + ncf_if_free(iface); + interfaceDriverUnlock(driver); + return ret; +} + +static int interfaceIsActive(virInterfacePtr ifinfo) +{ + struct interface_driver *driver = ifinfo->conn->interfacePrivateData; + struct netcf_if *iface = NULL; + unsigned int flags = 0; + int ret = -1; + + interfaceDriverLock(driver); + + iface = interfaceDriverGetNetcfIF(driver->netcf, ifinfo); + if (!iface) { + /* helper already reported error */ + goto cleanup; + } + + if (ncf_if_status(iface, &flags) < 0) { + const char *errmsg, *details; + int errcode = ncf_error(driver->netcf, &errmsg, &details); + virReportError(netcf_to_vir_err(errcode), + _("failed to get status of interface %s: %s%s%s"), + ifinfo->name, errmsg, details ? " - " : "", + details ? details : ""); + goto cleanup; + } + + ret = flags & NETCF_IFACE_ACTIVE ? 1 : 0; + +cleanup: + ncf_if_free(iface); + interfaceDriverUnlock(driver); + return ret; +} + +#ifdef HAVE_NETCF_TRANSACTIONS +static int interfaceChangeBegin(virConnectPtr conn, unsigned int flags) +{ + struct interface_driver *driver = conn->interfacePrivateData; + int ret; + + virCheckFlags(0, -1); /* currently flags must be 0 */ + + interfaceDriverLock(driver); + + ret = ncf_change_begin(driver->netcf, 0); + if (ret < 0) { + const char *errmsg, *details; + int errcode = ncf_error(driver->netcf, &errmsg, &details); + virReportError(netcf_to_vir_err(errcode), + _("failed to begin transaction: %s%s%s"), + errmsg, details ? " - " : "", + details ? details : ""); + } + + interfaceDriverUnlock(driver); + return ret; +} + +static int interfaceChangeCommit(virConnectPtr conn, unsigned int flags) +{ + struct interface_driver *driver = conn->interfacePrivateData; + int ret; + + virCheckFlags(0, -1); /* currently flags must be 0 */ + + interfaceDriverLock(driver); + + ret = ncf_change_commit(driver->netcf, 0); + if (ret < 0) { + const char *errmsg, *details; + int errcode = ncf_error(driver->netcf, &errmsg, &details); + virReportError(netcf_to_vir_err(errcode), + _("failed to commit transaction: %s%s%s"), + errmsg, details ? " - " : "", + details ? details : ""); + } + + interfaceDriverUnlock(driver); + return ret; +} + +static int interfaceChangeRollback(virConnectPtr conn, unsigned int flags) +{ + struct interface_driver *driver = conn->interfacePrivateData; + int ret; + + virCheckFlags(0, -1); /* currently flags must be 0 */ + + interfaceDriverLock(driver); + + ret = ncf_change_rollback(driver->netcf, 0); + if (ret < 0) { + const char *errmsg, *details; + int errcode = ncf_error(driver->netcf, &errmsg, &details); + virReportError(netcf_to_vir_err(errcode), + _("failed to rollback transaction: %s%s%s"), + errmsg, details ? " - " : "", + details ? details : ""); + } + + interfaceDriverUnlock(driver); + return ret; +} +#endif /* HAVE_NETCF_TRANSACTIONS */ + +static virInterfaceDriver interfaceDriver = { + "Interface", + .open = interfaceOpenInterface, /* 0.7.0 */ + .close = interfaceCloseInterface, /* 0.7.0 */ + .numOfInterfaces = interfaceNumOfInterfaces, /* 0.7.0 */ + .listInterfaces = interfaceListInterfaces, /* 0.7.0 */ + .numOfDefinedInterfaces = interfaceNumOfDefinedInterfaces, /* 0.7.0 */ + .listDefinedInterfaces = interfaceListDefinedInterfaces, /* 0.7.0 */ + .interfaceLookupByName = interfaceLookupByName, /* 0.7.0 */ + .interfaceLookupByMACString = interfaceLookupByMACString, /* 0.7.0 */ + .interfaceGetXMLDesc = interfaceGetXMLDesc, /* 0.7.0 */ + .interfaceDefineXML = interfaceDefineXML, /* 0.7.0 */ + .interfaceUndefine = interfaceUndefine, /* 0.7.0 */ + .interfaceCreate = interfaceCreate, /* 0.7.0 */ + .interfaceDestroy = interfaceDestroy, /* 0.7.0 */ + .interfaceIsActive = interfaceIsActive, /* 0.7.3 */ +#ifdef HAVE_NETCF_TRANSACTIONS + .interfaceChangeBegin = interfaceChangeBegin, /* 0.9.2 */ + .interfaceChangeCommit = interfaceChangeCommit, /* 0.9.2 */ + .interfaceChangeRollback = interfaceChangeRollback, /* 0.9.2 */ +#endif /* HAVE_NETCF_TRANSACTIONS */ +}; + +int interfaceRegister(void) { + virRegisterInterfaceDriver(&interfaceDriver); + return 0; +} diff --git a/src/interface/interface_driver.h b/src/interface/interface_driver.h new file mode 100644 index 0000000..38fbc77 --- /dev/null +++ b/src/interface/interface_driver.h @@ -0,0 +1,29 @@ +/* + * interface_driver.h: core driver methods for managing physical host interfaces + * + * Copyright (C) 2006, 2007 Red Hat, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. + * + * Author: Laine Stump <laine(a)redhat.com> + */ + + +#ifndef __VIR_INTERFACE__DRIVER_H +# define __VIR_INTERFACE__DRIVER_H + +int interfaceRegister(void); + +#endif /* __VIR_INTERFACE__DRIVER_H */ diff --git a/src/interface/netcf_driver.c b/src/interface/netcf_driver.c deleted file mode 100644 index 935be66..0000000 --- a/src/interface/netcf_driver.c +++ /dev/null @@ -1,663 +0,0 @@ -/* - * interface_driver.c: backend driver methods to handle physical - * interface configuration using the netcf library. - * - * Copyright (C) 2006-2011 Red Hat, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; If not, see - * <http://www.gnu.org/licenses/>. - * - * Author: Laine Stump <laine(a)redhat.com> - */ - -#include <config.h> - -#include <netcf.h> - -#include "virterror_internal.h" -#include "datatypes.h" -#include "netcf_driver.h" -#include "interface_conf.h" -#include "memory.h" - -#define VIR_FROM_THIS VIR_FROM_INTERFACE - -/* Main driver state */ -struct interface_driver -{ - virMutex lock; - struct netcf *netcf; -}; - - -static void interfaceDriverLock(struct interface_driver *driver) -{ - virMutexLock(&driver->lock); -} - -static void interfaceDriverUnlock(struct interface_driver *driver) -{ - virMutexUnlock(&driver->lock); -} - -static int netcf_to_vir_err(int netcf_errcode) -{ - switch (netcf_errcode) - { - case NETCF_NOERROR: - /* no error, everything ok */ - return VIR_ERR_OK; - case NETCF_EINTERNAL: - /* internal error, aka bug */ - return VIR_ERR_INTERNAL_ERROR; - case NETCF_EOTHER: - /* other error, copout for being more specific */ - return VIR_ERR_INTERNAL_ERROR; - case NETCF_ENOMEM: - /* - * allocation failed return VIR ERR NO MEMORY - * though it should not be used now. - */ - return 2; - case NETCF_EXMLPARSER: - /* XML parser choked */ - return VIR_ERR_XML_ERROR; - case NETCF_EXMLINVALID: - /* XML invalid in some form */ - return VIR_ERR_XML_ERROR; - case NETCF_ENOENT: - /* Required entry in a tree is missing */ - return VIR_ERR_INTERNAL_ERROR; - case NETCF_EEXEC: - /* external program execution failed or returned non-0 */ - return VIR_ERR_INTERNAL_ERROR; -#ifdef NETCF_EINVALIDOP - case NETCF_EINVALIDOP: - /* attempted operation is invalid while the system is in the current state. */ - return VIR_ERR_OPERATION_INVALID; -#endif - default: - return VIR_ERR_INTERNAL_ERROR; - } -} - -static struct netcf_if *interfaceDriverGetNetcfIF(struct netcf *ncf, virInterfacePtr ifinfo) -{ - /* 1) caller already has lock, - * 2) caller cleans up iface on return - */ - struct netcf_if *iface = ncf_lookup_by_name(ncf, ifinfo->name); - if (!iface) { - const char *errmsg, *details; - int errcode = ncf_error(ncf, &errmsg, &details); - if (errcode != NETCF_NOERROR) { - virReportError(netcf_to_vir_err(errcode), - _("couldn't find interface named '%s': %s%s%s"), - ifinfo->name, errmsg, details ? " - " : "", - details ? details : ""); - } else { - virReportError(VIR_ERR_NO_INTERFACE, - _("couldn't find interface named '%s'"), - ifinfo->name); - } - } - return iface; -} - -static virDrvOpenStatus interfaceOpenInterface(virConnectPtr conn, - virConnectAuthPtr auth ATTRIBUTE_UNUSED, - unsigned int flags) -{ - struct interface_driver *driverState; - - virCheckFlags(VIR_CONNECT_RO, VIR_DRV_OPEN_ERROR); - - if (VIR_ALLOC(driverState) < 0) - { - virReportOOMError(); - goto alloc_error; - } - - /* initialize non-0 stuff in driverState */ - if (virMutexInit(&driverState->lock) < 0) - { - /* what error to report? */ - goto mutex_error; - } - - /* open netcf */ - if (ncf_init(&driverState->netcf, NULL) != 0) - { - /* what error to report? */ - goto netcf_error; - } - - conn->interfacePrivateData = driverState; - return VIR_DRV_OPEN_SUCCESS; - -netcf_error: - if (driverState->netcf) - { - ncf_close(driverState->netcf); - } - virMutexDestroy (&driverState->lock); -mutex_error: - VIR_FREE(driverState); -alloc_error: - return VIR_DRV_OPEN_ERROR; -} - -static int interfaceCloseInterface(virConnectPtr conn) -{ - - if (conn->interfacePrivateData != NULL) - { - struct interface_driver *driver = conn->interfacePrivateData; - - /* close netcf instance */ - ncf_close(driver->netcf); - /* destroy lock */ - virMutexDestroy(&driver->lock); - /* free driver state */ - VIR_FREE(driver); - } - conn->interfacePrivateData = NULL; - return 0; -} - -static int interfaceNumOfInterfaces(virConnectPtr conn) -{ - int count; - struct interface_driver *driver = conn->interfacePrivateData; - - interfaceDriverLock(driver); - count = ncf_num_of_interfaces(driver->netcf, NETCF_IFACE_ACTIVE); - if (count < 0) { - const char *errmsg, *details; - int errcode = ncf_error(driver->netcf, &errmsg, &details); - virReportError(netcf_to_vir_err(errcode), - _("failed to get number of interfaces on host: %s%s%s"), - errmsg, details ? " - " : "", details ? details : ""); - } - - interfaceDriverUnlock(driver); - return count; -} - -static int interfaceListInterfaces(virConnectPtr conn, char **const names, int nnames) -{ - struct interface_driver *driver = conn->interfacePrivateData; - int count; - - interfaceDriverLock(driver); - - count = ncf_list_interfaces(driver->netcf, nnames, names, NETCF_IFACE_ACTIVE); - if (count < 0) { - const char *errmsg, *details; - int errcode = ncf_error(driver->netcf, &errmsg, &details); - virReportError(netcf_to_vir_err(errcode), - _("failed to list host interfaces: %s%s%s"), - errmsg, details ? " - " : "", - details ? details : ""); - } - - interfaceDriverUnlock(driver); - return count; - -} - -static int interfaceNumOfDefinedInterfaces(virConnectPtr conn) -{ - int count; - struct interface_driver *driver = conn->interfacePrivateData; - - interfaceDriverLock(driver); - count = ncf_num_of_interfaces(driver->netcf, NETCF_IFACE_INACTIVE); - if (count < 0) { - const char *errmsg, *details; - int errcode = ncf_error(driver->netcf, &errmsg, &details); - virReportError(netcf_to_vir_err(errcode), - _("failed to get number of defined interfaces on host: %s%s%s"), - errmsg, details ? " - " : "", - details ? details : ""); - } - - interfaceDriverUnlock(driver); - return count; -} - -static int interfaceListDefinedInterfaces(virConnectPtr conn, char **const names, int nnames) -{ - struct interface_driver *driver = conn->interfacePrivateData; - int count; - - interfaceDriverLock(driver); - - count = ncf_list_interfaces(driver->netcf, nnames, names, NETCF_IFACE_INACTIVE); - if (count < 0) { - const char *errmsg, *details; - int errcode = ncf_error(driver->netcf, &errmsg, &details); - virReportError(netcf_to_vir_err(errcode), - _("failed to list host defined interfaces: %s%s%s"), - errmsg, details ? " - " : "", - details ? details : ""); - } - - interfaceDriverUnlock(driver); - return count; - -} - -static virInterfacePtr interfaceLookupByName(virConnectPtr conn, - const char *name) -{ - struct interface_driver *driver = conn->interfacePrivateData; - struct netcf_if *iface; - virInterfacePtr ret = NULL; - - interfaceDriverLock(driver); - iface = ncf_lookup_by_name(driver->netcf, name); - if (!iface) { - const char *errmsg, *details; - int errcode = ncf_error(driver->netcf, &errmsg, &details); - if (errcode != NETCF_NOERROR) { - virReportError(netcf_to_vir_err(errcode), - _("couldn't find interface named '%s': %s%s%s"), - name, errmsg, - details ? " - " : "", details ? details : ""); - } else { - virReportError(VIR_ERR_NO_INTERFACE, - _("couldn't find interface named '%s'"), name); - } - goto cleanup; - } - - ret = virGetInterface(conn, ncf_if_name(iface), ncf_if_mac_string(iface)); - -cleanup: - ncf_if_free(iface); - interfaceDriverUnlock(driver); - return ret; -} - -static virInterfacePtr interfaceLookupByMACString(virConnectPtr conn, - const char *macstr) -{ - struct interface_driver *driver = conn->interfacePrivateData; - struct netcf_if *iface; - int niface; - virInterfacePtr ret = NULL; - - interfaceDriverLock(driver); - niface = ncf_lookup_by_mac_string(driver->netcf, macstr, 1, &iface); - - if (niface < 0) { - const char *errmsg, *details; - int errcode = ncf_error(driver->netcf, &errmsg, &details); - virReportError(netcf_to_vir_err(errcode), - _("couldn't find interface with MAC address '%s': %s%s%s"), - macstr, errmsg, details ? " - " : "", - details ? details : ""); - goto cleanup; - } - if (niface == 0) { - virReportError(VIR_ERR_NO_INTERFACE, - _("couldn't find interface with MAC address '%s'"), - macstr); - goto cleanup; - } - if (niface > 1) { - virReportError(VIR_ERR_MULTIPLE_INTERFACES, - "%s", _("multiple interfaces with matching MAC address")); - goto cleanup; - } - - ret = virGetInterface(conn, ncf_if_name(iface), ncf_if_mac_string(iface)); - -cleanup: - ncf_if_free(iface); - interfaceDriverUnlock(driver); - return ret; -} - -static char *interfaceGetXMLDesc(virInterfacePtr ifinfo, - unsigned int flags) -{ - struct interface_driver *driver = ifinfo->conn->interfacePrivateData; - struct netcf_if *iface = NULL; - char *xmlstr = NULL; - virInterfaceDefPtr ifacedef = NULL; - char *ret = NULL; - - virCheckFlags(VIR_INTERFACE_XML_INACTIVE, NULL); - - interfaceDriverLock(driver); - - iface = interfaceDriverGetNetcfIF(driver->netcf, ifinfo); - if (!iface) { - /* helper already reported error */ - goto cleanup; - } - - if ((flags & VIR_INTERFACE_XML_INACTIVE)) { - xmlstr = ncf_if_xml_desc(iface); - } else { - xmlstr = ncf_if_xml_state(iface); - } - if (!xmlstr) { - const char *errmsg, *details; - int errcode = ncf_error(driver->netcf, &errmsg, &details); - virReportError(netcf_to_vir_err(errcode), - _("could not get interface XML description: %s%s%s"), - errmsg, details ? " - " : "", - details ? details : ""); - goto cleanup; - } - - ifacedef = virInterfaceDefParseString(xmlstr); - if (!ifacedef) { - /* error was already reported */ - goto cleanup; - } - - ret = virInterfaceDefFormat(ifacedef); - if (!ret) { - /* error was already reported */ - goto cleanup; - } - -cleanup: - ncf_if_free(iface); - VIR_FREE(xmlstr); - virInterfaceDefFree(ifacedef); - interfaceDriverUnlock(driver); - return ret; -} - -static virInterfacePtr interfaceDefineXML(virConnectPtr conn, - const char *xml, - unsigned int flags) -{ - struct interface_driver *driver = conn->interfacePrivateData; - struct netcf_if *iface = NULL; - char *xmlstr = NULL; - virInterfaceDefPtr ifacedef = NULL; - virInterfacePtr ret = NULL; - - virCheckFlags(0, NULL); - - interfaceDriverLock(driver); - - ifacedef = virInterfaceDefParseString(xml); - if (!ifacedef) { - /* error was already reported */ - goto cleanup; - } - - xmlstr = virInterfaceDefFormat(ifacedef); - if (!xmlstr) { - /* error was already reported */ - goto cleanup; - } - - iface = ncf_define(driver->netcf, xmlstr); - if (!iface) { - const char *errmsg, *details; - int errcode = ncf_error(driver->netcf, &errmsg, &details); - virReportError(netcf_to_vir_err(errcode), - _("could not get interface XML description: %s%s%s"), - errmsg, details ? " - " : "", - details ? details : ""); - goto cleanup; - } - - ret = virGetInterface(conn, ncf_if_name(iface), ncf_if_mac_string(iface)); - -cleanup: - ncf_if_free(iface); - VIR_FREE(xmlstr); - virInterfaceDefFree(ifacedef); - interfaceDriverUnlock(driver); - return ret; -} - -static int interfaceUndefine(virInterfacePtr ifinfo) { - struct interface_driver *driver = ifinfo->conn->interfacePrivateData; - struct netcf_if *iface = NULL; - int ret = -1; - - interfaceDriverLock(driver); - - iface = interfaceDriverGetNetcfIF(driver->netcf, ifinfo); - if (!iface) { - /* helper already reported error */ - goto cleanup; - } - - ret = ncf_if_undefine(iface); - if (ret < 0) { - const char *errmsg, *details; - int errcode = ncf_error(driver->netcf, &errmsg, &details); - virReportError(netcf_to_vir_err(errcode), - _("failed to undefine interface %s: %s%s%s"), - ifinfo->name, errmsg, details ? " - " : "", - details ? details : ""); - goto cleanup; - } - -cleanup: - ncf_if_free(iface); - interfaceDriverUnlock(driver); - return ret; -} - -static int interfaceCreate(virInterfacePtr ifinfo, - unsigned int flags) -{ - struct interface_driver *driver = ifinfo->conn->interfacePrivateData; - struct netcf_if *iface = NULL; - int ret = -1; - - virCheckFlags(0, -1); - - interfaceDriverLock(driver); - - iface = interfaceDriverGetNetcfIF(driver->netcf, ifinfo); - if (!iface) { - /* helper already reported error */ - goto cleanup; - } - - ret = ncf_if_up(iface); - if (ret < 0) { - const char *errmsg, *details; - int errcode = ncf_error(driver->netcf, &errmsg, &details); - virReportError(netcf_to_vir_err(errcode), - _("failed to create (start) interface %s: %s%s%s"), - ifinfo->name, errmsg, details ? " - " : "", - details ? details : ""); - goto cleanup; - } - -cleanup: - ncf_if_free(iface); - interfaceDriverUnlock(driver); - return ret; -} - -static int interfaceDestroy(virInterfacePtr ifinfo, - unsigned int flags) -{ - struct interface_driver *driver = ifinfo->conn->interfacePrivateData; - struct netcf_if *iface = NULL; - int ret = -1; - - virCheckFlags(0, -1); - - interfaceDriverLock(driver); - - iface = interfaceDriverGetNetcfIF(driver->netcf, ifinfo); - if (!iface) { - /* helper already reported error */ - goto cleanup; - } - - ret = ncf_if_down(iface); - if (ret < 0) { - const char *errmsg, *details; - int errcode = ncf_error(driver->netcf, &errmsg, &details); - virReportError(netcf_to_vir_err(errcode), - _("failed to destroy (stop) interface %s: %s%s%s"), - ifinfo->name, errmsg, details ? " - " : "", - details ? details : ""); - goto cleanup; - } - -cleanup: - ncf_if_free(iface); - interfaceDriverUnlock(driver); - return ret; -} - -static int interfaceIsActive(virInterfacePtr ifinfo) -{ - struct interface_driver *driver = ifinfo->conn->interfacePrivateData; - struct netcf_if *iface = NULL; - unsigned int flags = 0; - int ret = -1; - - interfaceDriverLock(driver); - - iface = interfaceDriverGetNetcfIF(driver->netcf, ifinfo); - if (!iface) { - /* helper already reported error */ - goto cleanup; - } - - if (ncf_if_status(iface, &flags) < 0) { - const char *errmsg, *details; - int errcode = ncf_error(driver->netcf, &errmsg, &details); - virReportError(netcf_to_vir_err(errcode), - _("failed to get status of interface %s: %s%s%s"), - ifinfo->name, errmsg, details ? " - " : "", - details ? details : ""); - goto cleanup; - } - - ret = flags & NETCF_IFACE_ACTIVE ? 1 : 0; - -cleanup: - ncf_if_free(iface); - interfaceDriverUnlock(driver); - return ret; -} - -#ifdef HAVE_NETCF_TRANSACTIONS -static int interfaceChangeBegin(virConnectPtr conn, unsigned int flags) -{ - struct interface_driver *driver = conn->interfacePrivateData; - int ret; - - virCheckFlags(0, -1); /* currently flags must be 0 */ - - interfaceDriverLock(driver); - - ret = ncf_change_begin(driver->netcf, 0); - if (ret < 0) { - const char *errmsg, *details; - int errcode = ncf_error(driver->netcf, &errmsg, &details); - virReportError(netcf_to_vir_err(errcode), - _("failed to begin transaction: %s%s%s"), - errmsg, details ? " - " : "", - details ? details : ""); - } - - interfaceDriverUnlock(driver); - return ret; -} - -static int interfaceChangeCommit(virConnectPtr conn, unsigned int flags) -{ - struct interface_driver *driver = conn->interfacePrivateData; - int ret; - - virCheckFlags(0, -1); /* currently flags must be 0 */ - - interfaceDriverLock(driver); - - ret = ncf_change_commit(driver->netcf, 0); - if (ret < 0) { - const char *errmsg, *details; - int errcode = ncf_error(driver->netcf, &errmsg, &details); - virReportError(netcf_to_vir_err(errcode), - _("failed to commit transaction: %s%s%s"), - errmsg, details ? " - " : "", - details ? details : ""); - } - - interfaceDriverUnlock(driver); - return ret; -} - -static int interfaceChangeRollback(virConnectPtr conn, unsigned int flags) -{ - struct interface_driver *driver = conn->interfacePrivateData; - int ret; - - virCheckFlags(0, -1); /* currently flags must be 0 */ - - interfaceDriverLock(driver); - - ret = ncf_change_rollback(driver->netcf, 0); - if (ret < 0) { - const char *errmsg, *details; - int errcode = ncf_error(driver->netcf, &errmsg, &details); - virReportError(netcf_to_vir_err(errcode), - _("failed to rollback transaction: %s%s%s"), - errmsg, details ? " - " : "", - details ? details : ""); - } - - interfaceDriverUnlock(driver); - return ret; -} -#endif /* HAVE_NETCF_TRANSACTIONS */ - -static virInterfaceDriver interfaceDriver = { - "Interface", - .open = interfaceOpenInterface, /* 0.7.0 */ - .close = interfaceCloseInterface, /* 0.7.0 */ - .numOfInterfaces = interfaceNumOfInterfaces, /* 0.7.0 */ - .listInterfaces = interfaceListInterfaces, /* 0.7.0 */ - .numOfDefinedInterfaces = interfaceNumOfDefinedInterfaces, /* 0.7.0 */ - .listDefinedInterfaces = interfaceListDefinedInterfaces, /* 0.7.0 */ - .interfaceLookupByName = interfaceLookupByName, /* 0.7.0 */ - .interfaceLookupByMACString = interfaceLookupByMACString, /* 0.7.0 */ - .interfaceGetXMLDesc = interfaceGetXMLDesc, /* 0.7.0 */ - .interfaceDefineXML = interfaceDefineXML, /* 0.7.0 */ - .interfaceUndefine = interfaceUndefine, /* 0.7.0 */ - .interfaceCreate = interfaceCreate, /* 0.7.0 */ - .interfaceDestroy = interfaceDestroy, /* 0.7.0 */ - .interfaceIsActive = interfaceIsActive, /* 0.7.3 */ -#ifdef HAVE_NETCF_TRANSACTIONS - .interfaceChangeBegin = interfaceChangeBegin, /* 0.9.2 */ - .interfaceChangeCommit = interfaceChangeCommit, /* 0.9.2 */ - .interfaceChangeRollback = interfaceChangeRollback, /* 0.9.2 */ -#endif /* HAVE_NETCF_TRANSACTIONS */ -}; - -int interfaceRegister(void) { - virRegisterInterfaceDriver(&interfaceDriver); - return 0; -} diff --git a/src/interface/netcf_driver.h b/src/interface/netcf_driver.h deleted file mode 100644 index 38fbc77..0000000 --- a/src/interface/netcf_driver.h +++ /dev/null @@ -1,29 +0,0 @@ -/* - * interface_driver.h: core driver methods for managing physical host interfaces - * - * Copyright (C) 2006, 2007 Red Hat, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; If not, see - * <http://www.gnu.org/licenses/>. - * - * Author: Laine Stump <laine(a)redhat.com> - */ - - -#ifndef __VIR_INTERFACE__DRIVER_H -# define __VIR_INTERFACE__DRIVER_H - -int interfaceRegister(void); - -#endif /* __VIR_INTERFACE__DRIVER_H */ diff --git a/src/util/util.c b/src/util/util.c index 9068e0f..793f803 100644 --- a/src/util/util.c +++ b/src/util/util.c @@ -1251,39 +1251,52 @@ int virDirCreate(const char *path ATTRIBUTE_UNUSED, } #endif /* WIN32 */ +#define here fprintf(stderr, "%s:%d %s\n", __func__, __LINE__, path) + static int virFileMakePathHelper(char *path, mode_t mode) { struct stat st; char *p; if (stat(path, &st) >= 0) { - if (S_ISDIR(st.st_mode)) + if (S_ISDIR(st.st_mode)) { + here; return 0; + } errno = ENOTDIR; + here; return -1; } - if (errno != ENOENT) + if (errno != ENOENT) { + here; return -1; + } if ((p = strrchr(path, '/')) == NULL) { errno = EINVAL; + here; return -1; } if (p != path) { *p = '\0'; - if (virFileMakePathHelper(path, mode) < 0) + if (virFileMakePathHelper(path, mode) < 0) { + here; return -1; + } *p = '/'; } - if (mkdir(path, mode) < 0 && errno != EEXIST) + if (mkdir(path, mode) < 0 && errno != EEXIST) { + here; return -1; + } + here; return 0; } diff --git a/tests/virdrivermoduletest.c b/tests/virdrivermoduletest.c index 4d6e91e..8762de4 100644 --- a/tests/virdrivermoduletest.c +++ b/tests/virdrivermoduletest.c @@ -79,7 +79,7 @@ mymain(void) #ifdef WITH_NWFILTER TEST("nwfilter", NULL); #endif -#ifdef WITH_NETCF +#ifdef WITH_INTERFACE TEST("interface", NULL); #endif #ifdef WITH_QEMU diff --git a/tools/virsh.c b/tools/virsh.c index 7a5b92c..b8ec663 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -2643,8 +2643,8 @@ vshShowVersion(vshControl *ctl ATTRIBUTE_UNUSED) #ifdef WITH_BRIDGE vshPrint(ctl, " Bridging"); #endif -#ifdef WITH_NETCF - vshPrint(ctl, " Interface"); +#if defined(WITH_INTERFACE) && defined(WITH_NETCF) + vshPrint(ctl, " Interface (netcf)"); #endif #ifdef WITH_NWFILTER vshPrint(ctl, " Nwfilter"); -- 1.7.8.6

2 1

[libvirt] [PATCH 0/1] Migrate per-port data during Qemu Live Migration
by Kyle Mestery 01 Sep '12

01 Sep '12

Open vSwitch controllers may store per-port data in the OVS DB on a host. This is an opaque data blob utilized by a controller to store information relevant to the port itself. This patch provides a mechanism for this to migrate with the virtual machine during live migration by adding code to the V3 migration protocol. Tested migration with "virtualport type='openvswitch'", both with and without this per-port data. Also tested migration with non-OVS bridges. Kyle Mestery (1): Add the ability to migrate per-port data on Open vSwitch ports during qemu live migration. A controller can use this to store data relating to each port, and have it migrated with the virtual machine and populated on the destination host. src/qemu/qemu_migration.c | 248 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 246 insertions(+), 2 deletions(-) -- 1.7.11.4

1 1

[libvirt] Libvirt 0.10.0-rc1 segfaults when daemon run as root
by Shawn Furrow 01 Sep '12

01 Sep '12

Hi all, For some reason when I run "libvirtd -d" as root it seems to not start. I investigate by running "libvirtd -v" as root and I get a segfault. Here is the output: 2012-08-23 19:01:23.237+0000: 27464: info : libvirt version: 0.10.0 > 2012-08-23 19:01:23.237+0000: 27464: error : virDriverLoadModule:78 : > failed to load module > /usr/local/lib/libvirt/connection-driver/libvirt_driver_qemu.so > /usr/local/lib/libvirt/connection-driver/libvirt_driver_qemu.so: undefined > symbol: virSecurityManagerGetProcessLabel > 2012-08-23 19:01:23.238+0000: 27464: error : virDriverLoadModule:78 : > failed to load module > /usr/local/lib/libvirt/connection-driver/libvirt_driver_lxc.so > /usr/local/lib/libvirt/connection-driver/libvirt_driver_lxc.so: undefined > symbol: virSecurityManagerGetProcessLabel > Caught Segmentation violation dumping internal log buffer: > > ====== start of log ===== > 2012-08-23 19:01:23.235+000027464: debug : main:1120 : Decided on pid file > path '/usr/local/var/run/libvirtd.pid' > 2012-08-23 19:01:23.235+000027464: debug : main:1130 : Decided on socket > paths '/usr/local/var/run/libvirt/libvirt-sock' and > '/usr/local/var/run/libvirt/libvirt-sock-ro' > 2012-08-23 19:01:23.235+000027464: debug : main:1168 : Ensuring run dir > '/usr/local/var/run/libvirt' exists > 2012-08-23 19:01:23.235+000027464: debug : virEventRegisterDefaultImpl:204 > : registering default event implementation > 2012-08-23 19:01:23.235+000027464: debug : virEventPollAddHandle:111 : > Used 0 handle slots, adding at least 10 more > 2012-08-23 19:01:23.235+000027464: debug : virEventPollInterruptLocked:697 > : Skip interrupt, 0 0 > 2012-08-23 19:01:23.236+000027464: debug : virEventPollAddHandle:136 : > EVENT_POLL_ADD_HANDLE: watch=1 fd=5 events=1 cb=0x7f323cd415a0 opaque=(nil) > ff=(nil) > 2012-08-23 19:01:23.236+000027464: debug : virEventRegisterImpl:177 : > addHandle=0x7f323cd423d0 updateHandle=0x7f323cd414a0 > removeHandle=0x7f323cd41360 addTimeout=0x7f323cd42220 > updateTimeout=0x7f323cd415e0 removeTimeout=0x7f323cd41260 > 2012-08-23 19:01:23.236+000027464: debug : virNetServerNew:407 : > srv=0xdd8890 refs=1 > 2012-08-23 19:01:23.236+000027464: debug : main:1206 : Dropping privileges > (if required) > 2012-08-23 19:01:23.236+000027464: debug : virDriverModuleInitialize:53 : > Module dir /usr/local/lib/libvirt/connection-driver > 2012-08-23 19:01:23.236+000027464: debug : virDriverLoadModule:66 : Module > load network > 2012-08-23 19:01:23.236+000027464: debug : virRegisterNetworkDriver:564 : > registering Network as network driver 4 > 2012-08-23 19:01:23.236+000027464: debug : virDriverLoadModule:66 : Module > load storage > 2012-08-23 19:01:23.236+000027464: debug : virRegisterStorageDriver:624 : > registering storage as storage driver 4 > 2012-08-23 19:01:23.236+000027464: debug : virDriverLoadModule:66 : Module > load secret > 2012-08-23 19:01:23.237+000027464: debug : virRegisterSecretDriver:684 : > registering secret as secret driver 3 > 2012-08-23 19:01:23.237+000027464: debug : virDriverLoadModule:66 : Module > load nwfilter > 2012-08-23 19:01:23.237+000027464: debug : virRegisterNWFilterDriver:714 : > registering nwfilter as network filter driver 3 > 2012-08-23 19:01:23.237+000027464: debug : virDriverLoadModule:66 : Module > load qemu > 2012-08-23 19:01:23.237+000027464: error : virDriverLoadModule:78 : failed > to load module > /usr/local/lib/libvirt/connection-driver/libvirt_driver_qemu.so > /usr/local/lib/libvirt/connection-driver/libvirt_driver_qemu.so: undefined > symbol: virSecurityManagerGetProcessLabel > 2012-08-23 19:01:23.238+000027464: debug : virDriverLoadModule:66 : Module > load lxc > 2012-08-23 19:01:23.238+000027464: error : virDriverLoadModule:78 : failed > to load module > /usr/local/lib/libvirt/connection-driver/libvirt_driver_lxc.so > /usr/local/lib/libvirt/connection-driver/libvirt_driver_lxc.so: undefined > symbol: virSecurityManagerGetProcessLabel > 2012-08-23 19:01:23.238+000027464: debug : virDriverLoadModule:66 : Module > load uml > 2012-08-23 19:01:23.238+000027464: debug : virRegisterDriver:732 : > driver=0x7f3232ec7760 name=UML > 2012-08-23 19:01:23.238+000027464: debug : virRegisterDriver:747 : > registering UML as driver 6 > 2012-08-23 19:01:23.238+000027464: debug : virDriverLoadModule:66 : Module > load xen > 2012-08-23 19:01:23.239+000027464: debug : virRegisterDriver:732 : > driver=0x7f3232caad00 name=Xen > 2012-08-23 19:01:23.239+000027464: debug : virRegisterDriver:747 : > registering Xen as driver 7 > 2012-08-23 19:01:23.239+000027464: debug : virNetServerProgramNew:63 : > prog=0xddca40 refs=1 > 2012-08-23 19:01:23.239+000027464: debug : virNetServerProgramRef:84 : > prog=0xddca40 refs=2 > 2012-08-23 19:01:23.239+000027464: debug : virNetServerProgramNew:63 : > prog=0xddcbc0 refs=1 > 2012-08-23 19:01:23.239+000027464: debug : virNetServerProgramRef:84 : > prog=0xddcbc0 refs=2 > 2012-08-23 19:01:23.239+000027464: debug : virEventPollInterruptLocked:697 > : Skip interrupt, 0 0 > 2012-08-23 19:01:23.239+000027464: debug : virEventPollAddHandle:136 : > EVENT_POLL_ADD_HANDLE: watch=2 fd=7 events=1 cb=0x7f323ce241e0 > opaque=0xdd8890 ff=(nil) > 2012-08-23 19:01:23.239+000027464: debug : main:1257 : Attempting to > configure auditing subsystem > 2012-08-23 19:01:23.239+000027464: debug : main:1263 : Proceeding without > auditing > 2012-08-23 19:01:23.239+000027464: debug : virHookCheck:119 : No hook > script /usr/local/etc/libvirt/hooks/daemon > 2012-08-23 19:01:23.239+000027464: debug : virHookCheck:119 : No hook > script /usr/local/etc/libvirt/hooks/qemu > 2012-08-23 19:01:23.239+000027464: debug : virHookCheck:119 : No hook > script /usr/local/etc/libvirt/hooks/lxc > 2012-08-23 19:01:23.239+000027464: debug : daemonSetupNetworking:464 : > Registering unix socket /usr/local/var/run/libvirt/libvirt-sock > 2012-08-23 19:01:23.239+000027464: debug : virNetSocketNew:119 : > localAddr=0x7fff419bf530 remoteAddr=(nil) fd=9 errfd=-1 pid=0 > 2012-08-23 19:01:23.239+000027464: debug : virNetSocketNew:179 : > RPC_SOCKET_NEW: sock=0xddcbf0 refs=1 fd=9 errfd=-1 pid=0 > localAddr=127.0.0.1;0, remoteAddr=(null) > 2012-08-23 19:01:23.239+000027464: debug : virNetSocketRef:713 : > RPC_SOCKET_REF: sock=0xddcbf0 refs=2 > 2012-08-23 19:01:23.239+000027464: debug : virEventPollInterruptLocked:697 > : Skip interrupt, 0 0 > 2012-08-23 19:01:23.239+000027464: debug : virEventPollAddHandle:136 : > EVENT_POLL_ADD_HANDLE: watch=3 fd=9 events=0 cb=0x7f323ce2ab10 > opaque=0xddcbf0 ff=0x7f323ce2ba60 > 2012-08-23 19:01:23.239+000027464: debug : daemonSetupNetworking:474 : > Registering unix socket /usr/local/var/run/libvirt/libvirt-sock-ro > 2012-08-23 19:01:23.239+000027464: debug : virNetSocketNew:119 : > localAddr=0x7fff419bf530 remoteAddr=(nil) fd=10 errfd=-1 pid=0 > 2012-08-23 19:01:23.239+000027464: debug : virNetSocketNew:179 : > RPC_SOCKET_NEW: sock=0xddd430 refs=1 fd=10 errfd=-1 pid=0 > localAddr=127.0.0.1;0, remoteAddr=(null) > 2012-08-23 19:01:23.239+000027464: debug : virNetSocketRef:713 : > RPC_SOCKET_REF: sock=0xddd430 refs=2 > 2012-08-23 19:01:23.239+000027464: debug : virEventPollInterruptLocked:697 > : Skip interrupt, 0 0 > 2012-08-23 19:01:23.239+000027464: debug : virEventPollAddHandle:136 : > EVENT_POLL_ADD_HANDLE: watch=4 fd=10 events=0 cb=0x7f323ce2ab10 > opaque=0xddd430 ff=0x7f323ce2ba60 > 2012-08-23 19:01:23.239+000027464: debug : virNetServerRef:420 : > srv=0xdd8890 refs=2 > 2012-08-23 19:01:23.239+000027464: debug : virNetlinkEventServiceStart:656 > : libnl was not available at build time > 2012-08-23 19:01:23.239+000027464: debug : virNetServerRun:714 : > srv=0xdd8890 quit=0 > 2012-08-23 19:01:23.239+000027464: debug : virEventRunDefaultImpl:244 : > running default event implementation > 2012-08-23 19:01:23.239+000027464: debug : virEventPollCleanupTimeouts:501 > : Cleanup 0 > 2012-08-23 19:01:23.239+000027464: debug : virEventPollCleanupTimeouts:537 > : Found 0 out of 0 timeout slots used, releasing 0 > 2012-08-23 19:01:23.239+000027464: debug : virEventPollCleanupHandles:549 > : Cleanup 4 > 2012-08-23 19:01:23.240+000027464: debug : virEventPollMakePollFDs:378 : > Prepare n=0 w=1, f=5 e=1 d=0 > 2012-08-23 19:01:23.240+000027475: debug : virStateInitialize:798 : > Running global init for Remote state driver > 2012-08-23 19:01:23.240+000027475: debug : virStateInitialize:798 : > Running global init for Network state driver > 2012-08-23 19:01:23.240+000027464: debug : virEventPollMakePollFDs:378 : > Prepare n=1 w=2, f=7 e=1 d=0 > 2012-08-23 19:01:23.240+000027464: debug : virEventPollMakePollFDs:378 : > Prepare n=2 w=3, f=9 e=0 d=0 > 2012-08-23 19:01:23.240+000027464: debug : virEventPollMakePollFDs:378 : > Prepare n=3 w=4, f=10 e=0 d=0 > 2012-08-23 19:01:23.240+000027464: debug : > virEventPollCalculateTimeout:320 : Calculate expiry of 0 timers > 2012-08-23 19:01:23.240+000027464: debug : > virEventPollCalculateTimeout:346 : Timeout at 0 due in -1 ms > 2012-08-23 19:01:23.240+000027464: debug : virEventPollRunOnce:614 : > EVENT_POLL_RUN: nhandles=2 timeout=-1 > > ====== end of log ===== > Segmentation fault/ However, when I run "libvirtd -d" as me, it does not segfault and continues running. However I cannot connect to the libvirt-sock because it gets created at "$HOME/.cache/libvirt/libvirt-sock" but virsh looks for it at "/usr/local/var/run/libvirt-sock". Here is what I get when I run "libvirtd -v" as me: 2012-08-23 19:02:15.145+0000: 27483: info : libvirt version: 0.10.0 > 2012-08-23 19:02:15.145+0000: 27483: error : virDriverLoadModule:78 : > failed to load module > /usr/local/lib/libvirt/connection-driver/libvirt_driver_qemu.so > /usr/local/lib/libvirt/connection-driver/libvirt_driver_qemu.so: undefined > symbol: virSecurityManagerGetProcessLabel > 2012-08-23 19:02:15.145+0000: 27483: error : virDriverLoadModule:78 : > failed to load module > /usr/local/lib/libvirt/connection-driver/libvirt_driver_lxc.so > /usr/local/lib/libvirt/connection-driver/libvirt_driver_lxc.so: undefined > symbol: virSecurityManagerGetProcessLabel Any ideas why this is happening? I am on Ubuntu 10.04 running libvirt 0.10.0 with qemu-kvm 1.1 Thanks, Shawn -- Virginia Tech Bradley Department of Electrical and Computer Engineering B.S. Electrical Engineering B.S. Computer Engineering

3 2

[libvirt] [perl-Sys-Virt][PATCH] Virt.xs: fix flag issue on set_scheduler_parameters
by Alex Jia 01 Sep '12

01 Sep '12

From: Alex Jia <Alex Jia ajia(a)redhat.com> The default flags are inconsistent on both qemuSetSchedulerParameters() and qemuGetSchedulerParameters() in libvirt, the qemuGetSchedulerParameters() always passes 'VIR_DOMAIN_AFFECT_CURRENT' flag to the qemuGetSchedulerParametersFlags(), it should be a expected behavior, but the qemuSetSchedulerParameters() always passes 'VIR_DOMAIN_AFFECT_LIVE' flag to the qemuSetSchedulerParametersFlags(), if users use default flag=0 or explicitly give a 'VIR_DOMAIN_AFFECT_CURRENT' flag to the set_scheduler_parameters() in perl-Sys-Virt, because the flag value is 0, the result is the virDomainSetSchedulerParameters() is called incorrectly. How to reproduce? # cat test.pl #!/usr/bin/env perl use warnings; use strict; use Sys::Virt; my $uri = "qemu:///system"; my $domname = "foo"; # change your guest name my $con = Sys::Virt->new(address => $uri, readonly => 0); my $dom = $con->get_domain_by_name($domname); my %sched_param = (Sys::Virt::Domain::SCHEDULER_CPU_SHARES=>1); $dom->set_scheduler_parameters(\%sched_param, Sys::Virt::Domain::AFFECT_CURRENT); # perl test.pl libvirt error code: 55, message: Requested operation is not valid: domain is not running Signed-off-by: Alex Jia <Alex Jia ajia(a)redhat.com> --- Virt.xs | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Virt.xs b/Virt.xs index 2b8d74c..0ebf95d 100644 --- a/Virt.xs +++ b/Virt.xs @@ -2833,7 +2833,7 @@ set_scheduler_parameters(dom, newparams, flags=0) } } vir_typed_param_from_hv(newparams, params, nparams); - if (flags) { + if (flags != 1) { if (virDomainSetSchedulerParametersFlags(dom, params, nparams, flags) < 0) _croak_error(); } else { -- 1.7.1

3 4

[libvirt] [PATCH][TCK] add script to test storage and vol get commands
by Kyla Zhang 01 Sep '12

01 Sep '12

including pool->get_uuid pool->get_name pool->refresh pool->get_volume_by_name vol->get_name vol->get_key vol->get_path vol->get_info vmm->get_storage_pool_by_uuid --- scripts/storage/120-get-ops.t | 116 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 116 insertions(+), 0 deletions(-) create mode 100644 scripts/storage/120-get-ops.t diff --git a/scripts/storage/120-get-ops.t b/scripts/storage/120-get-ops.t new file mode 100644 index 0000000..bf1f279 --- /dev/null +++ b/scripts/storage/120-get-ops.t @@ -0,0 +1,116 @@ +# -*- perl -*- +# +# Copyright (C) 2012 Red Hat, Inc. +# Copyright (C) 2012 Kyla Zhang <weizhan(a)redhat.com> +# +# This program is free software; You can redistribute it and/or modify +# it under the GNU General Public License as published by the Free +# Software Foundation; either version 2, or (at your option) any +# later version +# +# The file "LICENSE" distributed along with this file provides full +# details of the terms and conditions +# + +=pod + +=head1 NAME + +storage/120-get-opts.t - Get command testing for pool and vol including +pool->get_uuid +pool->get_name +pool->refresh +pool->get_volume_by_name +vol->get_name +vol->get_key +vol->get_path +vol->get_info + +=head1 DESCRIPTION + +The test case validates the get commands for pool and vol works well + +=cut + +use strict; +use warnings; + +use Test::More tests => 15; + +use Sys::Virt::TCK; +use Test::Exception; + +my $tck = Sys::Virt::TCK->new(); +my $conn = eval { $tck->setup(); }; +BAIL_OUT "failed to setup test harness: $@" if $@; +END { $tck->cleanup if $tck; } + +my $name = "tck1"; +my $xml = $tck->generic_pool("dir", $name)->as_xml; +my $dir = $tck->create_empty_dir("storage-fs", $name); +my $vol1_name = "tck_vol1"; +my $vol2_name = "tck_vol2"; + + +diag "Creating a new transient pool"; +my $pool; +ok_pool(sub { $pool = $conn->create_storage_pool($xml) }, "created transient pool object"); + + +diag "Get pool uuid"; +my $pool_uuid=$pool->get_uuid(); +is ($conn->get_storage_pool_by_uuid($pool_uuid)->get_name(), $name, "Get pool uuid succeed"); + + +diag "Get pool name"; +is($pool->get_name(), $name, "Get pool name $name"); + + +diag "Get volume by name"; +my $vol1_xml = $tck->generic_volume($vol1_name, "raw", 1024*1024*50)->allocation(0)->as_xml; +my $vol1 = $pool->create_volume($vol1_xml); +is($pool->get_volume_by_name($vol1_name)->get_name(), $vol1_name, "Get volume $vol1_name"); + + +diag "Get volume without refresh after creating image with dd"; +system("dd if=/dev/zero of=$dir/$vol2_name count=7 bs=1048576"); +ok_error(sub { $pool->get_volume_by_name($vol2_name) }, + "Can't get volume $vol2_name without refresh", Sys::Virt::Error::ERR_NO_STORAGE_VOL); + + +diag "Refresh pool and get volume again"; +lives_ok(sub { $pool->refresh() }, "Pool refresh succeed"); +my $vol2=$pool->get_volume_by_name($vol2_name); +is($vol2->get_name(), $vol2_name, "Get volume $vol2_name"); + + +diag "get vol key"; +my $vol2_key=xpath($vol2, "string(/volume/key)"); +is($vol2->get_key(), $vol2_key, "Get vol key $vol2_key"); + + +diag "Get vol path"; +my $vol2_path=xpath($vol2, "string(/volume/target/path)"); +is($vol2->get_path(), $vol2_path, "Get vol path $vol2_path"); + + +diag "Get vol info"; +is($vol2->get_info()->{type}, Sys::Virt::StorageVol::TYPE_FILE, "Get vol type file"); +my $vol2_capacity=xpath($vol2, "string(/volume/capacity)"); +is($vol2->get_info()->{capacity}, $vol2_capacity, "Get vol capacity $vol2_capacity"); +my $vol2_allocation=xpath($vol2, "string(/volume/allocation)"); +is($vol2->get_info()->{allocation}, $vol2_allocation, "Get vol allocation $vol2_allocation"); + + +diag "Destroy volume"; +lives_ok(sub { $vol1->delete(0) }, "deleted volume 1"); +lives_ok(sub { $vol2->delete(0) }, "deleted volume 2"); + +diag "Destroying the transient pool"; +$pool->destroy; + +diag "Checking that transient pool has gone away"; +ok_error(sub { $conn->get_storage_pool_by_name("tck") }, "NO_POOL error raised from missing pool", + Sys::Virt::Error::ERR_NO_STORAGE_POOL); + +# end -- 1.7.1

3 2

[libvirt] [PATCH] command: shell-quote when logging commands
by Eric Blake 01 Sep '12

01 Sep '12

Without this patch, logged command executions can be ambiguous if the command contained any shell metacharacters. This has caused more than one person to attempt to patch clients to add unnecessary quoting, without realizing that the command itself was run with correct args, and only the logged output was ambiguous. * src/util/command.c (virCommandToString): Add shell escapes. * tests/commandtest.c (test16): Test new behavior. * tests/commanddata/test16.log: Update expected output. * tests/qemuxml2argvdata/qemuxml2argv-*.args: Likewise. * tests/networkxml2argvdata/*.argv: Likewise. --- src/util/command.c | 25 ++++++++++++++++------ tests/commanddata/test16.log | 2 +- tests/commandtest.c | 6 ++++-- .../nat-network-dns-txt-record.argv | 2 +- .../qemuxml2argv-disk-drive-network-rbd-auth.args | 7 +++--- .../qemuxml2argv-disk-drive-network-rbd.args | 7 +++--- .../qemuxml2argv-graphics-vnc.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-qemu-ns.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-smbios.args | 6 +++--- 9 files changed, 38 insertions(+), 21 deletions(-) diff --git a/src/util/command.c b/src/util/command.c index 49ec178..418b198 100644 --- a/src/util/command.c +++ b/src/util/command.c @@ -1614,9 +1614,10 @@ virCommandWriteArgLog(virCommandPtr cmd, int logfd) * virCommandToString: * @cmd: the command to convert * - * Call after adding all arguments and environment settings, but before - * Run/RunAsync, to return a string representation of the environment and - * arguments of cmd. If virCommandRun cannot succeed (because of an + * Call after adding all arguments and environment settings, but + * before Run/RunAsync, to return a string representation of the + * environment and arguments of cmd, suitably quoted for pasting into + * a shell. If virCommandRun cannot succeed (because of an * out-of-memory condition while building cmd), NULL will be returned. * Caller is responsible for freeing the resulting string. */ @@ -1639,13 +1640,25 @@ virCommandToString(virCommandPtr cmd) } for (i = 0; i < cmd->nenv; i++) { - virBufferAdd(&buf, cmd->env[i], strlen(cmd->env[i])); + /* In shell, a='b c' has a different meaning than 'a=b c', so + * we must determine where the '=' lives. */ + char *eq = strchr(cmd->env[i], '='); + + if (!eq) { + virBufferFreeAndReset(&buf); + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("invalid use of command API")); + return NULL; + } + eq++; + virBufferAdd(&buf, cmd->env[i], eq - cmd->env[i]); + virBufferEscapeShell(&buf, eq); virBufferAddChar(&buf, ' '); } - virBufferAdd(&buf, cmd->args[0], strlen(cmd->args[0])); + virBufferEscapeShell(&buf, cmd->args[0]); for (i = 1; i < cmd->nargs; i++) { virBufferAddChar(&buf, ' '); - virBufferAdd(&buf, cmd->args[i], strlen(cmd->args[i])); + virBufferEscapeShell(&buf, cmd->args[i]); } if (virBufferError(&buf)) { diff --git a/tests/commanddata/test16.log b/tests/commanddata/test16.log index 7088165..119dd29 100644 --- a/tests/commanddata/test16.log +++ b/tests/commanddata/test16.log @@ -1 +1 @@ -A=B true C +A=B C=D E true F G H diff --git a/tests/commandtest.c b/tests/commandtest.c index b1c7523..c005153 100644 --- a/tests/commandtest.c +++ b/tests/commandtest.c @@ -607,12 +607,14 @@ static int test16(const void *unused ATTRIBUTE_UNUSED) { virCommandPtr cmd = virCommandNew("true"); char *outactual = NULL; - const char *outexpect = "A=B true C"; + const char *outexpect = "A=B C='D E' true F 'G H'"; int ret = -1; int fd = -1; virCommandAddEnvPair(cmd, "A", "B"); - virCommandAddArg(cmd, "C"); + virCommandAddEnvPair(cmd, "C", "D E"); + virCommandAddArg(cmd, "F"); + virCommandAddArg(cmd, "G H"); if ((outactual = virCommandToString(cmd)) == NULL) { virErrorPtr err = virGetLastError(); diff --git a/tests/networkxml2argvdata/nat-network-dns-txt-record.argv b/tests/networkxml2argvdata/nat-network-dns-txt-record.argv index 1b31871..2a6c799 100644 --- a/tests/networkxml2argvdata/nat-network-dns-txt-record.argv +++ b/tests/networkxml2argvdata/nat-network-dns-txt-record.argv @@ -1,6 +1,6 @@ @DNSMASQ@ --strict-order --bind-interfaces \ --local=// --domain-needed --filterwin2k --conf-file= \ ---except-interface lo --txt-record=example,example value \ +--except-interface lo '--txt-record=example,example value' \ --listen-address 192.168.122.1 --listen-address 192.168.123.1 \ --listen-address 2001:db8:ac10:fe01::1 \ --listen-address 2001:db8:ac10:fd01::1 --listen-address 10.24.10.1 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-auth.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-auth.args index b323e91..02a9869 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-auth.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-auth.args @@ -2,9 +2,10 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \ /usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -monitor \ unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -drive \ file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 -drive \ -file=rbd:pool/image:\ +'file=rbd:pool/image:\ id=myname:\ key=QVFDVm41aE82SHpGQWhBQXEwTkN2OGp0SmNJY0UrSE9CbE1RMUE=:\ auth_supported=cephx\;none:\ -mon_host=mon1.example.org\:6321\;mon2.example.org\:6322\;mon3.example.org\:6322,\ -if=virtio,format=raw -net none -serial none -parallel none -usb +mon_host=mon1.example.org\:6321\;mon2.example.org\:6322\;\ +mon3.example.org\:6322,\ +if=virtio,format=raw' -net none -serial none -parallel none -usb diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd.args index 69cf7c7..61c8f7d 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd.args @@ -2,6 +2,7 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \ /usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -monitor \ unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -drive \ file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 -drive \ -file=rbd:pool/image:auth_supported=none:\ -mon_host=mon1.example.org\:6321\;mon2.example.org\:6322\;mon3.example.org\:6322,\ -if=virtio,format=raw -net none -serial none -parallel none -usb +'file=rbd:pool/image:auth_supported=none:\ +mon_host=mon1.example.org\:6321\;mon2.example.org\:6322\;\ +mon3.example.org\:6322,\ +if=virtio,format=raw' -net none -serial none -parallel none -usb diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc.args index 2af1540..af99225 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc.args @@ -1,4 +1,4 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ /usr/bin/qemu -S -M pc -m 214 -smp 1 -monitor unix:/tmp/test-monitor,server,\ nowait -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -serial none \ --parallel none -usb -vnc [2001:1:2:3:4:5:1234:1234]:3 +-parallel none -usb -vnc '[2001:1:2:3:4:5:1234:1234]:3' diff --git a/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns.args b/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns.args index 19450a1..88bdd13 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns.args @@ -1,4 +1,4 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test NS=ns BAR= \ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test NS=ns BAR='' \ /usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -monitor \ unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -hda \ /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -usb -unknown \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-smbios.args b/tests/qemuxml2argvdata/qemuxml2argv-smbios.args index 3f6cb81..ac28bad 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-smbios.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-smbios.args @@ -1,7 +1,7 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ -pc -m 214 -smp 1 -smbios type=0,vendor=LENOVO,version=6FET82WW (3.12 ) -smbios \ -type=1,manufacturer=Fedora,product=Virt-Manager,version=0.8.2-3.fc14,\ +pc -m 214 -smp 1 -smbios 'type=0,vendor=LENOVO,version=6FET82WW (3.12 )' \ +-smbios 'type=1,manufacturer=Fedora,product=Virt-Manager,version=0.8.2-3.fc14,\ serial=32dfcb37-5af1-552b-357c-be8c3aa38310,\ -uuid=c7a5fdbd-edaf-9455-926a-d65c16db1809,sku=1234567890,family=Red Hat \ +uuid=c7a5fdbd-edaf-9455-926a-d65c16db1809,sku=1234567890,family=Red Hat' \ -nographic -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -hda \ /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -usb -- 1.7.11.4

2 2

[libvirt] [PATCH] qemu: fix remote port searching
by Martin Kletzander 31 Aug '12

31 Aug '12

After fixing the last review comments on remote port searching (commit a14b4aea512d6c3a42af56207a65ef10ac4a12a1), the commit right after that wasn't modified accordingly, therefore two values weren't changed as they should and the configurable ports don't work as expected. This simple commit changes last two values missed and fixes the issue. --- This time I double checked that it does what it should! src/qemu/qemu_process.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 7f85aea..5c3b89e 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -3467,7 +3467,7 @@ int qemuProcessStart(virConnectPtr conn, if (vm->def->graphics[0]->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC && !vm->def->graphics[0]->data.vnc.socket && vm->def->graphics[0]->data.vnc.autoport) { - int port = qemuProcessNextFreePort(driver, QEMU_REMOTE_PORT_MIN); + int port = qemuProcessNextFreePort(driver, driver->remotePortMin); if (port < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Unable to find an unused port for VNC")); @@ -3478,7 +3478,7 @@ int qemuProcessStart(virConnectPtr conn, int port = -1; if (vm->def->graphics[0]->data.spice.autoport || vm->def->graphics[0]->data.spice.port == -1) { - port = qemuProcessNextFreePort(driver, QEMU_REMOTE_PORT_MIN); + port = qemuProcessNextFreePort(driver, driver->remotePortMin); if (port < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, -- 1.7.12

3 5

[libvirt] [PATCH 0/2] virsh: Check for connection usability before each command
by Peter Krempa 31 Aug '12

31 Aug '12

Some commands in virsh forgot to do this check before executing remote commands and printed unexpected error messages. This series moves the connection check to a central point so that these mistakes don't happen. Also it's a nice cleanup :). Peter Krempa (2): virsh: Improve checking for connection when running commands virsh: remove unneeded usage of vshConnectionUsability() tools/virsh-domain-monitor.c | 36 -------- tools/virsh-domain.c | 215 ------------------------------------------- tools/virsh-host.c | 40 -------- tools/virsh-interface.c | 40 -------- tools/virsh-network.c | 35 ------- tools/virsh-nodedev.c | 18 ---- tools/virsh-nwfilter.c | 15 --- tools/virsh-pool.c | 57 ------------ tools/virsh-secret.c | 18 ---- tools/virsh-snapshot.c | 30 ------ tools/virsh-volume.c | 50 ---------- tools/virsh.c | 46 +++++---- tools/virsh.h | 1 - 13 files changed, 28 insertions(+), 573 deletions(-) -- 1.7.12

2 4

[libvirt] [PATCH] schemas: Fix wwn pattern
by Osier Yang 31 Aug '12

31 Aug '12

It should be [] instead of (). --- docs/schemas/nodedev.rng | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/docs/schemas/nodedev.rng b/docs/schemas/nodedev.rng index c07a97d..88a4e9d 100644 --- a/docs/schemas/nodedev.rng +++ b/docs/schemas/nodedev.rng @@ -247,7 +247,7 @@ <define name='wwn'> <data type='string'> - <param name='pattern'>(0-9a-fA-F){16}</param> + <param name='pattern'>[0-9a-fA-F]{16}</param> </data> </define> -- 1.7.7.3

2 2

[libvirt] [PATCH] util: Update the inconsistent and outdated comments
by Osier Yang 31 Aug '12

31 Aug '12

The codes were updated to allow to reset the device as long as there is no devices/functions behind the same bus. However, the comments were kept without touched. --- Pushed under trivial rule. --- src/util/pci.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/util/pci.c b/src/util/pci.c index 137521b..0742d07 100644 --- a/src/util/pci.c +++ b/src/util/pci.c @@ -605,10 +605,9 @@ pciTrySecondaryBusReset(pciDevice *dev, uint16_t ctl; int ret = -1; - /* For now, we just refuse to do a secondary bus reset - * if there are other devices/functions behind the bus. - * In future, we could allow it so long as those devices - * are not in use by the host or other guests. + /* Refuse to do a secondary bus reset if there are other + * devices/functions behind the bus are used by the host + * or other guests. */ if ((conflict = pciBusContainsActiveDevices(dev, inactiveDevs))) { virReportError(VIR_ERR_INTERNAL_ERROR, -- 1.7.7.3

1 0

[libvirt] [PATCH 0/2] conf: Fix parsing and formatting of seclabels
by Jiri Denemark 31 Aug '12

31 Aug '12

This patchset contains updated patches from Marcelo with the changes I sent previously as a WIP. Marcelo Cerri (2): conf: Fix parsing of seclabels without model conf: Avoid formatting auto-generated DAC labels src/conf/domain_conf.c | 78 ++++++++++++++++++++++++++++++++++---------------- src/conf/domain_conf.h | 1 + 2 files changed, 55 insertions(+), 24 deletions(-) -- 1.7.12

2 4

[libvirt] [PATCH] virsh: fixed incorrect timing report
by Viktor Mihajlovski 31 Aug '12

31 Aug '12

When executing virsh -t <command> the reported timing was off by 3 orders of magnitude if the command took more than one second. Signed-off-by: Viktor Mihajlovski <mihajlov(a)linux.vnet.ibm.com> --- tools/virsh.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 7a5b92c..04d1b52 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -1509,7 +1509,7 @@ vshCommandRun(vshControl *ctl, const vshCmd *cmd) return ret; if (enable_timing) { - double diff_ms = (((after.tv_sec - before.tv_sec) * 1000000.0) + + double diff_ms = (((after.tv_sec - before.tv_sec) * 1000.0) + ((after.tv_usec - before.tv_usec) / 1000.0)); vshPrint(ctl, _("\n(Time: %.3f ms)\n\n"), diff_ms); -- 1.7.0.4

3 2

[libvirt] [PATCH] virsh: Document subdriver option of attach-disk
by Jiri Denemark 31 Aug '12

31 Aug '12

--- tools/virsh.pod | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/tools/virsh.pod b/tools/virsh.pod index cad5b1c..a26c420 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -1675,9 +1675,15 @@ I<source> is path for the files and devices. I<target> controls the bus or device under which the disk is exposed to the guest OS. It indicates the "logical" device name. I<driver> can be I<file>, I<tap> or I<phy> for the Xen hypervisor depending on the kind of access; or I<qemu> for the QEMU emulator. -I<type> can indicate I<lun>, I<cdrom> or I<floppy> as alternative to the disk default, -although this use only replaces the media within the existing virtual cdrom or -floppy device; consider using B<update-device> for this usage instead. +Further details to the driver can be passed using I<subdriver>. For Xen +I<subdriver> can be I<aio>, while for QEMU subdriver should match the format +of the disk source, such as I<raw> or I<qcow2>. Hypervisor default will be +used if I<subdriver> is not specified. However, the default may not be +correct, esp. for QEMU as for security reasons it is configured not to detect +disk formats. I<type> can indicate I<lun>, I<cdrom> or I<floppy> as +alternative to the disk default, although this use only replaces the media +within the existing virtual cdrom or floppy device; consider using +B<update-device> for this usage instead. I<mode> can specify the two specific mode I<readonly> or I<shareable>. I<--config> indicates the changes will affect the next boot of the domain, for compatibility purposes, I<--persistent> is alias of I<--config>. -- 1.7.12

2 2

[libvirt] [PATCH] qemu: Don't ignore CPU tuning config if required cgroups are missing
by Jiri Denemark 31 Aug '12

31 Aug '12

--- src/qemu/qemu_cgroup.c | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c index df67ff3..7298e28 100644 --- a/src/qemu/qemu_cgroup.c +++ b/src/qemu/qemu_cgroup.c @@ -546,16 +546,21 @@ int qemuSetupCgroupForVcpu(struct qemud_driver *driver, virDomainObjPtr vm) unsigned long long period = vm->def->cputune.period; long long quota = vm->def->cputune.quota; - if (driver->cgroup == NULL) - return 0; /* Not supported, so claim success */ - if ((period || quota) && - !qemuCgroupControllerActive(driver, VIR_CGROUP_CONTROLLER_CPU)) { - virReportError(VIR_ERR_SYSTEM_ERROR, "%s", - _("cgroup cpu is not active")); + (!driver->cgroup || + !qemuCgroupControllerActive(driver, VIR_CGROUP_CONTROLLER_CPU))) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("cgroup cpu is required for scheduler tuning")); return -1; } + /* We are trying to setup cgroups for CPU pinning, which can also be done + * with virProcessInfoSetAffinity, thus the lack of cgroups is not fatal + * here. + */ + if (driver->cgroup == NULL) + return 0; + rc = virCgroupForDomain(driver->cgroup, vm->def->name, &cgroup, 0); if (rc != 0) { virReportSystemError(-rc, @@ -636,6 +641,14 @@ int qemuSetupCgroupForEmulator(struct qemud_driver *driver, long long quota = vm->def->cputune.emulator_quota; int rc, i; + if ((period || quota) && + (!driver->cgroup || + !qemuCgroupControllerActive(driver, VIR_CGROUP_CONTROLLER_CPU))) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("cgroup cpu is required for scheduler tuning")); + return -1; + } + if (driver->cgroup == NULL) return 0; /* Not supported, so claim success */ @@ -656,10 +669,8 @@ int qemuSetupCgroupForEmulator(struct qemud_driver *driver, } for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) { - if (!qemuCgroupControllerActive(driver, i)) { - VIR_WARN("cgroup %d is not active", i); + if (!qemuCgroupControllerActive(driver, i)) continue; - } rc = virCgroupMoveTask(cgroup, cgroup_emulator, i); if (rc < 0) { virReportSystemError(-rc, -- 1.7.12

2 2

[libvirt] [PATCH 0/2] WIP: additional fixes to the security driver
by Jiri Denemark 31 Aug '12

31 Aug '12

Hi, these patches are a work in progress and apply on top of the two recent patches from Marcelo. Jiri Denemark (2): Fix seclabels parsing Format seclabels in a compatible way src/conf/domain_conf.c | 41 +++++++++++++++++++++++++---------------- 1 file changed, 25 insertions(+), 16 deletions(-) -- 1.7.12

1 3