- Devel - libvirt List Archives

[libvirt] [PATCH] docs: document rng backend path restrictions of older libvirt
by Ján Tomko 14 Jun '16

14 Jun '16

Commit 67f2b72 removed the path restrictions for rng backend, along with the documentation of the restriction. Restore the documentation for users still using older libvirt. https://bugzilla.redhat.com/show_bug.cgi?id=1074464 --- docs/formatdomain.html.in | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index daa0891..17e563c 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -6356,9 +6356,10 @@ qemu-kvm -net nic,model=? /dev/null This backend type expects a non-blocking character device as input. The file name is specified as contents of the - <code>backend</code> element. When no file name is specified - the hypervisor default is used. For qemu, the default is - /dev/random + <code>backend</code> element. Since 1.3.4 + any path is accepted. Before that /dev/random and /dev/hwrng were + the only accepted paths. When no file name is specified the hypervisor + default is used. For qemu, the default is /dev/random </dd> <dt><code>egd</code></dt> -- 2.7.3

2 1

[libvirt] [PATCH v2 0/6] Introducing storage pool lifecycle event APIs
by Jovanka Gulicoska 14 Jun '16

14 Jun '16

Changes follow comments on v1 patches. Introducing implementation of storage pool event APIs. Code changes follow network event APIs. Implemented functions: virStoragePoolEventRegisterAny(), virStoragePoolEventDeregisterAny(), virStoragePoolLifeCycleEventNew(), introduced STARTED, STOPPED, DEFINE, UNDEFINE and REFRESHED. STARTED signal is emiited in storagePoolCreateXML() and storagePoolCreate() DEFINED signal is emitted in storagePoolDefineXML() UNDEFINED signal is emitted in storagePoolUndefine() STOPPED signal is emitted in storagePoolDestroy() and storagePoolRefresh() REFRESHED signal is emitted in storagePoolRefresh() There are also test as well as unittests for the new functions and signals. This is part of a GSOC project: Asynchronous lifecycle events for storage objects As part of the project there should also be implementation for storage volume events. For now there's no signal when volumes are created or deleted, they can also be implemented, but probably the easiest way is to have apps watch for REFRESH signal, and later extend storage driver code to refresh a pool after volume APIs are called. Jovanka Gulicoska (6): Introduce storage lifecycle event APIs conf: add storage_event handling test: implement storage lifecycle event APIs remote: implement storage lifecycle event APIs storage: implement storage lifecycle event APIs event-test: support storage lifecycle event APIs daemon/libvirtd.h | 2 + daemon/remote.c | 201 +++++++++++++++++++++++++++++- examples/object-events/event-test.c | 46 ++++++- include/libvirt/libvirt-storage.h | 94 ++++++++++++++ src/Makefile.am | 5 + src/conf/storage_conf.h | 4 + src/conf/storage_event.c | 237 ++++++++++++++++++++++++++++++++++++ src/conf/storage_event.h | 60 +++++++++ src/datatypes.h | 13 ++ src/driver-storage.h | 14 +++ src/libvirt-storage.c | 125 +++++++++++++++++++ src/libvirt_private.syms | 5 + src/libvirt_public.syms | 7 ++ src/remote/remote_driver.c | 128 +++++++++++++++++++ src/remote/remote_protocol.x | 43 ++++++- src/remote_protocol-structs | 16 +++ src/storage/storage_driver.c | 110 +++++++++++++++++ src/test/test_driver.c | 71 +++++++++++ tests/objecteventtest.c | 177 +++++++++++++++++++++++++++ 19 files changed, 1355 insertions(+), 3 deletions(-) create mode 100644 src/conf/storage_event.c create mode 100644 src/conf/storage_event.h -- 2.5.5

3 18

[libvirt] Enabling libvirt admin API
by Erik Skultety 14 Jun '16

14 Jun '16

It's been a while since an RFE for getting and setting specific daemon configuration parameters[1] during runtime landed in bugzilla. Although there was only need for dynamic reconfiguration of number of connected clients allowed in the original request, the plan Dan proposed was to implement a separate libvirt administration library, specifying some ideas regarding the functionality that the first version should support. These of course needed a fair amount of helper functions (before any API could be introduced), so a decision to explicitly disable creation of the admin socket (also neither distributing the .so nor the header) until the interface is capable to do something more than just connecting/disconnecting, listing servers and polling for library version has been made. Besides the dynamic reconfiguration of the logging parameters which has been waiting in the list (presumably needs a fresh rebase onto the current master) due to being related and dependent on the logging level refactor[2] (I CCed Daniel as he might have an update on this), the remaining requirements on the interface have been met already. So I was wondering if we could manage to enable it in the upcoming release, as well as getting it to 7.3 (thus not delaying the RFC anymore). I'd like to hear your opinions on this matter, possibly because I might have missed something that would cause the "official" release of the feature to be prolonged even more. [1] https://bugzilla.redhat.com/show_bug.cgi?id=735385 [2] https://www.redhat.com/archives/libvir-list/2016-May/msg00760.html Regards, Erik

3 2

[libvirt] Libvirt multi queue support
by Naor Shlomo 14 Jun '16

14 Jun '16

Hello experts, Could anyone please tell me if Multi Queue it fully supported in Libvirt and if so what version contains it? Thanks, Naor

3 9

[libvirt] libvirt disk labels and QEMU drive host alias generation
by Kashyap Chamarthy 14 Jun '16

14 Jun '16

Summary ------- It seems like libvirt is generating the same QEMU drive host alias ('drive-virtio-disk%d') for different two disk labels (vdb, vdb1). [Refer the contextual root cause analysis discussion at the end with Laine & Peter.] Let's take a quick example to demonstrate the issue. On a guest that is shut down, attach a couplee of disks with labels 'vdb', and 'vdb1' $ sudo virsh attach-disk cvm1 \ /export/vmimages/1.raw vdb --config $ sudo virsh attach-disk cvm1 \ /export/vmimages/1.raw vdb1 --config $ virsh domblklist cvm1 Target Source ------------------------------------------------ vda /var/lib/libvirt/images/cirros-0.3.3-x86_64-disk.img vdb /export/vmimages/1.raw vdb1 /export/vmimages/1.raw Which results in guest XML: [...] <disk type='file' device='disk'> <driver name='qemu' type='raw'/> <source file='/export/vmimages/1.raw'/> <target dev='vdb' bus='virtio'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/> </disk> <disk type='file' device='disk'> <driver name='qemu' type='raw'/> <source file='/export/vmimages/1.raw'/> <target dev='vdb1' bus='virtio'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x08' function='0x0'/> </disk> [...] Sarting the guest (error message manually wrapped) fails, as $ virsh start cvm1 error: Failed to start domain cvm1 error: internal error: process exited while connecting to monitor: qemu-system-x86_64: -drive file=/export/vmimages/1.raw,format=raw,if=none,id=drive-virtio-disk1: Duplicate ID 'drive-virtio-disk1' for drive It results in QEMU CLI: -drive file=/export/vmimages/1.raw,format=raw,if=none,id=drive-virtio-disk1 \ -device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x7,drive=drive-virtio-disk1,id=virtio-disk1 \ -drive file=/export/vmimages/1.raw,format=raw,if=none,id=drive-virtio-disk1 \ -device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x8,drive=drive-virtio-disk1,id=virtio-disk1 \ Root cause analysis discussion from IRC from Friday --------------------------------------------------- [laine] The problem is that the "alias" libvirt generates based on the target device name should be unique, but it isn't. I can see why it's doing that. When putting the index of the disk it's processing within the entries into drive-virtio-disk%d, it learns the index by calling virDiskNameToIndex(). It's going through a list of disks, 0, 1, 2, 3, etc creating the alias. But at each index, it calls this other function to learn the index, and that function just searches for the first entry that matches the name. If they *really* don't know the index (because they only have a pointer to the entry) they should just search for the entry with the matching *address in memory* Haven't stepped through it carefully, but it looks like "vdb" and "vdb1" lead to the same id, and also "vdb" and "sdb" [pkrempa] The alias generator calls virDiskNameToIndex() which calls virDiskNameParse(). virDiskNameParse() parses the name including the partition number and returns it. virDiskNameToIndex() discards the partition number and returns the disk index. If we accept both 'sdb' and 'sdb1' but generate the same alias then that's a bug. -- /kashyap

3 3

[libvirt] [PATCH 0/6] Some patches for native TLS encrypted chardev TCP support
by John Ferlan 14 Jun '16

14 Jun '16

Not fully complete yet as I need the key secret from the LUKS encryption support series; however, I figured I would post what I have that is at least "separable". This set of patches is in support of: https://bugzilla.redhat.com/show_bug.cgi?id=1300776 What's missing is the ability to provide an AES secret/key/passphrase in order to generate the qemu "passwordid=tlskey0" option. John Ferlan (6): caps: Add capability for tls-x509-creds docs: Clarify chardev protocol qemu: Refactor qemuDomainAttachChrDevice error paths conf: Add new tlsx509 attribute for tcp chardev qemu: Add support for TLS X.509 path qemu: Add the ability to hotplug the TLS X.509 environment docs/formatdomain.html.in | 36 +++++++- docs/schemas/domaincommon.rng | 12 +++ src/conf/domain_audit.c | 2 + src/conf/domain_conf.c | 15 +++ src/conf/domain_conf.h | 1 + src/conf/virchrdev.c | 1 + src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 101 +++++++++++++++++++++ src/qemu/qemu_command.h | 6 ++ src/qemu/qemu_hotplug.c | 47 ++++++++-- src/qemu/qemu_monitor_json.c | 9 ++ src/security/security_dac.c | 11 ++- src/security/security_selinux.c | 10 ++ src/security/virt-aa-helper.c | 12 ++- tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 1 + .../caps_2.6.0-gicv2.aarch64.xml | 1 + .../caps_2.6.0-gicv3.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.xml | 1 + tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 1 + .../qemuxml2argv-serial-tcp-tlsx509-chardev.args | 32 +++++++ .../qemuxml2argv-serial-tcp-tlsx509-chardev.xml | 42 +++++++++ tests/qemuxml2argvtest.c | 3 + .../qemuxml2xmlout-serial-tcp-tlsx509-chardev.xml | 51 +++++++++++ tests/qemuxml2xmltest.c | 1 + 25 files changed, 385 insertions(+), 15 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-tlsx509-chardev.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-tlsx509-chardev.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-serial-tcp-tlsx509-chardev.xml -- 2.5.5

2 11

[libvirt] [PATCH 1/6] add VirtualBox 5 support to file vbox/vbox_tmpl.c
by Martin Pietsch 14 Jun '16

14 Jun '16

