- Devel - libvirt List Archives

[libvirt] Coverity on libvirt-1.0.0 release
by Alex Jia 02 Nov '12

02 Nov '12

Hi all, This is a Coverity report on libvirt-1.0.0 release, for details, please check attachment. Analysis summary report: ------------------------ Files analyzed : 294 Total LoC input to cov-analyze : 391588 Functions analyzed : 9762 Paths analyzed : 1146758 Time taken by Coverity analysis : 00:20:58 Defect occurrences found : 304 Total 5 ATOMICITY 53 BAD_SIZEOF 7 CHECKED_RETURN 1 CONSTANT_EXPRESSION_RESULT 7 DEADCODE 19 FORWARD_NULL 2 LOCK 1 MISSING_BREAK 8 NEGATIVE_RETURNS 1 NO_EFFECT 7 NULL_RETURNS 2 OVERRUN_STATIC 122 RESOURCE_LEAK 1 RETURN_LOCAL 17 REVERSE_INULL 2 SIZEOF_MISMATCH 1 STRING_NULL 1 STRING_OVERFLOW 4 TAINTED_SCALAR 25 TOCTOU 9 UNINIT 1 UNREACHABLE 8 UNUSED_VALUE -- Regards, Alex

1 0

[libvirt] [PATCH] logging.c: Properly indent and ignore one syntax-check rule
by Michal Privoznik 02 Nov '12

02 Nov '12

With our fix of mkostemp (pushed as 2b435c15) we define a macro to compile with uclibc. However, this definition is conditional and thus needs to be properly indented. Moreover, with this definition sc_prohibit_mkstemp syntax-check rule keeps yelling: src/util/logging.c:63:# define mkostemp(x,y) mkstemp(x) maint.mk: use mkostemp with O_CLOEXEC instead of mkstemp Therefore we should ignore this file for this rule. --- Pushed under build-breaker rule. cfg.mk | 2 ++ src/util/logging.c | 2 +- 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/cfg.mk b/cfg.mk index cda04e4..963f642 100644 --- a/cfg.mk +++ b/cfg.mk @@ -817,3 +817,5 @@ exclude_file_name_regexp--sc_unmarked_diagnostics = \ ^(docs/apibuild.py|tests/virt-aa-helper-test)$$ exclude_file_name_regexp--sc_size_of_brackets = cfg.mk + +exclude_file_name_regexp--sc_prohibit_mkstemp = ^src/util/logging\.c$$ diff --git a/src/util/logging.c b/src/util/logging.c index c0b2f0b..27bd74c 100644 --- a/src/util/logging.c +++ b/src/util/logging.c @@ -60,7 +60,7 @@ #ifdef __UCLIBC__ /* uclibc does not implement mkostemp GNU extention */ -#define mkostemp(x,y) mkstemp(x) +# define mkostemp(x,y) mkstemp(x) #endif VIR_ENUM_DECL(virLogSource) -- 1.7.8.6

2 1

[libvirt] [PATCH 0/2] Add lock in libxl
by Bamvor Jian Zhang 02 Nov '12

02 Nov '12

These two patches implement a lock for long-running job(save, dump and migration) and normal job which will return in short time but maybe affect the state of virtual machine. With these patches, the normal job could not execute while the long-ruuning job or other normal job is running. In order to tracking these job, job type for normal job and long-ruuning job(will be called as async job in code) is defined. The abort job is called while user want to cancel such async job. Note that there is no cancellation function for async job in xenlight stack. So, abort function just block the cancellation of user. Bamvor Jian Zhang (2): Introduce a lock for libxl long-running api Add lock for libxl api src/libxl/libxl_conf.h | 58 +++++ src/libxl/libxl_driver.c | 665 ++++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 662 insertions(+), 61 deletions(-) -- 1.7.12

4 9

[libvirt] [PATCH] qemu: use default machine type if missing it in qemu command line
by Guannan Ren 02 Nov '12

02 Nov '12

BZ:https://bugzilla.redhat.com/show_bug.cgi?id=871273 when using virsh qemu-attach to attach an existing qemu process, if it misses the -M option in qemu command line, libvirtd crashed because the NULL value of def->os.machine in later use. Example: /usr/libexec/qemu-kvm -name foo \ -cdrom /var/lib/libvirt/images/boot.img \ -monitor unix:/tmp/demo,server,nowait \ error: End of file while reading data: Input/output error error: Failed to reconnect to the hypervisor This patch tries to set default machine type if the value of def->os.machine is still NULL after qemu command line parsing. --- src/qemu/qemu_command.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index fe99f5d..0b6d2f8 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -8768,6 +8768,17 @@ virDomainDefPtr qemuParseCommandLine(virCapsPtr caps, } } + if (!def->os.machine) { + const char *defaultMachine = + virCapabilitiesDefaultGuestMachine(caps, + def->os.type, + def->os.arch, + virDomainVirtTypeToString(def->virtType)); + if (defaultMachine != NULL) + if (!(def->os.machine = strdup(defaultMachine))) + goto no_memory; + } + if (!nographics && def->ngraphics == 0) { virDomainGraphicsDefPtr sdl; const char *display = qemuFindEnv(progenv, "DISPLAY"); -- 1.7.1

