- Devel - libvirt List Archives

[libvirt] [PATCH] Only enforce check for YAJL when starting a VM
by Daniel P. Berrange 04 Jul '12

04 Jul '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> The previous check for YAJL would have many undesirable consequences, the most important being that it caused the capabilities XML to loose all <guest> elements. There is no user visible feedback as to what is wrong in this respect, merely a syslog message. The empty capabilities causes libvirtd to then throw away all guest XML configs that are stored. This changes the code so that the check for YAJL is only performed at the time we attempt to spawn a QEMU process error: Failed to start domain vm-vnc error: unsupported configuration: this qemu binary requires libvirt to be compiled with yajl Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/qemu/qemu_capabilities.c | 13 +++++++++---- src/qemu/qemu_capabilities.h | 4 +++- src/qemu/qemu_command.c | 1 + src/qemu/qemu_driver.c | 1 + src/qemu/qemu_process.c | 3 +++ 5 files changed, 17 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 1e12a39..1d6ab2d 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -691,7 +691,8 @@ qemuCapsInitGuest(virCapsPtr caps, return 0; /* Ignore binary if extracting version info fails */ - if (qemuCapsExtractVersionInfo(binary, info->arch, NULL, &qemuCaps) < 0) { + if (qemuCapsExtractVersionInfo(binary, info->arch, + false, NULL, &qemuCaps) < 0) { ret = 0; goto cleanup; } @@ -1472,7 +1473,9 @@ qemuCapsParseDeviceStr(const char *str, virBitmapPtr flags) return 0; } -int qemuCapsExtractVersionInfo(const char *qemu, const char *arch, +int qemuCapsExtractVersionInfo(const char *qemu, + const char *arch, + bool check_yajl, unsigned int *retversion, virBitmapPtr *retflags) { @@ -1505,7 +1508,8 @@ int qemuCapsExtractVersionInfo(const char *qemu, const char *arch, if (!(flags = qemuCapsNew()) || qemuCapsParseHelpStr(qemu, help, flags, - &version, &is_kvm, &kvm_version, true) == -1) + &version, &is_kvm, &kvm_version, + check_yajl) == -1) goto cleanup; /* Currently only x86_64 and i686 support PCI-multibus. */ @@ -1583,7 +1587,8 @@ int qemuCapsExtractVersion(virCapsPtr caps, return -1; } - if (qemuCapsExtractVersionInfo(binary, ut.machine, version, NULL) < 0) { + if (qemuCapsExtractVersionInfo(binary, ut.machine, false, + version, NULL) < 0) { return -1; } diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 83c135b..c14d53a 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -167,7 +167,9 @@ int qemuCapsProbeCPUModels(const char *qemu, int qemuCapsExtractVersion(virCapsPtr caps, unsigned int *version); -int qemuCapsExtractVersionInfo(const char *qemu, const char *arch, +int qemuCapsExtractVersionInfo(const char *qemu, + const char *arch, + bool check_yajl, unsigned int *version, virBitmapPtr *qemuCaps); diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 528b189..5959352 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -949,6 +949,7 @@ qemuDomainAssignPCIAddresses(virDomainDefPtr def) qemuDomainPCIAddressSetPtr addrs = NULL; if (qemuCapsExtractVersionInfo(def->emulator, def->os.arch, + false, NULL, &qemuCaps) < 0) goto cleanup; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 2f93404..eb2ed0e 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -4757,6 +4757,7 @@ static char *qemuDomainXMLToNative(virConnectPtr conn, } if (qemuCapsExtractVersionInfo(def->emulator, def->os.arch, + false, NULL, &qemuCaps) < 0) goto cleanup; diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index c5140c3..fd4c9c9 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -3073,6 +3073,7 @@ qemuProcessReconnect(void *opaque) */ if (!priv->qemuCaps && qemuCapsExtractVersionInfo(obj->def->emulator, obj->def->os.arch, + false, NULL, &priv->qemuCaps) < 0) goto error; @@ -3478,6 +3479,7 @@ int qemuProcessStart(virConnectPtr conn, qemuCapsFree(priv->qemuCaps); priv->qemuCaps = NULL; if (qemuCapsExtractVersionInfo(vm->def->emulator, vm->def->os.arch, + true, NULL, &priv->qemuCaps) < 0) goto cleanup; @@ -4237,6 +4239,7 @@ int qemuProcessAttach(virConnectPtr conn ATTRIBUTE_UNUSED, priv->qemuCaps = NULL; if (qemuCapsExtractVersionInfo(vm->def->emulator, vm->def->os.arch, + false, NULL, &priv->qemuCaps) < 0) goto cleanup; -- 1.7.10.4

2 1

[libvirt] [PATCH] virsh: Fix ordering of arguments when calling vshCalloc.
by Peter Krempa 04 Jul '12

04 Jul '12

In vshSnapshotListCollect() vshCalloc was called with swapped nmemb and size argument. This caused division by zero in xalloc_oversized as the macro doesn't expect size to be zero. --- tools/virsh.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 53d1825..25ed177 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -17200,8 +17200,8 @@ vshSnapshotListCollect(vshControl *ctl, virDomainPtr dom, if (count >= 0) { /* When mixing --from and --tree, we also want a copy of from * in the list, but with no parent for that one entry. */ - snaplist->snaps = vshCalloc(ctl, sizeof(*snaplist->snaps), - count + (tree && from)); + snaplist->snaps = vshCalloc(ctl, pcount + (tree && from), + sizeof(*snaplist->snaps)); snaplist->nsnaps = count; for (i = 0; i < count; i++) snaplist->snaps[i].snap = snaps[i]; -- 1.7.8.6

2 3

[libvirt] [PATCH] qemu: Mark domains as having managed state image only on managed save
by Peter Krempa 04 Jul '12

04 Jul '12