--- src/vbox/vbox_tmpl.c | 290 ++++++++++++++++++++++++++++++++------------------- 1 file changed, 183 insertions(+), 107 deletions(-) diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c index 7a8205d..79ce001 100644 --- a/src/vbox/vbox_tmpl.c +++ b/src/vbox/vbox_tmpl.c @@ -69,6 +69,8 @@ # include "vbox_CAPI_v4_3.h" #elif VBOX_API_VERSION == 4003004 # include "vbox_CAPI_v4_3_4.h" +#elif VBOX_API_VERSION == 5000000 +# include "vbox_CAPI_v5_0.h" #else # error "Unsupport VBOX_API_VERSION" #endif @@ -228,18 +230,18 @@ static void nsIDtoChar(unsigned char *uuid, const nsID *iid) memcpy(uuidinterim, iid, VIR_UUID_BUFLEN); virUUIDFormat(uuidinterim, uuidstrsrc); - uuidstrdst[0] = uuidstrsrc[6]; - uuidstrdst[1] = uuidstrsrc[7]; - uuidstrdst[2] = uuidstrsrc[4]; - uuidstrdst[3] = uuidstrsrc[5]; - uuidstrdst[4] = uuidstrsrc[2]; - uuidstrdst[5] = uuidstrsrc[3]; - uuidstrdst[6] = uuidstrsrc[0]; - uuidstrdst[7] = uuidstrsrc[1]; + uuidstrdst[0] = uuidstrsrc[6]; + uuidstrdst[1] = uuidstrsrc[7]; + uuidstrdst[2] = uuidstrsrc[4]; + uuidstrdst[3] = uuidstrsrc[5]; + uuidstrdst[4] = uuidstrsrc[2]; + uuidstrdst[5] = uuidstrsrc[3]; + uuidstrdst[6] = uuidstrsrc[0]; + uuidstrdst[7] = uuidstrsrc[1]; - uuidstrdst[8] = uuidstrsrc[8]; + uuidstrdst[8] = uuidstrsrc[8]; - uuidstrdst[9] = uuidstrsrc[11]; + uuidstrdst[9] = uuidstrsrc[11]; uuidstrdst[10] = uuidstrsrc[12]; uuidstrdst[11] = uuidstrsrc[9]; uuidstrdst[12] = uuidstrsrc[10]; @@ -267,18 +269,18 @@ static void nsIDFromChar(nsID *iid, const unsigned char *uuid) virUUIDFormat(uuid, uuidstrsrc); - uuidstrdst[0] = uuidstrsrc[6]; - uuidstrdst[1] = uuidstrsrc[7]; - uuidstrdst[2] = uuidstrsrc[4]; - uuidstrdst[3] = uuidstrsrc[5]; - uuidstrdst[4] = uuidstrsrc[2]; - uuidstrdst[5] = uuidstrsrc[3]; - uuidstrdst[6] = uuidstrsrc[0]; - uuidstrdst[7] = uuidstrsrc[1]; + uuidstrdst[0] = uuidstrsrc[6]; + uuidstrdst[1] = uuidstrsrc[7]; + uuidstrdst[2] = uuidstrsrc[4]; + uuidstrdst[3] = uuidstrsrc[5]; + uuidstrdst[4] = uuidstrsrc[2]; + uuidstrdst[5] = uuidstrsrc[3]; + uuidstrdst[6] = uuidstrsrc[0]; + uuidstrdst[7] = uuidstrsrc[1]; - uuidstrdst[8] = uuidstrsrc[8]; + uuidstrdst[8] = uuidstrsrc[8]; - uuidstrdst[9] = uuidstrsrc[11]; + uuidstrdst[9] = uuidstrsrc[11]; uuidstrdst[10] = uuidstrsrc[12]; uuidstrdst[11] = uuidstrsrc[9]; uuidstrdst[12] = uuidstrsrc[10]; @@ -621,13 +623,12 @@ _vboxIIDFromArrayItem(vboxGlobalData *data, vboxIIDUnion *iidu, # if VBOX_API_VERSION < 4000000 /* Only 3.x will use this function. */ static bool vboxGetDeviceDetails(const char *deviceName, - PRUint32 *aMaxPortPerInst, - PRUint32 *aMaxSlotPerPort, - PRUint32 storageBus, - PRInt32 *deviceInst, - PRInt32 *devicePort, - PRInt32 *deviceSlot) -{ + PRUint32 *aMaxPortPerInst, + PRUint32 *aMaxSlotPerPort, + PRUint32 storageBus, + PRInt32 *deviceInst, + PRInt32 *devicePort, + PRInt32 *deviceSlot) { int total = 0; PRUint32 maxPortPerInst = 0; PRUint32 maxSlotPerPort = 0; @@ -829,8 +830,8 @@ _vboxAttachDrivesOld(virDomainDefPtr def, vboxGlobalData *data, IMachine *machin machine->vtbl->GetDVDDrive(machine, &dvdDrive); if (dvdDrive) { - IDVDImage *dvdImage = NULL; - PRUnichar *dvdfileUtf16 = NULL; + IDVDImage *dvdImage = NULL; + PRUnichar *dvdfileUtf16 = NULL; vboxIID dvduuid = VBOX_IID_INITIALIZER; vboxIID dvdemptyuuid = VBOX_IID_INITIALIZER; @@ -873,10 +874,10 @@ _vboxAttachDrivesOld(virDomainDefPtr def, vboxGlobalData *data, IMachine *machin } } else if (def->disks[i]->device == VIR_DOMAIN_DISK_DEVICE_DISK) { if (type == VIR_STORAGE_TYPE_FILE && src) { - IHardDisk *hardDisk = NULL; + IHardDisk *hardDisk = NULL; PRUnichar *hddfileUtf16 = NULL; vboxIID hdduuid = VBOX_IID_INITIALIZER; - PRUnichar *hddEmpty = NULL; + PRUnichar *hddEmpty = NULL; /* Current Limitation: Harddisk can't be connected to * Secondary Master as Secondary Master is always used * for CD/DVD Drive, so don't connect the harddisk if it @@ -930,8 +931,8 @@ _vboxAttachDrivesOld(virDomainDefPtr def, vboxGlobalData *data, IMachine *machin VIR_DEBUG("Not connecting harddisk to hdc as hdc" " is taken by CD/DVD Drive"); } else { - PRInt32 channel = 0; - PRInt32 device = 0; + PRInt32 channel = 0; + PRInt32 device = 0; PRUnichar *hddcnameUtf16 = NULL; char *hddcname; @@ -941,13 +942,13 @@ _vboxAttachDrivesOld(virDomainDefPtr def, vboxGlobalData *data, IMachine *machin if (STREQ(def->disks[i]->dst, "hda")) { channel = 0; - device = 0; + device = 0; } else if (STREQ(def->disks[i]->dst, "hdb")) { channel = 0; - device = 1; + device = 1; } else if (STREQ(def->disks[i]->dst, "hdd")) { channel = 1; - device = 1; + device = 1; } rc = machine->vtbl->AttachHardDisk(machine, @@ -982,8 +983,8 @@ _vboxAttachDrivesOld(virDomainDefPtr def, vboxGlobalData *data, IMachine *machin if (floppyDrive) { rc = floppyDrive->vtbl->SetEnabled(floppyDrive, 1); if (NS_SUCCEEDED(rc)) { - IFloppyImage *floppyImage = NULL; - PRUnichar *fdfileUtf16 = NULL; + IFloppyImage *floppyImage = NULL; + PRUnichar *fdfileUtf16 = NULL; vboxIID fduuid = VBOX_IID_INITIALIZER; vboxIID fdemptyuuid = VBOX_IID_INITIALIZER; @@ -1038,7 +1039,7 @@ static void _vboxAttachDrivesOld(virDomainDefPtr def, vboxGlobalData *data, IMachine *machine) { size_t i; - nsresult rc = 0; + nsresult rc; PRUint32 maxPortPerInst[StorageBus_Floppy + 1] = {}; PRUint32 maxSlotPerPort[StorageBus_Floppy + 1] = {}; @@ -1110,14 +1111,14 @@ _vboxAttachDrivesOld(virDomainDefPtr def, vboxGlobalData *data, IMachine *machin ? "True" : "False")); if (type == VIR_STORAGE_TYPE_FILE && src) { - IMedium *medium = NULL; - PRUnichar *mediumUUID = NULL; + IMedium *medium = NULL; + PRUnichar *mediumUUID = NULL; PRUnichar *mediumFileUtf16 = NULL; - PRUint32 storageBus = StorageBus_Null; - PRUint32 deviceType = DeviceType_Null; - PRInt32 deviceInst = 0; - PRInt32 devicePort = 0; - PRInt32 deviceSlot = 0; + PRUint32 storageBus = StorageBus_Null; + PRUint32 deviceType = DeviceType_Null; + PRInt32 deviceInst = 0; + PRInt32 devicePort = 0; + PRInt32 deviceSlot = 0; VBOX_UTF8_TO_UTF16(src, &mediumFileUtf16); @@ -1311,7 +1312,9 @@ _vboxDomainSnapshotRestore(virDomainPtr dom, ISnapshot *snapshot) { vboxGlobalData *data = dom->conn->privateData; +# if VBOX_API_VERSION < 5000000 IConsole *console = NULL; +# endif /*VBOX_API_VERSION < 5000000*/ IProgress *progress = NULL; PRUint32 state; nsresult rc; @@ -1344,16 +1347,22 @@ _vboxDomainSnapshotRestore(virDomainPtr dom, } rc = VBOX_SESSION_OPEN(domiid.value, machine); +# if VBOX_API_VERSION < 5000000 if (NS_SUCCEEDED(rc)) rc = data->vboxSession->vtbl->GetConsole(data->vboxSession, &console); +# endif /*VBOX_API_VERSION < 5000000*/ if (NS_FAILED(rc)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("could not open VirtualBox session with domain %s"), dom->name); goto cleanup; } - +# if VBOX_API_VERSION < 5000000 rc = console->vtbl->RestoreSnapshot(console, snapshot, &progress); +# elif VBOX_API_VERSION >= 5000000 /*VBOX_API_VERSION < 5000000*/ + rc = machine->vtbl->RestoreSnapshot(machine, snapshot, &progress); +# endif /*VBOX_API_VERSION >= 5000000*/ + if (NS_FAILED(rc) || !progress) { if (rc == VBOX_E_INVALID_VM_STATE) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", @@ -1378,7 +1387,9 @@ _vboxDomainSnapshotRestore(virDomainPtr dom, cleanup: VBOX_RELEASE(progress); +# if VBOX_API_VERSION < 5000000 VBOX_RELEASE(console); +# endif /*VBOX_API_VERSION < 5000000*/ VBOX_SESSION_CLOSE(); vboxIIDUnalloc(&domiid); return ret; @@ -1406,8 +1417,8 @@ vboxCallbackOnMachineStateChange(IVirtualBoxCallback *pThis ATTRIBUTE_UNUSED, PRUnichar *machineId, PRUint32 state) { virDomainPtr dom = NULL; - int event = 0; - int detail = 0; + int event = 0; + int detail = 0; vboxDriverLock(g_pVBoxGlobalData); @@ -1415,7 +1426,7 @@ vboxCallbackOnMachineStateChange(IVirtualBoxCallback *pThis ATTRIBUTE_UNUSED, DEBUGPRUnichar("machineId", machineId); if (machineId) { - char *machineIdUtf8 = NULL; + char *machineIdUtf8 = NULL; unsigned char uuid[VIR_UUID_BUFLEN]; g_pVBoxGlobalData->pFuncs->pfnUtf16ToUtf8(machineId, &machineIdUtf8); @@ -1426,31 +1437,31 @@ vboxCallbackOnMachineStateChange(IVirtualBoxCallback *pThis ATTRIBUTE_UNUSED, virObjectEventPtr ev; if (state == MachineState_Starting) { - event = VIR_DOMAIN_EVENT_STARTED; + event = VIR_DOMAIN_EVENT_STARTED; detail = VIR_DOMAIN_EVENT_STARTED_BOOTED; } else if (state == MachineState_Restoring) { - event = VIR_DOMAIN_EVENT_STARTED; + event = VIR_DOMAIN_EVENT_STARTED; detail = VIR_DOMAIN_EVENT_STARTED_RESTORED; } else if (state == MachineState_Paused) { - event = VIR_DOMAIN_EVENT_SUSPENDED; + event = VIR_DOMAIN_EVENT_SUSPENDED; detail = VIR_DOMAIN_EVENT_SUSPENDED_PAUSED; } else if (state == MachineState_Running) { - event = VIR_DOMAIN_EVENT_RESUMED; + event = VIR_DOMAIN_EVENT_RESUMED; detail = VIR_DOMAIN_EVENT_RESUMED_UNPAUSED; } else if (state == MachineState_PoweredOff) { - event = VIR_DOMAIN_EVENT_STOPPED; + event = VIR_DOMAIN_EVENT_STOPPED; detail = VIR_DOMAIN_EVENT_STOPPED_SHUTDOWN; } else if (state == MachineState_Stopping) { - event = VIR_DOMAIN_EVENT_STOPPED; + event = VIR_DOMAIN_EVENT_STOPPED; detail = VIR_DOMAIN_EVENT_STOPPED_DESTROYED; } else if (state == MachineState_Aborted) { - event = VIR_DOMAIN_EVENT_STOPPED; + event = VIR_DOMAIN_EVENT_STOPPED; detail = VIR_DOMAIN_EVENT_STOPPED_CRASHED; } else if (state == MachineState_Saving) { - event = VIR_DOMAIN_EVENT_STOPPED; + event = VIR_DOMAIN_EVENT_STOPPED; detail = VIR_DOMAIN_EVENT_STOPPED_SAVED; } else { - event = VIR_DOMAIN_EVENT_STOPPED; + event = VIR_DOMAIN_EVENT_STOPPED; detail = VIR_DOMAIN_EVENT_STOPPED_SHUTDOWN; } @@ -1525,8 +1536,8 @@ vboxCallbackOnMachineRegistered(IVirtualBoxCallback *pThis ATTRIBUTE_UNUSED, PRUnichar *machineId, PRBool registered) { virDomainPtr dom = NULL; - int event = 0; - int detail = 0; + int event = 0; + int detail = 0; vboxDriverLock(g_pVBoxGlobalData); @@ -1534,7 +1545,7 @@ vboxCallbackOnMachineRegistered(IVirtualBoxCallback *pThis ATTRIBUTE_UNUSED, DEBUGPRUnichar("machineId", machineId); if (machineId) { - char *machineIdUtf8 = NULL; + char *machineIdUtf8 = NULL; unsigned char uuid[VIR_UUID_BUFLEN]; g_pVBoxGlobalData->pFuncs->pfnUtf16ToUtf8(machineId, &machineIdUtf8); @@ -1551,10 +1562,10 @@ vboxCallbackOnMachineRegistered(IVirtualBoxCallback *pThis ATTRIBUTE_UNUSED, * to show the VIR_DOMAIN_EVENT_UNDEFINED event */ if (registered) { - event = VIR_DOMAIN_EVENT_DEFINED; + event = VIR_DOMAIN_EVENT_DEFINED; detail = VIR_DOMAIN_EVENT_DEFINED_ADDED; } else { - event = VIR_DOMAIN_EVENT_UNDEFINED; + event = VIR_DOMAIN_EVENT_UNDEFINED; detail = VIR_DOMAIN_EVENT_UNDEFINED_REMOVED; } @@ -1750,7 +1761,7 @@ vboxConnectDomainEventRegister(virConnectPtr conn, virFreeCallback freecb) { vboxGlobalData *data = conn->privateData; - int vboxRet = -1; + int vboxRet = -1; nsresult rc; int ret = -1; @@ -1854,7 +1865,7 @@ static int vboxConnectDomainEventRegisterAny(virConnectPtr conn, virFreeCallback freecb) { vboxGlobalData *data = conn->privateData; - int vboxRet = -1; + int vboxRet = -1; nsresult rc; int ret = -1; @@ -2160,26 +2171,26 @@ _dumpIDEHDDsOld(virDomainDefPtr def, vboxGlobalData *data, IMachine *machine) { - PRInt32 hddNum = 0; - IHardDisk *hardDiskPM = NULL; - IHardDisk *hardDiskPS = NULL; - IHardDisk *hardDiskSS = NULL; - const char *hddBus = "IDE"; - PRUnichar *hddBusUtf16 = NULL; + PRInt32 hddNum = 0; + IHardDisk *hardDiskPM = NULL; + IHardDisk *hardDiskPS = NULL; + IHardDisk *hardDiskSS = NULL; + const char *hddBus = "IDE"; + PRUnichar *hddBusUtf16 = NULL; /* dump IDE hdds if present */ VBOX_UTF8_TO_UTF16(hddBus, &hddBusUtf16); def->ndisks = 0; - machine->vtbl->GetHardDisk(machine, hddBusUtf16, 0, 0, &hardDiskPM); + machine->vtbl->GetHardDisk(machine, hddBusUtf16, 0, 0, &hardDiskPM); if (hardDiskPM) def->ndisks++; - machine->vtbl->GetHardDisk(machine, hddBusUtf16, 0, 1, &hardDiskPS); + machine->vtbl->GetHardDisk(machine, hddBusUtf16, 0, 1, &hardDiskPS); if (hardDiskPS) def->ndisks++; - machine->vtbl->GetHardDisk(machine, hddBusUtf16, 1, 1, &hardDiskSS); + machine->vtbl->GetHardDisk(machine, hddBusUtf16, 1, 1, &hardDiskSS); if (hardDiskSS) def->ndisks++; @@ -2199,8 +2210,8 @@ _dumpIDEHDDsOld(virDomainDefPtr def, if (hardDiskPM) { PRUnichar *hddlocationUtf16 = NULL; - char *hddlocation = NULL; - PRUint32 hddType = HardDiskType_Normal; + char *hddlocation = NULL; + PRUint32 hddType = HardDiskType_Normal; hardDiskPM->vtbl->imedium.GetLocation((IMedium *)hardDiskPM, &hddlocationUtf16); VBOX_UTF16_TO_UTF8(hddlocationUtf16, &hddlocation); @@ -2221,8 +2232,8 @@ _dumpIDEHDDsOld(virDomainDefPtr def, if (hardDiskPS) { PRUnichar *hddlocationUtf16 = NULL; - char *hddlocation = NULL; - PRUint32 hddType = HardDiskType_Normal; + char *hddlocation = NULL; + PRUint32 hddType = HardDiskType_Normal; hardDiskPS->vtbl->imedium.GetLocation((IMedium *)hardDiskPS, &hddlocationUtf16); VBOX_UTF16_TO_UTF8(hddlocationUtf16, &hddlocation); @@ -2243,8 +2254,8 @@ _dumpIDEHDDsOld(virDomainDefPtr def, if (hardDiskSS) { PRUnichar *hddlocationUtf16 = NULL; - char *hddlocation = NULL; - PRUint32 hddType = HardDiskType_Normal; + char *hddlocation = NULL; + PRUint32 hddType = HardDiskType_Normal; hardDiskSS->vtbl->imedium.GetLocation((IMedium *)hardDiskSS, &hddlocationUtf16); VBOX_UTF16_TO_UTF8(hddlocationUtf16, &hddlocation); @@ -2269,10 +2280,10 @@ _dumpDVD(virDomainDefPtr def, vboxGlobalData *data, IMachine *machine) { - IDVDDrive *dvdDrive = NULL; - IDVDImage *dvdImage = NULL; + IDVDDrive *dvdDrive = NULL; + IDVDImage *dvdImage = NULL; PRUnichar *locationUtf16 = NULL; - char *location = NULL; + char *location = NULL; /* dump CDROM/DVD if the drive is attached and has DVD/CD in it */ @@ -2323,8 +2334,8 @@ _dumpDVD(virDomainDefPtr def, static int _attachDVD(vboxGlobalData *data, IMachine *machine, const char *src) { - IDVDDrive *dvdDrive = NULL; - IDVDImage *dvdImage = NULL; + IDVDDrive *dvdDrive = NULL; + IDVDImage *dvdImage = NULL; PRUnichar *dvdfileUtf16 = NULL; vboxIID dvduuid = VBOX_IID_INITIALIZER; vboxIID dvdemptyuuid = VBOX_IID_INITIALIZER; @@ -2410,10 +2421,10 @@ _dumpFloppy(virDomainDefPtr def, { IFloppyDrive *floppyDrive = NULL; IFloppyImage *floppyImage = NULL; - PRUnichar *locationUtf16 = NULL; - char *location = NULL; - PRBool enabled = PR_FALSE; - PRUint32 state = DriveState_Null; + PRUnichar *locationUtf16 = NULL; + char *location = NULL; + PRBool enabled = PR_FALSE; + PRUint32 state = DriveState_Null; /* dump Floppy if the drive is attached and has floppy in it */ machine->vtbl->GetFloppyDrive(machine, &floppyDrive); @@ -2466,8 +2477,8 @@ static int _attachFloppy(vboxGlobalData *data, IMachine *machine, const char *src) { IFloppyDrive *floppyDrive; - IFloppyImage *floppyImage = NULL; - PRUnichar *fdfileUtf16 = NULL; + IFloppyImage *floppyImage = NULL; + PRUnichar *fdfileUtf16 = NULL; vboxIID fduuid = VBOX_IID_INITIALIZER; vboxIID fdemptyuuid = VBOX_IID_INITIALIZER; nsresult rc; @@ -2812,7 +2823,7 @@ _virtualboxCreateMachine(vboxGlobalData *data, virDomainDefPtr def, IMachine **m { vboxIID iid = VBOX_IID_INITIALIZER; PRUnichar *machineNameUtf16 = NULL; - nsresult rc = -1; + nsresult rc; VBOX_UTF8_TO_UTF16(def->name, &machineNameUtf16); vboxIIDFromUUID(&iid, def->uuid); @@ -2825,7 +2836,7 @@ _virtualboxCreateMachine(vboxGlobalData *data, virDomainDefPtr def, IMachine **m iid.value, machine); #elif VBOX_API_VERSION < 4000000 /* 3002000 <= VBOX_API_VERSION < 4000000 */ - PRBool override = PR_FALSE; + PRBool override = PR_FALSE; rc = data->vboxObj->vtbl->CreateMachine(data->vboxObj, machineNameUtf16, NULL, @@ -2834,7 +2845,7 @@ _virtualboxCreateMachine(vboxGlobalData *data, virDomainDefPtr def, IMachine **m override, machine); #elif VBOX_API_VERSION >= 4000000 && VBOX_API_VERSION < 4002000 - PRBool override = PR_FALSE; + PRBool override = PR_FALSE; rc = data->vboxObj->vtbl->CreateMachine(data->vboxObj, NULL, machineNameUtf16, @@ -2843,12 +2854,18 @@ _virtualboxCreateMachine(vboxGlobalData *data, virDomainDefPtr def, IMachine **m override, machine); #else /* VBOX_API_VERSION >= 4002000 */ - char *createFlags = NULL; + const char *flagsUUIDPrefix = "UUID="; + const char *flagsForceOverwrite = "forceOverwrite=0"; + const char *flagsSeparator = ","; + char createFlags[strlen(flagsUUIDPrefix) + VIR_UUID_STRING_BUFLEN + strlen(flagsSeparator) + strlen(flagsForceOverwrite) + 1]; PRUnichar *createFlagsUtf16 = NULL; - if (virAsprintf(&createFlags, - "UUID=%s,forceOverwrite=0", uuidstr) < 0) - goto cleanup; + snprintf(createFlags, sizeof(createFlags), "%s%s%s%s", + flagsUUIDPrefix, + uuidstr, + flagsSeparator, + flagsForceOverwrite + ); VBOX_UTF8_TO_UTF16(createFlags, &createFlagsUtf16); rc = data->vboxObj->vtbl->CreateMachine(data->vboxObj, NULL, @@ -2858,8 +2875,6 @@ _virtualboxCreateMachine(vboxGlobalData *data, virDomainDefPtr def, IMachine **m nsnull, createFlagsUtf16, machine); - cleanup: - VIR_FREE(createFlags); #endif /* VBOX_API_VERSION >= 4002000 */ } VBOX_UTF16_FREE(machineNameUtf16); @@ -2874,7 +2889,12 @@ _virtualboxCreateHardDisk(IVirtualBox *vboxObj, PRUnichar *format, /* In vbox 2.2 and 3.0, this function will create a IHardDisk object. * In vbox 3.1 and later, this function will create a IMedium object. */ +#if VBOX_API_VERSION < 5000000 return vboxObj->vtbl->CreateHardDisk(vboxObj, format, location, hardDisk); +#elif VBOX_API_VERSION >= 5000000 /*VBOX_API_VERSION >= 5000000*/ + return vboxObj->vtbl->CreateMedium(vboxObj, format, location, AccessMode_ReadWrite, DeviceType_HardDisk, hardDisk); +#endif /*VBOX_API_VERSION >= 5000000*/ + } static nsresult @@ -3366,7 +3386,23 @@ _sessionGetMachine(ISession *session, IMachine **machine) static nsresult _consoleSaveState(IConsole *console, IProgress **progress) { +#if VBOX_API_VERSION < 5000000 return console->vtbl->SaveState(console, progress); +#else /*VBOX_API_VERSION < 5000000*/ + IMachine *machine; + nsresult rc; + + rc = console->vtbl->GetMachine(console, &machine); + + if (NS_SUCCEEDED(rc)) + rc = machine->vtbl->SaveState(machine, progress); + else + virReportError(VIR_ERR_INTERNAL_ERROR, + _("unable to get machine from console. (error %d)"), rc); + + return rc; + +#endif /*VBOX_API_VERSION >= 5000000*/ } static nsresult @@ -3414,7 +3450,25 @@ static nsresult _consoleTakeSnapshot(IConsole *console, PRUnichar *name, PRUnichar *description, IProgress **progress) { +#if VBOX_API_VERSION < 5000000 return console->vtbl->TakeSnapshot(console, name, description, progress); +#else + IMachine *machine; + nsresult rc; + PRUnichar *id = NULL; + bool bpause = true; /*NO live snapshot*/ + + rc = console->vtbl->GetMachine(console, &machine); + + if (NS_SUCCEEDED(rc)) + rc = machine->vtbl->TakeSnapshot(machine, name, description, bpause, &id, progress); + else + virReportError(VIR_ERR_INTERNAL_ERROR, + _("unable to get machine from console. (error %d)"), rc); + + VBOX_RELEASE(machine); + return rc; +#endif /* VBOX_API_VERSION >= 5000000 */ } static nsresult @@ -3422,9 +3476,24 @@ _consoleDeleteSnapshot(IConsole *console, vboxIIDUnion *iidu, IProgress **progre { #if VBOX_API_VERSION < 3001000 return console->vtbl->DiscardSnapshot(console, IID_MEMBER(value), progress); -#else /* VBOX_API_VERSION >= 3001000 */ +#elif VBOX_API_VERSION >= 3001000 && VBOX_API_VERSION < 5000000 /* VBOX_API_VERSION >= 3001000 */ return console->vtbl->DeleteSnapshot(console, IID_MEMBER(value), progress); -#endif /* VBOX_API_VERSION >= 3001000 */ +#else /* VBOX_API_VERSION >= 5000000 */ + IMachine *machine; + nsresult rc; + + rc = console->vtbl->GetMachine(console, &machine); + + if (NS_SUCCEEDED(rc)) + rc = machine->vtbl->DeleteSnapshot(machine, IID_MEMBER(value), progress); + else + virReportError(VIR_ERR_INTERNAL_ERROR, + _("unable to get machine from console. (error %d)"), rc); + + VBOX_RELEASE(machine); + + return rc; +#endif /* VBOX_API_VERSION >= 5000000 */ } static nsresult @@ -4342,11 +4411,18 @@ _displayGetScreenResolution(IDisplay *display ATTRIBUTE_UNUSED, #elif VBOX_API_VERSION < 4003000 return display->vtbl->GetScreenResolution(display, screenId, width, height, bitsPerPixel); -#else /* VBOX_API_VERSION >= 4003000 */ +#elif VBOX_API_VERSION < 5000000 /* VBOX_API_VERSION >= 4003000 */ return display->vtbl->GetScreenResolution(display, screenId, width, height, bitsPerPixel, xOrigin, yOrigin); -#endif /* VBOX_API_VERSION >= 4003000 */ +#else /*VBOX_API_VERSION >= 5000000 */ + PRUint32 gms; + + return display->vtbl->GetScreenResolution(display, screenId, width, + height, bitsPerPixel, + xOrigin, yOrigin, &gms); +#endif /* VBOX_API_VERSION >= 5000000 */ + } static nsresult @@ -4357,10 +4433,10 @@ _displayTakeScreenShotPNGToArray(IDisplay *display ATTRIBUTE_UNUSED, PRUint32 *screenDataSize ATTRIBUTE_UNUSED, PRUint8** screenData ATTRIBUTE_UNUSED) { -#if VBOX_API_VERSION < 4000000 +#if VBOX_API_VERSION < 4000000 || VBOX_API_VERSION >= 5000000 vboxUnsupported(); return 0; -#else /* VBOX_API_VERSION >= 4000000 */ +#else /* VBOX_API_VERSION >= 4000000 && VBOX_API_VERSION < 5000000 */ return display->vtbl->TakeScreenShotPNGToArray(display, screenId, width, height, screenDataSize, screenData); -- 2.7.4