2 4

[libvirt] [PATCH v11] support offline migration
by liguang 02 Nov '12

02 Nov '12

original migration did not aware of offline case, so, try to support offline migration quietly (did not disturb original migration) by pass VIR_MIGRATE_OFFLINE flag to migration APIs if only the domain is really inactive, and migration process will not puzzled by domain offline and exit unexpectedly. these changes did not take care of disk images the domain required, for them could be transferred by other APIs as suggested, then VIR_MIGRATE_OFFLINE should not combined with VIR_MIGRATE_NON_SHARED_*. if you want a persistent migration, you should do "virsh migrate --persistent" youself. Signed-off-by: liguang <lig.fnst(a)cn.fujitsu.com> --- include/libvirt/libvirt.h.in | 1 + src/qemu/qemu_driver.c | 15 ++++++++++ src/qemu/qemu_migration.c | 60 +++++++++++++++++++++++++++++++++++------ src/qemu/qemu_migration.h | 3 +- tools/virsh-domain.c | 6 ++++ 5 files changed, 75 insertions(+), 10 deletions(-) diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index 81f12a4..1cebc21 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 97ad23e..38bfcab 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -9622,6 +9622,20 @@ qemuDomainMigrateBegin3(virDomainPtr domain, } if (!virDomainObjIsActive(vm)) { + if (flags & VIR_MIGRATE_OFFLINE) { + if (flags & (VIR_MIGRATE_NON_SHARED_DISK| + VIR_MIGRATE_NON_SHARED_INC)) { + virReportError(VIR_ERR_OPERATION_INVALID, + "%s", _("migrating storage handled by volume APIs")); + goto endjob; + } + if (!(flags & VIR_MIGRATE_PERSIST_DEST)) { + virReportError(VIR_ERR_OPERATION_INVALID, + "%s", _("VIR_MIGRATE_OFFLINE should combined with VIR_MIGRATE_PERSIST_DEST")); + goto endjob; + } + goto offline; + } virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("domain is not running")); goto endjob; @@ -9634,6 +9648,7 @@ qemuDomainMigrateBegin3(virDomainPtr domain, if (qemuDomainCheckEjectableMedia(driver, vm, asyncJob) < 0) goto endjob; +offline: if (!(xml = qemuMigrationBegin(driver, vm, xmlin, dname, cookieout, cookieoutlen, flags))) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index db69a0a..b2f921e 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,9 @@ qemuMigrationCookieXMLFormat(struct qemud_driver *driver, virBufferAdjustIndent(buf, -2); } + if (mig->flags & QEMU_MIGRATION_COOKIE_OFFLINE) + virBufferAsprintf(buf, " <offline/>\n"); + virBufferAddLit(buf, "</qemu-migration>\n"); return 0; } @@ -662,6 +667,11 @@ qemuMigrationCookieXMLParse(qemuMigrationCookiePtr mig, VIR_FREE(nodes); } + if ((flags & QEMU_MIGRATION_COOKIE_OFFLINE)) { + if (virXPathBoolean("count(./offline) > 0", ctxt)) + mig->flags |= QEMU_MIGRATION_COOKIE_OFFLINE; + } + return 0; error: @@ -721,6 +731,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; @@ -1168,6 +1182,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, @@ -1331,6 +1352,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 */ @@ -1873,7 +1903,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; @@ -2389,6 +2420,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; @@ -2494,7 +2527,7 @@ finish: vm->def->name); cleanup: - if (ddomain) { + if (ddomain || (flags & VIR_MIGRATE_OFFLINE)) { virObjectUnref(ddomain); ret = 0; } else { @@ -2571,7 +2604,7 @@ 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; @@ -2634,7 +2667,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; @@ -2958,6 +2991,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; @@ -2973,6 +3008,7 @@ qemuMigrationFinish(struct qemud_driver *driver, goto endjob; } + offline: if (flags & VIR_MIGRATE_PERSIST_DEST) { virDomainDefPtr vmdef; if (vm->persistent) @@ -3020,7 +3056,7 @@ qemuMigrationFinish(struct qemud_driver *driver, event = NULL; } - if (!(flags & VIR_MIGRATE_PAUSED)) { + if (!(flags & VIR_MIGRATE_PAUSED) && !(flags & VIR_MIGRATE_OFFLINE)) { /* run 'cont' on the destination, which allows migration on qemu * >= 0.10.6 to work properly. This isn't strictly necessary on * older qemu's, but it also doesn't hurt anything there @@ -3069,9 +3105,11 @@ qemuMigrationFinish(struct qemud_driver *driver, VIR_DOMAIN_EVENT_SUSPENDED, VIR_DOMAIN_EVENT_SUSPENDED_PAUSED); } - if (virDomainSaveStatus(driver->caps, driver->stateDir, vm) < 0) { - VIR_WARN("Failed to save status on vm %s", vm->def->name); - goto endjob; + if (virDomainObjIsActive(vm)) { + if (virDomainSaveStatus(driver->caps, driver->stateDir, vm) < 0) { + VIR_WARN("Failed to save status on vm %s", vm->def->name); + goto endjob; + } } /* Guest is successfully running, so cancel previous auto destroy */ @@ -3091,6 +3129,7 @@ qemuMigrationFinish(struct qemud_driver *driver, endjob: if (qemuMigrationJobFinish(driver, vm) == 0) { vm = NULL; + } else if (flags & VIR_MIGRATE_OFFLINE) { } else if (!vm->persistent && !virDomainObjIsActive(vm)) { qemuDomainRemoveInactive(driver, vm); vm = NULL; @@ -3137,6 +3176,8 @@ int qemuMigrationConfirm(struct qemud_driver *driver, if (!(mig = qemuMigrationEatCookie(driver, vm, cookiein, cookieinlen, 0))) return -1; + if (flags & VIR_MIGRATE_OFFLINE) + goto offline; /* Did the migration go as planned? If yes, kill off the * domain object, but if no, resume CPUs @@ -3173,6 +3214,7 @@ int qemuMigrationConfirm(struct qemud_driver *driver, } } +offline: qemuMigrationCookieFree(mig); rv = 0; diff --git a/src/qemu/qemu_migration.h b/src/qemu/qemu_migration.h index 7a2269a..b4f6a77 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 505169b..2218379 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -6647,6 +6647,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} }; @@ -6713,6 +6714,11 @@ doMigrate(void *opaque) if (vshCommandOptBool(cmd, "unsafe")) flags |= VIR_MIGRATE_UNSAFE; + if (vshCommandOptBool(cmd, "offline")) { + if (!virDomainIsActive(dom)) + flags |= VIR_MIGRATE_OFFLINE; + } + if (xmlfile && virFileReadAll(xmlfile, 8192, &xml) < 0) { vshError(ctl, _("file '%s' doesn't exist"), xmlfile); -- 1.7.2.5

6 10

[libvirt] [PATCH] qemu: capabilities detection for 0.15 through 1.1
by Doug Goldstein 02 Nov '12

02 Nov '12

With the introduction of the new capabilities storage relying on QMP we lost some insight into features available between 0.15 and 1.1. We use QMP on these versions but only when we go to start the actual guest rather than for querying up front. The issue is help scraping isn't an exact science while QMP is an exact science. The issue with the existing approach of checking QMP on startup is that if the command is really not there, then we never clear the bit. An example of this being a problem in on Ubuntu 12.04 LTS where the default qemu-kvm package does not include SPICE support but -help claims that it does (because -help always advertises SPICE support). So the user does not get to see our helpful message when they attempt to start up a SPICE based domain without having SPICE support. --- Really hoping a Ubuntu 12.04 user or Ubuntu developer can test this out and see if this remedies the issue. There's a long list of issues opened on Launchpad with this bug. I believe where this fix really remedies things for people is when they're using -vga std instead of -vga qxl. Due to the fact that qxl will have a spicevmc device that just won't work so they'll at least get notification that way. -vga std will result in no message and the domain not working. --- src/qemu/qemu_capabilities.c | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 271273c..37b50c1 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1871,6 +1871,21 @@ qemuCapsProbeQMPCommands(qemuCapsPtr caps, if ((ncommands = qemuMonitorGetCommands(mon, &commands)) < 0) return -1; + /* We want to clear these capabilities out so we can properly + * detect them. Otherwise if they're already set and we don't + * detect them, the bit won't clear. + */ + qemuCapsClear(caps, QEMU_CAPS_WAKEUP); + qemuCapsClear(caps, QEMU_CAPS_TRANSACTION); + qemuCapsClear(caps, QEMU_CAPS_BLOCKJOB_SYNC); + qemuCapsClear(caps, QEMU_CAPS_BLOCKJOB_ASYNC); + qemuCapsClear(caps, QEMU_CAPS_DUMP_GUEST_MEMORY); + qemuCapsClear(caps, QEMU_CAPS_SPICE); + qemuCapsClear(caps, QEMU_CAPS_KVM); + qemuCapsClear(caps, QEMU_CAPS_VNC); + qemuCapsClear(caps, QEMU_CAPS_BLOCK_COMMIT); + qemuCapsClear(caps, QEMU_CAPS_DRIVE_MIRROR); + for (i = 0 ; i < ncommands ; i++) { char *name = commands[i]; if (STREQ(name, "system_wakeup")) @@ -1909,6 +1924,13 @@ qemuCapsProbeQMPEvents(qemuCapsPtr caps, int nevents; size_t i; + /* We want to clear these capabilities out so we can properly + * detect them. Otherwise if they're already set and we don't + * detect them, the bit won't clear. + */ + qemuCapsClear(caps, QEMU_CAPS_BALLOON_EVENT); + qemuCapsClear(caps, QEMU_CAPS_SEAMLESS_MIGRATION); + if ((nevents = qemuMonitorGetEvents(mon, &events)) < 0) return -1; -- 1.7.8.6

1 0

[libvirt] [PATCH] qemu: QMP capabilities support starts with 1.2
by Doug Goldstein 02 Nov '12

02 Nov '12

Per the code comment in qemuCapsInitQMPBasic() and Eric, we should only use QMP for capabilities probing starting with 1.2 and newer. --- src/qemu/qemu_capabilities.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 271273c..64c0bea 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -2314,7 +2314,7 @@ qemuCapsInitQMP(qemuCapsPtr caps, VIR_DEBUG("Got version %d.%d.%d (%s)", major, minor, micro, NULLSTR(package)); - if (!(major >= 1 || (major == 1 && minor >= 1))) { + if (!(major >= 1 || (major == 1 && minor >= 2))) { VIR_DEBUG("Not new enough for QMP capabilities detection"); ret = 0; goto cleanup; -- 1.7.8.6

2 3

[libvirt] [RFC: PATCH] nodeinfo: support kernels that lack socket information
by Eric Blake 02 Nov '12

02 Nov '12

On RHEL 5, I was getting a segfault trying to start libvirtd, because we were failing virNodeParseSocket but not checking for errors, and then calling CPU_SET(-1, &sock_map) as a result. But if you don't have a topology/physical_package_id file, then you can just assume that the cpu belongs to socket 0. * src/nodeinfo.c (virNodeGetCpuValue): Change bool into default_value. (virNodeParseSocket, virNodeParseNode): Update callers. --- I'm still testing this, but wanted to get eyes on it now as I think it belongs in 1.0.0 if it passes my testing. Having libvirtd dump core on RHEL 5 is not nice. I'm not quite sure when the regression was introduced, but it was caused by our refactoring of code to parse different sysfs files. src/nodeinfo.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/src/nodeinfo.c b/src/nodeinfo.c index 35c5f96..ccf0682 100644 --- a/src/nodeinfo.c +++ b/src/nodeinfo.c @@ -79,13 +79,14 @@ static int linuxNodeGetMemoryStats(FILE *meminfo, int *nparams); /* Return the positive decimal contents of the given - * DIR/cpu%u/FILE, or -1 on error. If MISSING_OK and the - * file could not be found, return 1 instead of an error; this is - * because some machines cannot hot-unplug cpu0, or because - * hot-unplugging is disabled. */ + * DIR/cpu%u/FILE, or -1 on error. If DEFAULT_VALUE is non-negative + * and the file could not be found, return that instead of an error; + * this is useful for machines that cannot hot-unplug cpu0, or where + * hot-unplugging is disabled, or where the kernel is too old + * to support NUMA cells, etc. */ static int virNodeGetCpuValue(const char *dir, unsigned int cpu, const char *file, - bool missing_ok) + int default_value) { char *path; FILE *pathfp; @@ -100,8 +101,8 @@ virNodeGetCpuValue(const char *dir, unsigned int cpu, const char *file, pathfp = fopen(path, "r"); if (pathfp == NULL) { - if (missing_ok && errno == ENOENT) - value = 1; + if (default_value >= 0 && errno == ENOENT) + value = default_value; else virReportSystemError(errno, _("cannot open %s"), path); goto cleanup; @@ -174,7 +175,7 @@ static int virNodeParseSocket(const char *dir, unsigned int cpu) { int ret = virNodeGetCpuValue(dir, cpu, "topology/physical_package_id", - false); + 0); # if defined(__powerpc__) || \ defined(__powerpc64__) || \ defined(__s390__) || \ @@ -236,7 +237,7 @@ virNodeParseNode(const char *node, int *sockets, int *cores, int *threads) if (sscanf(cpudirent->d_name, "cpu%u", &cpu) != 1) continue; - if ((online = virNodeGetCpuValue(node, cpu, "online", true)) < 0) + if ((online = virNodeGetCpuValue(node, cpu, "online", 1)) < 0) goto cleanup; if (!online) @@ -275,7 +276,7 @@ virNodeParseNode(const char *node, int *sockets, int *cores, int *threads) if (sscanf(cpudirent->d_name, "cpu%u", &cpu) != 1) continue; - if ((online = virNodeGetCpuValue(node, cpu, "online", true)) < 0) + if ((online = virNodeGetCpuValue(node, cpu, "online", 1)) < 0) goto cleanup; if (!online) @@ -297,7 +298,7 @@ virNodeParseNode(const char *node, int *sockets, int *cores, int *threads) /* logical cpu is equivalent to a core on s390 */ core = cpu; # else - core = virNodeGetCpuValue(node, cpu, "topology/core_id", false); + core = virNodeGetCpuValue(node, cpu, "topology/core_id", -1); # endif CPU_SET(core, &core_maps[sock]); -- 1.7.11.7

1 0

Re: [libvirt] [virt-devel] This patch removes the mknod capability from Linux Containers.
by Eric Blake 02 Nov '12

02 Nov '12

[originally posted to the wrong list] On 11/01/2012 12:57 PM, Daniel J Walsh wrote: > > 0001-Linux-Containers-are-not-allowed-to-create-device-no.patch > > >>From 3913ef4148728430cc9df79b84d5ec44130f4ac8 Mon Sep 17 00:00:00 2001 > From: rhatdan <dwalsh(a)redhat.com> I'll adjust the author attribution to match other patches of yours (we generally prefer 'git shortlog' to list full names). > Date: Thu, 1 Nov 2012 14:54:39 -0400 > Subject: [PATCH] Linux Containers are not allowed to create device nodes. > This needs to be done before the container starts. Turning > off the mknod capabilty is noticed by systemd, which will s/capabilty/capability/ > no longer attempt to create device nodes. Missing a blank line, so 'git log' tries to treat this as a really long subject line. > > This eliminates SELinux AVC messages and ugly failure messages in the journal. > --- > src/lxc/lxc_container.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c > index 2789c17..8faa664 100644 > --- a/src/lxc/lxc_container.c > +++ b/src/lxc/lxc_container.c > @@ -1717,6 +1717,7 @@ static int lxcContainerDropCapabilities(bool keepReboot ATTRIBUTE_UNUSED) > CAPNG_INHERITABLE | CAPNG_BOUNDING_SET, > CAP_SYS_MODULE, /* No kernel module loading */ > CAP_SYS_TIME, /* No changing the clock */ > + CAP_MKNOD, /* No creating device nodes */ > CAP_AUDIT_CONTROL, /* No messing with auditing status */ > CAP_MAC_ADMIN, /* No messing with LSM config */ > keepReboot ? -1 : CAP_SYS_BOOT, /* No use of reboot */ Makes sense to me. ACK; I'll clean it up and push in time for 1.0.0. -- Eric Blake eblake(a)redhat.com +1-919-301-3266 Libvirt virtualization library http://libvirt.org

2 1

[libvirt] [PATCH 0/2] qemu: Fix incorrect qemuDomainGetBlockIoTune() results
by Stefan Hajnoczi 01 Nov '12

01 Nov '12

The qemuDomainGetBlockIoTune() function was returning incorrect results as I discovered on Fedora Virt Test Day: https://fedoraproject.org/wiki/QA:Testcase_Virtualization_IO_Throttling The problem is that I/O limits can be set but I only see zeroes when displaying them with "virsh blkdeviotune <domain> <device>" on a domain with two disks. First, we're comparing guest device names ("virtio-blk-0") instead of host device names ("drive-virtio-blk-0"). Second, the JSON monitor code has inverted string compare logic so we were skipping the device we were looking for. These patches make "virsh blkdeviotune" report correct results. Stefan Hajnoczi (2): qemu: Keep QEMU host drive prefix in BlkIoTune qemu: Fix device name comparison in qemuMonitorJSONBlockIoThrottleInfo() src/qemu/qemu_monitor_json.c | 5 +---- src/qemu/qemu_monitor_text.c | 3 --- 2 files changed, 1 insertion(+), 7 deletions(-) -- 1.7.12.1

2 3