QEmu domains were marked as having managed save image even if they were saved using the regular save. With this patch, domains are marked so only when using managed save API. --- src/qemu/qemu_driver.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 2f93404..3410535 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -2739,7 +2739,6 @@ qemuDomainSaveInternal(struct qemud_driver *driver, virDomainPtr dom, } ret = 0; - vm->hasManagedSave = true; /* Shut it down */ qemuProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_SAVED, 0); @@ -2916,8 +2915,10 @@ qemuDomainManagedSave(virDomainPtr dom, unsigned int flags) VIR_INFO("Saving state to %s", name); compressed = QEMUD_SAVE_FORMAT_RAW; - ret = qemuDomainSaveInternal(driver, dom, vm, name, compressed, - NULL, flags); + if ((ret = qemuDomainSaveInternal(driver, dom, vm, name, compressed, + NULL, flags)) == 0) + vm->hasManagedSave = true; + vm = NULL; cleanup: -- 1.7.8.6

3 3

[libvirt] question about save/restore domain
by Jovanka Gulicoska 04 Jul '12

04 Jul '12

Hi, my name is Jovanka Gulicoska and I'm SoC student. I'm working on implementing save/load of VM in Gnome-Boxes. Something confused me about snapshots. In the documentation about life cycle, in section about Save/Restore is said that domain saved with virDomainSave/virDomainSaveFlags can be restored only once. But in the documentation about Snapshot XML format there is no information about this in VM state snapshots. So is it better just to use virDomainSnapshotCreateXML instead of virDomainSave/virDomainSaveFlags? I've created bindings for this functions in libvirt-glib but I wanted to be sure before I send them for review. Thanks, Jovanka (gulic)

5 8

[libvirt] libvirt can't get capablities
by Li Zhang 04 Jul '12

04 Jul '12

Hi, I have suffered several times on both x86 machine and power machine. When we want to use libvirt to create on VMs, it reports "unknown OS type hvm". We can't get <guest> capabilities. The log is as the following(log_level=1): 2003-01-02 01:21:39.895+0000: 12214: error : virDomainDefParseXML:8491 : unknown OS type hvm 2003-01-02 01:21:39.896+0000: 12214: error : virDomainDefParseXML:8491 : unknown OS type hvm 2003-01-02 01:22:00.135+0000: 12207: error : qemuCapsComputeCmdFlags:1218 : unsupported configuration: this qemu binary requires libvirt to be compiled with yajl 2003-01-02 01:22:13.342+0000: 12207: error : qemuCapsComputeCmdFlags:1218 : unsupported configuration: this qemu binary requires libvirt to be compiled with yajl 2003-01-02 01:22:13.347+0000: 12204: error : qemuCapsExtractVersion:1576 : internal error Cannot find suitable emulator for ppc64 2003-01-02 01:22:13.351+0000: 12205: error : qemuCapsExtractVersion:1576 : internal error Cannot find suitable emulator for ppc64 2003-01-02 01:22:13.355+0000: 12207: error : qemuCapsExtractVersion:1576 : internal error Cannot find suitable emulator for ppc64 2003-01-02 01:22:13.355+0000: 12208: error : qemuCapsExtractVersion:1576 : internal error Cannot find suitable emulator for ppc64 2003-01-02 01:22:13.357+0000: 12206: error : qemuCapsExtractVersion:1576 : internal error Cannot find suitable emulator for ppc64 I search online and find one similar issue from Redhat bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=509337 Is there any solution to avoid this problem? Any idea? -- Best Regards Li IBM LTC, China System&Technology Lab, Beijing

4 10

[libvirt] [Patch v2] vmware: detect when a domain was shut down from the inside
by Jean-Baptiste Rouault 04 Jul '12

04 Jul '12