2 8

[libvirt] [PATCH] docs: Fix syntax-check
by John Ferlan 14 Jun '16

14 Jun '16

Commit id '42ff399a' broke syntax-check by not encasing <dt> elements in <code>xxx</code> Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- Pushed under build breaker rule. docs/downloads.html.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/downloads.html.in b/docs/downloads.html.in index 899671a..f213b29 100644 --- a/docs/downloads.html.in +++ b/docs/downloads.html.in @@ -55,12 +55,12 @@ <dl> - <dt>major</dt> + <dt><code>major</code></dt> <dd>incremented by 1 for the first release of the year (the Jan 15th release)</dd> - <dt>minor</dt> + <dt><code>minor</code></dt> <dd>incremented by 1 for each monthly release from git master</dd> - <dt>micro</dt> + <dt><code>micro</code></dt> <dd>always 0 for releases from git master, incremented by 1 for each stable maintenance release</dd> </dl> -- 2.5.5

1 0

[libvirt] [PATCH v2] Bump release to 2.0.0 and document release schedule & versioning
by Daniel P. Berrange 14 Jun '16

14 Jun '16

This bumps the release number of 2.0.0, to reflect the switch to a new time based release versioning scheme. The downloads page is updated to describe our policies for release schedules and release version numbering The stable release docs are changed to reflect the fact that the stable version numbers are now just 3 digits long instead of 4. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- configure.ac | 2 +- docs/downloads.html.in | 51 +++++++++++++++++++++++++++++++++++++++++++---- docs/formatdomain.html.in | 6 +++--- src/libvirt_lxc.syms | 2 +- src/libxl/libxl_driver.c | 2 +- src/vz/vz_driver.c | 2 +- 6 files changed, 54 insertions(+), 11 deletions(-) diff --git a/configure.ac b/configure.ac index 827d9db..0114149 100644 --- a/configure.ac +++ b/configure.ac @@ -16,7 +16,7 @@ dnl You should have received a copy of the GNU Lesser General Public dnl License along with this library. If not, see dnl <http://www.gnu.org/licenses/>. -AC_INIT([libvirt], [1.3.6], [libvir-list(a)redhat.com] [], [http://libvirt.org] +AC_INIT([libvirt], [2.0.0], [libvir-list(a)redhat.com] [], [http://libvirt.org] AC_CONFIG_SRCDIR([src/libvirt.c]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_HEADERS([config.h]) diff --git a/docs/downloads.html.in b/docs/downloads.html.in index 13a6db1..899671a 100644 --- a/docs/downloads.html.in +++ b/docs/downloads.html.in @@ -32,20 +32,63 @@ <li><a href="http://libvirt.org/sources/libvirt-git-snapshot.tar.gz">libvirt.org HTTP server</a></li> </ul> + <h2><a name="schedule">Primary release schedule</a></h2> + + + Libvirt follows a time based plan, with releases made once a month + on the 1st of each month give or take a few days. The only exception + is at the start of the year where there are two 6 weeks gaps (first + release in the middle of Jan, then skip the Feb release), giving + a total of 11 releases a year. + + + <h2><a name="numbering">Release numbering</a></h2> + + + Since libvirt 2.0.0, a time based version numbering rule + is applied. As such, the changes in version number have + do not have any implications with respect to the scope of + features or bugfixes included, the stability of the code, + or the API / ABI compatibility (libvirt API / ABI is guaranteed + stable forever). The rules applied for changing the libvirt + version number are: + + + <dl> + <dt>major</dt> + <dd>incremented by 1 for the first release of the year (the + Jan 15th release)</dd> + <dt>minor</dt> + <dd>incremented by 1 for each monthly release from git master</dd> + <dt>micro</dt> + <dd>always 0 for releases from git master, incremented by 1 + for each stable maintenance release</dd> + </dl> + + + Prior to 2.0.0, the major/minor numbers were incremented + fairly arbitrarily, and maintenance releases appended a + fourth digit. + + <h2><a name="maintenance">Maintenance releases</a></h2> In the git repository are several stable maintenance branches, matching the - pattern <code>vmajor.minor.micro-maint</code>; + pattern <code>vmajor.minor-maint</code>; these branches are forked off the corresponding - <code>vmajor.minor.micro</code> formal + <code>vmajor.minor.0</code> formal release, and may have further releases of the - form <code>vmajor.minor.micro.rel</code>. + form <code>vmajor.minor.micro</code>. These maintenance branches should only contain bug fixes, and no new features, backported from the master branch, and are supported as long as at least one downstream distribution expresses interest in a given branch. These maintenance - branches are considered during CVE analysis. + branches are considered during CVE analysis. In contrast + to the primary releases which are made once a month, there + is no formal schedule for the maintenance releases, which + are made whenever there is a need to make available key + bugfixes to downstream consumers. diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 0ad2bbc..daa0891 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -2574,7 +2574,7 @@ if <code>discard</code> is set to "ignore"). NB enabling the detection is a compute intensive operation, but can save file space and/or time on slow media. - Since 1.3.6 + Since 2.0.0 </li> <li> The optional <code>iothread</code> attribute assigns the @@ -5372,7 +5372,7 @@ qemu-kvm -net nic,model=? /dev/null of the first forward dev will be used. </dd> - <dt><code>socket</code> since 1.3.6 (QEMU only)</dt> + <dt><code>socket</code> since 2.0.0 (QEMU only)</dt> <dd> This listen type tells a graphics server to listen on unix socket. @@ -5388,7 +5388,7 @@ qemu-kvm -net nic,model=? /dev/null attribute all <code>listen</code> elements are ignored. </dd> - <dt><code>none</code> since 1.3.6 (QEMU only)</dt> + <dt><code>none</code> since 2.0.0 (QEMU only)</dt> <dd> This listen type doesn't have any other attribute. Libvirt supports diff --git a/src/libvirt_lxc.syms b/src/libvirt_lxc.syms index 56c24c0..9b418ee 100644 --- a/src/libvirt_lxc.syms +++ b/src/libvirt_lxc.syms @@ -21,7 +21,7 @@ LIBVIRT_LXC_1.0.4 { virDomainLxcEnterSecurityLabel; } LIBVIRT_LXC_1.0.2; -LIBVIRT_LXC_1.3.6 { +LIBVIRT_LXC_2.0.0 { global: virDomainLxcEnterCGroup; } LIBVIRT_LXC_1.0.4; diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 9e9957e..0644f60 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -5700,7 +5700,7 @@ static virHypervisorDriver libxlHypervisorDriver = { .domainMigrateConfirm3Params = libxlDomainMigrateConfirm3Params, /* 1.2.6 */ .nodeGetSecurityModel = libxlNodeGetSecurityModel, /* 1.2.16 */ .domainInterfaceAddresses = libxlDomainInterfaceAddresses, /* 1.3.5 */ - .connectGetDomainCapabilities = libxlConnectGetDomainCapabilities, /* 1.3.6 */ + .connectGetDomainCapabilities = libxlConnectGetDomainCapabilities, /* 2.0.0 */ }; static virConnectDriver libxlConnectDriver = { diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c index bb0d1b9..bb96fa0 100644 --- a/src/vz/vz_driver.c +++ b/src/vz/vz_driver.c @@ -2756,7 +2756,7 @@ static virHypervisorDriver vzHypervisorDriver = { .domainIsUpdated = vzDomainIsUpdated, /* 1.2.21 */ .domainGetVcpusFlags = vzDomainGetVcpusFlags, /* 1.2.21 */ .domainGetMaxVcpus = vzDomainGetMaxVcpus, /* 1.2.21 */ - .domainSetUserPassword = vzDomainSetUserPassword, /* 1.3.6 */ + .domainSetUserPassword = vzDomainSetUserPassword, /* 2.0.0 */ .connectDomainEventRegisterAny = vzConnectDomainEventRegisterAny, /* 1.2.10 */ .connectDomainEventDeregisterAny = vzConnectDomainEventDeregisterAny, /* 1.2.10 */ .nodeGetCPUMap = vzNodeGetCPUMap, /* 1.2.8 */ -- 2.5.5

