- Devel - libvirt List Archives

[libvirt] [PATCH V5] support offline migration
by liguang 10 Sep '12

10 Sep '12

original migration did not aware of offline case, so, add code to support offline migration quietly (did not disturb original migration) by pass VIR_MIGRATE_OFFLINE flag to migration APIs, and migration process will not puzzeled by domain offline and exit unexpectly. these changes did not take care of disk images the domain required, for disk images could be transfered by other APIs as suggested. so, the migration result is just make domain definition alive at target side. Signed-off-by: liguang <lig.fnst(a)cn.fujitsu.com> --- include/libvirt/libvirt.h.in | 1 + src/qemu/qemu_driver.c | 8 +++++ src/qemu/qemu_migration.c | 63 ++++++++++++++++++++++++++++++++++++----- src/qemu/qemu_migration.h | 3 +- tools/virsh-domain.c | 4 ++ 5 files changed, 70 insertions(+), 9 deletions(-) diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index cfe5047..77df2ab 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -995,6 +995,7 @@ typedef enum { * whole migration process; this will be used automatically * when supported */ VIR_MIGRATE_UNSAFE = (1 << 9), /* force migration even if it is considered unsafe */ + VIR_MIGRATE_OFFLINE = (1 << 10), /* offline migrate */ } virDomainMigrateFlags; /* Domain migration. */ diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index b12d9bc..0ed7053 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -9641,6 +9641,8 @@ qemuDomainMigrateBegin3(virDomainPtr domain, } if (!virDomainObjIsActive(vm)) { + if (flags |= VIR_MIGRATE_OFFLINE) + goto offline; virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("domain is not running")); goto endjob; @@ -9653,6 +9655,7 @@ qemuDomainMigrateBegin3(virDomainPtr domain, if (qemuDomainCheckEjectableMedia(driver, vm, asyncJob) < 0) goto endjob; +offline: if (!(xml = qemuMigrationBegin(driver, vm, xmlin, dname, cookieout, cookieoutlen, flags))) @@ -9888,6 +9891,11 @@ qemuDomainMigrateConfirm3(virDomainPtr domain, goto cleanup; } + if (flags & VIR_MIGRATE_OFFLINE) { + ret = 0; + goto cleanup; + } + if (!qemuMigrationJobIsActive(vm, QEMU_ASYNC_JOB_MIGRATION_OUT)) goto cleanup; diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 1b21ef6..cf140d4 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; @@ -439,6 +441,12 @@ qemuMigrationCookieXMLFormat(struct qemud_driver *driver, virBufferAdjustIndent(buf, -2); } + if (mig->flags & QEMU_MIGRATION_COOKIE_OFFLINE) { + virBufferAsprintf(buf, " <offline mig_ol='%d'>\n", + 1); + virBufferAddLit(buf, " </offline>\n"); + } + virBufferAddLit(buf, "</qemu-migration>\n"); return 0; } @@ -662,6 +670,18 @@ qemuMigrationCookieXMLParse(qemuMigrationCookiePtr mig, VIR_FREE(nodes); } + if ((flags & QEMU_MIGRATION_COOKIE_OFFLINE) && + virXPathBoolean("count(./offline) > 0", ctxt)) { + int offline = 0; + if (virXPathInt("string(./offline/@mig_ol)", ctxt, &offline) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + "%s", _("missing mig_ol attribute in migration data")); + goto error; + } + if (offline != 1) + mig->flags &= ~QEMU_MIGRATION_COOKIE_OFFLINE; + } + return 0; error: @@ -721,6 +741,10 @@ qemuMigrationBakeCookie(qemuMigrationCookiePtr mig, qemuMigrationCookieAddPersistent(mig, dom) < 0) return -1; + if (flags & QEMU_MIGRATION_COOKIE_OFFLINE) { + mig->flags |= QEMU_MIGRATION_COOKIE_OFFLINE; + } + if (!(*cookieout = qemuMigrationCookieXMLFormatStr(driver, mig))) return -1; @@ -1151,6 +1175,13 @@ char *qemuMigrationBegin(struct qemud_driver *driver, QEMU_MIGRATION_COOKIE_LOCKSTATE) < 0) goto cleanup; + if (flags & VIR_MIGRATE_OFFLINE) { + if (qemuMigrationBakeCookie(mig, driver, vm, + cookieout, cookieoutlen, + QEMU_MIGRATION_COOKIE_OFFLINE) < 0) + goto cleanup; + } + if (xmlin) { if (!(def = virDomainDefParseString(driver->caps, xmlin, QEMU_EXPECTED_VIRT_TYPES, @@ -1314,6 +1345,15 @@ qemuMigrationPrepareAny(struct qemud_driver *driver, goto endjob; } + if (!(mig = qemuMigrationEatCookie(driver, vm, cookiein, cookieinlen, + QEMU_MIGRATION_COOKIE_OFFLINE))) + return ret; + + if (mig->flags & QEMU_MIGRATION_COOKIE_OFFLINE) { + ret = 0; + goto cleanup; + } + /* Start the QEMU daemon, with the same command-line arguments plus * -incoming $migrateFrom */ @@ -1856,7 +1896,8 @@ qemuMigrationRun(struct qemud_driver *driver, virLockManagerPluginGetName(driver->lockManager)); return -1; } - + if (flags & VIR_MIGRATE_OFFLINE) + return 0; if (!(mig = qemuMigrationEatCookie(driver, vm, cookiein, cookieinlen, QEMU_MIGRATION_COOKIE_GRAPHICS))) goto cleanup; @@ -2372,6 +2413,8 @@ static int doPeer2PeerMigrate3(struct qemud_driver *driver, qemuDomainObjExitRemoteWithDriver(driver, vm); } VIR_FREE(dom_xml); + if (flags & VIR_MIGRATE_OFFLINE) + goto cleanup; if (ret == -1) goto cleanup; @@ -2477,7 +2520,7 @@ finish: vm->def->name); cleanup: - if (ddomain) { + if (ddomain || (flags & VIR_MIGRATE_OFFLINE)) { virObjectUnref(ddomain); ret = 0; } else { @@ -2554,10 +2597,9 @@ static int doPeer2PeerMigrate(struct qemud_driver *driver, } /* domain may have been stopped while we were talking to remote daemon */ - if (!virDomainObjIsActive(vm)) { + if (!virDomainObjIsActive(vm) && !(flags & VIR_MIGRATE_OFFLINE)) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("guest unexpectedly quit")); - goto cleanup; } /* Change protection is only required on the source side (us), and @@ -2617,7 +2659,7 @@ qemuMigrationPerformJob(struct qemud_driver *driver, if (qemuMigrationJobStart(driver, vm, QEMU_ASYNC_JOB_MIGRATION_OUT) < 0) goto cleanup; - if (!virDomainObjIsActive(vm)) { + if (!virDomainObjIsActive(vm) && !(flags & VIR_MIGRATE_OFFLINE)) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("domain is not running")); goto endjob; @@ -2941,6 +2983,8 @@ qemuMigrationFinish(struct qemud_driver *driver, */ if (retcode == 0) { if (!virDomainObjIsActive(vm)) { + if (flags & VIR_MIGRATE_OFFLINE) + goto offline; virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("guest unexpectedly quit")); goto endjob; @@ -3038,7 +3082,7 @@ qemuMigrationFinish(struct qemud_driver *driver, goto endjob; } } - + offline: dom = virGetDomain (dconn, vm->def->name, vm->def->uuid); event = virDomainEventNewFromObj(vm, @@ -3120,7 +3164,10 @@ int qemuMigrationConfirm(struct qemud_driver *driver, if (!(mig = qemuMigrationEatCookie(driver, vm, cookiein, cookieinlen, 0))) return -1; - + if (flags & VIR_MIGRATE_OFFLINE) { + rv = 0; + goto cleanup; + } /* Did the migration go as planned? If yes, kill off the * domain object, but if no, resume CPUs */ 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, diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 4684466..4cd4687 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -6525,6 +6525,7 @@ static const vshCmdOptDef opts_migrate[] = { {"dname", VSH_OT_DATA, 0, N_("rename to new name during migration (if supported)")}, {"timeout", VSH_OT_INT, 0, N_("force guest to suspend if live migration exceeds timeout (in seconds)")}, {"xml", VSH_OT_STRING, 0, N_("filename containing updated XML for the target")}, + {"offline", VSH_OT_BOOL, 0, N_("for offline migration")}, {NULL, 0, 0, NULL} }; @@ -6591,6 +6592,9 @@ doMigrate(void *opaque) if (vshCommandOptBool(cmd, "unsafe")) flags |= VIR_MIGRATE_UNSAFE; + if (vshCommandOptBool(cmd, "offline")) + flags |= VIR_MIGRATE_OFFLINE; + if (xmlfile && virFileReadAll(xmlfile, 8192, &xml) < 0) { vshError(ctl, _("file '%s' doesn't exist"), xmlfile); -- 1.7.2.5

2 2

[libvirt] [PATCHv6 0/2] Implementation of virConnectListAllDomains() for esx and hyperv
by Peter Krempa 10 Sep '12

10 Sep '12

Yet another respin updated and rebased to current head. Both drivers are compile tested but I don't have the infrastructure do a functional test. Peter Krempa (2): hyperv: Add implementation for virConnectListAllDomains() esx: Add implementation for virConnectListAllDomains() src/esx/esx_driver.c | 194 +++++++++++++++++++++++++++++++++++++++++++++ src/hyperv/hyperv_driver.c | 135 +++++++++++++++++++++++++++++++ 2 files changed, 329 insertions(+) -- 1.7.12

3 5

[libvirt] [PATCH] esx: Fix and improve esxListAllDomains function
by Matthias Bolte 09 Sep '12

09 Sep '12

Avoid requesting information such as identity or power state when it is not necessary. Lookup virtual machine list with the required fields (configStatus, name, and config.uuid) to make esxVI_GetVirtualMachineIdentity work. No need to call esxVI_GetNumberOfSnapshotTrees. rootSnapshotTreeList can be tested for emptiness by checking it for NULL. esxVI_LookupRootSnapshotTreeList already does the error reporting, don't overwrite it. Check if autostart is enabled at all before looking up the individual autostart setting of a virtual machine. Reorder VIR_EXPAND_N(doms, ndoms, 1) to avoid leaking the result of the call to virGetDomain if VIR_EXPAND_N fails. If virGetDomain fails it already reports an error, don't overwrite it with an OOM error. All items in doms up to the count-th one are valid, no need to double check before freeing them. Finally, don't leak autoStartDefaults and powerInfoList. --- src/esx/esx_driver.c | 116 ++++++++++++++++++++++++++++++++----------------- 1 files changed, 76 insertions(+), 40 deletions(-) diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index 28e2c65..28f3386 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -5010,13 +5010,15 @@ esxListAllDomains(virConnectPtr conn, { int ret = -1; esxPrivate *priv = conn->privateData; + bool needIdentity; + bool needPowerState; virDomainPtr dom; virDomainPtr *doms = NULL; size_t ndoms = 0; + esxVI_String *propertyNameList = NULL; esxVI_ObjectContent *virtualMachineList = NULL; esxVI_ObjectContent *virtualMachine = NULL; - esxVI_String *propertyNameList = NULL; - esxVI_AutoStartDefaults *autostart_defaults = NULL; + esxVI_AutoStartDefaults *autoStartDefaults = NULL; esxVI_VirtualMachinePowerState powerState; esxVI_AutoStartPowerInfo *powerInfoList = NULL; esxVI_AutoStartPowerInfo *powerInfo = NULL; @@ -5025,7 +5027,6 @@ esxListAllDomains(virConnectPtr conn, int id; unsigned char uuid[VIR_UUID_BUFLEN]; int count = 0; - int snapshotCount; bool autostart; int state; @@ -5035,7 +5036,7 @@ esxListAllDomains(virConnectPtr conn, * - persistence: all esx machines are persistent * - managed save: esx doesn't support managed save */ - if ((MATCH(VIR_CONNECT_LIST_DOMAINS_TRANSIENT) && + if ((MATCH(VIR_CONNECT_LIST_DOMAINS_TRANSIENT) && !MATCH(VIR_CONNECT_LIST_DOMAINS_PERSISTENT)) || (MATCH(VIR_CONNECT_LIST_DOMAINS_MANAGEDSAVE) && !MATCH(VIR_CONNECT_LIST_DOMAINS_NO_MANAGEDSAVE))) { @@ -5047,23 +5048,49 @@ esxListAllDomains(virConnectPtr conn, goto cleanup; } - if (esxVI_EnsureSession(priv->primary) < 0) + if (esxVI_EnsureSession(priv->primary) < 0) return -1; /* check system default autostart value */ if (MATCH(VIR_CONNECT_LIST_DOMAINS_FILTERS_AUTOSTART)) { if (esxVI_LookupAutoStartDefaults(priv->primary, - &autostart_defaults) < 0) + &autoStartDefaults) < 0) { goto cleanup; + } + + if (autoStartDefaults->enabled == esxVI_Boolean_True) { + if (esxVI_LookupAutoStartPowerInfoList(priv->primary, + &powerInfoList) < 0) { + goto cleanup; + } + } + } - if (esxVI_LookupAutoStartPowerInfoList(priv->primary, - &powerInfoList) < 0) + needIdentity = MATCH(VIR_CONNECT_LIST_DOMAINS_FILTERS_SNAPSHOT) || + domains != NULL; + + if (needIdentity) { + /* Request required data for esxVI_GetVirtualMachineIdentity */ + if (esxVI_String_AppendValueListToList(&propertyNameList, + "configStatus\0" + "name\0" + "config.uuid\0") < 0) { goto cleanup; + } } - if (esxVI_String_AppendValueToList(&propertyNameList, - "runtime.powerState") < 0 || - esxVI_LookupVirtualMachineList(priv->primary, propertyNameList, + needPowerState = MATCH(VIR_CONNECT_LIST_DOMAINS_FILTERS_ACTIVE) || + MATCH(VIR_CONNECT_LIST_DOMAINS_FILTERS_STATE) || + domains != NULL; + + if (needPowerState) { + if (esxVI_String_AppendValueToList(&propertyNameList, + "runtime.powerState") < 0) { + goto cleanup; + } + } + + if (esxVI_LookupVirtualMachineList(priv->primary, propertyNameList, &virtualMachineList) < 0) goto cleanup; @@ -5075,12 +5102,21 @@ esxListAllDomains(virConnectPtr conn, for (virtualMachine = virtualMachineList; virtualMachine != NULL; virtualMachine = virtualMachine->_next) { + if (needIdentity) { + VIR_FREE(name); - VIR_FREE(name); + if (esxVI_GetVirtualMachineIdentity(virtualMachine, &id, + &name, uuid) < 0) { + goto cleanup; + } + } - if (esxVI_GetVirtualMachineIdentity(virtualMachine, &id, &name, uuid) < 0 || - esxVI_GetVirtualMachinePowerState(virtualMachine, &powerState) < 0) - goto cleanup; + if (needPowerState) { + if (esxVI_GetVirtualMachinePowerState(virtualMachine, + &powerState) < 0) { + goto cleanup; + } + } /* filter by active state */ if (MATCH(VIR_CONNECT_LIST_DOMAINS_FILTERS_ACTIVE) && @@ -5092,23 +5128,17 @@ esxListAllDomains(virConnectPtr conn, /* filter by snapshot existence */ if (MATCH(VIR_CONNECT_LIST_DOMAINS_FILTERS_SNAPSHOT)) { + esxVI_VirtualMachineSnapshotTree_Free(&rootSnapshotTreeList); + if (esxVI_LookupRootSnapshotTreeList(priv->primary, uuid, &rootSnapshotTreeList) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Couldn't retrieve snapshot list for " - "domain '%s'"), name); goto cleanup; } - snapshotCount = esxVI_GetNumberOfSnapshotTrees(rootSnapshotTreeList, - true, false); - - esxVI_VirtualMachineSnapshotTree_Free(&rootSnapshotTreeList); - if (!((MATCH(VIR_CONNECT_LIST_DOMAINS_HAS_SNAPSHOT) && - snapshotCount > 0) || + rootSnapshotTreeList != NULL) || (MATCH(VIR_CONNECT_LIST_DOMAINS_NO_SNAPSHOT) && - snapshotCount == 0))) + rootSnapshotTreeList == NULL))) continue; } @@ -5116,19 +5146,18 @@ esxListAllDomains(virConnectPtr conn, if (MATCH(VIR_CONNECT_LIST_DOMAINS_FILTERS_AUTOSTART)) { autostart = false; - for (powerInfo = powerInfoList; powerInfo != NULL; - powerInfo = powerInfo->_next) { - if (STREQ(powerInfo->key->value, virtualMachine->obj->value)) { - if (STRCASEEQ(powerInfo->startAction, "powerOn")) - autostart = true; + if (autoStartDefaults->enabled == esxVI_Boolean_True) { + for (powerInfo = powerInfoList; powerInfo != NULL; + powerInfo = powerInfo->_next) { + if (STREQ(powerInfo->key->value, virtualMachine->obj->value)) { + if (STRCASEEQ(powerInfo->startAction, "powerOn")) + autostart = true; - break; + break; + } } } - autostart = autostart && - autostart_defaults->enabled == esxVI_Boolean_True; - if (!((MATCH(VIR_CONNECT_LIST_DOMAINS_AUTOSTART) && autostart) || (MATCH(VIR_CONNECT_LIST_DOMAINS_NO_AUTOSTART) && @@ -5139,6 +5168,7 @@ esxListAllDomains(virConnectPtr conn, /* filter by domain state */ if (MATCH(VIR_CONNECT_LIST_DOMAINS_FILTERS_STATE)) { state = esxVI_VirtualMachinePowerState_ConvertToLibvirt(powerState); + if (!((MATCH(VIR_CONNECT_LIST_DOMAINS_RUNNING) && state == VIR_DOMAIN_RUNNING) || (MATCH(VIR_CONNECT_LIST_DOMAINS_PAUSED) && @@ -5158,17 +5188,18 @@ esxListAllDomains(virConnectPtr conn, continue; } - if (!(dom = virGetDomain(conn, name, uuid))) + if (VIR_EXPAND_N(doms, ndoms, 1) < 0) goto no_memory; + if (!(dom = virGetDomain(conn, name, uuid))) + goto cleanup; + /* Only running/suspended virtual machines have an ID != -1 */ if (powerState != esxVI_VirtualMachinePowerState_PoweredOff) dom->id = id; else dom->id = -1; - if (VIR_EXPAND_N(doms, ndoms, 1) < 0) - goto no_memory; doms[count++] = dom; } @@ -5180,14 +5211,19 @@ esxListAllDomains(virConnectPtr conn, cleanup: if (doms) { for (id = 0; id < count; id++) { - if (doms[id]) - virDomainFree(doms[id]); + virDomainFree(doms[id]); } + + VIR_FREE(doms); } - VIR_FREE(doms); + VIR_FREE(name); + esxVI_AutoStartDefaults_Free(&autoStartDefaults); + esxVI_AutoStartPowerInfo_Free(&powerInfoList); esxVI_String_Free(&propertyNameList); esxVI_ObjectContent_Free(&virtualMachineList); + esxVI_VirtualMachineSnapshotTree_Free(&rootSnapshotTreeList); + return ret; no_memory: -- 1.7.4.1

1 1

[libvirt] [PATCH] esx: Remove unused variable from esxDomainGetAutostart
by Matthias Bolte 09 Sep '12

09 Sep '12

--- I've pushed this one under the trivial rule. src/esx/esx_driver.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index 28e2c65..991f03c 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -3363,7 +3363,6 @@ esxDomainGetAutostart(virDomainPtr domain, int *autostart) esxPrivate *priv = domain->conn->privateData; esxVI_AutoStartDefaults *defaults = NULL; esxVI_String *propertyNameList = NULL; - esxVI_ObjectContent *hostAutoStartManager = NULL; esxVI_AutoStartPowerInfo *powerInfo = NULL; esxVI_AutoStartPowerInfo *powerInfoList = NULL; esxVI_ObjectContent *virtualMachine = NULL; @@ -3417,7 +3416,6 @@ esxDomainGetAutostart(virDomainPtr domain, int *autostart) cleanup: esxVI_String_Free(&propertyNameList); - esxVI_ObjectContent_Free(&hostAutoStartManager); esxVI_AutoStartDefaults_Free(&defaults); esxVI_AutoStartPowerInfo_Free(&powerInfoList); esxVI_ObjectContent_Free(&virtualMachine); -- 1.7.4.1

1 0

[libvirt] SCSI command passthrough
by Geert Jansen 09 Sep '12

09 Sep '12

Hi, i'm trying to pass through SCSI commands from a guest to a host. Both guest and host are RHEL 6.3. The relevant section in my XML is: <devices> <disk type='block' device='lun'> <driver name='qemu' type='raw' cache='none'/> <source dev='/dev/sdb'/> <target dev='sdb' bus='scsi'/> <address type='drive' controller='0' bus='0' target='1' unit='0'/> </disk> <controller type='scsi' index='0' model='virtio-scsi'> <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/> </controller> ... </devices> Commands that are whitelisted by the host kernel come through (e.g. "sg_inq"), but other commands don't (e.g. "sg_persist"). I need sg_persist so i tried making qemu-kvm setuid root. This works. Is there a better way to allow arbitrary SCSI commands, perferably on a per-VM basis, rather than making qemu setuid root? Regards, Geert

2 1

[libvirt] [PATCH 0/4] Fix PM events
by Jiri Denemark 08 Sep '12

08 Sep '12

PM related events suffered from quite a lot of issues. The only thing that actually worked was STARTED life cycle event with WAKEUP detail. Jiri Denemark (4): Fix docs for PM event callbacks Fix PMSuspend and PMWakeup events Add PMSUSPENDED life cycle event examples: Fix event detail printing in python test daemon/remote.c | 2 ++ examples/domain-events/events-c/event-test.c | 14 ++++++++++++-- examples/domain-events/events-python/event-test.py | 8 +++++--- include/libvirt/libvirt.h.in | 20 ++++++++++++++++---- python/libvirt-override.c | 4 ++-- src/qemu/qemu_process.c | 12 ++++++++++-- 6 files changed, 47 insertions(+), 13 deletions(-) -- 1.7.12

3 13

[libvirt] [PATCH] build: fix build on older gcc
by Eric Blake 08 Sep '12

08 Sep '12

On RHEL 6.2, gcc 4.4.6 complains: cc1: warning: command line option "-Wenum-compare" is valid for C++/ObjC++ but not for C which in turn breaks a -Werror build. Meanwhile, in Fedora 17, gcc 4.7.0, -Wenum-compare has been enhanced to also work on C, but at the same time, it is documented that -Wall now implicitly includes -Wenum-compare. Therefore, it is sufficient to remove explicit checks for this option, avoiding the warning from older gcc while still getting the compile-time safety from newer gcc. * m4/virt-compile-warnings.m4 (-Wenum-compare): Omit explicit check. --- Pushing under the build-breaker rule. m4/virt-compile-warnings.m4 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/m4/virt-compile-warnings.m4 b/m4/virt-compile-warnings.m4 index c3ff962..d1173eb 100644 --- a/m4/virt-compile-warnings.m4 +++ b/m4/virt-compile-warnings.m4 @@ -57,6 +57,8 @@ AC_DEFUN([LIBVIRT_COMPILE_WARNINGS],[ dontwarn="$dontwarn -Wformat-nonliteral" # Gnulib's stat-time.h violates this dontwarn="$dontwarn -Waggregate-return" + # gcc 4.4.6 complains this is C++ only; gcc 4.7.0 implies this from -Wall + dontwarn="$dontwarn -Wenum-compare" # Gnulib uses '#pragma GCC diagnostic push' to silence some # warnings, but older gcc doesn't support this. -- 1.7.11.4

1 0

[libvirt] [PATCH 0/6] parallels: get rid of cached domains list in driver
by Dmitry Guryanov 07 Sep '12

07 Sep '12

The goal of this patch series is to get rid of cached domains list. Someone can create several connections to libvirt or change something (start VM or change parameters) using native tools. In such case first connection will not get any info about those changes. There is no way to check, if the cache valid, so remove it and always query needed data using prlctl command. Dmitry Guryanov (6): parallels: return a new list of domains from parallelsLoadDomains parallels: rename uuidstr to __uuidstr in macro parallels: return up-to-date info about domains parallels: don't track domain state in global domains list parallels: don't use stored domains list in parallelsDomainDefineXML parallels: remove domains list from _parallelsConn structure src/parallels/parallels_driver.c | 423 ++++++++++++++++++-------------------- src/parallels/parallels_utils.h | 1 - 2 files changed, 195 insertions(+), 229 deletions(-)

1 7

[libvirt] [PATCH] remove dnsmasq command line parameter "--filterwin2k"
by Gene Czarcinski 07 Sep '12

07 Sep '12

This patch removed the "--filterwin2k" dnsmasq command line parameter which was unnecessary for domain specification, possibly blocked some usage, and was command line clutter. Gene Czarcinski <gene(a)czarc.net> diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 53eebed..808c843 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -543,7 +543,7 @@ networkBuildDnsmasqArgv(virNetworkObjPtr network, /* need to specify local even if no domain specified */ virCommandAddArgFormat(cmd, "--local=/%s/", network->def->domain ? network->def->domain : ""); - virCommandAddArgList(cmd, "--domain-needed", "--filterwin2k", NULL); + virCommandAddArg(cmd, "--domain-needed"); if (pidfile) virCommandAddArgPair(cmd, "--pid-file", pidfile); diff --git a/tests/networkxml2argvdata/isolated-network.argv b/tests/networkxml2argvdata/isolated-network.argv index 276f42a..048c72b 100644 --- a/tests/networkxml2argvdata/isolated-network.argv +++ b/tests/networkxml2argvdata/isolated-network.argv @@ -1,5 +1,5 @@ @DNSMASQ@ --strict-order --bind-interfaces \ ---local=// --domain-needed --filterwin2k --conf-file= \ +--local=// --domain-needed --conf-file= \ --except-interface lo --dhcp-option=3 --no-resolv \ --listen-address 192.168.152.1 \ --dhcp-range 192.168.152.2,192.168.152.254 \ diff --git a/tests/networkxml2argvdata/nat-network-dns-hosts.argv b/tests/networkxml2argvdata/nat-network-dns-hosts.argv index 8040e2a..03a0676 100644 --- a/tests/networkxml2argvdata/nat-network-dns-hosts.argv +++ b/tests/networkxml2argvdata/nat-network-dns-hosts.argv @@ -1,4 +1,4 @@ @DNSMASQ@ --strict-order --bind-interfaces --domain=example.com \ ---local=/example.com/ --domain-needed --filterwin2k \ +--local=/example.com/ --domain-needed \ --conf-file= --except-interface lo --listen-address 192.168.122.1 \ --expand-hosts --addn-hosts=/var/lib/libvirt/dnsmasq/default.addnhosts\ diff --git a/tests/networkxml2argvdata/nat-network-dns-srv-record-minimal.argv b/tests/networkxml2argvdata/nat-network-dns-srv-record-minimal.argv index bb50fd6..a1e4200 100644 --- a/tests/networkxml2argvdata/nat-network-dns-srv-record-minimal.argv +++ b/tests/networkxml2argvdata/nat-network-dns-srv-record-minimal.argv @@ -1,7 +1,7 @@ @DNSMASQ@ \ --strict-order \ --bind-interfaces \ ---local=// --domain-needed --filterwin2k --conf-file= \ +--local=// --domain-needed --conf-file= \ --except-interface lo \ --srv-host=name.tcp.,,,, \ --listen-address 192.168.122.1 \ diff --git a/tests/networkxml2argvdata/nat-network-dns-srv-record.argv b/tests/networkxml2argvdata/nat-network-dns-srv-record.argv index 36498f2..8af38c4 100644 --- a/tests/networkxml2argvdata/nat-network-dns-srv-record.argv +++ b/tests/networkxml2argvdata/nat-network-dns-srv-record.argv @@ -1,7 +1,7 @@ @DNSMASQ@ \ --strict-order \ --bind-interfaces \ ---local=// --domain-needed --filterwin2k --conf-file= \ +--local=// --domain-needed --conf-file= \ --except-interface lo \ --srv-host=name.tcp.test-domain-name,.,1024,10,10 \ --listen-address 192.168.122.1 \ diff --git a/tests/networkxml2argvdata/nat-network-dns-txt-record.argv b/tests/networkxml2argvdata/nat-network-dns-txt-record.argv index 2a6c799..404b56a 100644 --- a/tests/networkxml2argvdata/nat-network-dns-txt-record.argv +++ b/tests/networkxml2argvdata/nat-network-dns-txt-record.argv @@ -1,5 +1,5 @@ @DNSMASQ@ --strict-order --bind-interfaces \ ---local=// --domain-needed --filterwin2k --conf-file= \ +--local=// --domain-needed --conf-file= \ --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 \ diff --git a/tests/networkxml2argvdata/nat-network.argv b/tests/networkxml2argvdata/nat-network.argv index 265b931..1dc8f73 100644 --- a/tests/networkxml2argvdata/nat-network.argv +++ b/tests/networkxml2argvdata/nat-network.argv @@ -1,5 +1,5 @@ @DNSMASQ@ --strict-order --bind-interfaces \ ---local=// --domain-needed --filterwin2k --conf-file= \ +--local=// --domain-needed --conf-file= \ --except-interface lo --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/networkxml2argvdata/netboot-network.argv b/tests/networkxml2argvdata/netboot-network.argv index 4f998d5..5a85ec2 100644 --- a/tests/networkxml2argvdata/netboot-network.argv +++ b/tests/networkxml2argvdata/netboot-network.argv @@ -1,5 +1,5 @@ @DNSMASQ@ --strict-order --bind-interfaces --domain=example.com \ ---local=/example.com/ --domain-needed --filterwin2k --conf-file= \ +--local=/example.com/ --domain-needed --conf-file= \ --except-interface lo --listen-address 192.168.122.1 \ --dhcp-range 192.168.122.2,192.168.122.254 \ --dhcp-leasefile=/var/lib/libvirt/dnsmasq/netboot.leases \ diff --git a/tests/networkxml2argvdata/netboot-proxy-network.argv b/tests/networkxml2argvdata/netboot-proxy-network.argv index 89319ef..36836b0 100644 --- a/tests/networkxml2argvdata/netboot-proxy-network.argv +++ b/tests/networkxml2argvdata/netboot-proxy-network.argv @@ -1,5 +1,5 @@ @DNSMASQ@ --strict-order --bind-interfaces --domain=example.com \ ---local=/example.com/ --domain-needed --filterwin2k --conf-file= \ +--local=/example.com/ --domain-needed --conf-file= \ --except-interface lo --listen-address 192.168.122.1 \ --dhcp-range 192.168.122.2,192.168.122.254 \ --dhcp-leasefile=/var/lib/libvirt/dnsmasq/netboot.leases \ diff --git a/tests/networkxml2argvdata/routed-network.argv b/tests/networkxml2argvdata/routed-network.argv index ac43991..77e802f 100644 --- a/tests/networkxml2argvdata/routed-network.argv +++ b/tests/networkxml2argvdata/routed-network.argv @@ -1,3 +1,3 @@ @DNSMASQ@ --strict-order --bind-interfaces \ ---local=// --domain-needed --filterwin2k --conf-file= \ +--local=// --domain-needed --conf-file= \ --except-interface lo --listen-address 192.168.122.1\

3 3

[libvirt] [PATCH v0] qemu: Add sandbox support.
by Ján Tomko 07 Sep '12

07 Sep '12

QEMU (since 1.2-rc0) supports setting up a syscall whitelist through libseccomp on linux kernel from 3.5-rc1. This is enabled by specifying -sandbox on on qemu command line. This patch detects this capability by searching for -sandbox in qemu help output and runs qemu with -sandbox on if sandbox is set to non-zero in qemu.conf. --- Should this option be in qemu.conf, or would it be better to set it per-domain in the XML? --- src/qemu/qemu.conf | 6 ++++++ src/qemu/qemu_capabilities.c | 3 +++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 3 +++ src/qemu/qemu_conf.c | 5 +++++ src/qemu/qemu_conf.h | 1 + 6 files changed, 19 insertions(+), 0 deletions(-) diff --git a/src/qemu/qemu.conf b/src/qemu/qemu.conf index d3175fa..47e510e 100644 --- a/src/qemu/qemu.conf +++ b/src/qemu/qemu.conf @@ -375,3 +375,9 @@ # #keepalive_interval = 5 #keepalive_count = 5 + + + +# Enable this to use seccomp syscall whitelisting in QEMU. +# +#sandbox = 1 diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 2ba7956..b0728e8 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -176,6 +176,7 @@ VIR_ENUM_IMPL(qemuCaps, QEMU_CAPS_LAST, "disable-s3", "disable-s4", /* 105 */ + "sandbox" ); struct qemu_feature_flags { @@ -1139,6 +1140,8 @@ qemuCapsComputeCmdFlags(const char *help, } if (strstr(help, "-smbios type")) qemuCapsSet(flags, QEMU_CAPS_SMBIOS_TYPE); + if (strstr(help, "-sandbox")) + qemuCapsSet(flags, QEMU_CAPS_SANDBOX); if ((netdev = strstr(help, "-netdev"))) { /* Disable -netdev on 0.12 since although it exists, diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index a7b3a06..0066901 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -141,6 +141,7 @@ enum qemuCapsFlags { QEMU_CAPS_IOLIMITS = 103, /* -device ...logical_block_size & co */ QEMU_CAPS_DISABLE_S3 = 104, /* S3 BIOS Advertisement on/off */ QEMU_CAPS_DISABLE_S4 = 105, /* S4 BIOS Advertisement on/off */ + QEMU_CAPS_SANDBOX = 106, /* -sandbox */ QEMU_CAPS_LAST, /* this must always be the last item */ }; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index e739f34..737d4d9 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -6462,6 +6462,9 @@ qemuBuildCommandLine(virConnectPtr conn, ? qemucmd->env_value[i] : ""); } + if (driver->sandbox && qemuCapsGet(qemuCaps, QEMU_CAPS_SANDBOX)) + virCommandAddArgList(cmd, "-sandbox", "on", NULL); + return cmd; no_memory: diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index e9e15c5..a367fcd 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -129,6 +129,7 @@ int qemudLoadDriverConfig(struct qemud_driver *driver, driver->keepAliveInterval = 5; driver->keepAliveCount = 5; + driver->sandbox = false; /* Just check the file is readable before opening it, otherwise * libvirt emits an error. @@ -570,6 +571,10 @@ int qemudLoadDriverConfig(struct qemud_driver *driver, CHECK_TYPE("keepalive_count", VIR_CONF_LONG); if (p) driver->keepAliveCount = p->l; + p = virConfGetValue(conf, "sandbox"); + CHECK_TYPE("sandbox", VIR_CONF_LONG); + if (p) driver->sandbox = p->l; + virConfFree (conf); return 0; } diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h index ac285f6..f1b6465 100644 --- a/src/qemu/qemu_conf.h +++ b/src/qemu/qemu_conf.h @@ -152,6 +152,7 @@ struct qemud_driver { int keepAliveInterval; unsigned int keepAliveCount; + bool sandbox; }; typedef struct _qemuDomainCmdlineDef qemuDomainCmdlineDef; -- 1.7.8.6

5 11

[libvirt] [PATCH V3] Add proxy FS support to libvirt
by M. Mohan Kumar 07 Sep '12

07 Sep '12

From: "M. Mohan Kumar" <mohan(a)in.ibm.com> A new FS driver type 'proxy' is added to QEMU 9p server. This patch adds support for using proxy FS driver from libvirt. QEMU proxy FS driver uses socket for communicating between helper and qemu proxy FS driver. Proxy helper (a stand alone binary part of qemu) is invoked with one of the descriptors created using socketpair call and the share path. Similarly QEMU is invoked with another descriptor created using the same socketpair system call and with other required FS driver parameters. Need for proxy FS driver ======================== Pass through security model in QEMU 9p server has following issues: 1) TOCTTOU vulnerability: Following symbolic links in the server could provide access to files beyond 9p export path. 2) Running QEMU with root privilege could be a security issue (pass through security model needs root privilege). Proxy FS driver is implemented to solve these issues. Proxy FS uses chroot + socket combination for securing the vulnerability known with following symbolic links. Intention of adding a new filesystem type is to allow qemu to run in non-root mode, but doing privileged operations in a chroot environment using socket IO. Proxy helper is invoked with root privileges and chroots into 9p export path. QEMU proxy fs driver sends filesystem request to proxy helper and receives the response from it. Proxy helper is designed such a way that it needs only few capabilities related to filesystem operations (such as CAP_DAC_OVERRIDE, CAP_FOWNER, etc) and all other capabilities are dropped (CAP_SYS_CHROOT, etc) Proxy patches http://permalink.gmane.org/gmane.comp.emulators.qemu/128735 Signed-off-by: M. Mohan Kumar <mohan(a)in.ibm.com> --- Changes from previous version V3 * Addressed Daniel's review comments Changes from previous version V2 * Rebased on top of current libvirt git level Changes from previous version * Remove the xml node for specifying the virtfs-proxy-helper path, now it is determined from qemu binary path. docs/formatdomain.html.in | 2 + src/conf/domain_conf.c | 3 +- src/conf/domain_conf.h | 2 +- src/qemu/qemu_capabilities.c | 5 ++- src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 83 ++++++++++++++++++++++++++++++++++++++++-- src/qemu/qemu_command.h | 3 +- tests/qemuhelptest.c | 7 +++- 8 files changed, 96 insertions(+), 10 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 2c5c456..bf74ed8 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -1621,6 +1621,8 @@ while the value <code>immediate</code> means that a host writeback is immediately triggered for all pages touched during a guest file write operation <span class="since">(since 0.9.10)</span>. + or <code>type='proxy'</code> <span class="since">(since + 1.0)</span>. </dd> <dt><code>type='template'</code></dt> <dd> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 851284a..79ca2b7 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -268,7 +268,8 @@ VIR_ENUM_IMPL(virDomainFS, VIR_DOMAIN_FS_TYPE_LAST, VIR_ENUM_IMPL(virDomainFSDriverType, VIR_DOMAIN_FS_DRIVER_TYPE_LAST, "default", "path", - "handle") + "handle", + "proxy") VIR_ENUM_IMPL(virDomainFSAccessMode, VIR_DOMAIN_FS_ACCESSMODE_LAST, "passthrough", diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index fd0e89e..a296f49 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -660,6 +660,7 @@ enum virDomainFSDriverType { VIR_DOMAIN_FS_DRIVER_TYPE_DEFAULT = 0, VIR_DOMAIN_FS_DRIVER_TYPE_PATH, VIR_DOMAIN_FS_DRIVER_TYPE_HANDLE, + VIR_DOMAIN_FS_DRIVER_TYPE_PROXY, VIR_DOMAIN_FS_DRIVER_TYPE_LAST }; @@ -698,7 +699,6 @@ struct _virDomainFSDef { unsigned long long space_soft_limit; /* in bytes */ }; - /* 5 different types of networking config */ enum virDomainNetType { VIR_DOMAIN_NET_TYPE_USER, diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 5472267..88b7e87 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -144,7 +144,6 @@ VIR_ENUM_IMPL(qemuCaps, QEMU_CAPS_LAST, "ich9-ahci", "no-acpi", "fsdev-readonly", - "virtio-blk-pci.scsi", /* 80 */ "blk-sg-io", "drive-copy-on-read", @@ -172,7 +171,7 @@ VIR_ENUM_IMPL(qemuCaps, QEMU_CAPS_LAST, "bridge", /* 100 */ "lsi", "virtio-scsi-pci", - + "fsdev-proxy", ); struct qemu_feature_flags { @@ -1133,6 +1132,8 @@ qemuCapsComputeCmdFlags(const char *help, qemuCapsSet(flags, QEMU_CAPS_FSDEV_READONLY); if (strstr(fsdev, "writeout")) qemuCapsSet(flags, QEMU_CAPS_FSDEV_WRITEOUT); + if (strstr(fsdev, "sock_fd")) + qemuCapsSet(flags, QEMU_CAPS_FSDEV_PROXY); } if (strstr(help, "-smbios type")) qemuCapsSet(flags, QEMU_CAPS_SMBIOS_TYPE); diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index d606890..073a1cd 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -138,6 +138,7 @@ enum qemuCapsFlags { QEMU_CAPS_NETDEV_BRIDGE = 100, /* bridge helper support */ QEMU_CAPS_SCSI_LSI = 101, /* -device lsi */ QEMU_CAPS_VIRTIO_SCSI_PCI = 102, /* -device virtio-scsi-pci */ + QEMU_CAPS_FSDEV_PROXY = 103, /* -fsdev proxy supported */ QEMU_CAPS_LAST, /* this must always be the last item */ }; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 4ca3047..3f78635 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -46,6 +46,7 @@ #include <sys/utsname.h> #include <sys/stat.h> #include <fcntl.h> +#include <libgen.h> #define VIR_FROM_THIS VIR_FROM_QEMU @@ -116,7 +117,8 @@ VIR_ENUM_DECL(qemuDomainFSDriver) VIR_ENUM_IMPL(qemuDomainFSDriver, VIR_DOMAIN_FS_DRIVER_TYPE_LAST, "local", "local", - "handle"); + "handle", + "proxy"); static void @@ -2632,9 +2634,59 @@ error: return NULL; } +/* + * Invokes the Proxy Helper with one of the socketpair as its parameter + * + */ +static int qemuInvokeProxyHelper(const char *emulator, int sock, const char *path) +{ +#define HELPER "virtfs-proxy-helper" + int ret_val, status; + virCommandPtr cmd; + char *helper, *dname, *dp; + + dp = strdup(emulator); + if (!dp) { + virReportOOMError(); + return -1; + } + dname = strrchr(dp, '/'); + if (!dname) { + VIR_FREE(dp); + VIR_FORCE_CLOSE(sock); + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unable to get path details from %s"), dp); + return -1; + } + *dname = '\0'; + if (virAsprintf(&helper, "%s/%s", dp, HELPER) < 0) { + VIR_FREE(dp); + VIR_FORCE_CLOSE(sock); + virReportOOMError(); + return -1; + } + + cmd = virCommandNewArgList(helper, NULL); + virCommandAddArg(cmd, "-f"); + virCommandAddArgFormat(cmd, "%d", sock); + virCommandAddArg(cmd, "-p"); + virCommandAddArgFormat(cmd, "%s", path); + virCommandTransferFD(cmd, sock); + virCommandDaemonize(cmd); + ret_val = virCommandRun(cmd, &status); + if (ret_val < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("%s can't execute"), helper); + VIR_FORCE_CLOSE(sock); + } + virCommandFree(cmd); + VIR_FREE(helper); + VIR_FREE(dp); + return ret_val; +} char *qemuBuildFSStr(virDomainFSDefPtr fs, - virBitmapPtr qemuCaps ATTRIBUTE_UNUSED) + virBitmapPtr qemuCaps ATTRIBUTE_UNUSED, int qemuSocket) { virBuffer opt = VIR_BUFFER_INITIALIZER; const char *driver = qemuDomainFSDriverTypeToString(fs->fsdriver); @@ -2683,6 +2735,10 @@ char *qemuBuildFSStr(virDomainFSDefPtr fs, } virBufferAsprintf(&opt, ",id=%s%s", QEMU_FSDEV_HOST_PREFIX, fs->info.alias); + + if (fs->fsdriver == VIR_DOMAIN_FS_DRIVER_TYPE_PROXY) + virBufferAsprintf(&opt, ",sock_fd=%d", qemuSocket); + virBufferAsprintf(&opt, ",path=%s", fs->src); if (fs->readonly) { @@ -5153,10 +5209,31 @@ qemuBuildCommandLine(virConnectPtr conn, if (qemuCapsGet(qemuCaps, QEMU_CAPS_FSDEV)) { for (i = 0 ; i < def->nfss ; i++) { char *optstr; + int sockets[2] = {-1, -1}; virDomainFSDefPtr fs = def->fss[i]; + /* + * If its a proxy FS, we need to create a socket pair + * and invoke proxy_helper + */ + if (fs->fsdriver == VIR_DOMAIN_FS_DRIVER_TYPE_PROXY) { + if (qemuCapsGet(qemuCaps, QEMU_CAPS_FSDEV_PROXY) < 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("proxy helper not supported")); + goto error; + } + /* create a socket pair */ + if (socketpair(PF_UNIX, SOCK_STREAM, 0, sockets) < 0) { + virReportSystemError(errno, _("socketpair %s"), "failed"); + goto error; + } + virCommandTransferFD(cmd, sockets[1]); + if (qemuInvokeProxyHelper(def->emulator, sockets[0], + fs->src) < 0) + goto error; + } virCommandAddArg(cmd, "-fsdev"); - if (!(optstr = qemuBuildFSStr(fs, qemuCaps))) + if (!(optstr = qemuBuildFSStr(fs, qemuCaps, sockets[1]))) goto error; virCommandAddArg(cmd, optstr); VIR_FREE(optstr); diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h index e999bc7..2da5ad0 100644 --- a/src/qemu/qemu_command.h +++ b/src/qemu/qemu_command.h @@ -89,7 +89,8 @@ char *qemuBuildDriveStr(virConnectPtr conn, bool bootable, virBitmapPtr qemuCaps); char *qemuBuildFSStr(virDomainFSDefPtr fs, - virBitmapPtr qemuCaps); + virBitmapPtr qemuCaps, + int qemuSocket); /* Current, best practice */ char * qemuBuildDriveDevStr(virDomainDefPtr def, diff --git a/tests/qemuhelptest.c b/tests/qemuhelptest.c index 2d15c94..6af2e68 100644 --- a/tests/qemuhelptest.c +++ b/tests/qemuhelptest.c @@ -679,7 +679,9 @@ mymain(void) QEMU_CAPS_SCSI_BLOCK, QEMU_CAPS_SCSI_CD, QEMU_CAPS_IDE_CD, - QEMU_CAPS_SCSI_LSI); + QEMU_CAPS_SCSI_LSI, + QEMU_CAPS_FSDEV_PROXY); + DO_TEST("qemu-1.1.0", 1001000, 0, 0, QEMU_CAPS_VNC_COLON, QEMU_CAPS_NO_REBOOT, @@ -759,7 +761,8 @@ mymain(void) QEMU_CAPS_NEC_USB_XHCI, QEMU_CAPS_NETDEV_BRIDGE, QEMU_CAPS_SCSI_LSI, - QEMU_CAPS_VIRTIO_SCSI_PCI); + QEMU_CAPS_VIRTIO_SCSI_PCI, + QEMU_CAPS_FSDEV_PROXY); return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } -- 1.7.7.6

2 3

[libvirt] [PATCH] events: Fix domain event race on client disconnect
by Christophe Fergeau 07 Sep '12

07 Sep '12

GNOME Boxes sometimes stops getting domain events from libvirtd, even after restarting it. Further investigation in libvirtd shows that events are properly queued with virDomainEventStateQueue, but the timer virDomainEventTimer which flushes the events and sends them to the clients never gets called. Looking at the event queue in gdb shows that it's non-empty and that its size increases with each new events. virDomainEventTimer is set up in virDomainEventStateRegister[ID] when going from 0 client connecte to 1 client connected, but is initially disabled. The timer is removed in virDomainEventStateRegister[ID] when the last client is disconnected (going from 1 client connected to 0). This timer (which handles sending the events to the clients) is enabled in virDomainEventStateQueue when queueing an event on an empty queue (queue containing 0 events). It's disabled in virDomainEventStateFlush after flushing the queue (ie removing all the elements from it). This way, no extra work is done when the queue is empty, and when the next event comes up, the timer will get reenabled because the queue will go from 0 event to 1 event, which triggers enabling the timer. However, with this Boxes bug, we have a client connected (Boxes), a non-empty queue (there are events waiting to be sent), but a disabled timer, so something went wrong. When Boxes connects (it's the only client connecting to the libvirtd instance I used for debugging), the event timer is not set as expected (state->timer == -1 when virDomainEventStateRegisterID is called), but at the same time the event queue is not empty. In other words, we had no clients connected, but pending events. This also explains why the timer never gets enabled as this is only done when an event is queued on an empty queue. I think this can happen if an event gets queued using virDomainEventStateQueue and the client disconnection happens before the event timer virDomainEventTimer gets a chance to run and flush the event. In this situation, virDomainEventStateDeregister[ID] will get called with a non-empty event queue, the timer will be destroyed if this was the only client connected. Then, when other clients connect at a later time, they will never get notified about domain events as the event timer will never get enabled because the timer is only enabled if the event queue is empty when virDomainEventStateRegister[ID] gets called, which will is no longer the case. To avoid this issue, this commit makes sure to remove all events from the event queue when the last client in unregistered. As there is no longer anyone interested in receiving these events, these events are stale so there is no need to keep them around. A client connecting later will have no interest in getting events that happened before it got connected. --- src/conf/domain_event.c | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/src/conf/domain_event.c b/src/conf/domain_event.c index 43ecdcf..7ab973b 100644 --- a/src/conf/domain_event.c +++ b/src/conf/domain_event.c @@ -525,13 +525,13 @@ void virDomainEventFree(virDomainEventPtr event) } /** - * virDomainEventQueueFree: + * virDomainEventQueueClear: * @queue: pointer to the queue * - * Free the memory in the queue. We process this like a list here + * Removes all elements from the queue */ static void -virDomainEventQueueFree(virDomainEventQueuePtr queue) +virDomainEventQueueClear(virDomainEventQueuePtr queue) { int i; if (!queue) @@ -541,6 +541,22 @@ virDomainEventQueueFree(virDomainEventQueuePtr queue) virDomainEventFree(queue->events[i]); } VIR_FREE(queue->events); + queue->count = 0; +} + +/** + * virDomainEventQueueFree: + * @queue: pointer to the queue + * + * Free the memory in the queue. We process this like a list here + */ +static void +virDomainEventQueueFree(virDomainEventQueuePtr queue) +{ + if (!queue) + return; + + virDomainEventQueueClear(queue); VIR_FREE(queue); } @@ -1559,6 +1575,7 @@ virDomainEventStateDeregister(virConnectPtr conn, state->timer != -1) { virEventRemoveTimeout(state->timer); state->timer = -1; + virDomainEventQueueClear(state->queue); } virDomainEventStateUnlock(state); @@ -1596,6 +1613,7 @@ virDomainEventStateDeregisterID(virConnectPtr conn, state->timer != -1) { virEventRemoveTimeout(state->timer); state->timer = -1; + virDomainEventQueueClear(state->queue); } virDomainEventStateUnlock(state); -- 1.7.11.4

3 5

[libvirt] [RFC PATCH v1 0/2] Qemu/Gluster support in Libvirt
by Harsh Prateek Bora 07 Sep '12

07 Sep '12

This patchset provides support for Gluster protocol based network disks. It is based on the proposed gluster support in Qemu on qemu-devel: http://lists.gnu.org/archive/html/qemu-devel/2012-08/msg01539.html TODO: - Add support for IPv6 format based server addr - Support for transport types other than socket. Harsh Prateek Bora (2): Qemu/Gluster: Add Gluster protocol as supported network disk formats. tests: Add tests for gluster protocol based network disks support docs/schemas/domaincommon.rng | 8 ++ src/conf/domain_conf.c | 14 ++- src/conf/domain_conf.h | 3 +- src/qemu/qemu_command.c | 123 +++++++++++++++++++++ tests/qemuargv2xmltest.c | 1 + .../qemuxml2argv-disk-drive-network-gluster.args | 1 + .../qemuxml2argv-disk-drive-network-gluster.xml | 33 ++++++ tests/qemuxml2argvtest.c | 2 + 8 files changed, 182 insertions(+), 3 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-gluster.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-gluster.xml -- 1.7.11.2

9 17

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

07 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

5 10

[libvirt] [libvirt-snmp][ANNOUNCE] libvirt-snmp-0.0.3
by Michal Privoznik 07 Sep '12

07 Sep '12

I am pleased to announce that a new release of the libvirt-snmp package, version 0.0.3, is now available from ftp://libvirt.org/libvirt/snmp/ The new package contains several bug fixes and enhancements. Thanks to all the people involved in contributing to this release. Michal

1 0

Re: [libvirt] Memory free in libvirt JNA
by Benjamin Wang (gendwang) 07 Sep '12

07 Sep '12

Hi, Overview Part of JNA API describes as following: 1. Description1: If the native method returns char* and actually allocates memory, a return type of Pointer should be used to avoid leaking the memory. It is then up to you to take the necessary steps to free the allocated memory. 2. Description2: Declare the method as returning a Structure of the appropriate type, then invoke Structure.toArray(int) to convert to an array of initialized structures of the appropriate size. Note that your Structure class must have a no-args constructor, and you are responsible for freeing the returned memory if applicable in whatever way is appropriate for the called function. And the example code shows as following: // Original C code struct Display* get_displays(int* pcount); void free_displays(struct Display* displays); // Equivalent JNA mapping Display get_displays(IntByReference pcount); void free_displays(Display[] displays); ... IntByReference pcount = new IntByReference(); Display d = lib.get_displays(pcount); Display[] displays = (Display[])d.toArray(pcount.getValue()); ... lib.free_displays(displays); That's to say. All the memory allocated by native code must be freed explicitly in JNA part. We must add some free memory methods to support the memory-freeing. Any comments? B.R. Benjamin Wang -----Original Message----- From: Daniel Veillard [mailto:veillard@redhat.com] Sent: 2012年8月20日 14:25 To: Benjamin Wang (gendwang) Cc: stoty(a)tvnet.hu; Daniel.Schwager(a)dtnet.de Subject: Re: Memory free in libvirt JNA On Mon, Aug 20, 2012 at 05:15:45AM +0000, Benjamin Wang (gendwang) wrote: > Hi Veillard, > Thanks for your reply. I checked the current Libvirt-JNA > implementation. I find that a method named "free" defined in Domain > class which is used to free the domain object. If this is mandatory, that's to say, we should a lot of methods into the current Libvirt-jna implementation to free the memory which is allocated by libvirt API. Please correct me! As far as I understat free() is aliased as finalize() on that object so the java runtime will call free() automatically on garbage collection. I'm not a java expert, check some Java litterature for more details about how this is done and the cases where free() might be better called directly. 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/

1 0

[libvirt] [PATCH] Fix location of SELinux mount during RPM builds
by Daniel P. Berrange 07 Sep '12

07 Sep '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> When building RPMs the host kernel cannot be assumed to match the target OS kernel. Thus auto-detecting /selinux vs /sys/fs/selinux based on the host kernel can result in the wrong choice (eg F18 builds on a RHEL6 host kernel) --- libvirt.spec.in | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/libvirt.spec.in b/libvirt.spec.in index 044b00f..fb35934 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1222,6 +1222,15 @@ of recent versions of Linux (and other OSes). %if 0%{?enable_autotools} autoreconf -if %endif + +%if %{with_selinux} +%if %{?fedora} >= 17 || %{?rhel} >= 7 +%define with_selinux_mount --with-selinux-mount="/sys/fs/cgroup" +%else +%define with_selinux_mount --with-selinux-mount="/selinux" +%endif +%endif + %configure %{?_without_xen} \ %{?_without_qemu} \ %{?_without_openvz} \ @@ -1254,6 +1263,7 @@ autoreconf -if %{?_without_capng} \ %{?_without_netcf} \ %{?_without_selinux} \ + %{?_with_selinux_mount} \ %{?_without_hal} \ %{?_without_udev} \ %{?_without_yajl} \ -- 1.7.11.2

3 2

[libvirt] [PATCHv3 0/4] Add range checking for scheduler tunables
by Peter Krempa 07 Sep '12

07 Sep '12

This version improves virsh so that it doesn't update all tunables but only those that changed (and now correctly). This series contains a new patch that adds a helper to deal with typed parameters. Regarding typed parameters: Shouldn't we make the helpers to deal with them public? (Patches 1 and 2 didn't change to v2) Peter Krempa (4): qemu: clean up qemuSetSchedulerParametersFlags() qemu: Add range checking for scheduler tunables when changed by API util: Add helper to assign typed params from string virsh: Update only changed scheduler tunables src/libvirt_private.syms | 1 + src/qemu/qemu_driver.c | 96 ++++++++++++++++----------- src/util/virtypedparam.c | 97 ++++++++++++++++++++++++++++ src/util/virtypedparam.h | 6 ++ tools/virsh-domain.c | 164 +++++++++++++++++++++-------------------------- 5 files changed, 236 insertions(+), 128 deletions(-) -- 1.7.12

2 7

[libvirt] RFC: APIs to manage KSM
by Osier Yang 07 Sep '12

07 Sep '12

Triggered by the requirement to control the new sys knob /sys/kernel/mm/ksm/merge_nodes for a NUMA aware host by patch: http://permalink.gmane.org/gmane.linux.kernel.mm/81497 It shows there is no methods to manage the KSM in libvirt. This proposes the new APIs like following, thanks for suggestions/idea in advance. == The macros and enums for the params' fields /* virNodeKSMRunMode: * * Represents the modes of /sys/kernel/mm/ksm/run. */ typedef enum { /* Stop ksmd from running but keep merged pages */ VIR_NODE_STOP_KSM_KEEP_MERGED_PAGES = 0, /* Start ksmd */ VIR_NODE_START_KSM = 1, /* Stop ksmd and and unmerge all pages currently merged */ VIR_NODE_STOP_KSM_UNMERGE_PAGES = 2, } virNodeKSMRunMode; /* * VIR_NODE_KSM_PAGES_TO_SCAN: * * Macro for typed parameter that represents how many present pages * to scan before ksmd goes to sleep. */ # define VIR_NODE_KSM_PAGES_TO_SCAN "pages_to_scan" /* * VIR_NODE_KSM_SLEEP_MILLISECS: * * Macro for typed parameter that represents how many milliseconds * ksmd should sleep before next scan. */ # define VIR_NODE_KSM_SLEEP_MILLISECS "sleep_millisecs" /* * VIR_NODE_KSM_RUN: * * Macro for typed parameter that is used to control ksmd's state, as * an int containing a virNodeKSMRunMode value. */ # define VIR_NODE_KSM_RUN "run" /* * VIR_NODE_KSM_PAGES_SHARED: * * Macro for typed parameter that represents how many ksm shared pages * are being used. */ # define VIR_NODE_KSM_PAGES_SHARED "pages_shared" /* * VIR_NODE_KSM_PAGES_SHARING: * * Macro for typed parameter that represents how many sites are * sharing the pages i.e. how much saved. */ # define VIR_NODE_KSM_PAGES_SHARING "pages_sharing" /* VIR_NODE_KSM_PAGES_UNSHARED: * * Macro for typed parameter that represents how many pages unique * but repeatedly checked for merging. */ # define VIR_NODE_KSM_PAGES_UNSHARED "pages_unshared" /* VIR_NODE_KSM_PAGES_VOLATILE: * * Macro for typed parameter that represents how many pages changing * too fast to be placed in a tree. */ # define VIR_NODE_KSM_PAGES_VOLATILE "pages_volatile" /* VIR_NODE_KSM_FULL_SCAN: * * Macro for typed parameter that represents how many times all * mergeable areas have been scanned. */ # define VIR_NODE_KSM_FULL_SCAN "full_scan" == API to Get KSM parameters. /* * virNodeGetKSMParameters: * @conn: pointer to the hypervisor connection * @params: pointer to memory parameter object * (return value, allocated by the caller) * @nparams: pointer to number of memory parameters; input and output * @flags: extra flags; not used yet, so callers should always pass 0 * * ... Detailed comments ommitted ... * * Returns 0 in case of success, and -1 in case of failure. */ int virNodeGetKSMParameters(virConnectPtr conn, virTypedParameterPtr params, int *nparams, unsigned int flags); == API to set KSM parameters. Currently only "run", "pages_to_scan", and "sleep_millisecs" are writable. The new boolearn sys knob "merge_nodes" could be added once it's acceptted by kernel upstream. /* * virNodeSetKSMParameters: * @conn: pointer to the hypervisor connection * @params: pointer to scheduler parameter objects * @naprams: number of scheduler parameter objects * (this value can be the same or less than the returned * value nparams of virDomainGetSchedulerType) * @flags: extra flags; not used yet, so callers should always pass 0 * * ... Detailed comments ommitted ... * * Returns 0 in case of success, -1 in case of failure. */ int virNodeSetKSMParameters(virConnectPtr conn, virTypedParameterPtr params, int nparams, unsigned int flags); BTW, the other thing libvirt misses is to tell ksmtuned to retune when a domain is started or destroyed. Which is outlined in the Red Hat Virtualization Administration Guide doc, but it's not true. So either we have a hole in libvirt, or lacks a fix for the document. <...> The KSM tuning service The ksmtuned service does not have any options. The ksmtuned service loops and adjusts ksm. The ksmtuned service is notified by libvirt when a guest is created or destroyed. </...> https://access.redhat.com/knowledge/docs/en-US/Red_Hat_Enterprise_Linux/6/h… Regards, Osier

3 6

[libvirt] [PATCH] Refactor ESX storage driver and add iSCSI support
by Ata E Husain Bohra 07 Sep '12

07 Sep '12

Resent of http://www.redhat.com/archives/libvir-list/2012-August/msg01353.html. Merging recent branch updates to this patch. Ata E Husain Bohra (1): Refactor ESX storage driver and add iSCSI support src/Makefile.am | 16 +- src/esx/esx_driver.c | 4 +- src/esx/esx_storage_backend_iscsi.c | 794 +++++++++++++++++++ src/esx/esx_storage_backend_iscsi.h | 31 + src/esx/esx_storage_backend_vmfs.c | 1471 +++++++++++++++++++++++++++++++++++ src/esx/esx_storage_backend_vmfs.h | 31 + src/esx/esx_storage_driver.c | 1303 +++++-------------------------- src/esx/esx_vi.c | 341 +++++++- src/esx/esx_vi.h | 21 +- src/esx/esx_vi_generator.input | 308 +++++++- src/esx/esx_vi_generator.py | 19 + 11 files changed, 3218 insertions(+), 1121 deletions(-) create mode 100644 src/esx/esx_storage_backend_iscsi.c create mode 100644 src/esx/esx_storage_backend_iscsi.h create mode 100644 src/esx/esx_storage_backend_vmfs.c create mode 100644 src/esx/esx_storage_backend_vmfs.h -- 1.7.9.5

2 1

[libvirt] [PATCH] Don't assume use of /sys/fs/cgroup
by Daniel P. Berrange 07 Sep '12

07 Sep '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> The introduction of /sys/fs/cgroup came in fairly recent kernels. Prior to that time distros would pick a custom directory like /cgroup or /dev/cgroup. We need to auto-detect where this is, rather than hardcoding it --- src/lxc/lxc_container.c | 71 +++++++++++++++++++++++++++++++++---------------- src/util/cgroup.h | 2 -- 2 files changed, 48 insertions(+), 25 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index f3a4622..9bc5610 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -1307,7 +1307,8 @@ static void lxcContainerCGroupFree(struct lxcContainerCGroup *mounts, static int lxcContainerIdentifyCGroups(struct lxcContainerCGroup **mountsret, - size_t *nmountsret) + size_t *nmountsret, + char **root) { FILE *procmnt = NULL; struct mntent mntent; @@ -1321,8 +1322,9 @@ static int lxcContainerIdentifyCGroups(struct lxcContainerCGroup **mountsret, *mountsret = NULL; *nmountsret = 0; + *root = NULL; - VIR_DEBUG("Finding cgroups mount points under %s", VIR_CGROUP_SYSFS_MOUNT); + VIR_DEBUG("Finding cgroups mount points of type cgroup"); if (!(procmnt = setmntent("/proc/mounts", "r"))) { virReportSystemError(errno, "%s", @@ -1332,10 +1334,24 @@ static int lxcContainerIdentifyCGroups(struct lxcContainerCGroup **mountsret, while (getmntent_r(procmnt, &mntent, mntbuf, sizeof(mntbuf)) != NULL) { VIR_DEBUG("Got %s", mntent.mnt_dir); - if (STRNEQ(mntent.mnt_type, "cgroup") || - !STRPREFIX(mntent.mnt_dir, VIR_CGROUP_SYSFS_MOUNT)) + if (STRNEQ(mntent.mnt_type, "cgroup")) continue; + if (!*root) { + char *tmp; + if (!(*root = strdup(mntent.mnt_dir))) { + virReportOOMError(); + goto cleanup; + } + tmp = strrchr(*root, '/'); + *tmp = '\0'; + } else if (!STRPREFIX(mntent.mnt_dir, *root)) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Cgroup %s is not mounted under %s"), + mntent.mnt_dir, *root); + goto cleanup; + } + /* Skip named mounts with no controller since they're * for application use only ie systemd */ if (strstr(mntent.mnt_opts, "name=")) @@ -1349,14 +1365,14 @@ static int lxcContainerIdentifyCGroups(struct lxcContainerCGroup **mountsret, virReportOOMError(); goto cleanup; } - VIR_DEBUG("Grabbed %s", mntent.mnt_dir); + VIR_DEBUG("Grabbed '%s'", mntent.mnt_dir); } - VIR_DEBUG("Checking for symlinks in %s", VIR_CGROUP_SYSFS_MOUNT); - if (!(dh = opendir(VIR_CGROUP_SYSFS_MOUNT))) { + VIR_DEBUG("Checking for symlinks in %s", *root); + if (!(dh = opendir(*root))) { virReportSystemError(errno, _("Unable to read directory %s"), - VIR_CGROUP_SYSFS_MOUNT); + *root); goto cleanup; } @@ -1370,7 +1386,7 @@ static int lxcContainerIdentifyCGroups(struct lxcContainerCGroup **mountsret, continue; VIR_DEBUG("Checking entry %s", dent->d_name); - if (virAsprintf(&path, "%s/%s", VIR_CGROUP_SYSFS_MOUNT, dent->d_name) < 0) { + if (virAsprintf(&path, "%s/%s", *root, dent->d_name) < 0) { virReportOOMError(); goto cleanup; } @@ -1410,25 +1426,28 @@ cleanup: endmntent(procmnt); VIR_FREE(path); - if (ret < 0) + if (ret < 0) { lxcContainerCGroupFree(mounts, nmounts); + VIR_FREE(*root); + } return ret; } static int lxcContainerMountCGroups(struct lxcContainerCGroup *mounts, size_t nmounts, - char * sec_mount_options) + const char *root, + char *sec_mount_options) { size_t i; char *opts = NULL; - VIR_DEBUG("Mounting cgroups at '%s'", VIR_CGROUP_SYSFS_MOUNT); + VIR_DEBUG("Mounting cgroups at '%s'", root); - if (virFileMakePath(VIR_CGROUP_SYSFS_MOUNT) < 0) { + if (virFileMakePath(root) < 0) { virReportSystemError(errno, _("Unable to create directory %s"), - VIR_CGROUP_SYSFS_MOUNT); + root); return -1; } @@ -1438,11 +1457,11 @@ static int lxcContainerMountCGroups(struct lxcContainerCGroup *mounts, return -1; } - if (mount("tmpfs", VIR_CGROUP_SYSFS_MOUNT, "tmpfs", MS_NOSUID|MS_NODEV|MS_NOEXEC, opts) < 0) { + if (mount("tmpfs", root, "tmpfs", MS_NOSUID|MS_NODEV|MS_NOEXEC, opts) < 0) { VIR_FREE(opts); virReportSystemError(errno, _("Failed to mount %s on %s type %s"), - "tmpfs", VIR_CGROUP_SYSFS_MOUNT, "tmpfs"); + "tmpfs", root, "tmpfs"); return -1; } VIR_FREE(opts); @@ -1467,10 +1486,10 @@ static int lxcContainerMountCGroups(struct lxcContainerCGroup *mounts, } if (mount("cgroup", mounts[i].dir, "cgroup", - 0, mounts[i].dir + strlen(VIR_CGROUP_SYSFS_MOUNT) + 1) < 0) { + 0, mounts[i].dir + strlen(root) + 1) < 0) { virReportSystemError(errno, - _("Failed to mount %s on %s"), - "cgroup", mounts[i].dir); + _("Failed to mount cgroup on '%s'"), + mounts[i].dir); return -1; } } @@ -1493,10 +1512,11 @@ static int lxcContainerSetupPivotRoot(virDomainDefPtr vmDef, struct lxcContainerCGroup *mounts = NULL; size_t nmounts = 0; int ret = -1; + char *cgroupRoot; /* Before pivoting we need to identify any * cgroups controllers that are mounted */ - if (lxcContainerIdentifyCGroups(&mounts, &nmounts) < 0) + if (lxcContainerIdentifyCGroups(&mounts, &nmounts, &cgroupRoot) < 0) return -1; /* Gives us a private root, leaving all parent OS mounts on /.oldroot */ @@ -1519,7 +1539,8 @@ static int lxcContainerSetupPivotRoot(virDomainDefPtr vmDef, /* Now we can re-mount the cgroups controllers in the * same configuration as before */ - if (lxcContainerMountCGroups(mounts, nmounts, sec_mount_options) < 0) + if (lxcContainerMountCGroups(mounts, nmounts, + cgroupRoot, sec_mount_options) < 0) goto cleanup; /* Mounts /dev/pts */ @@ -1542,6 +1563,7 @@ static int lxcContainerSetupPivotRoot(virDomainDefPtr vmDef, cleanup: lxcContainerCGroupFree(mounts, nmounts); + VIR_FREE(cgroupRoot); return ret; } @@ -1555,6 +1577,7 @@ static int lxcContainerSetupExtraMounts(virDomainDefPtr vmDef, int ret = -1; struct lxcContainerCGroup *mounts = NULL; size_t nmounts = 0; + char *cgroupRoot; VIR_DEBUG("def=%p", vmDef); /* @@ -1582,7 +1605,7 @@ static int lxcContainerSetupExtraMounts(virDomainDefPtr vmDef, /* Before replacing /sys we need to identify any * cgroups controllers that are mounted */ - if (lxcContainerIdentifyCGroups(&mounts, &nmounts) < 0) + if (lxcContainerIdentifyCGroups(&mounts, &nmounts, &cgroupRoot) < 0) return -1; /* Gets rid of any existing stuff under /proc, since we need new @@ -1598,7 +1621,8 @@ static int lxcContainerSetupExtraMounts(virDomainDefPtr vmDef, /* Now we can re-mount the cgroups controllers in the * same configuration as before */ - if (lxcContainerMountCGroups(mounts, nmounts, sec_mount_options) < 0) + if (lxcContainerMountCGroups(mounts, nmounts, + cgroupRoot, sec_mount_options) < 0) goto cleanup; VIR_DEBUG("Mounting completed"); @@ -1607,6 +1631,7 @@ static int lxcContainerSetupExtraMounts(virDomainDefPtr vmDef, cleanup: lxcContainerCGroupFree(mounts, nmounts); + VIR_FREE(cgroupRoot); return ret; } diff --git a/src/util/cgroup.h b/src/util/cgroup.h index 68ac232..bb12b40 100644 --- a/src/util/cgroup.h +++ b/src/util/cgroup.h @@ -28,8 +28,6 @@ struct virCgroup; typedef struct virCgroup *virCgroupPtr; -# define VIR_CGROUP_SYSFS_MOUNT "/sys/fs/cgroup" - enum { VIR_CGROUP_CONTROLLER_CPU, VIR_CGROUP_CONTROLLER_CPUACCT, -- 1.7.11.2

2 1

[libvirt] [PATCH] nwfilter: drop use of awk
by Eric Blake 07 Sep '12

07 Sep '12

Commit 2a41bc9 dropped a dependency on gawk, but we can go one step further and avoid awk altogether. * src/nwfilter/nwfilter_ebiptables_driver.c (iptablesLinkIPTablesBaseChain): Simplify command. (ebiptablesDriverInit, ebiptablesDriverShutdown): Drop awk probe. --- Caveat - I was not set up to test this via actual nwfilter operations, so it needs a thorough testing review. src/nwfilter/nwfilter_ebiptables_driver.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/src/nwfilter/nwfilter_ebiptables_driver.c b/src/nwfilter/nwfilter_ebiptables_driver.c index 034e6c4..8ffe737 100644 --- a/src/nwfilter/nwfilter_ebiptables_driver.c +++ b/src/nwfilter/nwfilter_ebiptables_driver.c @@ -84,7 +84,6 @@ static char *ebtables_cmd_path; static char *iptables_cmd_path; static char *ip6tables_cmd_path; static char *grep_cmd_path; -static char *awk_cmd_path; #define PRINT_ROOT_CHAIN(buf, prefix, ifname) \ snprintf(buf, sizeof(buf), "libvirt-%c-%s", prefix, ifname) @@ -565,12 +564,11 @@ static int iptablesLinkIPTablesBaseChain(virBufferPtr buf, int stopOnError) { virBufferAsprintf(buf, - "res=$($IPT -L %s -n --line-number | " - "%s \" %s \")\n" + "res=$($IPT -L %s -n --line-number | %s '%s')\n" "if [ $? -ne 0 ]; then\n" " $IPT -I %s %d -j %s\n" "else\n" - " r=$(echo $res | %s '{print $1}')\n" + " set dummy $res; r=$2\n" " if [ \"${r}\" != \"%d\" ]; then\n" " " CMD_DEF("$IPT -I %s %d -j %s") CMD_SEPARATOR " " CMD_EXEC @@ -582,11 +580,9 @@ static int iptablesLinkIPTablesBaseChain(virBufferPtr buf, " fi\n" "fi\n", - syschain, - grep_cmd_path, udchain, + syschain, grep_cmd_path, udchain, syschain, pos, udchain, - awk_cmd_path, pos, @@ -4295,7 +4291,6 @@ ebiptablesDriverInit(bool privileged) if (virMutexInit(&execCLIMutex) < 0) return -EINVAL; - awk_cmd_path = virFindFileInPath("awk"); grep_cmd_path = virFindFileInPath("grep"); /* @@ -4311,7 +4306,7 @@ ebiptablesDriverInit(bool privileged) /* ip(6)tables support needs awk & grep, ebtables doesn't */ if ((iptables_cmd_path != NULL || ip6tables_cmd_path != NULL) && - (!grep_cmd_path || !awk_cmd_path)) { + !grep_cmd_path) { VIR_ERROR(_("essential tools to support ip(6)tables " "firewalls could not be located")); VIR_FREE(iptables_cmd_path); @@ -4333,7 +4328,6 @@ ebiptablesDriverInit(bool privileged) static void ebiptablesDriverShutdown(void) { - VIR_FREE(awk_cmd_path); VIR_FREE(grep_cmd_path); VIR_FREE(ebtables_cmd_path); VIR_FREE(iptables_cmd_path); -- 1.7.11.4

2 2

[libvirt] [PATCH] Include some extra headers needed for OpenBSD.
by Jasper Lievisse Adriaanse 07 Sep '12

07 Sep '12

>From bafcb4ed2b90b5ba845ca6b61861e3caa548b16a Mon Sep 17 00:00:00 2001 From: Jasper Lievisse Adriaanse <jasper(a)humppa.nl> Date: Tue, 4 Sep 2012 16:57:09 +0200 Subject: [PATCH] Include some extra headers needed for OpenBSD. --- src/util/virnetdevbridge.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/src/util/virnetdevbridge.c b/src/util/virnetdevbridge.c index 7b11bee..8559223 100644 --- a/src/util/virnetdevbridge.c +++ b/src/util/virnetdevbridge.c @@ -30,6 +30,15 @@ #include "intprops.h" #include <sys/ioctl.h> + +#ifdef HAVE_SYS_PARAM_H +# include <sys/param.h> +#endif + +#ifdef HAVE_SYS_SOCKET_H +# include <sys/socket.h> +#endif + #ifdef HAVE_NET_IF_H # include <net/if.h> #endif -- 1.7.6 -- Cheers, Jasper "Stay Hungry. Stay Foolish"

3 12

[libvirt] [PATCH v4 00/10] Atomic API to list storage pools
by Osier Yang 07 Sep '12

07 Sep '12

Think the subject tells enough after 3 rounds, so ommits words here. v3 - v4: * Just rebase on the top: - Version changes - rebase after virsh split cleanups 1/10 ~ 2/10 are ACK'ed in v3, but for easy viewing, they are still posted. Osier Yang (10): list: Define new API virStorageListAllStoragePools list: Add helpers for listing storage pool objects list: Implement the RPC calls for virConnectListAllStoragePools list: Implement listAllStoragePools for storage driver list: Implement listAllStoragePools for test driver list: Add helper to convert strings separated by ', ' to array virsh: Fix the wrong doc for pool-list list: Change MATCH for common use in virsh list: Use virConnectListAllStoragePools in virsh python: Expose virStorageListAllStoragePools to python binding daemon/remote.c | 54 +++ include/libvirt/libvirt.h.in | 33 ++ python/generator.py | 5 +- python/libvirt-override-api.xml | 6 + python/libvirt-override-virConnect.py | 12 + python/libvirt-override.c | 47 +++ src/conf/storage_conf.c | 116 ++++++ src/conf/storage_conf.h | 35 ++ src/driver.h | 5 + src/libvirt.c | 112 ++++++- src/libvirt_private.syms | 1 + src/libvirt_public.syms | 5 + src/remote/remote_driver.c | 64 ++++ src/remote/remote_protocol.x | 13 +- src/remote_protocol-structs | 12 + src/storage/storage_driver.c | 18 + src/test/test_driver.c | 17 + tools/virsh-domain-monitor.c | 2 - tools/virsh-domain.c | 19 +- tools/virsh-pool.c | 631 ++++++++++++++++++++++++++++++++- tools/virsh.c | 44 +++ tools/virsh.h | 3 + tools/virsh.pod | 33 ++- 23 files changed, 1249 insertions(+), 38 deletions(-) -- 1.7.7.3

3 31

[libvirt] need help/clarification about git and patches.
by Gene Czarcinski 07 Sep '12

07 Sep '12

Using git is more than a little different way of doing business for me. My usual way to create and apply a patch is to rebuild a src.rpm. This way I have a lot less changes of screwing something up because of ignorance. It it a little while but I finally cloned a copy of libvirt.git. I applied a patch to remove the "--filterwin2k" [one fixup because a test file changed slightly. I then ran "git diff" and produce a new patch. OK, now what? I did the "git commit" and then tried to do the "git send-email" like it says in your "hacking" document ... "git: 'send-email' is not a git command. I am going to do what I believe is the right thing to do and submit the patch but there needs to be a bit more info as to how we should do things. Gene

4 5

[libvirt] [libvirt-designer][PATCH 0/4] Yet another functional extension
by Michal Privoznik 07 Sep '12

07 Sep '12

This time aimed on virtxml tool to make it user friendlier a little bit. Michal Privoznik (4): Implement resources setting Cleanup double error setting and operating on empty list virtxml: Detect OS from given ISO virtxml: Detect platform from libvirt connection URI examples/virtxml.c | 200 ++++++++++++++++++++++++---- libvirt-designer/libvirt-designer-domain.c | 113 +++++++++++++++- libvirt-designer/libvirt-designer-domain.h | 8 + libvirt-designer/libvirt-designer.sym | 3 +- 4 files changed, 292 insertions(+), 32 deletions(-) -- 1.7.8.6

1 4

[libvirt] [PATCH] Remove duplicate symbols and add test case
by Daniel P. Berrange 06 Sep '12

06 Sep '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> When the event symbols were added to the public API, not all of them were removed from the private exports list. Solaris gets unhappy when there are duplicated symbols. Extend the symfile check to test for this scenario --- src/check-symfile.pl | 13 +++++++++---- src/libvirt_private.syms | 2 -- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/check-symfile.pl b/src/check-symfile.pl index 454fed3..c0b7ec7 100755 --- a/src/check-symfile.pl +++ b/src/check-symfile.pl @@ -5,9 +5,11 @@ die "syntax: $0 SYMFILE ELFLIB(S)" unless int(@ARGV) >= 2; my $symfile = shift @ARGV; my @elflibs = @ARGV; -my @wantsyms; +my %wantsyms; my %gotsyms; +my $ret = 0; + open SYMFILE, $symfile or die "cannot read $symfile: $!"; while (<SYMFILE>) { @@ -21,7 +23,12 @@ while (<SYMFILE>) { die "malformed line $_" unless /^\s*(\S+);$/; - push @wantsyms, $1; + if (exists $wantsyms{$1}) { + print STDERR "Symbol $1 is listed twice\n"; + $ret = 1; + } else { + $wantsyms{$1} = 1; + } } close SYMFILE; @@ -37,8 +44,6 @@ foreach my $elflib (@elflibs) { close NM; } -my $ret = 0; - foreach my $sym (@wantsyms) { next if exists $gotsyms{$sym}; diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 65067d6..72d2095 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1177,8 +1177,6 @@ virDirCreate; virDoubleToStr; virEnumFromString; virEnumToString; -virEventAddHandle; -virEventRemoveHandle; virFileAbsPath; virFileAccessibleAs; virFileBuildPath; -- 1.7.11.2

4 3

[libvirt] [PATCH] list: fix typo in virsh patch
by Eric Blake 06 Sep '12

06 Sep '12

A last minute rename in an earlier patch to virsh.h was not properly reflected when rebasing virsh-pool.c. * tools/virsh-pool.c (vshStoragePoolListCollect): Use VSH_MATCH, not MATCH. --- Pushing under the build-breaker rule. tools/virsh-pool.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/tools/virsh-pool.c b/tools/virsh-pool.c index 365d035..15d1883 100644 --- a/tools/virsh-pool.c +++ b/tools/virsh-pool.c @@ -642,15 +642,15 @@ fallback: vshResetLibvirtError(); /* There is no way to get the pool type */ - if (MATCH(VIR_CONNECT_LIST_STORAGE_POOLS_FILTERS_POOL_TYPE)) { + if (VSH_MATCH(VIR_CONNECT_LIST_STORAGE_POOLS_FILTERS_POOL_TYPE)) { vshError(ctl, "%s", _("Filtering using --type is not supported " "by this libvirt")); goto cleanup; } /* Get the number of active pools */ - if (!MATCH(VIR_CONNECT_LIST_STORAGE_POOLS_FILTERS_ACTIVE) || - MATCH(VIR_CONNECT_LIST_STORAGE_POOLS_ACTIVE)) { + if (!VSH_MATCH(VIR_CONNECT_LIST_STORAGE_POOLS_FILTERS_ACTIVE) || + VSH_MATCH(VIR_CONNECT_LIST_STORAGE_POOLS_ACTIVE)) { if ((nActivePools = virConnectNumOfStoragePools(ctl->conn)) < 0) { vshError(ctl, "%s", _("Failed to get the number of active pools ")); goto cleanup; @@ -658,8 +658,8 @@ fallback: } /* Get the number of inactive pools */ - if (!MATCH(VIR_CONNECT_LIST_STORAGE_POOLS_FILTERS_ACTIVE) || - MATCH(VIR_CONNECT_LIST_STORAGE_POOLS_INACTIVE)) { + if (!VSH_MATCH(VIR_CONNECT_LIST_STORAGE_POOLS_FILTERS_ACTIVE) || + VSH_MATCH(VIR_CONNECT_LIST_STORAGE_POOLS_INACTIVE)) { if ((nInactivePools = virConnectNumOfDefinedStoragePools(ctl->conn)) < 0) { vshError(ctl, "%s", _("Failed to get the number of inactive pools")); goto cleanup; @@ -674,8 +674,8 @@ fallback: names = vshMalloc(ctl, sizeof(char *) * nAllPools); /* Retrieve a list of active storage pool names */ - if (!MATCH(VIR_CONNECT_LIST_STORAGE_POOLS_FILTERS_ACTIVE) || - MATCH(VIR_CONNECT_LIST_STORAGE_POOLS_ACTIVE)) { + if (!VSH_MATCH(VIR_CONNECT_LIST_STORAGE_POOLS_FILTERS_ACTIVE) || + VSH_MATCH(VIR_CONNECT_LIST_STORAGE_POOLS_ACTIVE)) { if (virConnectListStoragePools(ctl->conn, names, nActivePools) < 0) { vshError(ctl, "%s", _("Failed to list active pools")); @@ -684,8 +684,8 @@ fallback: } /* Add the inactive storage pools to the end of the name list */ - if (!MATCH(VIR_CONNECT_LIST_STORAGE_POOLS_FILTERS_ACTIVE) || - MATCH(VIR_CONNECT_LIST_STORAGE_POOLS_ACTIVE)) { + if (!VSH_MATCH(VIR_CONNECT_LIST_STORAGE_POOLS_FILTERS_ACTIVE) || + VSH_MATCH(VIR_CONNECT_LIST_STORAGE_POOLS_ACTIVE)) { if (virConnectListDefinedStoragePools(ctl->conn, &names[nActivePools], nInactivePools) < 0) { @@ -720,26 +720,26 @@ filter: pool = list->pools[i]; /* persistence filter */ - if (MATCH(VIR_CONNECT_LIST_STORAGE_POOLS_FILTERS_PERSISTENT)) { + if (VSH_MATCH(VIR_CONNECT_LIST_STORAGE_POOLS_FILTERS_PERSISTENT)) { if ((persistent = virStoragePoolIsPersistent(pool)) < 0) { vshError(ctl, "%s", _("Failed to get pool persistence info")); goto cleanup; } - if (!((MATCH(VIR_CONNECT_LIST_STORAGE_POOLS_PERSISTENT) && persistent) || - (MATCH(VIR_CONNECT_LIST_STORAGE_POOLS_TRANSIENT) && !persistent))) + if (!((VSH_MATCH(VIR_CONNECT_LIST_STORAGE_POOLS_PERSISTENT) && persistent) || + (VSH_MATCH(VIR_CONNECT_LIST_STORAGE_POOLS_TRANSIENT) && !persistent))) goto remove_entry; } /* autostart filter */ - if (MATCH(VIR_CONNECT_LIST_STORAGE_POOLS_FILTERS_AUTOSTART)) { + if (VSH_MATCH(VIR_CONNECT_LIST_STORAGE_POOLS_FILTERS_AUTOSTART)) { if (virStoragePoolGetAutostart(pool, &autostart) < 0) { vshError(ctl, "%s", _("Failed to get pool autostart state")); goto cleanup; } - if (!((MATCH(VIR_CONNECT_LIST_STORAGE_POOLS_AUTOSTART) && autostart) || - (MATCH(VIR_CONNECT_LIST_STORAGE_POOLS_NO_AUTOSTART) && !autostart))) + if (!((VSH_MATCH(VIR_CONNECT_LIST_STORAGE_POOLS_AUTOSTART) && autostart) || + (VSH_MATCH(VIR_CONNECT_LIST_STORAGE_POOLS_NO_AUTOSTART) && !autostart))) goto remove_entry; } -- 1.7.11.4

1 0

[libvirt] [PATCH] Define DYNLIB_NAME on OpenBSD.
by Jasper Lievisse Adriaanse 06 Sep '12

06 Sep '12

>From 05dd99030d865127c874d1b489b9c17412bdbb3b Mon Sep 17 00:00:00 2001 From: Jasper Lievisse Adriaanse <jasper(a)humppa.nl> Date: Tue, 4 Sep 2012 16:48:51 +0200 Subject: [PATCH] Define DYNLIB_NAME on OpenBSD. --- src/vbox/vbox_XPCOMCGlue.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/vbox/vbox_XPCOMCGlue.c b/src/vbox/vbox_XPCOMCGlue.c index e7e9c37..63470ae 100644 --- a/src/vbox/vbox_XPCOMCGlue.c +++ b/src/vbox/vbox_XPCOMCGlue.c @@ -48,7 +48,7 @@ /******************************************************************************* * Defined Constants And Macros * *******************************************************************************/ -#if defined(__linux__) || defined(__linux_gnu__) || defined(__sun__) || defined(__FreeBSD__) +#if defined(__linux__) || defined(__linux_gnu__) || defined(__sun__) || defined(__FreeBSD__) || defined(__OpenBSD__) # define DYNLIB_NAME "VBoxXPCOMC.so" #elif defined(__APPLE__) # define DYNLIB_NAME "VBoxXPCOMC.dylib" -- 1.7.6

3 2

[libvirt] Compile libvirt on Solaris
by Yang Zhou (yangzho) 06 Sep '12

06 Sep '12

Hi Experts, I am compiling libvirt 0.9.9 on Solaris 9. But got following errors when run "./configure --with-esx --with-qemu" ------------------------------------------------------------------------------------------------------- checking for library containing dlopen... -ldl checking for xen_vm_start in -lxenserver... no checking for libxl_domain_create_new in -lxenlight... no checking for xs_read in -lxenstore... no checking linux/kvm.h usability... no checking linux/kvm.h presence... no checking for linux/kvm.h... no checking for shell that supports <> redirection... /bin/sh checking linux/param.h usability... no checking linux/param.h presence... no checking for linux/param.h... no configure: error: You must install kernel-headers in order to compile libvirt with QEMU or LXC support bash-2.05$ ---------------------------------------------------------------------------------------------------- After look at configure, it's found the headers of linux/param.h, linux/sockios.h. linux/if_bridge.h and linux/if_tun.h are required. Obviously these files are missing on Solaris platform. Anybody can help how to solve this issue? Thanks! Regards, Yang

3 4

[libvirt] [PATCH 0/6 v4] Atomic API to list secrets
by Osier Yang 06 Sep '12

06 Sep '12

v3 - v4: * Just rebase on the top, split the patches from v3's larget set Osier Yang (6): list: Define new API virConnectListAllSecrets list: Implement RPC calls for virConnectListAllSecrets list: Implement listAllSecrets list: Expose virConnectListAllSecrets to Python binding list: Expose virConnectListAllSecrets to Python binding virsh: Remove unused vshNameSorter daemon/remote.c | 54 ++++++++++ include/libvirt/libvirt.h.in | 3 + python/generator.py | 1 + python/libvirt-override-api.xml | 6 + python/libvirt-override-virConnect.py | 12 ++ python/libvirt-override.c | 48 +++++++++ src/driver.h | 5 + src/libvirt.c | 50 +++++++++ src/libvirt_public.syms | 1 + src/remote/remote_driver.c | 64 ++++++++++++ src/remote/remote_protocol.x | 13 ++- src/remote_protocol-structs | 12 ++ src/secret/secret_driver.c | 59 +++++++++++- tools/virsh-secret.c | 182 +++++++++++++++++++++++++++----- tools/virsh.c | 9 -- tools/virsh.h | 1 - 16 files changed, 479 insertions(+), 41 deletions(-) -- 1.7.7.3

3 16

[libvirt] An introduction to the "libvirt-designer" library
by Daniel P. Berrange 06 Sep '12

06 Sep '12

People might have noticed Michal's patches[1] for the "libvirt-designer" and wondered wtf.com that is. This is an attempt to explain it... If you are familiar with the code in virt-install (also used by virt-manager) you'll know it has a bunch of internal classes / APIs for dealing with libvirt configuration, particularly wrt guest domains. If you're also familiar with other apps like GNOME Boxes, VDSM/oVirt, OpenStack, then you'll know that these apps have roughly the same needs as virt-install and virt-manager wrt libvirt configuration. The virt-install internal APIs though cannot practically be used by these apps since they were never really designed with broad re-use in mind. Obviously in such scenarios it is desirable to share code across apps instead of having them all reinvent the wheel. The libvirt-gconfig library was the first part in an attempt to address this problem by providing a formal API for creating & reading libvirt configurations without having to know anything about XML. This library is completely policy-free, restricting itself to direct/explicit manipulation of the configuration attributes. This deals with some of functionality found in the virt-install internal APIs. The libosinfo library [2] provides an API for discovering supportable and optimal hardware for operating systems & hypervisors. This replaces the OS configuration data tables found inside virt-install. The next step is to provide a policy-driven API for configurating virtual machines. When configuring a virtual machine, parameters can be roughly split into two groups - guest hardware config and host interaction config. The idea behind the libvirt-designer API is that when creating or changing a guest config, application developers should only need to care about the host interaction config. The guest hardware config can be figured out automatically on their behalf using data obtained from the libosinfo library. As an example, consider adding a disk to a guest. Traditionally an app developer needs to - Choose what virtual hardware to use - Figure out guest device name - Set the host filename - Choose optimal I/O parameters (cache mode, driver type, etc, etc) With the libvirt-designer APIs, an app developer will need to - Set the host filename The rest of the points will be filled in automatically, though the app developer will still get the opportunity to further customize the defaults via the existing libvirt-gconfig APIs. As mentioned above the libvirt-designer library is binding together the libvirt-gconfig and libosinfo APIs. It explicitly does *not* directly depend on libvirt or libvirt-gobject. This is to try to allow the libvirt-designer library to be used by a wide variety of applications, no matter how they are interacting with libvirt. eg if they use the CIM, SNMP or QMF bindings to libvirt they can still use libvirt-designer to build their XML configurations. The intent is that there is yet another library, so far called libvirt-builder, which binds together the libvirt-designer and libvirt-gobject APIs, to actually automate some of the lifecycle management and VM provisioning tasks. Since it will use libvirt-gobject, this final library would not be accessible to apps using CIM/SNMP/QMF bindings. With this library, we would have more or less complete coverage of all the important tasks found in the virt-install internal APIs, which can be reused by other apps. There is of course still quite a long way to go before we get there, since we're aiming to build this all up incrementally from the bottom up. The hope is that in the near term, GNOME Boxes will be able to start taking advantage of some of the code provided by libvirt-designer, since it already uses libvirt-gconfig & libosinfo. In addition as more functionality appears we'll be able to start changing virt-install to switch it over to these APIs in favour of its internal code. Regards, Daniel [1] https://www.redhat.com/archives/libvir-list/2012-September/msg00214.html [2] https://fedorahosted.org/libosinfo -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|

1 0

[libvirt] [RFC] [PATCH v2 1/6] add configure option --with-fuse for libvirt
by Gao feng 06 Sep '12

06 Sep '12

add a configure option --with-fuse to prepare introduction of fuse support for libvirt lxc. With help from Daniel Signed-off-by: Gao feng <gaofeng(a)cn.fujitsu.com> --- configure.ac | 36 ++++++++++++++++++++++++++++++++++++ libvirt.spec.in | 9 +++++++++ 2 files changed, 45 insertions(+), 0 deletions(-) diff --git a/configure.ac b/configure.ac index 3cc7b3c..e6d207e 100644 --- a/configure.ac +++ b/configure.ac @@ -1695,6 +1695,37 @@ AC_SUBST([CAPNG_CFLAGS]) AC_SUBST([CAPNG_LIBS]) +dnl libfuse +AC_ARG_WITH([fuse], + AC_HELP_STRING([--with-fuse], [use libfuse to proivde fuse filesystem support for libvirt lxc]), + [], + [with_fuse=check]) + +dnl +dnl This check looks for 'fuse' +dnl +FUSE_CFLAGS= +FUSE_LIBS= +if test "x$with_fuse" != "xno"; then + PKG_CHECK_MODULES([FUSE], [fuse], + [with_fuse=yes], [ + if test "x$with_fuse" = "xcheck" ; then + with_fuse=no + else + AC_MSG_ERROR( + [You must install fuse-devel to compile libvirt]) + fi + ]) + if test "x$with_fuse" = "xyes" ; then + FUSE_LIBS="-lfuse" + FUSE_CFLAGS="-D_FILE_OFFSET_BITS=64" + AC_DEFINE_UNQUOTED([HAVE_FUSE], 1, [whether fuse is available for libvirt lxc]) + fi +fi +AM_CONDITIONAL([HAVE_FUSE], [test "x$with_fuse" = "xyes"]) +AC_SUBST([FUSE_CFLAGS]) +AC_SUBST([FUSE_LIBS]) + dnl virsh libraries AC_CHECK_HEADERS([readline/readline.h]) @@ -2944,6 +2975,11 @@ AC_MSG_NOTICE([ capng: $CAPNG_CFLAGS $CAPNG_LIBS]) else AC_MSG_NOTICE([ capng: no]) fi +if test "$with_fuse" = "yes" ; then +AC_MSG_NOTICE([ fuse: $FUSE_CFLAGS $FUSE_LIBS]) +else +AC_MSG_NOTICE([ fuse: no]) +fi if test "$with_xen" = "yes" ; then AC_MSG_NOTICE([ xen: $XEN_CFLAGS $XEN_LIBS]) else diff --git a/libvirt.spec.in b/libvirt.spec.in index 140a182..939569e 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -91,6 +91,7 @@ # A few optional bits off by default, we enable later %define with_polkit 0%{!?_without_polkit:0} %define with_capng 0%{!?_without_capng:0} +%define with_fuse 0%{!?_without_fuse:0} %define with_netcf 0%{!?_without_netcf:0} %define with_udev 0%{!?_without_udev:0} %define with_hal 0%{!?_without_hal:0} @@ -466,6 +467,9 @@ BuildRequires: numactl-devel %if %{with_capng} BuildRequires: libcap-ng-devel >= 0.5.0 %endif +%if %{with_fuse} +BuildRequires: fuse-devel +%endif %if %{with_phyp} BuildRequires: libssh2-devel %endif @@ -1116,6 +1120,10 @@ of recent versions of Linux (and other OSes). %define _without_capng --without-capng %endif +%if ! %{with_fuse} +%define _without_fuse --without-fuse +%endif + %if ! %{with_netcf} %define _without_netcf --without-netcf %endif @@ -1206,6 +1214,7 @@ autoreconf -if %{?_without_numactl} \ %{?_without_numad} \ %{?_without_capng} \ + %{?_without_fuse} \ %{?_without_netcf} \ %{?_without_selinux} \ %{?_without_hal} \ -- 1.7.7.6

3 12

[libvirt] Bug:libvirtd boot up blocked in NAT network setup
by Wenchao Xia 06 Sep '12

06 Sep '12

Hello, guys I met a strange problem in libvirt+kvm massive deployment case. What shows is that libvirtd will not respond to any virsh calls, with debug I found that libvirtd was blocked at the step to setup default nat network, that is command "iptables -table nat xxxxx". In terminal, I found command "iptables -L" will also block, and "brctl show" shows that about 160 tap devices "vnetXXX" were attached to virbr0. After I deleted these tap devices, things become normal, But when I re-create them and attach these tap device to virbr0, it can't be reproduced. There are too server met this problem in test, so I think it is not a hardware problem. Does someone have experience this before? information: server: RH6.2 libvirt: libvirt-0.9.4 kernel: 2.6.32 -- Best Regards Wenchao Xia

1 0

[libvirt] [PATCH] pci: Save and restore each devices/functions behind the bus
by Osier Yang 06 Sep '12

06 Sep '12

Previously it refuses to do the secondary bus reset as long as there is(are) devices/functions behind the same bus, regardless of whether the devices/functions are being used or not. And it only save and restore the device itself's PCI config space. But later it was changed to allow the secondary bus reset as long as the devices/functions behind the same bus are not being used. Unfortunately, it still just saves and restores the device itself's PCI config space. It means we will lose the PCI config space for the devices share same bus when doing passthrough. Also, (hope my guess is right) as it assumes the secondary reset is allowed unless the device doesn't have devices/functions behind the same bus, so it only reads the bridge control register from the device, but not the parent. This patch fixes the problem by finding out all the devices/functions behind the same bus of the device to be reset, and save/restore PCI config space for all of them. And read the bridge control register from the device's parent (bridge) before resetting. * src/util/pci.c: - New helper pciSharesBus to check if two devices share same bus. - New helper pciDevicesShareBus to return a list containg all of the devices/functions which share same bus with the device - pciTrySecondaryBusReset: Save and restore PCI config space for all the devices/functions behind the same bus; Read the bridge control register from the device's parent instead before resetting. --- src/util/pci.c | 80 ++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 75 insertions(+), 5 deletions(-) diff --git a/src/util/pci.c b/src/util/pci.c index 0742d07..1a9777a 100644 --- a/src/util/pci.c +++ b/src/util/pci.c @@ -517,6 +517,39 @@ pciBusContainsActiveDevices(pciDevice *dev, return active; } +/* + * Check if the @dev and @check share bus. + */ +static int +pciSharesBus(pciDevice *dev, pciDevice *check, void *data ATTRIBUTE_UNUSED) +{ + if ((dev->domain == check->domain) && + (dev->bus == check->bus) && + (dev->slot == check->slot)) + return 1; + + return 0; +} + +/* + * Return all the devices/functions share same bus with @dev + * as a list. + */ +static pciDeviceList * +pciDevicesShareBus(pciDevice *dev) +{ + pciDevice *match = NULL; + pciDeviceList *pcis = NULL; + + if (!(pcis = pciDeviceListNew())) + return NULL; + + if (pciIterDevices(pciSharesBus, dev, &match, NULL)) + pciDeviceListAdd(pcis, match); + + return pcis; +} + /* Is @check the parent of @dev ? */ static int pciIsParent(pciDevice *dev, pciDevice *check, void *data) @@ -604,6 +637,9 @@ pciTrySecondaryBusReset(pciDevice *dev, uint8_t config_space[PCI_CONF_LEN]; uint16_t ctl; int ret = -1; + pciDeviceList *list = NULL; + uint8_t (*config_spaces)[PCI_CONF_LEN]; + int i; /* Refuse to do a secondary bus reset if there are other * devices/functions behind the bus are used by the host @@ -628,10 +664,7 @@ pciTrySecondaryBusReset(pciDevice *dev, VIR_DEBUG("%s %s: doing a secondary bus reset", dev->id, dev->name); - /* Save and restore the device's config space; we only do this - * for the supplied device since we refuse to do a reset if there - * are multiple devices/functions - */ + /* Save the device's config space */ if (pciRead(dev, 0, config_space, PCI_CONF_LEN) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to read PCI config space for %s"), @@ -639,10 +672,29 @@ pciTrySecondaryBusReset(pciDevice *dev, goto out; } + /* Save the config space of devices behind the same bus */ + if ((list = pciDevicesShareBus(dev))) { + if (VIR_ALLOC_N(config_spaces, list->count) < 0) { + virReportOOMError(); + goto out; + } + + for (i = 0; i < list->count; i++) { + pciDevice *pci = list->devs[i]; + + if (pciRead(pci, 0, config_spaces[i], PCI_CONF_LEN) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Failed to read PCI config space for %s"), + pci->name); + goto out; + } + } + } + /* 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); @@ -652,14 +704,32 @@ pciTrySecondaryBusReset(pciDevice *dev, usleep(200 * 1000); /* sleep 200ms */ + /* Restore the device's config space */ if (pciWrite(dev, 0, config_space, PCI_CONF_LEN) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to restore PCI config space for %s"), dev->name); goto out; } + + /* Restore the config space of devices behind the same bus */ + if (list) { + for (i = 0; i < list->count; i++) { + pciDevice *pci = list->devs[i]; + + if (pciWrite(pci, 0, config_spaces[i], PCI_CONF_LEN) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Failed to restore PCI config space for %s"), + pci->name); + goto out; + } + } + } + ret = 0; out: + pciDeviceListFree(list); + VIR_FREE(config_spaces); pciFreeDevice(parent); return ret; } -- 1.7.7.3

2 1

[libvirt] [PATCH v2 0/4] Add cpu hotplug support to libvirt.
by Tang Chen 06 Sep '12

06 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'/> <emulatorpin 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 change log of v2: [PATCH v2 1/4]: * Move all the handlers from hotplug.c to modules who want to listen to cpu hotplug events. [PATCH v2 2/4]: * Set /libvirt/cpuset.cpus to the lastest value when libvirtd is being initialized. [PATCH v2 3/4]: * Set /libvirt/qemu/cpuset.cpus to the lastest value when qemu driver is being initialized. [PATCH v2 4/4]: * Set /libvirt/lxc/cpuset.cpus to the lastest value when lxc driver is being initialized. Tang Chen (4): Add helpers to support cpu hotplug in libvirt. 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 | 62 +++++++++++ include/libvirt/virterror.h | 2 + src/Makefile.am | 1 + src/libvirt_private.syms | 7 ++ src/lxc/lxc_driver.c | 67 +++++++++++- src/qemu/qemu_driver.c | 64 ++++++++++++ src/util/cgroup.c | 10 +- src/util/cgroup.h | 7 ++ src/util/hotplug.c | 240 +++++++++++++++++++++++++++++++++++++++++++ src/util/hotplug.h | 44 ++++++++ src/util/virterror.c | 3 +- 11 files changed, 499 insertions(+), 8 deletions(-) create mode 100644 src/util/hotplug.c create mode 100644 src/util/hotplug.h -- 1.7.10.1

4 12

[libvirt] [PATCH 0/2] Fix 'make' issues on OpenBSD.
by Eric Blake 06 Sep '12

06 Sep '12

Pushing both under the build-breaker rule. 'make check' still fails some gnulib tests on OpenBSD, but that's not quite as severe. Eric Blake (2): build: avoid warnings from gcc 4.2.1 build: don't fail when xsltproc is missing docs/Makefile.am | 9 +++++---- m4/virt-compile-warnings.m4 | 8 +++++++- src/internal.h | 6 ++++-- 3 files changed, 16 insertions(+), 7 deletions(-) -- 1.7.11.4

1 5

[libvirt] [PATCH] build: require netcf-0.2.2 when installing on Fedora18+
by Laine Stump 06 Sep '12

06 Sep '12

A previous patch forced libnl-3 and netcf-0.2.2 (which itself requires libnl-3) when *building* for Fedora 18+ (and RHEL 7+), but the install-time Requires: for netcf has always been implicit due to libvirtd linking with libnetcf.so. However, the since the API of netcf didn't change when it was rebuilt to use libnl-3, the internal library version didn't change either, making it possible (from rpm's point of view) to upgrade libvirt without upgrading netcf (in reality, that leads to a segfault - see https://bugzilla.redhat.com/show_bug.cgi?id=853381) The solution is to put an explicit Requires: line in libvirt's specfile for fedora >= 18 and rhel >= 7. --- libvirt.spec.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libvirt.spec.in b/libvirt.spec.in index 9a1feed..cc5247b 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -589,6 +589,9 @@ Requires: iptables-ipv6 %if %{with_nwfilter} Requires: ebtables %endif +%if %{with_netcf} && (0%{?fedora} >= 18 || 0%{?rhel} >= 7) +Requires: netcf-libs >= 0.2.2 +%endif # needed for device enumeration %if %{with_hal} Requires: hal -- 1.7.11.4

2 2

[libvirt] [PATCH] network: prevent infinite hang if ovs-vswitchd isn't running
by Laine Stump 06 Sep '12

06 Sep '12

This fixes https://bugzilla.redhat.com/show_bug.cgi?id=852984 If a network or interface is configured to use Open vSwitch, but ovs-vswitchd (the Open vSwitch database service) isn't running, the ovs-vsctl add-port/del-port commands will hang indefinitely rather than returning an error. There is a --nowait option, but that appears to have no effect on add-port and del-port commands, so instead we add a --timeout=5 to the commands - they will retry for up to 5 seconds, then fail if there is no response. --- I'm not sure if 5 seconds is a reasonable timeout for this, but it seems to work okay for me (in a very lightly loaded environment, but a successful return is always effectively instantaneous...). Unfortunately there doesn't seem to be another way to bound the wait time of ovs-vsctl. :-( src/util/virnetdevopenvswitch.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/util/virnetdevopenvswitch.c b/src/util/virnetdevopenvswitch.c index 764f478..97b9d52 100644 --- a/src/util/virnetdevopenvswitch.c +++ b/src/util/virnetdevopenvswitch.c @@ -105,7 +105,7 @@ int virNetDevOpenvswitchAddPort(const char *brname, const char *ifname, cmd = virCommandNew(OVSVSCTL); - virCommandAddArgList(cmd, "--", "--may-exist", "add-port", + virCommandAddArgList(cmd, "--timeout=5", "--", "--may-exist", "add-port", brname, ifname, NULL); if (virBufferUse(&buf) != 0) @@ -166,7 +166,7 @@ int virNetDevOpenvswitchRemovePort(const char *brname ATTRIBUTE_UNUSED, const ch virCommandPtr cmd = NULL; cmd = virCommandNew(OVSVSCTL); - virCommandAddArgList(cmd, "--", "--if-exists", "del-port", ifname, NULL); + virCommandAddArgList(cmd, "--timeout=5", "--", "--if-exists", "del-port", ifname, NULL); if (virCommandRun(cmd, NULL) < 0) { virReportSystemError(VIR_ERR_INTERNAL_ERROR, -- 1.7.11.4

2 2

[libvirt] VM Migration with IEEE802.1Qbh and IEEE802.1Qbg
by Jagath Weerasinghe 06 Sep '12

06 Sep '12

Hi All, Can a VM connected as IEEE802.1Qbh be migrated to a destination host as it were connected as IEEE802.1Qbg? What I wanted to know is, is it possible to change the configuration from IEEE802.1Qbh to IEEE802.1Qbg on the fly? Regards Jagath

3 3

[libvirt] [PATCH] Fix adding ports to OVS bridges without VLAN tags
by Kyle Mestery 06 Sep '12

06 Sep '12

The introduction of the new VLAN code, along with the fix from 5e465df6be8bcb00f0b4bff831e91f4042fae272, caused the addition of OVS ports to fail with the following message: ovs-vsctl: 00002|vsctl|ERR|: missing column name This fix takes into account the VLAN arguments are optional, and correctly sets up the command line to run the "ovs-vsctl" command to add ports to the OVS bridge. Signed-off-by: Kyle Mestery <kmestery(a)cisco.com> CC: Eric Blake <eblake(a)redhat.com> --- V2: - Use virBufferUse() to check if a buffer is in use. Found by Eric Blake. --- src/util/virnetdevopenvswitch.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/util/virnetdevopenvswitch.c b/src/util/virnetdevopenvswitch.c index 00271a0..764f478 100644 --- a/src/util/virnetdevopenvswitch.c +++ b/src/util/virnetdevopenvswitch.c @@ -104,9 +104,15 @@ int virNetDevOpenvswitchAddPort(const char *brname, const char *ifname, } cmd = virCommandNew(OVSVSCTL); + + virCommandAddArgList(cmd, "--", "--may-exist", "add-port", + brname, ifname, NULL); + + if (virBufferUse(&buf) != 0) + virCommandAddArgList(cmd, virBufferCurrentContent(&buf), NULL); + if (ovsport->profileID[0] == '\0') { - virCommandAddArgList(cmd, "--", "--may-exist", "add-port", - brname, ifname, virBufferCurrentContent(&buf), + virCommandAddArgList(cmd, "--", "set", "Interface", ifname, attachedmac_ex_id, "--", "set", "Interface", ifname, ifaceid_ex_id, "--", "set", "Interface", ifname, vmid_ex_id, @@ -114,8 +120,7 @@ int virNetDevOpenvswitchAddPort(const char *brname, const char *ifname, "external-ids:iface-status=active", NULL); } else { - virCommandAddArgList(cmd, "--", "--may-exist", "add-port", - brname, ifname, virBufferCurrentContent(&buf), + virCommandAddArgList(cmd, "--", "set", "Interface", ifname, attachedmac_ex_id, "--", "set", "Interface", ifname, ifaceid_ex_id, "--", "set", "Interface", ifname, vmid_ex_id, -- 1.7.11.4

4 6

[libvirt] [PATCH] qemu: don't pin all the cpus
by Martin Kletzander 06 Sep '12

06 Sep '12

This is another fix for the emulator-pin series. When going through the cputune pinning settings, the current code is trying to pin all the CPUs, even when not all of them are specified. This causes error in the subsequent function which, of course, cannot find the cpu to pin. Since it's enough to pass the correct VCPU ID to the function, the fix is trivial. --- src/qemu/qemu_cgroup.c | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c index 7298e28..5b42793 100644 --- a/src/qemu/qemu_cgroup.c +++ b/src/qemu/qemu_cgroup.c @@ -542,7 +542,7 @@ int qemuSetupCgroupForVcpu(struct qemud_driver *driver, virDomainObjPtr vm) qemuDomainObjPrivatePtr priv = vm->privateData; virDomainDefPtr def = vm->def; int rc; - unsigned int i; + unsigned int i, j; unsigned long long period = vm->def->cputune.period; long long quota = vm->def->cputune.quota; @@ -603,13 +603,22 @@ int qemuSetupCgroupForVcpu(struct qemud_driver *driver, virDomainObjPtr vm) } /* Set vcpupin in cgroup if vcpupin xml is provided */ - if (def->cputune.nvcpupin && - qemuCgroupControllerActive(driver, VIR_CGROUP_CONTROLLER_CPUSET) && - qemuSetupCgroupVcpuPin(cgroup_vcpu, - def->cputune.vcpupin, - def->cputune.nvcpupin, - i) < 0) - goto cleanup; + if (qemuCgroupControllerActive(driver, VIR_CGROUP_CONTROLLER_CPUSET)) { + /* find the right CPU to pin, otherwise + * qemuSetupCgroupVcpuPin will fail. */ + for (j = 0; j < def->cputune.nvcpupin; j++) { + if (def->cputune.vcpupin[j]->vcpuid != i) + continue; + + if (qemuSetupCgroupVcpuPin(cgroup_vcpu, + def->cputune.vcpupin, + def->cputune.nvcpupin, + i) < 0) + goto cleanup; + + break; + } + } virCgroupFree(&cgroup_vcpu); } -- 1.7.12

2 2

[libvirt] [PATCH] maint: avoid doubled name in syntax check failures
by Eric Blake 06 Sep '12

06 Sep '12

Based on a similar gnulib patch; use of $(_sc_search_regexp) already injects $(ME) into any output messages, so a failure of these rules would look like this, pre-patch: ./config.status: ./config.status: use virStrToLong_*, not strtol variants * cfg.mk (sc_prohibit_strncmp, sc_prohibit_strtol) (sc_libvirt_unmarked_diagnostics): Drop redundant name. --- I couldn't quite bring myself to pushing this under the trivial rule, but am instead waiting for a review. cfg.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cfg.mk b/cfg.mk index 245e0f2..333563f 100644 --- a/cfg.mk +++ b/cfg.mk @@ -353,18 +353,18 @@ snp_ = strncmp *$.+$ sc_prohibit_strncmp: @prohibit='! *strncmp *\(|\<$(snp_) *[!=]=|[!=]= *$(snp_)' \ exclude=':# *define STR(N?EQLEN|PREFIX)\(' \ - halt='$(ME): use STREQLEN or STRPREFIX instead of str''ncmp' \ + halt='use STREQLEN or STRPREFIX instead of str''ncmp' \ $(_sc_search_regexp) # strtol and friends are too easy to misuse sc_prohibit_strtol: @prohibit='\bstrto(u?ll?|[ui]max) *\(' \ exclude='exempt from syntax-check' \ - halt='$(ME): use virStrToLong_*, not strtol variants' \ + halt='use virStrToLong_*, not strtol variants' \ $(_sc_search_regexp) @prohibit='\bstrto[df] *\(' \ exclude='exempt from syntax-check' \ - halt='$(ME): use virStrToDouble, not strtod variants' \ + halt='use virStrToDouble, not strtod variants' \ $(_sc_search_regexp) # Use virAsprintf rather than as'printf since *strp is undefined on error. @@ -550,7 +550,7 @@ func_re := ($(func_or)) sc_libvirt_unmarked_diagnostics: @prohibit='\<$(func_re) *\([^"]*"[^"]*[a-z]{3}' \ exclude='_\(' \ - halt='$(ME): found unmarked diagnostic(s)' \ + halt='found unmarked diagnostic(s)' \ $(_sc_search_regexp) @{ grep -nE '\<$(func_re) *\(.*;$$' $$($(VC_LIST_EXCEPT)); \ grep -A1 -nE '\<$(func_re) *\(.*,$$' $$($(VC_LIST_EXCEPT)); } \ -- 1.7.11.4

2 2

[libvirt] [PATCH] build: use re-entrant functions in virsh
by Eric Blake 06 Sep '12

06 Sep '12

Today's patches pointed out that virsh was still using localtime(), which is not thread-safe, even though virsh is definitely multi-threaded. * cfg.mk (exclude_file_name_regexp--sc_prohibit_nonreentrant): Tighten the rule. * tools/virsh.c (vshOutputLogFile): Avoid localtime. (vshEditWriteToTempFile, vshEditReadBackFile, cmdCd, cmdPwd) (vshCloseLogFile): Avoid strerror. * tools/console.c (vshMakeStdinRaw): Likewise. * tools/virsh-domain.c (vshGenFileName): Fix spacing in previous patch. --- cfg.mk | 2 +- tools/console.c | 11 +++++++---- tools/virsh-domain.c | 2 +- tools/virsh.c | 40 ++++++++++++++++++++++++---------------- 4 files changed, 33 insertions(+), 22 deletions(-) diff --git a/cfg.mk b/cfg.mk index 4cdfd1b..245e0f2 100644 --- a/cfg.mk +++ b/cfg.mk @@ -780,7 +780,7 @@ exclude_file_name_regexp--sc_prohibit_newline_at_end_of_diagnostic = \ ^src/rpc/gendispatch\.pl$$ exclude_file_name_regexp--sc_prohibit_nonreentrant = \ - ^((po|tests)/|docs/.*py$$|tools/(virsh|console)\.c$$) + ^((po|tests)/|docs/.*py$$) exclude_file_name_regexp--sc_prohibit_raw_allocation = \ ^(src/util/memory\.[ch]|examples/.*)$$ diff --git a/tools/console.c b/tools/console.c index fee2ce3..4394e48 100644 --- a/tools/console.c +++ b/tools/console.c @@ -1,7 +1,7 @@ /* * console.c: A dumb serial console client * - * Copyright (C) 2007-2008, 2010-2011 Red Hat, Inc. + * Copyright (C) 2007-2008, 2010-2012 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 @@ -299,13 +299,16 @@ vshGetEscapeChar(const char *s) return *s; } -int vshMakeStdinRaw(struct termios *ttyattr, bool report_errors) { +int +vshMakeStdinRaw(struct termios *ttyattr, bool report_errors) +{ struct termios rawattr; + char ebuf[1024]; if (tcgetattr(STDIN_FILENO, ttyattr) < 0) { if (report_errors) VIR_ERROR(_("unable to get tty attributes: %s"), - strerror(errno)); + virStrerror(errno, ebuf, sizeof(ebuf))); return -1; } @@ -315,7 +318,7 @@ int vshMakeStdinRaw(struct termios *ttyattr, bool report_errors) { if (tcsetattr(STDIN_FILENO, TCSAFLUSH, &rawattr) < 0) { if (report_errors) VIR_ERROR(_("unable to set tty attributes: %s"), - strerror(errno)); + virStrerror(errno, ebuf, sizeof(ebuf))); return -1; } diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 3cef782..727c39b 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -3723,7 +3723,7 @@ vshGenFileName(vshControl *ctl, virDomainPtr dom, const char *mime) ext = ".png"; /* add mime type here */ - time (&cur_time); + time(&cur_time); localtime_r(&cur_time, &time_info); strftime(timestr, sizeof(timestr), "%Y-%m-%d-%H:%M:%S", &time_info); diff --git a/tools/virsh.c b/tools/virsh.c index 88da429..e3f9e4e 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -511,6 +511,7 @@ vshEditWriteToTempFile(vshControl *ctl, const char *doc) char *ret; const char *tmpdir; int fd; + char ebuf[1024]; tmpdir = getenv ("TMPDIR"); if (!tmpdir) tmpdir = "/tmp"; @@ -521,14 +522,14 @@ vshEditWriteToTempFile(vshControl *ctl, const char *doc) fd = mkstemps(ret, 4); if (fd == -1) { vshError(ctl, _("mkstemps: failed to create temporary file: %s"), - strerror(errno)); + virStrerror(errno, ebuf, sizeof(ebuf))); VIR_FREE(ret); return NULL; } if (safewrite(fd, doc, strlen(doc)) == -1) { vshError(ctl, _("write: %s: failed to write to temporary file: %s"), - ret, strerror(errno)); + ret, virStrerror(errno, ebuf, sizeof(ebuf))); VIR_FORCE_CLOSE(fd); unlink(ret); VIR_FREE(ret); @@ -536,7 +537,7 @@ vshEditWriteToTempFile(vshControl *ctl, const char *doc) } if (VIR_CLOSE(fd) < 0) { vshError(ctl, _("close: %s: failed to write or close temporary file: %s"), - ret, strerror(errno)); + ret, virStrerror(errno, ebuf, sizeof(ebuf))); unlink(ret); VIR_FREE(ret); return NULL; @@ -606,11 +607,12 @@ char * vshEditReadBackFile(vshControl *ctl, const char *filename) { char *ret; + char ebuf[1024]; if (virFileReadAll(filename, VSH_MAX_XML_FILE, &ret) == -1) { vshError(ctl, _("%s: failed to read temporary file: %s"), - filename, strerror(errno)); + filename, virStrerror(errno, ebuf, sizeof(ebuf))); return NULL; } return ret; @@ -637,6 +639,7 @@ cmdCd(vshControl *ctl, const vshCmd *cmd) const char *dir = NULL; char *dir_malloced = NULL; bool ret = true; + char ebuf[1024]; if (!ctl->imode) { vshError(ctl, "%s", _("cd: command valid only in interactive mode")); @@ -650,7 +653,8 @@ cmdCd(vshControl *ctl, const vshCmd *cmd) dir = "/"; if (chdir(dir) == -1) { - vshError(ctl, _("cd: %s: %s"), strerror(errno), dir); + vshError(ctl, _("cd: %s: %s"), + virStrerror(errno, ebuf, sizeof(ebuf)), dir); ret = false; } @@ -672,11 +676,12 @@ cmdPwd(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) { char *cwd; bool ret = true; + char ebuf[1024]; cwd = getcwd(NULL, 0); if (!cwd) { vshError(ctl, _("pwd: cannot get current directory: %s"), - strerror(errno)); + virStrerror(errno, ebuf, sizeof(ebuf))); ret = false; } else { vshPrint(ctl, _("%s\n"), cwd); @@ -2188,7 +2193,7 @@ vshOutputLogFile(vshControl *ctl, int log_level, const char *msg_format, size_t len; const char *lvl = ""; time_t stTime; - struct tm *stTm; + struct tm stTm; if (ctl->log_fd == -1) return; @@ -2198,15 +2203,15 @@ vshOutputLogFile(vshControl *ctl, int log_level, const char *msg_format, * * [YYYY.MM.DD HH:MM:SS SIGNATURE PID] LOG_LEVEL message */ - time (&stTime); - stTm = localtime(&stTime); + time(&stTime); + localtime_r(&stTime, &stTm); virBufferAsprintf(&buf, "[%d.%02d.%02d %02d:%02d:%02d %s %d] ", - (1900 + stTm->tm_year), - (1 + stTm->tm_mon), - stTm->tm_mday, - stTm->tm_hour, - stTm->tm_min, - stTm->tm_sec, + (1900 + stTm.tm_year), + (1 + stTm.tm_mon), + stTm.tm_mday, + stTm.tm_hour, + stTm.tm_min, + stTm.tm_sec, SIGN_NAME, (int) getpid()); switch (log_level) { @@ -2264,10 +2269,13 @@ error: void vshCloseLogFile(vshControl *ctl) { + char ebuf[1024]; + /* log file close */ if (VIR_CLOSE(ctl->log_fd) < 0) { vshError(ctl, _("%s: failed to write log file: %s"), - ctl->logfile ? ctl->logfile : "?", strerror (errno)); + ctl->logfile ? ctl->logfile : "?", + virStrerror(errno, ebuf, sizeof(ebuf))); } if (ctl->logfile) { -- 1.7.11.4

2 2

[libvirt] [PATCH] (updated) additional parameters needed for dnsmasq
by Gene Czarcinski 05 Sep '12

05 Sep '12

As I said in a previous message, dnsmasq is forwarding a number of queries upstream that should not be done. There still remains an MX query for a plain name with no domain specified that will be forwarded is dnsmasq has --domain=xxx --local=/xxx/ specified. This does not happen with no domain name and --local=// ... not a libvirt problem. BTW, thanks again to Claudio Bley! ==================================================== diff -uNr libvirt-0.9.11.4.orig/src/network/bridge_driver.c libvirt-0.9.11.4/src/network/bridge_driver.c --- libvirt-0.9.11.4.orig/src/network/bridge_driver.c 2012-06-15 14:23:21.000000000 -0400 +++ libvirt-0.9.11.4/src/network/bridge_driver.c 2012-08-22 12:16:45.263488789 -0400 @@ -490,8 +490,15 @@ */ virCommandAddArgList(cmd, "--strict-order", "--bind-interfaces", NULL); - if (network->def->domain) + if (network->def->domain) { virCommandAddArgList(cmd, "--domain", network->def->domain, NULL); + virCommandAddArgFormat(cmd, "--local=/%s/", network->def->domain); + virCommandAddArgList(cmd, "--domain-needed", "--filterwin2k", NULL); + } + else { /* need to specify local even if no domain specified */ + virCommandAddArg(cmd, "--local=//"); + virCommandAddArgList(cmd, "--domain-needed", "--filterwin2k", NULL); + } if (pidfile) virCommandAddArgPair(cmd, "--pid-file", pidfile); diff -uNr libvirt-0.9.11.4.orig/tests/networkxml2argvdata/isolated-network.argv libvirt-0.9.11.4/tests/networkxml2argvdata/isolated-network.argv --- libvirt-0.9.11.4.orig/tests/networkxml2argvdata/isolated-network.argv 2012-06-15 14:21:54.000000000 -0400 +++ libvirt-0.9.11.4/tests/networkxml2argvdata/isolated-network.argv 2012-08-22 12:20:37.700995728 -0400 @@ -1,4 +1,5 @@ -@DNSMASQ@ --strict-order --bind-interfaces --conf-file= \ +@DNSMASQ@ --strict-order --bind-interfaces \ +--local=// --domain-needed --filterwin2k --conf-file= \ --except-interface lo --dhcp-option=3 --no-resolv \ --listen-address 192.168.152.1 \ --dhcp-range 192.168.152.2,192.168.152.254 \ diff -uNr libvirt-0.9.11.4.orig/tests/networkxml2argvdata/nat-network.argv libvirt-0.9.11.4/tests/networkxml2argvdata/nat-network.argv --- libvirt-0.9.11.4.orig/tests/networkxml2argvdata/nat-network.argv 2012-06-15 14:21:54.000000000 -0400 +++ libvirt-0.9.11.4/tests/networkxml2argvdata/nat-network.argv 2012-08-22 12:21:24.481703184 -0400 @@ -1,4 +1,5 @@ -@DNSMASQ@ --strict-order --bind-interfaces --conf-file= \ +@DNSMASQ@ --strict-order --bind-interfaces \ +--local=// --domain-needed --filterwin2k --conf-file= \ --except-interface lo --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 -uNr libvirt-0.9.11.4.orig/tests/networkxml2argvdata/nat-network-dns-hosts.argv libvirt-0.9.11.4/tests/networkxml2argvdata/nat-network-dns-hosts.argv --- libvirt-0.9.11.4.orig/tests/networkxml2argvdata/nat-network-dns-hosts.argv 2012-06-15 14:21:54.000000000 -0400 +++ libvirt-0.9.11.4/tests/networkxml2argvdata/nat-network-dns-hosts.argv 2012-08-22 12:25:30.378218203 -0400 @@ -1,3 +1,4 @@ @DNSMASQ@ --strict-order --bind-interfaces --domain example.com \ +--local=/example.com/ --domain-needed --filterwin2k \ --conf-file= --except-interface lo --listen-address 192.168.122.1 \ --expand-hosts --addn-hosts=/var/lib/libvirt/dnsmasq/default.addnhosts\ diff -uNr libvirt-0.9.11.4.orig/tests/networkxml2argvdata/nat-network-dns-srv-record.argv libvirt-0.9.11.4/tests/networkxml2argvdata/nat-network-dns-srv-record.argv --- libvirt-0.9.11.4.orig/tests/networkxml2argvdata/nat-network-dns-srv-record.argv 2012-06-15 14:21:54.000000000 -0400 +++ libvirt-0.9.11.4/tests/networkxml2argvdata/nat-network-dns-srv-record.argv 2012-08-22 12:22:35.471268869 -0400 @@ -1,7 +1,7 @@ @DNSMASQ@ \ --strict-order \ --bind-interfaces \ ---conf-file= \ +--local=// --domain-needed --filterwin2k --conf-file= \ --except-interface lo \ --srv-host=name.tcp.test-domain-name,.,1024,10,10 \ --listen-address 192.168.122.1 \ diff -uNr libvirt-0.9.11.4.orig/tests/networkxml2argvdata/nat-network-dns-srv-record-minimal.argv libvirt-0.9.11.4/tests/networkxml2argvdata/nat-network-dns-srv-record-minimal.argv --- libvirt-0.9.11.4.orig/tests/networkxml2argvdata/nat-network-dns-srv-record-minimal.argv 2012-06-15 14:21:54.000000000 -0400 +++ libvirt-0.9.11.4/tests/networkxml2argvdata/nat-network-dns-srv-record-minimal.argv 2012-08-22 12:22:48.422191468 -0400 @@ -1,7 +1,7 @@ @DNSMASQ@ \ --strict-order \ --bind-interfaces \ ---conf-file= \ +--local=// --domain-needed --filterwin2k --conf-file= \ --except-interface lo \ --srv-host=name.tcp.,,,, \ --listen-address 192.168.122.1 \ diff -uNr libvirt-0.9.11.4.orig/tests/networkxml2argvdata/nat-network-dns-txt-record.argv libvirt-0.9.11.4/tests/networkxml2argvdata/nat-network-dns-txt-record.argv --- libvirt-0.9.11.4.orig/tests/networkxml2argvdata/nat-network-dns-txt-record.argv 2012-06-15 14:21:54.000000000 -0400 +++ libvirt-0.9.11.4/tests/networkxml2argvdata/nat-network-dns-txt-record.argv 2012-08-22 12:23:47.642834970 -0400 @@ -1,4 +1,5 @@ -@DNSMASQ@ --strict-order --bind-interfaces --conf-file= \ +@DNSMASQ@ --strict-order --bind-interfaces \ +--local=// --domain-needed --filterwin2k --conf-file= \ --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 \ diff -uNr libvirt-0.9.11.4.orig/tests/networkxml2argvdata/netboot-network.argv libvirt-0.9.11.4/tests/networkxml2argvdata/netboot-network.argv --- libvirt-0.9.11.4.orig/tests/networkxml2argvdata/netboot-network.argv 2012-06-15 14:21:54.000000000 -0400 +++ libvirt-0.9.11.4/tests/networkxml2argvdata/netboot-network.argv 2012-08-22 12:24:31.838569611 -0400 @@ -1,5 +1,6 @@ @DNSMASQ@ --strict-order --bind-interfaces --domain example.com \ ---conf-file= --except-interface lo --listen-address 192.168.122.1 \ +--local=/example.com/ --domain-needed --filterwin2k --conf-file= \ +--except-interface lo --listen-address 192.168.122.1 \ --dhcp-range 192.168.122.2,192.168.122.254 \ --dhcp-leasefile=/var/lib/libvirt/dnsmasq/netboot.leases \ --dhcp-lease-max=253 --dhcp-no-override --expand-hosts --enable-tftp \ diff -uNr libvirt-0.9.11.4.orig/tests/networkxml2argvdata/netboot-proxy-network.argv libvirt-0.9.11.4/tests/networkxml2argvdata/netboot-proxy-network.argv --- libvirt-0.9.11.4.orig/tests/networkxml2argvdata/netboot-proxy-network.argv 2012-06-15 14:21:54.000000000 -0400 +++ libvirt-0.9.11.4/tests/networkxml2argvdata/netboot-proxy-network.argv 2012-08-22 12:27:24.586499884 -0400 @@ -1,5 +1,6 @@ @DNSMASQ@ --strict-order --bind-interfaces --domain example.com \ ---conf-file= --except-interface lo --listen-address 192.168.122.1 \ +--local=/example.com/ --domain-needed --filterwin2k --conf-file= \ +--except-interface lo --listen-address 192.168.122.1 \ --dhcp-range 192.168.122.2,192.168.122.254 \ --dhcp-leasefile=/var/lib/libvirt/dnsmasq/netboot.leases \ --dhcp-lease-max=253 --dhcp-no-override --expand-hosts \ diff -uNr libvirt-0.9.11.4.orig/tests/networkxml2argvdata/routed-network.argv libvirt-0.9.11.4/tests/networkxml2argvdata/routed-network.argv --- libvirt-0.9.11.4.orig/tests/networkxml2argvdata/routed-network.argv 2012-06-15 14:21:54.000000000 -0400 +++ libvirt-0.9.11.4/tests/networkxml2argvdata/routed-network.argv 2012-08-22 12:28:06.111841912 -0400 @@ -1,2 +1,3 @@ -@DNSMASQ@ --strict-order --bind-interfaces --conf-file= \ +@DNSMASQ@ --strict-order --bind-interfaces \ +--local=// --domain-needed --filterwin2k --conf-file= \ --except-interface lo --listen-address 192.168.122.1\ ========================================== Just in case, I also attached the patch. Gene

3 7

[libvirt] [PATCH] [trivial] Fix spelling mistake
by Philipp Hahn 05 Sep '12

05 Sep '12

provably -> probably Signed-off-by: Philipp Hahn <hahn(a)univention.de> --- cfg.mk | 2 +- src/libvirt.c | 2 +- tools/virsh.pod | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cfg.mk b/cfg.mk index 4cdfd1b..8fd9462 100644 --- a/cfg.mk +++ b/cfg.mk @@ -379,7 +379,7 @@ sc_prohibit_setuid: halt='use virSetUIDGID, not raw set*id' \ $(_sc_search_regexp) -# Use snprintf rather than s'printf, even if buffer is provably large enough, +# Use snprintf rather than s'printf, even if buffer is probably large enough, # since gnulib has more guarantees for snprintf portability sc_prohibit_sprintf: @prohibit='\<[s]printf\>' \ diff --git a/src/libvirt.c b/src/libvirt.c index b034ed6..041e4a6 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -17968,7 +17968,7 @@ error: * new hypervisor instance rather than reusing the existing hypervisor * (since this would terminate all connections to the domain, such as * such as VNC or Spice graphics) - this condition arises from active - * snapshots that are provably ABI incomaptible, as well as from + * snapshots that are probably ABI incomaptible, as well as from * inactive snapshots with a @flags request to start the domain after * the revert. * diff --git a/tools/virsh.pod b/tools/virsh.pod index a26c420..36b9593 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -2685,7 +2685,7 @@ the case of reverting from a running domain to an active state where a new hypervisor has to be created rather than reusing the existing hypervisor, because it implies drawbacks such as breaking any existing VNC or Spice connections; this condition happens with an active -snapshot that uses a provably incompatible configuration, as well as +snapshot that uses a probably incompatible configuration, as well as with an inactive snapshot that is combined with the I<--start> or I<--pause> flag. -- 1.7.1

2 1

[libvirt] [PATCHv2 0/3] Add range checking for scheduler tunables
by Peter Krempa 05 Sep '12

05 Sep '12

This series adds range checking to cpu scheduler tunables when changed using the API. V2 contains a new patch that avoids changing all tunables from virsh when setting just a single one. Peter Krempa (3): qemu: clean up qemuSetSchedulerParametersFlags() qemu: Add range checking for scheduler tunables when changed by API virsh: Update only changed scheduler tunables src/qemu/qemu_driver.c | 96 ++++++++++++++++++++++++++++++-------------------- tools/virsh-domain.c | 14 ++++---- 2 files changed, 66 insertions(+), 44 deletions(-) -- 1.7.12

1 3

Re: [libvirt] [Libguestfs] compile libguestfs 1.19.35
by Richard W.M. Jones 05 Sep '12

05 Sep '12

[The context for libvirt users is how to let people do 'make install' without having conflicts with installed copies of packages.] On Wed, Sep 05, 2012 at 07:39:37AM -0400, Whit Blauvelt wrote: > On Wed, Sep 05, 2012 at 08:07:09AM +0100, Richard W.M. Jones wrote: > > > It is possible to run 'make install', but we normally do not recommend > > you do that. To avoid conflicts between other packages, you should > > build a libguestfs package for your Linux distro, which is not so > > easy. > > Is there a goal at least that if a the group of programs including libvirt > and qemu-kvm is built and installed from tar, that it should install with > internal consistency regardless of underlying distro? > > All the distros necessarily lag development here. Sometimes new features are > key to a particular deployment. Isn't it a useful goal to produce components > such that, if "make install" is used with each of them, the result should be > good? Is that the goal of these related projects? > > Now days, for instance, every distro does a good LAMP stack. But earlier in > the development of that stack it was often best to compile it from source, > due to versions lagging and distro maintainers making assumptions that > weren't well honed. In the first few years of any new stack, shouldn't we > expect that many sysadmins will be in the same position? > > It's best if there's some defined subset of programs whose "make install" > options, by default, will produce a coherent stack. I'm not sure how special libvirt & qemu are. You could try installing to a local prefix (I sometimes use "./configure --prefix=$HOME/gnu"). Then you have to sort out the environment variables that need setting. I don't think libvirt or libguestfs or qemu document what environment variables should be set to run an internally consistent local copy of the entire libvirt/KVM stack from your home directory. libguestfs has the "./run" script which can be modified. Anyone got any thoughts? I think it is a genuine concern. Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming blog: http://rwmj.wordpress.com Fedora now supports 80 OCaml packages (the OPEN alternative to F#) http://cocan.org/getting_started_with_ocaml_on_red_hat_and_fedora

2 2

[libvirt] [PATCH 1/2] parallels: remove unused member 'os' from parallelsDomObj
by Dmitry Guryanov 05 Sep '12

05 Sep '12

Signed-off-by: Dmitry Guryanov <dguryanov(a)parallels.com> --- src/parallels/parallels_utils.h | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/src/parallels/parallels_utils.h b/src/parallels/parallels_utils.h index 082ee75..6a27003 100644 --- a/src/parallels/parallels_utils.h +++ b/src/parallels/parallels_utils.h @@ -44,7 +44,6 @@ typedef struct _parallelsConn *parallelsConnPtr; struct parallelsDomObj { int id; char *uuid; - char *os; }; typedef struct parallelsDomObj *parallelsDomObjPtr; -- 1.7.1

1 1

[libvirt] S4 event, states and caveats
by Martin Kletzander 05 Sep '12

05 Sep '12

Hi everybody, I'm going to add support for S4 event for libvirt and I'm thinking for a while now how to do that, so I'd like to discuss this here on the list before doing something wrong and mainly to eliminate bothering you guys with reviews of PATCH v5 etc. QEMU emits SUSPEND_DISK event before SHUTDOWN and then shuts down as usual when the guest is powering off. At first I wanted to add it the same way the support for SUSPEND was added, but when I come to think of it, this needs a little bit more. My main questions are: - What state should the machine have after it stops? a) pmsuspended (optionally with new reason) b) shutoff (ditto) c) new state (pmsuspended-disk for example) - How should we behave when dompmwakeup is called for such domain? - How should we behave when destroy is called for such domain? - How do we store the domain state persistently between restarts? - Should there be new lifecycle event to distinguish suspend to disk from poweroff? Plus you might have some additional things what to care about. In that case please let me know so it's been dealt with at the start. I'm inclining to new state for the domain (just because suspend to disk doesn't seem like a new "reason" to me) which can be woken up by the pmwakeup call (that would be basically the same as starting it). It's hard for me to say if destroy should reset the state. Even when it is prohibited, the machine can be recreated with the same disk and thus achieving the same result with a workaround. We can probably allow removing and changing devices connected as well as other settings of the domain. It is then problem of QEMU, it's BIOS and mainly the guest OS to deal with it, so basically it can be blamed on the user who did that :) If we don't allow that, the same rule with the workaround applies here anyway. I know Michal was thinking about how to store the data for the domain state because of transient devices etc. His idea was to save the files somewhere else than /var/run. I'd do that, but just for those suspended to disk. I'd add a lifecycle event with lifecycle control in the domain XML (now supported for poweroff, reboot and crash). Thanks for any remarks, additions, hints and replies. Have a nice day, Martin

1 0