This patch adds an internal function vmwareUpdateVMStatus to update the real state of the domain. This function is used in various places in the driver, in particular to detect when the domain has been shut down by the user with the "halt" command. --- v2: - Replace internal function vmwareGetVMStatus by vmwareUpdateVMStatus - Improve vmrun list output parsing - variable initialization and coding-style fixes src/vmware/vmware_driver.c | 95 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 95 insertions(+), 0 deletions(-) diff --git a/src/vmware/vmware_driver.c b/src/vmware/vmware_driver.c index 8f9d922..53e28e7 100644 --- a/src/vmware/vmware_driver.c +++ b/src/vmware/vmware_driver.c @@ -28,6 +28,7 @@ #include "datatypes.h" #include "virfile.h" #include "memory.h" +#include "util.h" #include "uuid.h" #include "command.h" #include "vmx.h" @@ -181,6 +182,64 @@ vmwareGetVersion(virConnectPtr conn, unsigned long *version) } static int +vmwareUpdateVMStatus(struct vmware_driver *driver, virDomainObjPtr vm) +{ + virCommandPtr cmd; + char *outbuf = NULL; + char *vmxAbsolutePath = NULL; + char *parsedVmxPath = NULL; + char *str; + char *saveptr = NULL; + bool found = false; + int oldState = virDomainObjGetState(vm, NULL); + int newState; + int ret = -1; + + cmd = virCommandNewArgList(VMRUN, "-T", vmw_types[driver->type], + "list", NULL); + virCommandSetOutputBuffer(cmd, &outbuf); + if (virCommandRun(cmd, NULL) < 0) + goto cleanup; + + if (virFileResolveAllLinks(((vmwareDomainPtr) vm->privateData)->vmxPath, + &vmxAbsolutePath) < 0) + goto cleanup; + + for(str = outbuf ; (parsedVmxPath = strtok_r(str, "\n", &saveptr)) != NULL; + str = NULL) { + + if (parsedVmxPath[0] != '/') + continue; + + if (STREQ(parsedVmxPath, vmxAbsolutePath)) { + found = true; + /* If the vmx path is in the output, the domain is running or + * is paused but we have no way to detect if it is paused or not. */ + if (oldState == VIR_DOMAIN_PAUSED) + newState = oldState; + else + newState = VIR_DOMAIN_RUNNING; + break; + } + } + + if (!found) { + vm->def->id = -1; + newState = VIR_DOMAIN_SHUTOFF; + } + + virDomainObjSetState(vm, newState, 0); + + ret = 0; + +cleanup: + virCommandFree(cmd); + VIR_FREE(outbuf); + VIR_FREE(vmxAbsolutePath); + return ret; +} + +static int vmwareStopVM(struct vmware_driver *driver, virDomainObjPtr vm, virDomainShutoffReason reason) @@ -331,6 +390,9 @@ vmwareDomainShutdownFlags(virDomainPtr dom, goto cleanup; } + if (vmwareUpdateVMStatus(driver, vm) < 0) + goto cleanup; + if (virDomainObjGetState(vm, NULL) != VIR_DOMAIN_RUNNING) { vmwareError(VIR_ERR_INTERNAL_ERROR, "%s", _("domain is not in running state")); @@ -485,6 +547,8 @@ vmwareDomainReboot(virDomainPtr dom, unsigned int flags) vmwareSetSentinal(cmd, vmw_types[driver->type]); vmwareSetSentinal(cmd, vmxPath); + if (vmwareUpdateVMStatus(driver, vm) < 0) + goto cleanup; if (virDomainObjGetState(vm, NULL) != VIR_DOMAIN_RUNNING) { vmwareError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -596,6 +660,9 @@ vmwareDomainCreateWithFlags(virDomainPtr dom, goto cleanup; } + if (vmwareUpdateVMStatus(driver, vm) < 0) + goto cleanup; + if (virDomainObjIsActive(vm)) { vmwareError(VIR_ERR_OPERATION_INVALID, "%s", _("Domain is already running")); @@ -645,6 +712,9 @@ vmwareDomainUndefineFlags(virDomainPtr dom, goto cleanup; } + if (vmwareUpdateVMStatus(driver, vm) < 0) + goto cleanup; + if (virDomainObjIsActive(vm)) { vm->persistent = 0; } else { @@ -874,6 +944,21 @@ vmwareDomainXMLFromNative(virConnectPtr conn, const char *nativeFormat, return xml; } +static void vmwareDomainObjListUpdateDomain(void *payload, const void *name ATTRIBUTE_UNUSED, void *data) +{ + struct vmware_driver *driver = data; + virDomainObjPtr vm = payload; + virDomainObjLock(vm); + vmwareUpdateVMStatus(driver, vm); + virDomainObjUnlock(vm); +} + +static void +vmwareDomainObjListUpdateAll(virDomainObjListPtr doms, struct vmware_driver *driver) +{ + virHashForEach(doms->objs, vmwareDomainObjListUpdateDomain, driver); +} + static int vmwareNumDefinedDomains(virConnectPtr conn) { @@ -881,6 +966,7 @@ vmwareNumDefinedDomains(virConnectPtr conn) int n; vmwareDriverLock(driver); + vmwareDomainObjListUpdateAll(&driver->domains, driver); n = virDomainObjListNumOfDomains(&driver->domains, 0); vmwareDriverUnlock(driver); @@ -894,6 +980,7 @@ vmwareNumDomains(virConnectPtr conn) int n; vmwareDriverLock(driver); + vmwareDomainObjListUpdateAll(&driver->domains, driver); n = virDomainObjListNumOfDomains(&driver->domains, 1); vmwareDriverUnlock(driver); @@ -908,6 +995,7 @@ vmwareListDomains(virConnectPtr conn, int *ids, int nids) int n; vmwareDriverLock(driver); + vmwareDomainObjListUpdateAll(&driver->domains, driver); n = virDomainObjListGetActiveIDs(&driver->domains, ids, nids); vmwareDriverUnlock(driver); @@ -922,6 +1010,7 @@ vmwareListDefinedDomains(virConnectPtr conn, int n; vmwareDriverLock(driver); + vmwareDomainObjListUpdateAll(&driver->domains, driver); n = virDomainObjListGetInactiveNames(&driver->domains, names, nnames); vmwareDriverUnlock(driver); return n; @@ -944,6 +1033,9 @@ vmwareDomainGetInfo(virDomainPtr dom, virDomainInfoPtr info) goto cleanup; } + if (vmwareUpdateVMStatus(driver, vm) < 0) + goto cleanup; + info->state = virDomainObjGetState(vm, NULL); info->cpuTime = 0; info->maxMem = vm->def->mem.max_balloon; @@ -979,6 +1071,9 @@ vmwareDomainGetState(virDomainPtr dom, goto cleanup; } + if (vmwareUpdateVMStatus(driver, vm) < 0) + goto cleanup; + *state = virDomainObjGetState(vm, reason); ret = 0; -- 1.7.9.1

2 2

[libvirt] [PATCH] remote: Fill remote parameters in remoteDomainListAllSnapshots()
by Peter Krempa 04 Jul '12

04 Jul '12