2 3

[libvirt] [PATCH] Change 1.3.6 occurrences to 2.0.0 to follow version bump
by Martin Kletzander 14 Jun '16

14 Jun '16

Version was bumped but documentation (and comments) didn't follow the numbering. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- Pushed as trivial. docs/formatdomain.html.in | 6 +++--- src/libxl/libxl_driver.c | 2 +- src/vz/vz_driver.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 0ad2bbcc90a2..daa089117d38 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -2574,7 +2574,7 @@ if <code>discard</code> is set to "ignore"). NB enabling the detection is a compute intensive operation, but can save file space and/or time on slow media. - Since 1.3.6 + Since 2.0.0 </li> <li> The optional <code>iothread</code> attribute assigns the @@ -5372,7 +5372,7 @@ qemu-kvm -net nic,model=? /dev/null of the first forward dev will be used. </dd> - <dt><code>socket</code> since 1.3.6 (QEMU only)</dt> + <dt><code>socket</code> since 2.0.0 (QEMU only)</dt> <dd> This listen type tells a graphics server to listen on unix socket. @@ -5388,7 +5388,7 @@ qemu-kvm -net nic,model=? /dev/null attribute all <code>listen</code> elements are ignored. </dd> - <dt><code>none</code> since 1.3.6 (QEMU only)</dt> + <dt><code>none</code> since 2.0.0 (QEMU only)</dt> <dd> This listen type doesn't have any other attribute. Libvirt supports diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 9e9957e739e0..0644f6046742 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -5700,7 +5700,7 @@ static virHypervisorDriver libxlHypervisorDriver = { .domainMigrateConfirm3Params = libxlDomainMigrateConfirm3Params, /* 1.2.6 */ .nodeGetSecurityModel = libxlNodeGetSecurityModel, /* 1.2.16 */ .domainInterfaceAddresses = libxlDomainInterfaceAddresses, /* 1.3.5 */ - .connectGetDomainCapabilities = libxlConnectGetDomainCapabilities, /* 1.3.6 */ + .connectGetDomainCapabilities = libxlConnectGetDomainCapabilities, /* 2.0.0 */ }; static virConnectDriver libxlConnectDriver = { diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c index bb0d1b99b67c..bb96fa07da10 100644 --- a/src/vz/vz_driver.c +++ b/src/vz/vz_driver.c @@ -2756,7 +2756,7 @@ static virHypervisorDriver vzHypervisorDriver = { .domainIsUpdated = vzDomainIsUpdated, /* 1.2.21 */ .domainGetVcpusFlags = vzDomainGetVcpusFlags, /* 1.2.21 */ .domainGetMaxVcpus = vzDomainGetMaxVcpus, /* 1.2.21 */ - .domainSetUserPassword = vzDomainSetUserPassword, /* 1.3.6 */ + .domainSetUserPassword = vzDomainSetUserPassword, /* 2.0.0 */ .connectDomainEventRegisterAny = vzConnectDomainEventRegisterAny, /* 1.2.10 */ .connectDomainEventDeregisterAny = vzConnectDomainEventDeregisterAny, /* 1.2.10 */ .nodeGetCPUMap = vzNodeGetCPUMap, /* 1.2.8 */ -- 2.8.4

2 2

[libvirt] [PATCH v2] vz: get additional error information from job correctly
by Maxim Nestratov 14 Jun '16

14 Jun '16

Function logPrlEventErrorHelper is made void and now it only prints an information (if any) from event. If there is no addition information (i.e. an error returned when asked), we don't rewrite original error code with secondary one. Signed-off-by: Maxim Nestratov <mnestratov(a)virtuozzo.com> --- src/vz/vz_sdk.c | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c index 99c5d4a..54c56e9 100644 --- a/src/vz/vz_sdk.c +++ b/src/vz/vz_sdk.c @@ -99,19 +99,13 @@ logPrlErrorHelper(PRL_RESULT err, const char *filename, } \ } while (0) -static PRL_RESULT +static void logPrlEventErrorHelper(PRL_HANDLE event, const char *filename, const char *funcname, size_t linenr) { - PRL_RESULT ret, retCode; char *msg1 = NULL, *msg2 = NULL; PRL_UINT32 len = 0; - int err = -1; - if ((ret = PrlEvent_GetErrCode(event, &retCode))) { - logPrlError(ret); - return ret; - } PrlEvent_GetErrString(event, PRL_TRUE, PRL_FALSE, NULL, &len); @@ -130,13 +124,9 @@ logPrlEventErrorHelper(PRL_HANDLE event, const char *filename, virReportErrorHelper(VIR_FROM_THIS, VIR_ERR_INTERNAL_ERROR, filename, funcname, linenr, _("%s %s"), msg1, msg2); - err = 0; - cleanup: VIR_FREE(msg1); VIR_FREE(msg2); - - return err; } static PRL_RESULT @@ -146,12 +136,12 @@ getJobResultHelper(PRL_HANDLE job, unsigned int timeout, PRL_HANDLE *result, { PRL_RESULT ret, retCode; - if ((ret = PrlJob_Wait(job, timeout))) { + if (PRL_FAILED(ret = PrlJob_Wait(job, timeout))) { logPrlErrorHelper(ret, filename, funcname, linenr); goto cleanup; } - if ((ret = PrlJob_GetRetCode(job, &retCode))) { + if (PRL_FAILED(ret = PrlJob_GetRetCode(job, &retCode))) { logPrlErrorHelper(ret, filename, funcname, linenr); goto cleanup; } @@ -159,17 +149,26 @@ getJobResultHelper(PRL_HANDLE job, unsigned int timeout, PRL_HANDLE *result, if (retCode) { PRL_HANDLE err_handle; + ret = retCode; + /* Sometimes it's possible to get additional error info. */ - if ((ret = PrlJob_GetError(job, &err_handle))) { + if (PRL_FAILED(retCode = PrlJob_GetError(job, &err_handle))) { logPrlErrorHelper(ret, filename, funcname, linenr); + if (PRL_ERR_NO_DATA != retCode) + logPrlError(retCode); goto cleanup; } - if (logPrlEventErrorHelper(err_handle, filename, funcname, linenr)) - logPrlErrorHelper(retCode, filename, funcname, linenr); + if (PRL_FAILED(retCode = PrlEvent_GetErrCode(err_handle, &retCode))) { + logPrlErrorHelper(ret, filename, funcname, linenr); + if (PRL_ERR_NO_DATA != retCode) + logPrlError(retCode); + goto cleanup; + } + + logPrlEventErrorHelper(err_handle, filename, funcname, linenr); PrlHandle_Free(err_handle); - ret = retCode; } else { ret = PrlJob_GetResult(job, result); if (PRL_FAILED(ret)) { -- 2.4.3

2 2

[libvirt] [PATCH] qemu: Obtain job before checking if domain is live
by Martin Kletzander 14 Jun '16

14 Jun '16

Since obtaining a job can wait for another job to finish, the state might change in the meantime. And checking it more than once is pointless. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/qemu/qemu_driver.c | 36 +++++++++++++++--------------------- 1 file changed, 15 insertions(+), 21 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index efb3f854fb10..e677440c20b2 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -5388,16 +5388,16 @@ qemuDomainGetVcpusFlags(virDomainPtr dom, unsigned int flags) goto cleanup; if (flags & VIR_DOMAIN_VCPU_GUEST) { + if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_QUERY) < 0) + goto cleanup; + if (!virDomainObjIsActive(vm)) { virReportError(VIR_ERR_INVALID_ARG, "%s", _("vCPU count provided by the guest agent can only be " "requested for live domains")); - goto cleanup; + goto endjob; } - if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_QUERY) < 0) - goto cleanup; - if (!qemuDomainAgentAvailable(vm, true)) goto endjob; @@ -17796,10 +17796,13 @@ qemuDomainPMSuspendForDuration(virDomainPtr dom, if (virDomainPMSuspendForDurationEnsureACL(dom->conn, vm->def) < 0) goto cleanup; + if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0) + goto cleanup; + if (!virDomainObjIsActive(vm)) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("domain is not running")); - goto cleanup; + goto endjob; } if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_WAKEUP) && @@ -17808,7 +17811,7 @@ qemuDomainPMSuspendForDuration(virDomainPtr dom, virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", _("Unable to suspend domain due to " "missing system_wakeup monitor command")); - goto cleanup; + goto endjob; } if (vm->def->pm.s3 || vm->def->pm.s4) { @@ -17817,29 +17820,20 @@ qemuDomainPMSuspendForDuration(virDomainPtr dom, target == VIR_NODE_SUSPEND_TARGET_HYBRID)) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("S3 state is disabled for this domain")); - goto cleanup; + goto endjob; } if (vm->def->pm.s4 == VIR_TRISTATE_BOOL_NO && target == VIR_NODE_SUSPEND_TARGET_DISK) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("S4 state is disabled for this domain")); - goto cleanup; + goto endjob; } } - if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0) - goto cleanup; - if (!qemuDomainAgentAvailable(vm, true)) goto endjob; - if (!virDomainObjIsActive(vm)) { - virReportError(VIR_ERR_OPERATION_INVALID, - "%s", _("domain is not running")); - goto endjob; - } - qemuDomainObjEnterAgent(vm); ret = qemuAgentSuspend(priv->agent, target); qemuDomainObjExitAgent(vm); @@ -17942,15 +17936,15 @@ qemuDomainQemuAgentCommand(virDomainPtr domain, if (virDomainQemuAgentCommandEnsureACL(domain->conn, vm->def) < 0) goto cleanup; + if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0) + goto cleanup; + if (!virDomainObjIsActive(vm)) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("domain is not running")); - goto cleanup; + goto endjob; } - if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0) - goto cleanup; - if (!qemuDomainAgentAvailable(vm, true)) goto endjob; -- 2.8.4

2 2

[libvirt] Switch to a time based version number rule
by Daniel P. Berrange 14 Jun '16

14 Jun '16

Currently libvirt uses a 3 digit version number, except when it uses a 4 digit version number. We have the following rules - major - no one has any clue about when we should bump this - minor - bump this when some "significant"[*] features appear - micro - bump this on each new release - extra - bump this for stable branch releases [*] for a definition of "significant" that no one knows Now consider our actual requirements - A number that increments on each monthly release - A number that can be incremented for stable branch releases Ok, the micro + extra digits deal with our two actual requirements, so one may ask what is the point of the major + minor digits ? In 11 years of libvirt development we've only bumped the major digit once, and we didn't have any real reason why we chose to the bump the major digit, instead of continuing to bump the minor digit. It just felt like we ought to have a 1.0 release after 7+ years. Our decisions about when to bump the minor digit have not been that much less arbitray. We just look at what features are around and randomly decide if any feel "big enough" to justify a minor digit bump. Way back in the early days of libvirt, we had exactly this kind of mess when deciding /when/ to actually make releases. Sometimes we'd release after a month, sometimes after 3 months, completely arbitrarily based on whether the chances felt "big enough" to justify a release. Feature based release schedules are insanity and so we wised up and adopted the time base release schedule where we release monthly (except over xmas/new year period). I venture to suggest that the reasons for switching from feature to time based release schedules, also apply to version numbers. IOW we should switch to a time based version number change rule, instead of a feature based version number change rule. So what I'm suggesting is that we adopt the following rule - major: bumped for the first release of each year - minor: bumped for every major release - micro: bumped for stable branch releases Rather than wait until next January to adopt this rule, I'd suggest we pretend that it is January now, and thus switch our next version number to be 2.0.0, and jump to 3.0.0 in January 2017. IOW, over the next 2 years we'll do the following releases off master: - Jul 1, 2016 - 2.0.0 - Aug 1, 2016 - 2.1.0 - Sep 1, 2016 - 2.2.0 - Oct 1, 2016 - 2.3.0 - Nov 1, 2016 - 2.4.0 - Dec 1, 2016 - 2.5.0 - Jan 15, 2017 - 3.0.0 - Mar 1, 2017 - 3.1.0 - Apr 1, 2017 - 3.2.0 - May 1, 2017 - 3.3.0 - Jun 1, 2017 - 3.4.0 - Jul 1, 2017 - 3.5.0 - Aug 1, 2017 - 3.6.0 - Sep 1, 2017 - 3.7.0 - Oct 1, 2017 - 3.8.0 - Nov 1, 2017 - 3.9.0 - Dec 1, 2017 - 3.10.0 - Jan 15, 2018 - 4.0.0 - Mar 1, 2018 - 4.1.0 - Apr 1, 2018 - 4.2.0 - .... The stable release branch naming would just use the first major + minor digit in its name.. eg the stable branch for 2.3.0 would use v2.3-maint and do stable releases 2.3.1, 2.3.2, 2.3.3, etc. 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 :|

8 16

[libvirt] [PATCH] qemu: Allow ACPI shutdown only for running domains
by Martin Kletzander 14 Jun '16

14 Jun '16

If the domain is not running, but for example the CPUs are stopped, the ACPI event gets queued and resume of the domain will just shut it off. https://bugzilla.redhat.com/show_bug.cgi?id=1216281 Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/qemu/qemu_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index efb3f854fb10..eb38843c62d8 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -2042,7 +2042,7 @@ static int qemuDomainShutdownFlags(virDomainPtr dom, unsigned int flags) if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0) goto cleanup; - if (!virDomainObjIsActive(vm)) { + if (virDomainObjGetState(vm, NULL) != VIR_DOMAIN_RUNNING) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("domain is not running")); goto endjob; -- 2.8.4

2 1

[libvirt] [PATCH] Bump release to 2.0.0 and document release schedule & versioning
by Daniel P. Berrange 14 Jun '16

14 Jun '16

This bumps the release number of 2.0.0, to reflect the switch to a new time based release versioning scheme. The downloads page is updated to describe our policies for release schedules and release version numbering The stable release docs are changed to reflect the fact that the stable version numbers are now just 3 digits long instead of 4. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- configure.ac | 2 +- docs/downloads.html.in | 59 ++++++++++++++++++++++++++++++++++++++++++++++---- src/libvirt_lxc.syms | 2 +- 3 files changed, 57 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac index 827d9db..0114149 100644 --- a/configure.ac +++ b/configure.ac @@ -16,7 +16,7 @@ dnl You should have received a copy of the GNU Lesser General Public dnl License along with this library. If not, see dnl <http://www.gnu.org/licenses/>. -AC_INIT([libvirt], [1.3.6], [libvir-list(a)redhat.com] [], [http://libvirt.org] +AC_INIT([libvirt], [2.0.0], [libvir-list(a)redhat.com] [], [http://libvirt.org] AC_CONFIG_SRCDIR([src/libvirt.c]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_HEADERS([config.h]) diff --git a/docs/downloads.html.in b/docs/downloads.html.in index 13a6db1..32cc2ec 100644 --- a/docs/downloads.html.in +++ b/docs/downloads.html.in @@ -32,20 +32,71 @@ <li><a href="http://libvirt.org/sources/libvirt-git-snapshot.tar.gz">libvirt.org HTTP server</a></li> </ul> + <h2><a name="schedule">Primary release schedule</a></h2> + + + Libvirt follows a time based plan, with releases made once a month + on the 1st of each month give or take a few days. The only exception + is at the start of the year where there are two 6 weeks gaps, giving + a total of 11 releases a year. Expect to see releases on approx: + + + <ul> + <li>Jan 15th</li> + <li>Mar 1st</li> + <li>Apr 1st</li> + <li>May 1st</li> + <li>Jun 1st</li> + <li>Jul 1st</li> + <li>Aug 1st</li> + <li>Sep 1st</li> + <li>Oct 1st</li> + <li>Nov 1st</li> + <li>Dec 1st</li> + </ul> + + <h2><a name="numbering">Release numbering</a></h2> + + + Since libvirt 2.0.0, a time based version numbering rule + is applied. As such, the changes in version number have + do not have any implications wrt the scope of features + or bugfixes included, the stability of the code, or the + API / ABI compatibility (libvirt API / ABI is guaranteed + stable forever). The rules applied for changing the libvirt + version number are: + + + <ul> + <li><code>major</code> - incremented by 1 for the first release of the year (the Jan 15th release)</li> + <li><code>minor</code> - incremented by 1 for each monthly release from git master</li> + <li><code>micro</code> - always 0 for releases from git master, incremented by 1 for each stable maintenance release</li> + </ul> + + + Prior to to 2.0.0 the major/minor numbers were incremented + fairly arbitrarily, and maintenance releases appended a + fourth digit. + + <h2><a name="maintenance">Maintenance releases</a></h2> In the git repository are several stable maintenance branches, matching the - pattern <code>vmajor.minor.micro-maint</code>; + pattern <code>vmajor.minor-maint</code>; these branches are forked off the corresponding - <code>vmajor.minor.micro</code> formal + <code>vmajor.minor.0</code> formal release, and may have further releases of the - form <code>vmajor.minor.micro.rel</code>. + form <code>vmajor.minor.micro</code>. These maintenance branches should only contain bug fixes, and no new features, backported from the master branch, and are supported as long as at least one downstream distribution expresses interest in a given branch. These maintenance - branches are considered during CVE analysis. + branches are considered during CVE analysis. In contrast + to the primary releases which are made once a month, there + is no formal schedule for the maintenance releases, which + are made whenever there is a need to make available key + bugfixes to downstream consumers. diff --git a/src/libvirt_lxc.syms b/src/libvirt_lxc.syms index 56c24c0..9b418ee 100644 --- a/src/libvirt_lxc.syms +++ b/src/libvirt_lxc.syms @@ -21,7 +21,7 @@ LIBVIRT_LXC_1.0.4 { virDomainLxcEnterSecurityLabel; } LIBVIRT_LXC_1.0.2; -LIBVIRT_LXC_1.3.6 { +LIBVIRT_LXC_2.0.0 { global: virDomainLxcEnterCGroup; } LIBVIRT_LXC_1.0.4; -- 2.5.5

5 6

[libvirt] [PATCH] cputest: Get rid of the array of test functions
by Jiri Denemark 14 Jun '16

14 Jun '16

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- tests/cputest.c | 134 +++++++++++++++++++++----------------------------------- 1 file changed, 51 insertions(+), 83 deletions(-) diff --git a/tests/cputest.c b/tests/cputest.c index f68a3ec..0175d01 100644 --- a/tests/cputest.c +++ b/tests/cputest.c @@ -54,31 +54,9 @@ enum cpuTestBoolWithError { YES = 1 }; -enum api { - API_COMPARE, - API_GUEST_DATA, - API_BASELINE, - API_UPDATE, - API_HAS_FEATURE, - API_HOST_CPUID, - API_GUEST_CPUID, - API_JSON_CPUID, -}; - -static const char *apis[] = { - "compare", - "guest data", - "baseline", - "update", - "has feature", - "host CPUID", - "guest CPUID", - "json CPUID", -}; struct data { const char *arch; - enum api api; const char *host; const char *name; const char **models; @@ -475,7 +453,7 @@ cpuTestHasFeature(const void *arg) static int -cpuTestCPUID(const void *arg) +cpuTestCPUID(bool guest, const void *arg) { const struct data *data = arg; int ret = -1; @@ -497,7 +475,7 @@ cpuTestCPUID(const void *arg) goto cleanup; cpu->arch = hostData->arch; - if (data->api == API_GUEST_CPUID) { + if (guest) { cpu->type = VIR_CPU_TYPE_GUEST; cpu->match = VIR_CPU_MATCH_EXACT; cpu->fallback = VIR_CPU_FALLBACK_FORBID; @@ -510,7 +488,7 @@ cpuTestCPUID(const void *arg) if (virAsprintf(&result, "cpuid-%s-%s", data->host, - data->api == API_HOST_CPUID ? "host" : "guest") < 0) + guest ? "guest" : "host") < 0) goto cleanup; ret = cpuTestCompareXML(data->arch, cpu, result, false); @@ -525,6 +503,20 @@ cpuTestCPUID(const void *arg) } +static int +cpuTestHostCPUID(const void *arg) +{ + return cpuTestCPUID(false, arg); +} + + +static int +cpuTestGuestCPUID(const void *arg) +{ + return cpuTestCPUID(true, arg); +} + + #if WITH_QEMU && WITH_YAJL static int cpuTestJSONCPUID(const void *arg) @@ -573,52 +565,6 @@ cpuTestJSONCPUID(const void *arg) #endif -static int (*cpuTest[])(const void *) = { - cpuTestCompare, - cpuTestGuestData, - cpuTestBaseline, - cpuTestUpdate, - cpuTestHasFeature, - cpuTestCPUID, - cpuTestCPUID, -#if WITH_QEMU && WITH_YAJL - cpuTestJSONCPUID, -#else - NULL, -#endif -}; - - -static int -cpuTestRun(const char *name, const struct data *data) -{ - char *label = NULL; - char *tmp; - - if (virAsprintf(&label, "CPU %s(%s): %s", apis[data->api], data->arch, name) < 0) - return -1; - - tmp = virTestLogContentAndReset(); - VIR_FREE(tmp); - - if (virTestRun(label, cpuTest[data->api], data) < 0) { - if (virTestGetDebug()) { - char *log; - if ((log = virTestLogContentAndReset()) && - strlen(log) > 0) - VIR_TEST_DEBUG("\n%s\n", log); - VIR_FREE(log); - } - - VIR_FREE(label); - return -1; - } - - VIR_FREE(label); - return 0; -} - - static const char *model486[] = { "486" }; static const char *nomodel[] = { "nomodel" }; static const char *models[] = { "qemu64", "core2duo", "Nehalem" }; @@ -640,23 +586,45 @@ mymain(void) #define DO_TEST(arch, api, name, host, cpu, \ models, nmodels, preferred, flags, result) \ do { \ - static struct data data = { \ - arch, api, host, cpu, models, \ + struct data data = { \ + arch, host, cpu, models, \ models == NULL ? NULL : #models, \ nmodels, preferred, flags, result \ }; \ - if (cpuTestRun(name, &data) < 0) \ + char *testLabel; \ + char *tmp; \ + \ + tmp = virTestLogContentAndReset(); \ + VIR_FREE(tmp); \ + \ + if (virAsprintf(&testLabel, "%s(%s): %s", \ + #api, arch, name) < 0) { \ ret = -1; \ + break; \ + } \ + \ + if (virTestRun(testLabel, api, &data) < 0) { \ + if (virTestGetDebug()) { \ + char *log; \ + if ((log = virTestLogContentAndReset()) && \ + strlen(log) > 0) \ + VIR_TEST_DEBUG("\n%s\n", log); \ + VIR_FREE(log); \ + } \ + ret = -1; \ + } \ + \ + VIR_FREE(testLabel); \ } while (0) #define DO_TEST_COMPARE(arch, host, cpu, result) \ - DO_TEST(arch, API_COMPARE, \ + DO_TEST(arch, cpuTestCompare, \ host "/" cpu " (" #result ")", \ host, cpu, NULL, 0, NULL, 0, result) #define DO_TEST_UPDATE(arch, host, cpu, result) \ do { \ - DO_TEST(arch, API_UPDATE, \ + DO_TEST(arch, cpuTestUpdate, \ cpu " on " host, \ host, cpu, NULL, 0, NULL, 0, 0); \ DO_TEST_COMPARE(arch, host, host "+" cpu, result); \ @@ -673,19 +641,19 @@ mymain(void) if (virAsprintf(&label, "%s%s", name, suffix) < 0) { \ ret = -1; \ } else { \ - DO_TEST(arch, API_BASELINE, label, NULL, "baseline-" name, \ - NULL, 0, NULL, flags, result); \ + DO_TEST(arch, cpuTestBaseline, label, NULL, \ + "baseline-" name, NULL, 0, NULL, flags, result); \ } \ VIR_FREE(label); \ } while (0) #define DO_TEST_HASFEATURE(arch, host, feature, result) \ - DO_TEST(arch, API_HAS_FEATURE, \ + DO_TEST(arch, cpuTestHasFeature, \ host "/" feature " (" #result ")", \ host, feature, NULL, 0, NULL, 0, result) #define DO_TEST_GUESTDATA(arch, host, cpu, models, preferred, result) \ - DO_TEST(arch, API_GUEST_DATA, \ + DO_TEST(arch, cpuTestGuestData, \ host "/" cpu " (" #models ", pref=" #preferred ")", \ host, cpu, models, \ models == NULL ? 0 : sizeof(models) / sizeof(char *), \ @@ -695,7 +663,7 @@ mymain(void) # define DO_TEST_CPUID_JSON(arch, host, json) \ do { \ if (json) { \ - DO_TEST(arch, API_JSON_CPUID, host, host, \ + DO_TEST(arch, cpuTestJSONCPUID, host, host, \ NULL, NULL, 0, NULL, 0, 0); \ } \ } while (0) @@ -705,9 +673,9 @@ mymain(void) #define DO_TEST_CPUID(arch, host, json) \ do { \ - DO_TEST(arch, API_HOST_CPUID, host, host, \ + DO_TEST(arch, cpuTestHostCPUID, host, host, \ NULL, NULL, 0, NULL, 0, 0); \ - DO_TEST(arch, API_GUEST_CPUID, host, host, \ + DO_TEST(arch, cpuTestGuestCPUID, host, host, \ NULL, NULL, 0, NULL, 0, 0); \ DO_TEST_CPUID_JSON(arch, host, json); \ } while (0) -- 2.8.4

2 1

[libvirt] [PATCH] Fix build without xen
by Martin Kletzander 14 Jun '16

14 Jun '16

Commit 11567cf66f36 introduced an include which will only work when building with xen (particularly libxl). However, that file is supposed to be includable from anywhere (as with other testutils* files. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- Pushed under the build-breaker rule. tests/testutilsxen.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/testutilsxen.h b/tests/testutilsxen.h index 8b997c32325c..2facf5e5afa5 100644 --- a/tests/testutilsxen.h +++ b/tests/testutilsxen.h @@ -2,7 +2,9 @@ # define _TESTUTILSXEN_H_ # include "capabilities.h" -# include "libxl/libxl_capabilities.h" +# ifdef WITH_LIBXL +# include "libxl/libxl_capabilities.h" +# endif virCapsPtr testXenCapsInit(void); -- 2.8.4

1 0

[libvirt] [PATCH] virt-host-validate: fix build with clang
by Roman Bogorodskiy 14 Jun '16

14 Jun '16

Building with clang 3.8 triggers the following error: CC virt_host_validate-virt-host-validate-qemu.o virt-host-validate-qemu.c:36:11: error: initializing 'char *' with an expression of type 'const char *' discards qualifiers [-Werror,-Wincompatible-pointer-types-discards-qualifiers] char *kvmhint = _("Check that CPU and firmware supports virtualization " ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ virt-host-validate-qemu.c:46:17: error: assigning to 'char *' from 'const char *' discards qualifiers [-Werror,-Wincompatible-pointer-types-discards-qualifiers] kvmhint = _("Check that the 'kvm-intel' or 'kvm-amd' modules are " ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 2 errors generated. Fix by using 'const' for kvmhint declaration. --- Pushed under the build-breaker rule. tools/virt-host-validate-qemu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/virt-host-validate-qemu.c b/tools/virt-host-validate-qemu.c index 66377e1..2aa396e 100644 --- a/tools/virt-host-validate-qemu.c +++ b/tools/virt-host-validate-qemu.c @@ -33,8 +33,8 @@ int virHostValidateQEMU(void) int ret = 0; bool hasHwVirt = false; bool hasVirtFlag = false; - char *kvmhint = _("Check that CPU and firmware supports virtualization " - "and kvm module is loaded"); + const char *kvmhint = _("Check that CPU and firmware supports virtualization " + "and kvm module is loaded"); if (!(flags = virHostValidateGetCPUFlags())) return -1; -- 2.7.4

1 0

[libvirt] [PATCH v5 0/2] Add support for zero-write detection
by Martin Kletzander 14 Jun '16

14 Jun '16

v5: - Reword documentation - Use detect_zeroes=on if it is unmap but discard=ignore - Use detect-zeroes on qemu cmdline instead of detect_zeroes v4: - Changed docs per Peter's review - https://www.redhat.com/archives/libvir-list/2016-June/msg00113.html v3: - I know Peter said he'll review it, but there are conflicts every once in a while, so rebased version will apply cleanly for a while - And it's actually not that big of a change to wait for some bigger things to be designed, I believe =) - https://www.redhat.com/archives/libvir-list/2016-April/msg01926.html v2: - use 'zeroes' instead of 'zeros' - https://www.redhat.com/archives/libvir-list/2016-February/msg01146.html v1: - https://www.redhat.com/archives/libvir-list/2015-December/msg00511.html Martin Kletzander (2): conf: Add support of zero-detection for disks qemu: Add support for zero-detection writes docs/formatdomain.html.in | 12 ++++++ docs/schemas/domaincommon.rng | 12 ++++++ src/conf/domain_conf.c | 19 ++++++++- src/conf/domain_conf.h | 11 ++++++ src/libvirt_private.syms | 2 + src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 24 ++++++++++++ tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 1 + .../caps_2.6.0-gicv2.aarch64.xml | 1 + .../caps_2.6.0-gicv3.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.xml | 1 + tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 1 + .../qemuxml2argv-disk-drive-detect-zeroes.args | 27 +++++++++++++ .../qemuxml2argv-disk-drive-detect-zeroes.xml | 45 ++++++++++++++++++++++ tests/qemuxml2argvtest.c | 3 ++ .../qemuxml2xmlout-disk-drive-detect-zeroes.xml | 1 + tests/qemuxml2xmltest.c | 1 + 20 files changed, 166 insertions(+), 1 deletion(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-detect-zeroes.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-detect-zeroes.xml create mode 120000 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-detect-zeroes.xml -- 2.8.3

2 3

[libvirt] [ruby-libvirt 1/2] Add .gitignore
by Guido Günther 14 Jun '16

14 Jun '16

--- .gitignore | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..f033dcf --- /dev/null +++ b/.gitignore @@ -0,0 +1,6 @@ +ext/libvirt/extconf.h +ext/libvirt/_libvirt.so +ext/libvirt/Makefile +ext/libvirt/mkmf.log +*.o +*~ -- 2.8.1

2 2

[libvirt] [PATCH] libxl: fix vm lock overwritten bug
by Wang Yufei 13 Jun '16

13 Jun '16

In libxl driver we do virObjectRef in libxlDomainObjBeginJob, If virCondWaitUntil failed, it goes to error, do virObjectUnref, There's a chance that someone undefine the vm at the same time, and refs unref to zero, vm is freed in libxlDomainObjBeginJob. But the vm outside function is not Null, we do virObjectUnlock(vm). That's how we overwrite the vm memory after it's freed. I fix it. Signed-off-by: Wang Yufei <james.wangyufei(a)huawei.com> --- src/conf/virdomainobjlist.c | 29 ++++++++-- src/conf/virdomainobjlist.h | 2 + src/libvirt_private.syms | 1 + src/libxl/libxl_domain.c | 18 ++----- src/libxl/libxl_domain.h | 5 +- src/libxl/libxl_driver.c | 127 ++++++++++++++++---------------------------- src/libxl/libxl_migration.c | 14 ++--- 7 files changed, 86 insertions(+), 110 deletions(-) diff --git a/src/conf/virdomainobjlist.c b/src/conf/virdomainobjlist.c index 27590c8..485671e 100644 --- a/src/conf/virdomainobjlist.c +++ b/src/conf/virdomainobjlist.c @@ -112,24 +112,45 @@ static int virDomainObjListSearchID(const void *payload, return want; } - -virDomainObjPtr virDomainObjListFindByID(virDomainObjListPtr doms, - int id) +static virDomainObjPtr +virDomainObjListFindByIDInternal(virDomainObjListPtr doms, + int id, + bool ref) { virDomainObjPtr obj; virObjectLock(doms); obj = virHashSearch(doms->objs, virDomainObjListSearchID, &id); + if (ref) { + virObjectRef(obj); + virObjectUnlock(doms); + } if (obj) { virObjectLock(obj); if (obj->removing) { virObjectUnlock(obj); + if (ref) + virObjectUnref(obj); obj = NULL; } } - virObjectUnlock(doms); + if (!ref) + virObjectUnlock(doms); return obj; } +virDomainObjPtr +virDomainObjListFindByID(virDomainObjListPtr doms, + int id) +{ + return virDomainObjListFindByIDInternal(doms, id, false); +} + +virDomainObjPtr +virDomainObjListFindByIDRef(virDomainObjListPtr doms, + int id) +{ + return virDomainObjListFindByIDInternal(doms, id, true); +} static virDomainObjPtr virDomainObjListFindByUUIDInternal(virDomainObjListPtr doms, diff --git a/src/conf/virdomainobjlist.h b/src/conf/virdomainobjlist.h index c0f856c..3c59bd3 100644 --- a/src/conf/virdomainobjlist.h +++ b/src/conf/virdomainobjlist.h @@ -34,6 +34,8 @@ virDomainObjListPtr virDomainObjListNew(void); virDomainObjPtr virDomainObjListFindByID(virDomainObjListPtr doms, int id); +virDomainObjPtr virDomainObjListFindByIDRef(virDomainObjListPtr doms, + int id); virDomainObjPtr virDomainObjListFindByUUID(virDomainObjListPtr doms, const unsigned char *uuid); virDomainObjPtr virDomainObjListFindByUUIDRef(virDomainObjListPtr doms, diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 85b9cd1..b42e2cd 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -888,6 +888,7 @@ virDomainObjListCollect; virDomainObjListConvert; virDomainObjListExport; virDomainObjListFindByID; +virDomainObjListFindByIDRef; virDomainObjListFindByName; virDomainObjListFindByUUID; virDomainObjListFindByUUIDRef; diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index 4a21f68..ec1ff51 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -123,8 +123,6 @@ libxlDomainObjBeginJob(libxlDriverPrivatePtr driver ATTRIBUTE_UNUSED, return -1; then = now + LIBXL_JOB_WAIT_TIME; - virObjectRef(obj); - while (priv->job.active) { VIR_DEBUG("Wait normal job condition for starting job: %s", libxlDomainJobTypeToString(job)); @@ -157,7 +155,6 @@ libxlDomainObjBeginJob(libxlDriverPrivatePtr driver ATTRIBUTE_UNUSED, virReportSystemError(errno, "%s", _("cannot acquire job mutex")); - virObjectUnref(obj); return -1; } @@ -171,7 +168,7 @@ libxlDomainObjBeginJob(libxlDriverPrivatePtr driver ATTRIBUTE_UNUSED, * non-zero, false if the reference count has dropped to zero * and obj is disposed. */ -bool +void libxlDomainObjEndJob(libxlDriverPrivatePtr driver ATTRIBUTE_UNUSED, virDomainObjPtr obj) { @@ -183,8 +180,6 @@ libxlDomainObjEndJob(libxlDriverPrivatePtr driver ATTRIBUTE_UNUSED, libxlDomainObjResetJob(priv); virCondSignal(&priv->job.cond); - - return virObjectUnref(obj); } int @@ -532,12 +527,10 @@ libxlDomainShutdownThread(void *opaque) } endjob: - if (!libxlDomainObjEndJob(driver, vm)) - vm = NULL; + libxlDomainObjEndJob(driver, vm); cleanup: - if (vm) - virObjectUnlock(vm); + virDomainObjEndAPI(&vm); if (dom_event) libxlDomainEventQueue(driver, dom_event); libxl_event_free(cfg->ctx, ev); @@ -570,7 +563,7 @@ libxlDomainEventHandler(void *data, VIR_LIBXL_EVENT_CONST libxl_event *event) if (xl_reason == LIBXL_SHUTDOWN_REASON_SUSPEND) goto error; - vm = virDomainObjListFindByID(driver->domains, event->domid); + vm = virDomainObjListFindByIDRef(driver->domains, event->domid); if (!vm) { VIR_INFO("Received event for unknown domain ID %d", event->domid); goto error; @@ -605,8 +598,7 @@ libxlDomainEventHandler(void *data, VIR_LIBXL_EVENT_CONST libxl_event *event) /* Cast away any const */ libxl_event_free(cfg->ctx, (libxl_event *)event); virObjectUnref(cfg); - if (vm) - virObjectUnlock(vm); + virDomainObjEndAPI(&vm); VIR_FREE(shutdown_info); } diff --git a/src/libxl/libxl_domain.h b/src/libxl/libxl_domain.h index c53adaa..af11a2c 100644 --- a/src/libxl/libxl_domain.h +++ b/src/libxl/libxl_domain.h @@ -85,10 +85,9 @@ libxlDomainObjBeginJob(libxlDriverPrivatePtr driver, enum libxlDomainJob job) ATTRIBUTE_RETURN_CHECK; -bool +void libxlDomainObjEndJob(libxlDriverPrivatePtr driver, - virDomainObjPtr obj) - ATTRIBUTE_RETURN_CHECK; + virDomainObjPtr obj); int libxlDomainJobUpdateTime(struct libxlDomainJobObj *job) diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 2ab08ac..629788d 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -290,7 +290,7 @@ libxlDomObjFromDomain(virDomainPtr dom) libxlDriverPrivatePtr driver = dom->conn->privateData; char uuidstr[VIR_UUID_STRING_BUFLEN]; - vm = virDomainObjListFindByUUID(driver->domains, dom->uuid); + vm = virDomainObjListFindByUUIDRef(driver->domains, dom->uuid); if (!vm) { virUUIDFormat(dom->uuid, uuidstr); virReportError(VIR_ERR_NO_DOMAIN, @@ -309,12 +309,12 @@ libxlAutostartDomain(virDomainObjPtr vm, libxlDriverPrivatePtr driver = opaque; int ret = -1; + virObjectRef(vm); virObjectLock(vm); virResetLastError(); if (libxlDomainObjBeginJob(driver, vm, LIBXL_JOB_MODIFY) < 0) { - virObjectUnlock(vm); - return ret; + goto cleanup; } if (vm->autostart && !virDomainObjIsActive(vm) && @@ -328,8 +328,9 @@ libxlAutostartDomain(virDomainObjPtr vm, ret = 0; endjob: - if (libxlDomainObjEndJob(driver, vm)) - virObjectUnlock(vm); + libxlDomainObjEndJob(driver, vm); + cleanup: + virDomainObjEndAPI(&vm); return ret; } @@ -983,6 +984,7 @@ libxlDomainCreateXML(virConnectPtr conn, const char *xml, VIR_DOMAIN_OBJ_LIST_ADD_CHECK_LIVE, NULL))) goto cleanup; + virObjectRef(vm); def = NULL; if (libxlDomainObjBeginJob(driver, vm, LIBXL_JOB_MODIFY) < 0) { @@ -1008,13 +1010,11 @@ libxlDomainCreateXML(virConnectPtr conn, const char *xml, dom->id = vm->def->id; endjob: - if (!libxlDomainObjEndJob(driver, vm)) - vm = NULL; + libxlDomainObjEndJob(driver, vm); cleanup: virDomainDefFree(def); - if (vm) - virObjectUnlock(vm); + virDomainObjEndAPI(&vm); virObjectUnref(cfg); return dom; } @@ -1141,12 +1141,10 @@ libxlDomainSuspend(virDomainPtr dom) ret = 0; endjob: - if (!libxlDomainObjEndJob(driver, vm)) - vm = NULL; + libxlDomainObjEndJob(driver, vm); cleanup: - if (vm) - virObjectUnlock(vm); + virDomainObjEndAPI(&vm); if (event) libxlDomainEventQueue(driver, event); virObjectUnref(cfg); @@ -1200,12 +1198,10 @@ libxlDomainResume(virDomainPtr dom) ret = 0; endjob: - if (!libxlDomainObjEndJob(driver, vm)) - vm = NULL; + libxlDomainObjEndJob(driver, vm); cleanup: - if (vm) - virObjectUnlock(vm); + virDomainObjEndAPI(&vm); if (event) libxlDomainEventQueue(driver, event); virObjectUnref(cfg); @@ -1373,12 +1369,10 @@ libxlDomainDestroyFlags(virDomainPtr dom, ret = 0; endjob: - if (!libxlDomainObjEndJob(driver, vm)) - vm = NULL; + libxlDomainObjEndJob(driver, vm); cleanup: - if (vm) - virObjectUnlock(vm); + virDomainObjEndAPI(&vm); if (event) libxlDomainEventQueue(driver, event); virObjectUnref(cfg); @@ -1517,12 +1511,10 @@ libxlDomainSetMemoryFlags(virDomainPtr dom, unsigned long newmem, ret = 0; endjob: - if (!libxlDomainObjEndJob(driver, vm)) - vm = NULL; + libxlDomainObjEndJob(driver, vm); cleanup: - if (vm) - virObjectUnlock(vm); + virDomainObjEndAPI(&vm); virObjectUnref(cfg); return ret; } @@ -1746,16 +1738,14 @@ libxlDomainSaveFlags(virDomainPtr dom, const char *to, const char *dxml, ret = 0; endjob: - if (!libxlDomainObjEndJob(driver, vm)) - vm = NULL; + libxlDomainObjEndJob(driver, vm); cleanup: if (remove_dom && vm) { virDomainObjListRemove(driver->domains, vm); vm = NULL; } - if (vm) - virObjectUnlock(vm); + virDomainObjEndAPI(&vm); return ret; } @@ -1802,7 +1792,7 @@ libxlDomainRestoreFlags(virConnectPtr conn, const char *from, VIR_DOMAIN_OBJ_LIST_ADD_CHECK_LIVE, NULL))) goto cleanup; - + virObjectRef(vm); def = NULL; if (libxlDomainObjBeginJob(driver, vm, LIBXL_JOB_MODIFY) < 0) { @@ -1819,15 +1809,13 @@ libxlDomainRestoreFlags(virConnectPtr conn, const char *from, if (ret < 0 && !vm->persistent) virDomainObjListRemove(driver->domains, vm); - if (!libxlDomainObjEndJob(driver, vm)) - vm = NULL; + libxlDomainObjEndJob(driver, vm); cleanup: if (VIR_CLOSE(fd) < 0) virReportSystemError(errno, "%s", _("cannot close file")); virDomainDefFree(def); - if (vm) - virObjectUnlock(vm); + virDomainObjEndAPI(&vm); virObjectUnref(cfg); return ret; } @@ -1923,16 +1911,14 @@ libxlDomainCoreDump(virDomainPtr dom, const char *to, unsigned int flags) } endjob: - if (!libxlDomainObjEndJob(driver, vm)) - vm = NULL; + libxlDomainObjEndJob(driver, vm); cleanup: if (remove_dom && vm) { virDomainObjListRemove(driver->domains, vm); vm = NULL; } - if (vm) - virObjectUnlock(vm); + virDomainObjEndAPI(&vm); if (event) libxlDomainEventQueue(driver, event); virObjectUnref(cfg); @@ -1986,16 +1972,14 @@ libxlDomainManagedSave(virDomainPtr dom, unsigned int flags) ret = 0; endjob: - if (!libxlDomainObjEndJob(driver, vm)) - vm = NULL; + libxlDomainObjEndJob(driver, vm); cleanup: if (remove_dom && vm) { virDomainObjListRemove(driver->domains, vm); vm = NULL; } - if (vm) - virObjectUnlock(vm); + virDomainObjEndAPI(&vm); VIR_FREE(name); return ret; } @@ -2212,14 +2196,12 @@ libxlDomainSetVcpusFlags(virDomainPtr dom, unsigned int nvcpus, } endjob: - if (!libxlDomainObjEndJob(driver, vm)) - vm = NULL; + libxlDomainObjEndJob(driver, vm); cleanup: VIR_FREE(bitmask); - if (vm) - virObjectUnlock(vm); - virObjectUnref(cfg); + virDomainObjEndAPI(&vm); + virObjectUnref(cfg); return ret; } @@ -2357,12 +2339,10 @@ libxlDomainPinVcpuFlags(virDomainPtr dom, unsigned int vcpu, } endjob: - if (!libxlDomainObjEndJob(driver, vm)) - vm = NULL; + libxlDomainObjEndJob(driver, vm); cleanup: - if (vm) - virObjectUnlock(vm); + virDomainObjEndAPI(&vm); virBitmapFree(pcpumap); virObjectUnref(cfg); return ret; @@ -2685,12 +2665,10 @@ libxlDomainCreateWithFlags(virDomainPtr dom, dom->id = vm->def->id; endjob: - if (!libxlDomainObjEndJob(driver, vm)) - vm = NULL; + libxlDomainObjEndJob(driver, vm); cleanup: - if (vm) - virObjectUnlock(vm); + virDomainObjEndAPI(&vm); return ret; } @@ -3695,14 +3673,12 @@ libxlDomainAttachDeviceFlags(virDomainPtr dom, const char *xml, } endjob: - if (!libxlDomainObjEndJob(driver, vm)) - vm = NULL; + libxlDomainObjEndJob(driver, vm); cleanup: virDomainDefFree(vmdef); virDomainDeviceDefFree(dev); - if (vm) - virObjectUnlock(vm); + virDomainObjEndAPI(&vm); virObjectUnref(cfg); return ret; } @@ -3788,14 +3764,12 @@ libxlDomainDetachDeviceFlags(virDomainPtr dom, const char *xml, } endjob: - if (!libxlDomainObjEndJob(driver, vm)) - vm = NULL; + libxlDomainObjEndJob(driver, vm); cleanup: virDomainDefFree(vmdef); virDomainDeviceDefFree(dev); - if (vm) - virObjectUnlock(vm); + virDomainObjEndAPI(&vm); virObjectUnref(cfg); return ret; } @@ -4076,14 +4050,12 @@ libxlDomainSetAutostart(virDomainPtr dom, int autostart) ret = 0; endjob: - if (!libxlDomainObjEndJob(driver, vm)) - vm = NULL; + libxlDomainObjEndJob(driver, vm); cleanup: VIR_FREE(configFile); VIR_FREE(autostartLink); - if (vm) - virObjectUnlock(vm); + virDomainObjEndAPI(&vm); virObjectUnref(cfg); return ret; } @@ -4288,12 +4260,10 @@ libxlDomainSetSchedulerParametersFlags(virDomainPtr dom, ret = 0; endjob: - if (!libxlDomainObjEndJob(driver, vm)) - vm = NULL; + libxlDomainObjEndJob(driver, vm); cleanup: - if (vm) - virObjectUnlock(vm); + virDomainObjEndAPI(&vm); virObjectUnref(cfg); return ret; } @@ -4609,12 +4579,10 @@ libxlDomainInterfaceStats(virDomainPtr dom, _("'%s' is not a known interface"), path); endjob: - if (!libxlDomainObjEndJob(driver, vm)) - vm = NULL; + libxlDomainObjEndJob(driver, vm); cleanup: - if (vm) - virObjectUnlock(vm); + virDomainObjEndAPI(&vm); return ret; } @@ -4791,13 +4759,11 @@ libxlDomainMemoryStats(virDomainPtr dom, ret = i; endjob: - if (!libxlDomainObjEndJob(driver, vm)) - vm = NULL; + libxlDomainObjEndJob(driver, vm); cleanup: libxl_dominfo_dispose(&d_info); - if (vm) - virObjectUnlock(vm); + virDomainObjEndAPI(&vm); virObjectUnref(cfg); return ret; } @@ -5364,8 +5330,7 @@ libxlDomainMigrateFinish3Params(virConnectPtr dconn, ret = libxlDomainMigrationFinish(dconn, vm, flags, cancelled); - if (!libxlDomainObjEndJob(driver, vm)) - vm = NULL; + libxlDomainObjEndJob(driver, vm); virDomainObjEndAPI(&vm); diff --git a/src/libxl/libxl_migration.c b/src/libxl/libxl_migration.c index 539ee1b..bf285a4 100644 --- a/src/libxl/libxl_migration.c +++ b/src/libxl/libxl_migration.c @@ -266,6 +266,7 @@ libxlDoMigrateReceive(void *opaque) int ret; bool remove_dom = 0; + virObjectRef(vm); virObjectLock(vm); if (libxlDomainObjBeginJob(driver, vm, LIBXL_JOB_MODIFY) < 0) goto cleanup; @@ -291,16 +292,14 @@ libxlDoMigrateReceive(void *opaque) VIR_FORCE_CLOSE(recvfd); virObjectUnref(args); - if (!libxlDomainObjEndJob(driver, vm)) - vm = NULL; + libxlDomainObjEndJob(driver, vm); cleanup: if (remove_dom && vm) { virDomainObjListRemove(driver->domains, vm); vm = NULL; } - if (vm) - virObjectUnlock(vm); + virDomainObjEndAPI(&vm); } @@ -437,14 +436,11 @@ libxlDomainMigrationBegin(virConnectPtr conn, xml = virDomainDefFormat(def, cfg->caps, VIR_DOMAIN_DEF_FORMAT_SECURE); endjob: - if (!libxlDomainObjEndJob(driver, vm)) - vm = NULL; + libxlDomainObjEndJob(driver, vm); cleanup: libxlMigrationCookieFree(mig); - if (vm) - virObjectUnlock(vm); - + virDomainObjEndAPI(&vm); virDomainDefFree(tmpdef); virObjectUnref(cfg); return xml; -- 1.8.3.4

2 1

[libvirt] [GSoC] Abstracting device address allocation
by Tomasz Flendrich 13 Jun '16

13 Jun '16

Hello everyone, Let me introduce myself - I'm Tomasz Flendrich and I'm a Google Summer of Code student from University of Wrocław, Poland. My goal is to create a generic address allocator (for PCI, virtio, SCSI, etc.), because current handling of addresses has its flaws: sometimes addresses aren't properly assigned and checked for duplicates. Additionally, a generic solution will be very useful when more hypervisors add the feature of explicitly stating the addresses of devices. The key goal I'm willing to achieve at this moment is defining a minimum viable product (one thing to be implemented quickly which is reasonably complete on its own, and has potential for further development in the direction which makes sense). I came up with an initial design. The internal allocator's data will be kept in struct Allocator. There will be one structure for one address type and all of the allocators would be in an array. We will have the possibility of adding an address pool to the allocator. For example, when we create a root PCI bus, we tell the allocator that the following PCI addresses are possible: {0..0}:{0..31}.{0..7}, where {a..b} means a range from a to b, inclusive. This function call could look like this: allocatorAddPool( allocator[PCI_ADDRESS_TYPE], &outputAddress, AllocatorRange(0, 0), AllocatorRange(0, 31), AllocatorRange(0, 7)); The outputAddress would be an array owned by the caller (only filled in by the allocator). If we were to allocate IP addresses for computers from the range 192.168.1.2 to 192.168.1.240, where the router has to have the address 192.168.1.254: First, we reserve the address for the router to let the Allocator know that it's in use, and that we can track collisions in manually assigned addresses: allocatorReserveAddress( allocator[IP_ADDRESS_TYPE], &outputAddress, AllocatorValue(192), AllocatorValue(168), AllocatorValue(1), AllocatorValue(254)); Then, we assign the addresses for the computers: allocatorReserveAddress( allocator[IP_ADDRESS_TYPE], &outputAddress, AllocatorValue(192), AllocatorValue(168), AllocatorValue(1), AllocatorRange(1, 254)); Please note that AllocatorValue() is now in use. There could be a different function call to simply assign any address: allocatorReserveAny(Allocator* allocator, &outputAddress); Let's say that we want an "sda" disk. We could create a wrapper: allocatorReserveSCSIAddress(allocator, "sda"); All this wrapper does is representing the string "sda" as an integer mapping to the letter (eg. 'a' = 0, 'z' = 25): allocatorReserveAddress(allocator[SCSI_ADDRESS_TYPE], &outputAddress, 0); If an address is already determined, because it was specified in the XML or it's some specific device that has to be at some specific address, we still reserve it to let the Allocator know that it's in use. How would this work internally? One of the possible solutions is keeping a set of ranges of addresses. For example, suppose that we have two PCI busses to use. Our address pool is stored as one range: {0..1} {0..31} {0..7} Now someone reserves address 0:13.2 Our new free addresses pool is now stored as this set of ranges: {0..0} {0..12} {0..7}, {0..0} {12..12} {0..1}, {0..0} {12..12} {3..7}, {0..0} {13..31} {0..7}, {1..1} {0..31} {0..7} If we kept every address separately, it would require 2*32*8=512 addresses. The set data structure from gnulib's gl_oset.h is a candidate for keeping the ranges in a sorted fashion. Another candidate is simply a sorted list from gl_list.h. This structure would be able to handle all types of addresses that are convertible to a fixed-length list of integers. We don't mind how many of these integers there are, because we can use variadic arguments. It won't allow duplicates if we stick to using it in every place where we have some addresses. It will also be very generic, with the possibility of writing wrappers on top of it that might be more convenient for some particular address type. This way we would keep qemu_* files as they are for now, and just replace existing allocators (and manual assignment of addresses) to calls to our new allocator. My ideas: - A possibility of reserving a range of addresses might be used to reserve a whole PCI slot at once. - Flags could be added, changing the behavior of particular addresses or the whole allocator. My questions: - Is this approach good long-term? - Is address releasing expected to be required at any point? (think device hotplug/unplug, etc.) - What other features are needed? Please speak up your mind if you have remarks or thoughts about the idea. I'd really appreciate it. Tomasz

3 5

[libvirt] [PATCH] tests: fix CPUID detection tests compilation failure
by Wei Liu 13 Jun '16

13 Jun '16

In 3704b9003 ("tests: Add CPU detection tests"), a macro called DO_TEST_CPUID_JSON is added. But it took only two arguments when QEMU or YAJL is not set. Fix it by adding a third argument. Shouldn't have any effect because that macro compiles to nothing. Signed-off-by: Wei Liu <wei.liu2(a)citrix.com> --- Cc: Jiri Denemark <jdenemar(a)redhat.com> For error: see http://logs.test-lab.xenproject.org/osstest/logs/95577/build-amd64-libvirt/… --- tests/cputest.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/cputest.c b/tests/cputest.c index f68a3ec..c374ddf 100644 --- a/tests/cputest.c +++ b/tests/cputest.c @@ -700,7 +700,7 @@ mymain(void) } \ } while (0) #else -# define DO_TEST_CPUID_JSON(arch, host) +# define DO_TEST_CPUID_JSON(arch, host, json) #endif #define DO_TEST_CPUID(arch, host, json) \ -- 2.1.4

2 1

[libvirt] [PATCH] virt-login-shell: mark as Linux only
by Roman Bogorodskiy 13 Jun '16

13 Jun '16

Currently, virt-login-shell is not allowed to build on Windows. Howerver, as it's designed around LXC, it does not make sense to build it on anything but Linux, so make the check strickter and allow to enable it on Linux only. --- m4/virt-login-shell.m4 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/m4/virt-login-shell.m4 b/m4/virt-login-shell.m4 index d5e2e00..55dcaf3 100644 --- a/m4/virt-login-shell.m4 +++ b/m4/virt-login-shell.m4 @@ -21,9 +21,9 @@ AC_DEFUN([LIBVIRT_CHECK_LOGIN_SHELL], [ m4_divert_text([DEFAULTS], [with_login_shell=check]) if test "x$with_login_shell" != "xno"; then - if test "x$with_win" = "xyes"; then + if test "x$with_linux" != "xyes"; then if test "x$with_login_shell" = "xyes"; then - AC_MSG_ERROR([virt-login-shell is not supported on Windows]) + AC_MSG_ERROR([virt-login-shell is supported on Linux only]) else with_login_shell=no; fi -- 2.7.4

2 3

[libvirt] [PATCH 0/4] A series of FreeBSD fixes
by Roman Bogorodskiy 13 Jun '16

13 Jun '16

This is a series of a few fixes to FreeBSD build in general and to the bhyve driver in general. Pushed that under the build breaker and trivial rule. However, for the first two fixes I'm not sure that's the best fix possible, so I'm open for feedback. Roman Bogorodskiy (4): nodeinfo: fix build on non-Linux hostcpu: fix build on FreeBSD bhyve: add missing virhost(cpu|mem).h headers bhyve: fix bhyvexml2arg test src/bhyve/bhyve_driver.c | 2 ++ src/nodeinfo.c | 2 ++ src/util/virhostcpu.c | 4 ++-- tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder.xml | 2 +- tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder1.xml | 2 +- tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder3.xml | 2 +- tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder4.xml | 2 +- tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder.xml | 4 ++-- tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder2.xml | 4 ++-- 9 files changed, 14 insertions(+), 10 deletions(-) -- 2.7.4

2 8