This patch fills the domain argument that is sent to the remote side. This caused a client segfault as the argument was NULL. --- src/remote/remote_driver.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 6f53264..eac50e6 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -4888,6 +4888,7 @@ remoteDomainListAllSnapshots(virDomainPtr dom, remoteDriverLock(priv); + make_nonnull_domain(&args.dom, dom); args.need_results = !!snapshots; args.flags = flags; -- 1.7.8.6

2 2

[libvirt] Release of libvirt-0.9.13
by Daniel Veillard 03 Jul '12

03 Jul '12

Okay the new release is out and available as uauls at ftp://libvirt.org/libvirt/ along with rpms generated on Fedora16, the git tree is tagged too. As suggested earlier it seems that the rate of commits is slowing down a bit, for example it took one month an a half to accumulate the 300+ commits of this release, considering that there is uauslly a slowdown during the summer months I plan to push the next release at the end of August, well unless there is a lot of activities or something urgent to push in the meantime. This release is rather rich, quite a few features and a lot of improvements: Features: - S390: support for s390(x) (Thang Pham and Viktor Mihajlovski) - snapshot: implement new APIs for esx and vbox (Eric Blake) - list: add virDomainListAllSnapshots API (Eric Blake) - snapshot: new query APIs (Eric Blake) - virsh: Allow users to reedit rejected XML (Michal Privoznik) - nwfilter: add DHCP snooping (Stefan Berger) - Enable driver modules in libvirt RPM (Daniel P. Berrange) - Default to enable driver modules for libvirtd (Daniel P. Berrange) - storage backend: Add RBD (RADOS Block Device) support (Wido den Hollander) - sVirt support for LXC domains (Daniel P. Berrange) Documentation: - virsh: Cleanup virsh -V output (Doug Goldstein) - configure: show correct default argument in help (Marc-André Lureau) - fix typo in virDomainDestroy API doc (Christophe Fergeau) - virsh: fix few typos on desc command (Martin Kletzander) - virsh: Update vol-create-as manpage (Michal Privoznik) - virsh: Tweak attach-* documentation (Michal Privoznik) - small typo in formatdomain.html (Laine Stump) - client rpc: Improve debug messages in virNetClientIO (Jiri Denemark) - minor fixes to domain interface documentation (Laine Stump) - link to FLOSS Weekly podcast, virt blogs (Eric Blake) - examples: add consolecallback example python script (Dave Allan) - Fix typo in comment start (Daniel P. Berrange) - typo in acceleration element (Martin Kletzander) - Improve docs about compiling libvirt from GIT (Daniel P. Berrange) Portability: - Fix compilation on older sanlock (Daniel Veillard) - Fix unused parameters / functions in virsh on Win32 (Daniel P. Berrange) - Update to latest GNULIB to fix compat with Mingw64 toolchain (Daniel P. Berrange) - winsock2.h must always be included before windows.h (Daniel P. Berrange) - Switch automated builds to use Mingw64 toolchain instead of Mingw32 (Daniel P. Berrange) - openvz: Fix wordsize on 64 bit architectures (Guido Günther) - Fixes for check and rpm builds without sanlock (and qemu) (Martin Kletzander) - Fix Win32 build by linking to ole32 (Daniel P. Berrange) - Add impl of APIs to get user directories on Win32 (Daniel P. Berrange) - fix building error on non fedora system (Wen Congyang) - Add stub impl of virNetlinkEventServiceLocalPid for Win32 (Daniel P. Berrange) - Fix build when configuring with polkit0 (Jim Fehlig) - build: fix virnetlink on glibc 2.11 (Eric Blake) - Fix build compat with older libselinux for LXC (Daniel P. Berrange) - build: really silence the 32-bit warning (Eric Blake) Bug Fixes: - build: use correct limit for unsigned long long (Eric Blake) - nwfilter: Fix memory leak (Stefan Berger) - network_conf: Don't free uninitialized pointers while parsing DNS SRV (Peter Krempa) - storage: Error out if the target is already mounted for netfs pool (Osier Yang) - events: Don't fail on registering events for two different domains (Michal Privoznik) - Don't install systemd service files executable (Guido Günther) - fix a bug of ref count in virnetserver.c (Hu Tao) - Fix deadlock on libvirtd shutdown (Jim Fehlig) - openvz: check pointer size instead of int (Guido Günther) - domain_conf: fix possible memory leak (Martin Kletzander) - error: Fix typos in argument checking macros (Peter Krempa) - LXC: fix incorrect DEBUG info (Gao feng) - LXC: fix memory leak in lxcContainerSetupExtraMounts (Gao feng) - LXC: fix memory leak in lxcContainerGetSubtree (Gao feng) - LXC: fix memory leak in lxcContainerMountFSBlockHelper (Gao feng) - qemu_agent: Wait for events instead of agent response (Michal Privoznik) - Fix launch of libvirtd when DHCP snooping support is not available. (Daniel P. Berrange) - qemu: fix potential dead lock (Wen Congyang) - virsh: Null terminated the string memcpy from buffer explicitly (Osier Yang) - qemu: Fix off-by-one error while unescaping monitor strings (Peter Krempa) - virsh: Don't generate invalid XML in attach-disk command (Peter Krempa) - client rpc: Fix error checking after poll() (Daniel P. Berrange) - client rpc: Send keepalive requests from IO event loop (Jiri Denemark) - Fix typo in RPM specfile (Daniel P. Berrange) - python: fix snapshot listing bugs (Eric Blake) - qemu: Don't overwrite security labels (Michal Privoznik) - rpc: Fix memleak in virNetMessageEncodeHeader (Michal Privoznik) - Fix privileges on /var/run/libvirt directory (Daniel P. Berrange) - Only migrate profile in non-privileged libvirtd instance (Daniel P. Berrange) - snapshot: avoid virsh crash with older servers (Eric Blake) - LXC: fix memory leak in lxcContainerMountFSBlockAuto (Gao feng) - LXC: fix incorrect parameter of mount in lxcContainerMountFSBind (Gao feng) - util: Fix deadlock in virLogReset (Jiri Denemark) - Assign correct address type to spapr-vlan and spapr-vty. (Li Zhang) - command: avoid potential deadlock on handshake (Eric Blake) - qemu: better detection of crashed domains (Martin Kletzander) - command: avoid deadlock on EPIPE situation (Eric Blake) - Fix sync issue in virNetClientStreamEventRemoveCallback (Radu Caragea) - qemu: avoid closing fd more than once (Wen Congyang) - command: check for fork error before closing fd (Wen Congyang) - fdstream: avoid double close bug (Eric Blake) - command: avoid double close bugs (Eric Blake) - avoid fd leak (Wen Congyang) - avoid closing uninitialized fd (Wen Congyang) - lxc: return correct number of CPUs (Martin Kletzander) - leak_fix.diff (Stefan Berger) - Fix typos in RPM dependencies (Daniel P. Berrange) - Remove more bogus systemd service dependencies (Daniel P. Berrange) - qemu_hotplug: Don't free the PCI device structure after hot-unplug (Peter Krempa) - Fix potential events deadlock when unref'ing virConnectPtr (Daniel P. Berrange) - qemu: Don't delete USB device on failed qemuPrepareHostdevUSBDevices (Michal Privoznik) - nodeinfo: Get the correct CPU number on AMD Magny Cours platform (Osier Yang) - nodeinfo: avoid probing host filesystem during test (Eric Blake) Improvements: - Remove sub-mounts under /dev when starting an LXC container (Daniel P. Berrange) - Fix vm's outbound traffic control problem (Eiichi Tsukata) - conf: Don't shadow error from virGetDomain() (Peter Krempa) - maint: include ignore-value in internal.h (Peter Krempa) - vbox: Add support for virConnectListAllDomains() (Peter Krempa) - virsh: Add domdisplay cmd for VNC, SPICE and RDP (Doug Goldstein) - AUTHORS: Update (Michal Privoznik) - S390: Added sysinfo for host on s390(x). (Thang Pham) - S390: Fixed core identification for s390 (Viktor Mihajlovski) - S390: Fixed Parser for /proc/cpuinfo needs to be adapted for your architecture (Thang Pham) - S390: Override QEMU_CAPS_NO_ACPI for s390x (Viktor Mihajlovski) - storage backend rbd: Do not prefix rbd: on volume names. (Wido den Hollander) - qemu: Improve error if setmem fails for lacking of balloon support (Osier Yang) - Include the default listen address in the live guest XML (Daniel P. Berrange) - storage: Introduce --inactive for pool-dumpxml (Michal Privoznik) - storage: Switch to new def on pool-destroy (Michal Privoznik) - Support bind mounting host files, as well as directories in LXC (Daniel J Walsh) - Allow NOCONFIGURE=1 to make autogen.sh skip ./configure (Daniel P. Berrange) - virsh: Use virXPath wrappers for vncdisplay cmd (Doug Goldstein) - Add support for shared sanlock leases (Daniel P. Berrange) - Add support for guest bind mounts with LXC (Daniel P. Berrange) - Add support for RAM filesystems for LXC (Daniel P. Berrange) - virsh: Improve error when trying to change vm's cpu count 0 (Peter Krempa) - qemu: Add xhci support (Gerd Hoffmann) - virsh: add support for virConnectListAllDomains and clean up cmdList (Peter Krempa) - virsh: Rename namesorter to vshNameSorter and clean up indentation (Peter Krempa) - Initialize random generator in lxc controller (Jim Fehlig) - storage: Set the perms if the pool target already exists for fs pools (Osier Yang) - snapshot: require existence before returning success (Eric Blake) - drivers: Implement virListAllDomains for drivers using virDomainObj (Peter Krempa) - Fix default USB controller for ppc64 (Dipankar Sarma) - list: add qemu snapshot list support (Eric Blake) - list: new helper function to collect snapshots (Eric Blake) - list: provide RPC call for snapshots (Eric Blake) - list: provide python bindings for snapshots (Eric Blake) - list: use the new snapshot API in virsh when possible (Eric Blake) - snapshot: expose new flags in virsh (Eric Blake) - snapshot: add additional filters when getting lists (Eric Blake) - virsh: make domiftune interface help string consistent (Martin Kletzander) - snapshot: merge count and name collection (Eric Blake) - snapshot: merge domain and snapshot computation (Eric Blake) - snapshot: use metaroot node to simplify management (Eric Blake) - conf: Add helper for listing domains on drivers supporting virDomainObj (Peter Krempa) - conf: Store managed save image existence in virDomainObj (Peter Krempa) - remote: implement remote protocol for virConnectListAllDomains() (Peter Krempa) - python: add API exports for virConnectListAllDomains() (Peter Krempa) - lib: Add public api to enable atomic listing of guest (Peter Krempa) - Add a custom 404 error page for the website (Daniel P. Berrange) - qemu_agent: Add some more debug prints (Michal Privoznik) - snapshot: use new virsh function for snapshot-list (Eric Blake) - snapshot: new virsh function factored from snapshot-list (Eric Blake) - autogen: Always abide --system (Cole Robinson) - Check for errors when parsing bridge interface XML (Jim Fehlig) - Add more debug logging for libvirtd startup (Daniel P. Berrange) - schema: Update domain XML schema (Osier Yang) - virsh: allow the user to specify vmcore's format (Wen Congyang) - qemu: allow the client to choose the vmcore's format (Wen Congyang) - qemu: implement qemu's dump-guest-memory (Wen Congyang) - Always pivot_root event if the new root source is '/' (Daniel P. Berrange) - Improve error message diagnosing incorrect XML CPU mode (Daniel P. Berrange) - qemu: Enable disconnecting SPICE clients without changing password (Peter Krempa) - virsh: Report name from edited object (Michal Privoznik) - virsh: Honor reedit opts printing to a function (Michal Privoznik) - network: fully support/use VIR_NETWORK_XML_INACTIVE flag (Laine Stump) - Add some missing hook functions (Daniel P. Berrange) - server rpc: Remove APIs for manipulating filters on locked client (Jiri Denemark) - rpc: Remove unused parameter in virKeepAliveStopInternal (Jiri Denemark) - rpc: Do not use timer for sending keepalive responses (Jiri Denemark) - client rpc: Separate call creation from running IO loop (Jiri Denemark) - rpc: Add APIs for direct triggering of keepalive timer (Jiri Denemark) - rpc: Refactor keepalive timer code (Jiri Denemark) - client rpc: Drop unused return value of virNetClientSendNonBlock (Jiri Denemark) - client rpc: Just queue non-blocking call if another thread has the buck (Jiri Denemark) - client rpc: Don't drop non-blocking calls (Jiri Denemark) - client rpc: Use event loop for writing (Jiri Denemark) - build: fix 'make dist' on virgin checkout (Eric Blake) - build: silence gettext warning (Eric Blake) - openvz: wire up domainUpdateDeviceFlags (Guido Günther) - openvz: add persist parameter to openvzSetDiskQuota (Guido Günther) - Introduce virDomainFSIndexByName (Guido Günther) - python: use simpler methods (Eric Blake) - qemuProcessStop: Switch to flags (Michal Privoznik) - snapshot: implement new APIs for qemu (Eric Blake) - snapshot: RPC for new query APIs (Eric Blake) - snapshot: add 'virsh snapshot-info' (Eric Blake) - Two RPM conditional fixes for RHEL-7 (Daniel P. Berrange) - snapshot: virsh indentation cleanup (Eric Blake) - virsh: make tree listing more flexible (Eric Blake) - virsh: remove limits on tree listing (Eric Blake) - buf: support peeking at string contents (Eric Blake) - Update AUTHORS (Osier Yang) - LXC: Delete unused variable src in lxcContainerMountBasicFS (Gao feng) - msg_buf_size is unsigned long not size_t (Guido Günther) - Only check for cluster fs if we're using a filesystem (Guido Günther) - snapshot: add virDomainSnapshotRef API (Eric Blake) - Fix missing ) in 2 strings (Cole Robinson) - maint: make it easier to copy FORTIFY_SOURCE snippet (Eric Blake) - build: fix build without i18n (Eric Blake) - spec: Build against systemd for udev (Cole Robinson) - build: fix build of fresh checkout (Eric Blake) - build: ensure storage driver is used (Eric Blake) - rpc: Size up RPC limits (Michal Privoznik) - rpc: Switch to dynamically allocated message buffer (Michal Privoznik) - build: fix 'make distcheck' issues (Eric Blake) - tests: Refresh qemu-1.1.0 data (Jiri Denemark) - virsh: Back out if the argument for vol-create-as is malformed (Osier Yang) - virsh: Accept UUID as an argument for net-info and net-start (Osier Yang) - virsh: Accept UUID as an argument for storage commands (Osier Yang) - Fix for parallel port passthrough for QEMU (Beat Jörg) - util: fix "make rpm" when viratomic.h is used (Laine Stump) - build: allow building with newer glibc-headers and -O0 (Eric Blake) - fix make syntax-check failed (Wen Congyang) - build: fix sc_prohibit_readlink (Eric Blake) - file: Log closing filedescriptors (Jiri Denemark) - command: Fix debug message during handshake (Jiri Denemark) - virsh: Switch from generated cmd*Edit commands to nongenerated (Michal Privoznik) - nwfilter: Add multiple IP address support to DHCP snooping (Stefan Berger) - nwfilter: move code for IP address map into separate file (Stefan Berger) - qemu: move -name arg to be 1st in "ps x" output (Marti Raudsepp) - qemu: fix netdev alias name assignment wrt type='hostdev' (Laine Stump) - tools: make virt-pki-validate work with acls and xattrs (Martin Kletzander) - build: include augeas-gentest.pl into dist file (Wen Congyang) - build: use same perl binary throughout build (Eric Blake) - build: fix testing of augeas files in VPATH builds (Eric Blake) - build: silence warning from autoconf (Eric Blake) - virCommand: Extend debug message for handshake (Michal Privoznik) - build: Fixed generating of libvirt_qemu_probes.h (Martin Kletzander) - build: don't lose probes.o files (Eric Blake) - build: fix missing dependencies for libvirt-qemu.so (Eric Blake) - build: don't clean a file that belongs in the tarball (Eric Blake) - virsh: avoid strncpy (Eric Blake) - build: update to latest gnulib (Eric Blake) - Introduce virMacAddr typedef (Stefan Berger) - Santize the reporting of VIR_ERR_INVALID_ERROR (Daniel P. Berrange) - build: silence libtool during tests (Eric Blake) - Fix linking to DTrace probes file (Daniel P. Berrange) - Autogenerate augeas test case from default config files (Daniel P. Berrange) - Re-order config options in qemu driver augeas lens (Daniel P. Berrange) - Fix mistakes in augeas lens (Daniel P. Berrange) - Standardize whitespace used in example config files (Daniel P. Berrange) - Remove uid param from directory lookup APIs (Daniel P. Berrange) - Fix check for socket existance / daemon spawn (Daniel P. Berrange) - Remove last usage of PATH_MAX and ban its future use (Daniel P. Berrange) - maint: avoid new automake warning about AM_PROG_CC_STDC (Jim Meyering) - build: silence libtool warning on probes.o (Eric Blake) - tests: run valgrind on real executables, not libtool wrappers (Eric Blake) - qemu augeas: Add spice_tls/spice_tls_x509_cert_dir (Douglas Schilling Landgraf) - tests: back to short test names (Eric Blake) - maint: ignore more files from version control (Eric Blake) - Add sentinel for virErrorDomain enum (Daniel P. Berrange) - Add parsing for VIR_ENUM_IMPL & VIR_ENUM_DECL in apibuild.py (Daniel P. Berrange) - security: Switch to C99-style struct initialization (Michal Privoznik) - Add test case for loading driver modules (Daniel P. Berrange) - Override default driver dir when running from GIT (Daniel P. Berrange) - Split QEMU dtrace probes into separate file (Daniel P. Berrange) - Replace RTLD_LOCAL with RTLD_GLOBAL (Daniel P. Berrange) - Ensure LXC driver links against libblkid explicitly. (Daniel P. Berrange) - Remove libvirt_test.la library (Daniel P. Berrange) - Fix broken linkage of libvirt_driver_nodedev.la (Daniel P. Berrange) - Only build server side drivers as modules (Daniel P. Berrange) - Fix dep from libvirt-lock-sanlock RPM (Daniel P. Berrange) - openvz: add quota argument when creating container (Guido Günther) - openvz: support file system quota reporting (Guido Günther) - Introduce filesystem limits to virDomainFSDef (Guido Günther) - Introduce virDomainParseScaledValue (Guido Günther) - util: export virBufferTrim (Laine Stump) - virBuffer: add way to trim back extra text (Eric Blake) - build: fix unused variable after last patch (Eric Blake) - nwfilter: Add support for ipset (Stefan Berger) - Adds support to param 'vcpu_time' in qemu_driver. (Hu Tao) - Add a new param 'vcpu_time' to virDomainGetCPUStats (Hu Tao) - tests: add ich6 codec type test to qemuxml2argv-sound-device (Marc-André Lureau) - qemu: honour sound <codec> sub-elements (Marc-André Lureau) - domain: add <codec> sound sub-element (Marc-André Lureau) - qemu: test CAPS_HDA_MICRO (Marc-André Lureau) - nodeinfo: test more details (Eric Blake) - Add a virLogMessage alternative taking va_list args (Daniel P. Berrange) - build: fix recent syntax-check breakage (Eric Blake) - qemu: Rollback on used USB devices (Michal Privoznik) - Reject any non-option command line arguments (Daniel P. Berrange) - Remount cgroups controllers after setting up new /sys in LXC (Daniel P. Berrange) - Trim /proc & /sys subtrees before mounting new instances (Daniel P. Berrange) - Avoid LXC pivot root in the root source is still / (Daniel P. Berrange) - Mount fresh instance of sysfs/selinux in LXC (Daniel P. Berrange) - Convert the LXC driver to use the security driver API for mount options (Daniel Walsh) - Add security driver APIs for getting mount options (Daniel Walsh) - Add support for LXC specific SELinux configuration (Daniel Walsh) - Use private data struct in SELinux driver (Daniel Walsh) - Don't enable the AppArmour security driver with LXC (Daniel Walsh) - Pass the virt driver name into security drivers (Daniel Walsh) - Remove bogus udev.target dep from libvirtd unit (Daniel P. Berrange) - qemu: Add support for -no-user-config (Jiri Denemark) - Set a sensible default master start port for ehci companion controllers (Daniel P. Berrange) - Fix logic for assigning PCI addresses to USB2 companion controllers (Daniel P. Berrange) - Fix virDomainDeviceInfoIsSet() to check all struct fields (Daniel P. Berrange) - Remove redundant trailing slash in user dir paths (Daniel P. Berrange) - Allow stack traces to be included with log messages (Daniel P. Berrange) - Move user libvirtd socket out of abstract namespace (Daniel P. Berrange) - Add openvz_util.c to POTFILES (Daniel P. Berrange) - Add bundled(gnulib) to RPM specfile (Daniel P. Berrange) - openvz: determine kb/pages only once (Guido Günther) - libvirt-guests: Remove LISTFILE if it's empty when stopping service (Osier Yang) - qemu: Set memory policy using cgroup if placement is auto (Osier Yang) - qemu: Use the CPU index in capabilities to map NUMA node to cpu list. (Osier Yang) - Assign spapr-vio bus address to ibmvscsi controller (Li Zhang) - sanlock: fix locking for readonly devices (David Weber) - nodeinfo: add some more tests (Eric Blake) - nodeinfo: drop static variable (Eric Blake) - maint: fix AUTHORS (Eric Blake) - Use XDG Base Directories instead of storing in home directory (William Jon McCann) Cleanups: - Remove accidentally added Patch: lines from mingw-libvirt.spec.in (Daniel P. Berrange) - Add /tools/libvirt-guests.service to .gitignore (Guido Günther) - sanlock: Properly indent (Michal Privoznik) - Remove stray debug fprintf in XML parser (Daniel P. Berrange) - util: Fix the indention (Osier Yang) - LXC: avoid useless duplicate memory free (Gao feng) - driver: Clean up driver header to space indentation (Peter Krempa) - build: fix whitespace damage (Eric Blake) - build: hoist qemu dependence on yajl to configure (Eric Blake) - maint: command.c whitespace cleanups (Eric Blake) - Revert "rpc: Discard non-blocking calls only when necessary" (Jiri Denemark) thanks everybody for the contributions, be it bug reports, documentation fixes, patches, etc. ! Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

3 2

[libvirt] [PATCH] Added the attribute vendor_id to the cpu model
by Hendrik Schwartke 03 Jul '12

03 Jul '12

Introducing the attribute vendor_id to force the CPUID instruction in a kvm guest to return the specified vendor. --- docs/schemas/domaincommon.rng | 7 +++++ src/conf/cpu_conf.c | 61 ++++++++++++++++++++++++++++++++--------- src/conf/cpu_conf.h | 3 ++ src/qemu/qemu_command.c | 6 +++- tests/testutilsqemu.c | 1 + 5 files changed, 64 insertions(+), 14 deletions(-) diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 46e539d..a246e8b 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -2820,6 +2820,13 @@ </choice> </attribute> </optional> + <optional> + <attribute name="vendor_id"> + <data type="string"> + <param name='pattern'>.{12}</param> + </data> + </attribute> + </optional> <choice> <text/> <empty/> diff --git a/src/conf/cpu_conf.c b/src/conf/cpu_conf.c index b520f7c..b8ca7a5 100644 --- a/src/conf/cpu_conf.c +++ b/src/conf/cpu_conf.c @@ -22,6 +22,7 @@ */ #include <config.h> +#include <ctype.h> #include "virterror_internal.h" #include "memory.h" @@ -68,6 +69,7 @@ virCPUDefFreeModel(virCPUDefPtr def) VIR_FREE(def->model); VIR_FREE(def->vendor); + VIR_FREE(def->vendor_id); for (i = 0; i < def->nfeatures; i++) VIR_FREE(def->features[i].name); @@ -104,6 +106,7 @@ virCPUDefCopyModel(virCPUDefPtr dst, if ((src->model && !(dst->model = strdup(src->model))) || (src->vendor && !(dst->vendor = strdup(src->vendor))) + || (src->vendor_id && !(dst->vendor_id = strdup(src->vendor_id))) || VIR_ALLOC_N(dst->features, src->nfeatures) < 0) goto no_memory; dst->nfeatures_max = dst->nfeatures = src->nfeatures; @@ -288,19 +291,42 @@ virCPUDefParseXML(const xmlNodePtr node, } if (def->type == VIR_CPU_TYPE_GUEST && - def->mode != VIR_CPU_MODE_HOST_PASSTHROUGH && - virXPathBoolean("boolean(./model[1]/@fallback)", ctxt)) { - const char *fallback; - - fallback = virXPathString("string(./model[1]/@fallback)", ctxt); - if (fallback) { - def->fallback = virCPUFallbackTypeFromString(fallback); - VIR_FREE(fallback); - if (def->fallback < 0) { - virCPUReportError(VIR_ERR_XML_ERROR, "%s", - _("Invalid fallback attribute")); - goto error; - } + def->mode != VIR_CPU_MODE_HOST_PASSTHROUGH) { + + if(virXPathBoolean("boolean(./model[1]/@fallback)", ctxt)) { + const char *fallback; + + fallback = virXPathString("string(./model[1]/@fallback)", ctxt); + if (fallback) { + def->fallback = virCPUFallbackTypeFromString(fallback); + VIR_FREE(fallback); + if (def->fallback < 0) { + virCPUReportError(VIR_ERR_XML_ERROR, "%s", + _("Invalid fallback attribute")); + goto error; + } + } + + if(virXPathBoolean("boolean(./model[1]/@vendor_id)", ctxt)) { + char *vendor_id; + + vendor_id = virXPathString("string(./model[1]/@vendor_id)", ctxt); + if(!vendor_id || strlen(vendor_id)!=VIR_CPU_VENDOR_ID_LENGTH) { + virCPUReportError(VIR_ERR_XML_ERROR, "%s", + _("vendor id must be 12 characters long")); + VIR_FREE(vendor_id); + goto error; + } + for(i=0; i<strlen(vendor_id); i++) { + if(!isprint(vendor_id[i]) || isspace(vendor_id[i])) { + virCPUReportError(VIR_ERR_XML_ERROR, "%s", + _("vendor id is invalid")); + VIR_FREE(vendor_id); + goto error; + } + } + def->vendor_id = vendor_id; + } } } @@ -588,6 +614,8 @@ virCPUDefFormatBuf(virBufferPtr buf, return -1; } virBufferAsprintf(buf, " fallback='%s'", fallback); + if(def->vendor_id) + virBufferAsprintf(buf, " vendor_id='%s'", def->vendor_id); } if (formatModel && def->model) { virBufferAsprintf(buf, ">%s</model>\n", def->model); @@ -738,6 +766,13 @@ virCPUDefIsEqual(virCPUDefPtr src, goto cleanup; } + if (STRNEQ_NULLABLE(src->vendor_id, dst->vendor_id)) { + virCPUReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Target CPU model %s does not match source %s"), + NULLSTR(dst->vendor_id), NULLSTR(src->vendor_id)); + goto cleanup; + } + if (src->sockets != dst->sockets) { virCPUReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Target CPU sockets %d does not match source %d"), diff --git a/src/conf/cpu_conf.h b/src/conf/cpu_conf.h index f8b7bf9..3daadbd 100644 --- a/src/conf/cpu_conf.h +++ b/src/conf/cpu_conf.h @@ -28,6 +28,8 @@ # include "buf.h" # include "xml.h" +#define VIR_CPU_VENDOR_ID_LENGTH 12 + enum virCPUType { VIR_CPU_TYPE_HOST, VIR_CPU_TYPE_GUEST, @@ -103,6 +105,7 @@ struct _virCPUDef { int match; /* enum virCPUMatch */ char *arch; char *model; + char *vendor_id; /* vendor id returned by CPUID in the guest */ int fallback; /* enum virCPUFallback */ char *vendor; unsigned int sockets; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index bd4f96a..56ecefb 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -3910,7 +3910,9 @@ qemuBuildCpuArgStr(const struct qemud_driver *driver, } virBufferAddLit(&buf, "host"); } else { - if (VIR_ALLOC(guest) < 0 || !(guest->arch = strdup(host->arch))) + if (VIR_ALLOC(guest) < 0 + || !(guest->arch = strdup(host->arch)) + || (cpu->vendor_id && !(guest->vendor_id = strdup(cpu->vendor_id)))) goto no_memory; if (cpu->match == VIR_CPU_MATCH_MINIMUM) @@ -3924,6 +3926,8 @@ qemuBuildCpuArgStr(const struct qemud_driver *driver, goto cleanup; virBufferAdd(&buf, guest->model, -1); + if(guest->vendor_id) + virBufferAsprintf(&buf, ",vendor=%s", guest->vendor_id); for (i = 0; i < guest->nfeatures; i++) { char sign; if (guest->features[i].policy == VIR_CPU_FEATURE_DISABLE) diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c index 8d5a3bf..8b7cb33 100644 --- a/tests/testutilsqemu.c +++ b/tests/testutilsqemu.c @@ -116,6 +116,7 @@ virCapsPtr testQemuCapsInit(void) { 0, /* match */ (char *) "x86_64", /* arch */ (char *) "core2duo", /* model */ + NULL, /* vendor_id */ 0, /* fallback */ (char *) "Intel", /* vendor */ 1, /* sockets */ -- 1.7.9.5

3 9

[libvirt] ANNOUNCE: Perl binding Sys-Virt release 0.9.13
by Daniel P. Berrange 03 Jul '12

03 Jul '12

I am pleased to announce that release 0.9.13 of Sys-Virt, the libvirt Perl API binding is now available for download: http://search.cpan.org/CPAN/authors/id/D/DA/DANBERR/Sys-Virt-0.9.13.tar.gz Changed in this release: - Add all new APIs and constants in libvirt 0.9.13 Further information, including online API documentation & previous release archives, is available from the CPAN home page http://search.cpan.org/dist/Sys-Virt/ Regards, Daniel -- |: 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