- Devel - libvirt List Archives

[libvirt] [PATCH] qemu: add support for LSI SAS1068 (aka MPT Fusion) SCSI controller
by Paolo Bonzini 23 Feb '16

23 Feb '16

This does nothing more than adding the new device and capability. The device is present since QEMU 2.6.0. Signed-off-by: Paolo Bonzini <pbonzini(a)redhat.com> --- src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 13 ++++++- .../qemuxml2argv-disk-scsi-mptsas1068.args | 27 +++++++++++++ .../qemuxml2argv-disk-scsi-mptsas1068.xml | 36 ++++++++++++++++++ tests/qemuxml2argvtest.c | 4 ++ .../qemuxml2xmlout-disk-scsi-mptsas1068.xml | 44 ++++++++++++++++++++++ tests/qemuxml2xmltest.c | 4 ++ 8 files changed, 130 insertions(+), 1 deletion(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-mptsas1068.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-mptsas1068.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-scsi-mptsas1068.xml diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 3099e34..2b953ea 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -314,6 +314,7 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST, "vserport-change-event", /* 210 */ "virtio-balloon-pci.deflate-on-oom", + "mptsas1068", ); @@ -1567,6 +1568,7 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = { { "virtio-tablet-pci", QEMU_CAPS_VIRTIO_TABLET }, { "virtio-input-host-device", QEMU_CAPS_VIRTIO_INPUT_HOST }, { "virtio-input-host-pci", QEMU_CAPS_VIRTIO_INPUT_HOST }, + { "mptsas1068", QEMU_CAPS_SCSI_MPTSAS1068 }, }; static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsVirtioBalloon[] = { diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index e5353de..b73c529 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -343,6 +343,7 @@ typedef enum { QEMU_CAPS_VSERPORT_CHANGE, /* VSERPORT_CHANGE event */ QEMU_CAPS_VIRTIO_BALLOON_AUTODEFLATE, /* virtio-balloon-{device,pci,ccw}. * deflate-on-oom */ + QEMU_CAPS_SCSI_MPTSAS1068, /* -device mptsas1068 */ QEMU_CAPS_LAST /* this must always be the last item */ } virQEMUCapsFlags; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index d7f19f3..4d4d65e 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -872,11 +872,19 @@ qemuSetSCSIControllerModel(virDomainDefPtr def, case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_IBMVSCSI: /*TODO: need checking work here if necessary */ break; + case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LSISAS1068: + if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_SCSI_MPTSAS1068)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("This QEMU doesn't support " + "the LSI SAS1068 (MPT Fusion) controller")); + return -1; + } + break; case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LSISAS1078: if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_SCSI_MEGASAS)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("This QEMU doesn't support " - "the LSI SAS1078 controller")); + "the LSI SAS1078 (MegaRAID) controller")); return -1; } break; @@ -4753,6 +4761,9 @@ qemuBuildControllerDevStr(virDomainDefPtr domainDef, case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_IBMVSCSI: virBufferAddLit(&buf, "spapr-vscsi"); break; + case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LSISAS1068: + virBufferAddLit(&buf, "mptsas1068"); + break; case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LSISAS1078: virBufferAddLit(&buf, "megasas"); break; diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-mptsas1068.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-mptsas1068.args new file mode 100644 index 0000000..bdfc1af --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-mptsas1068.args @@ -0,0 +1,27 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-name QEMUGuest1 \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-nographic \ +-nodefconfig \ +-nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-device mptsas1068,id=scsi0,bus=pci.0,addr=0x3 \ +-usb \ +-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ +-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ +-drive file=/tmp/scsidisk.img,format=raw,if=none,id=drive-scsi0-0-4-0 \ +-device scsi-disk,bus=scsi0.0,channel=0,scsi-id=4,lun=0,drive=drive-scsi0-0-4-0,\ +id=scsi0-0-4-0,wwn=0x5000c50015ea71ac \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-mptsas1068.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-mptsas1068.xml new file mode 100644 index 0000000..b817b69 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-mptsas1068.xml @@ -0,0 +1,36 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <disk type='file' device='disk'> + <source file='/tmp/scsidisk.img'/> + <target dev='sda' bus='scsi'/> + <address type='drive' controller='0' bus='0' target='4' unit='0'/> + <wwn>5000c50015ea71ac</wwn> + </disk> + <controller type='ide' index='0'/> + <controller type='scsi' index='0' model='lsisas1068'/> + <controller type='usb' index='0'/> + <controller type='pci' index='0' model='pci-root'/> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <memballoon model='virtio'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 3c7693b..b5d92c4 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -865,6 +865,10 @@ mymain(void) DO_TEST("disk-scsi-megasas", QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_SCSI_MEGASAS); + DO_TEST("disk-scsi-mptsas1068", + QEMU_CAPS_NODEFCONFIG, + QEMU_CAPS_SCSI_MPTSAS1068, + QEMU_CAPS_SCSI_DISK_WWN); DO_TEST("disk-sata-device", QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_ICH9_AHCI); DO_TEST("disk-aio", diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-scsi-mptsas1068.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-scsi-mptsas1068.xml new file mode 100644 index 0000000..a88b63a --- /dev/null +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-scsi-mptsas1068.xml @@ -0,0 +1,44 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <disk type='file' device='disk'> + <source file='/tmp/scsidisk.img'/> + <target dev='sda' bus='scsi'/> + <wwn>5000c50015ea71ac</wwn> + <address type='drive' controller='0' bus='0' target='4' unit='0'/> + </disk> + <controller type='ide' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> + </controller> + <controller type='scsi' index='0' model='lsisas1068'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </controller> + <controller type='usb' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> + </controller> + <controller type='pci' index='0' model='pci-root'/> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <memballoon model='virtio'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> + </memballoon> + </devices> +</domain> diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index d9550cc..d7d10f6 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -415,6 +415,10 @@ mymain(void) DO_TEST_FULL("disk-scsi-megasas", WHEN_ACTIVE, QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_SCSI_MEGASAS); + DO_TEST_FULL("disk-scsi-mptsas1068", WHEN_ACTIVE, + QEMU_CAPS_NODEFCONFIG, + QEMU_CAPS_SCSI_MPTSAS1068, + QEMU_CAPS_SCSI_DISK_WWN); DO_TEST("disk-mirror-old"); DO_TEST_FULL("disk-mirror", WHEN_ACTIVE, NONE); DO_TEST_FULL("disk-mirror", WHEN_INACTIVE, NONE); -- 2.5.0

3 4

[libvirt] [PATCH] Fix bug of attaching redirdev device
by Osier Yang 23 Feb '16

23 Feb '16

RHBZ: https://bugzilla.redhat.com/show_bug.cgi?id=1298070 The corresponding chardev must be attached first, otherwise the the qemu command line won't be complete (missing the host part), --- src/qemu/qemu_hotplug.c | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index ee305e7..5095e31 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1381,6 +1381,7 @@ int qemuDomainAttachRedirdevDevice(virQEMUDriverPtr driver, int ret; qemuDomainObjPrivatePtr priv = vm->privateData; virDomainDefPtr def = vm->def; + char *charAlias = NULL; char *devstr = NULL; if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_DEVICE)) { @@ -1391,21 +1392,33 @@ int qemuDomainAttachRedirdevDevice(virQEMUDriverPtr driver, if (qemuAssignDeviceRedirdevAlias(vm->def, redirdev, -1) < 0) goto error; - if (!(devstr = qemuBuildRedirdevDevStr(def, redirdev, priv->qemuCaps))) - goto error; - if (VIR_REALLOC_N(vm->def->redirdevs, vm->def->nredirdevs+1) < 0) + if (virAsprintf(&charAlias, "char%s", redirdev->info.alias) < 0) goto error; qemuDomainObjEnterMonitor(driver, vm); + if (qemuMonitorAttachCharDev(priv->mon, + charAlias, + &(redirdev->source.chr)) < 0) { + ignore_value(qemuDomainObjExitMonitor(driver, vm)); + goto error; + } + VIR_FREE(charAlias); + + if (!(devstr = qemuBuildRedirdevDevStr(def, redirdev, priv->qemuCaps))) + goto rollback; + + if (VIR_REALLOC_N(vm->def->redirdevs, vm->def->nredirdevs+1) < 0) + goto rollback; + ret = qemuMonitorAddDevice(priv->mon, devstr); if (qemuDomainObjExitMonitor(driver, vm) < 0) - goto error; + goto rollback; virDomainAuditRedirdev(vm, redirdev, "attach", ret == 0); if (ret < 0) - goto error; + goto rollback; vm->def->redirdevs[vm->def->nredirdevs++] = redirdev; @@ -1414,9 +1427,13 @@ int qemuDomainAttachRedirdevDevice(virQEMUDriverPtr driver, return 0; error: + VIR_FREE(charAlias); VIR_FREE(devstr); return -1; + rollback: + ignore_value(qemuMonitorDetachCharDev(priv->mon, charAlias)); + goto error; } static int -- 2.1.4

2 2

[libvirt] [PATCH v2 0/9] PCI hostdev refactoring
by Andrea Bolognani 23 Feb '16

23 Feb '16

Changes in v2: * Internal functions operate on a single device, don't pass around device lists for no reason * Use virHostdev prefix for internal functions * Split off style adjustments and comments updated to separate patches See the cover letter for v1[1] for details about the series. Cheers. [1] https://www.redhat.com/archives/libvir-list/2016-January/msg00835.html Andrea Bolognani (9): hostdev: Add virHostdevOnlyReattachPCIDevice() hostdev: Use common reattach code to rollback prepare errors hostdev: Use common reattach code in virHostdevPCINodeDeviceReAttach() hostdev: Add virHostdevOnlyDetachPCIDevice() hostdev: Use common detach code in virHostdevPCINodeDeviceDetach() hostdev: Minor style adjustments hostdev: Update comments pci: Phase out virPCIDeviceReattachInit() pci: Add debug messages when unbinding from stub driver src/libvirt_private.syms | 1 - src/util/virhostdev.c | 385 ++++++++++++++++++++++++++++++----------------- src/util/virpci.c | 30 ++-- src/util/virpci.h | 1 - tests/virpcitest.c | 5 +- 5 files changed, 272 insertions(+), 150 deletions(-) -- 2.5.0

2 29

[libvirt] About the vfio error when using SR-IOV
by Xiao Ma (xima2) 23 Feb '16

23 Feb '16

Hi, All I want to use the SR-IOV of intel 82576 NIC. I enabled IOMMU and VT-d and SR-IOV in BIOS. And enabled VT-d in kernel. The OS information is bellow: [root@host3 nova]# cat /etc/redhat-release CentOS Linux release 7.1.1503 (Core) [root@host3 nova]# uname -an Linux host3.localdomain 3.10.0-229.el7.x86_64 #1 SMP Fri Mar 6 11:36:42 UTC 2015 x86_64 x86_64 x86_64 GNU/Linux [root@host3 nova]# rpm -qa|grep qemu libvirt-daemon-driver-qemu-1.2.8-16.el7.x86_64 qemu-kvm-1.5.3-86.el7.x86_64 qemu-kvm-common-1.5.3-86.el7.x86_64 ipxe-roms-qemu-20130517-6.gitc4bce43.el7.noarch qemu-img-1.5.3-86.el7.x86_64 [root@host3 nova]# rpm -qa|grep libvirt libvirt-daemon-1.2.8-16.el7.x86_64 libvirt-daemon-driver-nwfilter-1.2.8-16.el7.x86_64 libvirt-python-1.2.8-7.el7.x86_64 libvirt-daemon-driver-storage-1.2.8-16.el7.x86_64 libvirt-daemon-driver-qemu-1.2.8-16.el7.x86_64 libvirt-daemon-config-nwfilter-1.2.8-16.el7.x86_64 libvirt-daemon-driver-secret-1.2.8-16.el7.x86_64 libvirt-daemon-driver-interface-1.2.8-16.el7.x86_64 libvirt-client-1.2.8-16.el7.x86_64 libvirt-glib-0.1.7-3.el7.x86_64 libvirt-daemon-driver-network-1.2.8-16.el7.x86_64 libvirt-daemon-driver-nodedev-1.2.8-16.el7.x86_64 libvirt-daemon-kvm-1.2.8-16.el7.x86_64 And I can see the vf of the NIC after ‘ echo '7' > /sys/class/net/ens1f1/device/sriov_numvfs ' [root@host3 VTS2.1-demo]# lspci |grep -i ethernet 08:00.0 Ethernet controller: QLogic Corp. 10GbE Converged Network Adapter (TCP/IP Networking) (rev 02) 08:00.1 Ethernet controller: QLogic Corp. 10GbE Converged Network Adapter (TCP/IP Networking) (rev 02) 0f:00.0 Ethernet controller: Intel Corporation 82576 Gigabit Network Connection (rev 01) 0f:00.1 Ethernet controller: Intel Corporation 82576 Gigabit Network Connection (rev 01) 10:10.1 Ethernet controller: Intel Corporation 82576 Virtual Function (rev 01) 10:10.3 Ethernet controller: Intel Corporation 82576 Virtual Function (rev 01) 10:10.5 Ethernet controller: Intel Corporation 82576 Virtual Function (rev 01) 10:10.7 Ethernet controller: Intel Corporation 82576 Virtual Function (rev 01) 10:11.1 Ethernet controller: Intel Corporation 82576 Virtual Function (rev 01) 10:11.3 Ethernet controller: Intel Corporation 82576 Virtual Function (rev 01) 10:11.5 Ethernet controller: Intel Corporation 82576 Virtual Function (rev 01) I configured the interface as bellow in XML: <interface type="hostdev" managed="yes"> <mac address="fa:16:3e:f7:57:5f"/> <source> <address type="pci" domain="0x0000" bus="0x10" slot="0x10" function="0x3"/> </source> <vlan> <tag id="1000"/> </vlan> </interface> But the error output when I boot one vm: [root@host3 VTS2.1-demo]# virsh create vtc.demo.xml error: Failed to create domain from vtc.demo.xml error: internal error: early end of file from monitor: possible problem: 2016-02-22T07:38:42.169035Z qemu-kvm: -device vfio-pci,host=10:10.3,id=hostdev0,bus=pci.0,addr=0x3: vfio: error, group 17 is not viable, please ensure all devices within the iommu_group are bound to their vfio bus driver. 2016-02-22T07:38:42.169215Z qemu-kvm: -device vfio-pci,host=10:10.3,id=hostdev0,bus=pci.0,addr=0x3: vfio: failed to get group 17 2016-02-22T07:38:42.169233Z qemu-kvm: -device vfio-pci,host=10:10.3,id=hostdev0,bus=pci.0,addr=0x3: Device initialization failed. 2016-02-22T07:38:42.169248Z qemu-kvm: -device vfio-pci,host=10:10.3,id=hostdev0,bus=pci.0,addr=0x3: Device 'vfio-pci' could not be initialized Could you please help to solve it? Looking forward for your reply. Thanks.

3 2

[libvirt] [PATCH] cmdNetworkUpdate: Prefer VSH_EXCLUSIVE_OPTIONS over if-else tree
by Michal Privoznik 22 Feb '16

22 Feb '16

We have macros that check and reject mutually exclusive parameters to our commands. Use those instead of if-else tree. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- tools/virsh-network.c | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/tools/virsh-network.c b/tools/virsh-network.c index 1ae206a..d0bd7a3 100644 --- a/tools/virsh-network.c +++ b/tools/virsh-network.c @@ -907,9 +907,12 @@ cmdNetworkUpdate(vshControl *ctl, const vshCmd *cmd) bool current = vshCommandOptBool(cmd, "current"); bool config = vshCommandOptBool(cmd, "config"); bool live = vshCommandOptBool(cmd, "live"); - unsigned int flags = 0; + unsigned int flags = VIR_NETWORK_UPDATE_AFFECT_CURRENT; const char *affected; + VSH_EXCLUSIVE_OPTIONS_VAR(current, live); + VSH_EXCLUSIVE_OPTIONS_VAR(current, config); + if (!(network = virshCommandOptNetwork(ctl, cmd, NULL))) return false; @@ -962,18 +965,10 @@ cmdNetworkUpdate(vshControl *ctl, const vshCmd *cmd) xml = xmlFromFile; } - if (current) { - if (live || config) { - vshError(ctl, "%s", _("--current must be specified exclusively")); - goto cleanup; - } - flags |= VIR_NETWORK_UPDATE_AFFECT_CURRENT; - } else { - if (config) - flags |= VIR_NETWORK_UPDATE_AFFECT_CONFIG; - if (live) - flags |= VIR_NETWORK_UPDATE_AFFECT_LIVE; - } + if (config) + flags |= VIR_NETWORK_UPDATE_AFFECT_CONFIG; + if (live) + flags |= VIR_NETWORK_UPDATE_AFFECT_LIVE; if (virNetworkUpdate(network, command, section, parentIndex, xml, flags) < 0) { -- 2.4.10

2 3

[libvirt] [PATCH v2] Migration with --live --offline option performs offline migration without warning/error.
by Nitesh Konkar 22 Feb '16

22 Feb '16

This patch gives an error when migration is attempted with both --live and --offline options. Signed-off-by: Nitesh Konkar <nitkon12(a)linux.vnet.ibm.com> --- tools/virsh-domain.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 43c8436..7b4a08e 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -9837,6 +9837,10 @@ cmdMigrate(vshControl *ctl, const vshCmd *cmd) int timeout = 0; bool live_flag = false; virshCtrlData data = { .dconn = NULL }; + bool live = vshCommandOptBool(cmd, "live"); + bool offline = vshCommandOptBool(cmd, "offline"); + + VSH_EXCLUSIVE_OPTIONS_VAR(live, offline); if (!(dom = virshCommandOptDomain(ctl, cmd, NULL))) return false; -- 1.8.3.1

2 1

[libvirt] [PATCH] qemu_process: mark auto-generated spice ports as reserved
by Pavel Hrdina 22 Feb '16

22 Feb '16

In case you will specify graphics like this: <graphics type='spice' port='-1'/> or <graphics type='spice' port='-1' tlsPort='6000'/> libvirt will automatically add autoport='no'. This leads to an issue that in qemuProcessStop() we don't release that port because we are releasing both port if autoport=yes or only port marked as reserved. If autoport=no but we request to generate port via '-1' we need to mark that port as reserved in order to release it. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1299696 Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- src/qemu/qemu_process.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index eaf9fea..e7f19a6 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -3694,6 +3694,9 @@ qemuProcessSPICEAllocatePorts(virQEMUDriverPtr driver, goto error; graphics->data.spice.port = port; + + if (!graphics->data.spice.autoport) + graphics->data.spice.portReserved = true; } if (needTLSPort || graphics->data.spice.tlsPort == -1) { @@ -3708,6 +3711,9 @@ qemuProcessSPICEAllocatePorts(virQEMUDriverPtr driver, goto error; graphics->data.spice.tlsPort = tlsPort; + + if (!graphics->data.spice.autoport) + graphics->data.spice.tlsPortReserved = true; } return 0; -- 2.7.1

2 2

[libvirt] [PATCH rfc v4 0/6] storage:dir: ploop volumes support
by Olga Krishtal 22 Feb '16

22 Feb '16

v4: - fixed identation issues. - in case of .uploadVol, DiskDescriptor.xml is restored. - added check of ploops'accessibility v3: - no VIR_STORAGE_VOL_PLOOP type any more - adapted all patches according to previous change - fixed comments v2: - fixed memory leak - chenged the return value of all helper functions to 0/-1. Now check for success is smth like that: vir****Ploop() < 0 - fixed some identation issues.

4 24

[libvirt] Plans for next release
by Daniel Veillard 22 Feb '16

22 Feb '16

So we are getting close to the end of the month and it's time to push a new release. I think that if we want to push it by March 1st we should start the freeze Wednesday at the latest, maybe RC1 on Wed, RC2 friday and release next Mon if everything looks okay. If there is an issue with this plan, please tell :) Daniel -- Daniel Veillard | Open Source and Standards, Red Hat veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

1 0

[libvirt] [PATCH] Migration with --live --offline option performs offline migration without warning/error.
by Nitesh Konkar 22 Feb '16

22 Feb '16

This patch gives an error when migration is attempted with both --live and --offline options. Signed-off-by: Nitesh Konkar <nitkon12(a)linux.vnet.ibm.com> --- tools/virsh-domain.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 62acecb..527db38 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -9795,6 +9795,12 @@ doMigrate(void *opaque) } else { /* For traditional live migration, connect to the destination host directly. */ virDomainPtr ddom = NULL; + + if ((flags & VIR_MIGRATE_OFFLINE) && (flags & VIR_MIGRATE_LIVE)){ + vshError(ctl, "%s", _("migrate: Using both --live and --offline option together is not permitted.")); + goto out; + } if ((ddom = virDomainMigrate3(dom, dconn, params, nparams, flags))) { virDomainFree(ddom); -- 1.8.3.1

2 2

[libvirt] [PATCH] virDomainDefFormatInternal: Drop useless check
by Michal Privoznik 22 Feb '16

22 Feb '16

There's a check if a domain definition has any graphics card and if so, we iterate over each one of them. This makes no sense, because even if it has none we can still iterate over. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/conf/domain_conf.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index e47d613..56bd1aa 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -22363,11 +22363,9 @@ virDomainDefFormatInternal(virDomainDefPtr def, goto error; } - if (def->ngraphics > 0) { - for (n = 0; n < def->ngraphics; n++) - if (virDomainGraphicsDefFormat(buf, def->graphics[n], flags) < 0) - goto error; - } + for (n = 0; n < def->ngraphics; n++) + if (virDomainGraphicsDefFormat(buf, def->graphics[n], flags) < 0) + goto error; for (n = 0; n < def->nsounds; n++) if (virDomainSoundDefFormat(buf, def->sounds[n], flags) < 0) -- 2.4.10

3 2

[libvirt] [PATCH] adminDaemonListServers: Don't leak @srv_names array
by Michal Privoznik 22 Feb '16

22 Feb '16

When getting a list of servers registered for a daemon, it's returned as a dynamically allocated array filled in with pointers to constant strings. Because the array is dynamic, it should be freed when no longer needed (but not the strings!). Even the function that creates the array suggests that. ==19446== 48 bytes in 3 blocks are definitely lost in loss record 821 of 1,034 ==19446== at 0x4C2C28E: realloc (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so) ==19446== by 0x54BAFC8: virReallocN (viralloc.c:245) ==19446== by 0x54BB0BE: virExpandN (viralloc.c:294) ==19446== by 0x54BB391: virInsertElementsN (viralloc.c:436) ==19446== by 0x164E3D: virNetDaemonGetServerNames (virnetdaemon.c:217) ==19446== by 0x15616F: adminDaemonListServers (admin_server.c:52) ==19446== by 0x155B8C: adminDispatchConnectListServers (admin.c:151) ==19446== by 0x155FD8: adminDispatchConnectListServersHelper (admin_dispatch.h:101) ==19446== by 0x568E862: virNetServerProgramDispatchCall (virnetserverprogram.c:437) ==19446== by 0x568E3C3: virNetServerProgramDispatch (virnetserverprogram.c:307) ==19446== by 0x5687B5B: virNetServerProcessMsg (virnetserver.c:135) ==19446== by 0x5687C1B: virNetServerHandleJob (virnetserver.c:156) Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- daemon/admin_server.c | 1 + 1 file changed, 1 insertion(+) diff --git a/daemon/admin_server.c b/daemon/admin_server.c index 7521e82..0196bfe 100644 --- a/daemon/admin_server.c +++ b/daemon/admin_server.c @@ -68,6 +68,7 @@ adminDaemonListServers(virNetDaemonPtr dmn, ret = nsrvs; cleanup: + VIR_FREE(srv_names); virObjectListFree(srvs); return ret; } -- 2.4.10

2 1

[libvirt] [PATCH 0/3] make virDomainObjGetPersistentDef return only persistent definition
by Nikolay Shirokovskiy 21 Feb '16

21 Feb '16

I want to make virDomainObjGetPersistentDef return only persistent definition as one can infer from its name. Patches 1 and 2 clean things up to make reasoning that this operation is possible more clear. Nikolay Shirokovskiy (3): domain: reuse update flags checking functions libxl: remove check duplicates common-impl: make virDomainObjGetPersistentDef return only persistent config src/conf/domain_conf.c | 19 ++++----- src/libxl/libxl_driver.c | 103 ++++------------------------------------------- src/lxc/lxc_driver.c | 75 +++------------------------------- 3 files changed, 24 insertions(+), 173 deletions(-) -- 1.8.3.1

2 13

[libvirt] [PATCH] libxl: support assignment from a pool of SRIOV VFs
by Chunyan Liu 20 Feb '16

20 Feb '16

Add codes to support creating domain with network defition of assigning SRIOV VF from a pool. And fix hot plug and unplug SRIOV VF under this kind of network defition. Signed-off-by: Chunyan Liu <cyliu(a)suse.com> --- src/libxl/libxl_conf.c | 5 +++-- src/libxl/libxl_domain.c | 48 +++++++++++++++++++++++++++++++++++++++++++++++- src/libxl/libxl_driver.c | 12 ++++++++++++ tests/Makefile.am | 3 +++ 4 files changed, 65 insertions(+), 3 deletions(-) diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index 6320421..f50c68a 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -1260,7 +1260,8 @@ libxlMakeNicList(virDomainDefPtr def, libxl_domain_config *d_config) return -1; for (i = 0; i < nnics; i++) { - if (l_nics[i]->type == VIR_DOMAIN_NET_TYPE_HOSTDEV) + if (l_nics[i]->type == VIR_DOMAIN_NET_TYPE_HOSTDEV || + l_nics[i]->data.network.actual->type == VIR_DOMAIN_NET_TYPE_HOSTDEV) continue; if (libxlMakeNic(def, l_nics[i], &x_nics[nvnics])) @@ -1278,7 +1279,7 @@ libxlMakeNicList(virDomainDefPtr def, libxl_domain_config *d_config) VIR_SHRINK_N(x_nics, nnics, nnics - nvnics); d_config->nics = x_nics; - d_config->num_nics = nnics; + d_config->num_nics = nvnics; return 0; diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index cf5c9f6..9bf7a5a 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -35,6 +35,7 @@ #include "virstring.h" #include "virtime.h" #include "locking/domain_lock.h" +#include "network/bridge_driver.h" #define VIR_FROM_THIS VIR_FROM_LIBXL @@ -314,7 +315,7 @@ libxlDomainDeviceDefPostParse(virDomainDeviceDefPtr dev, virDomainHostdevSubsysPCIPtr pcisrc; if (dev->type == VIR_DOMAIN_DEVICE_NET) - hostdev = &(dev->data.net)->data.hostdev.def; + hostdev = &dev->data.net->data.hostdev.def; else hostdev = dev->data.hostdev; pcisrc = &hostdev->source.subsys.u.pci; @@ -916,6 +917,48 @@ libxlConsoleCallback(libxl_ctx *ctx, libxl_event *ev, void *for_callback) libxl_event_free(ctx, ev); } +static int +libxlNetworkPrepareDevices(virDomainDefPtr def) +{ + int ret = -1; + size_t i; + + for (i = 0; i < def->nnets; i++) { + virDomainNetDefPtr net = def->nets[i]; + int actualType; + + /* If appropriate, grab a physical device from the configured + * network's pool of devices, or resolve bridge device name + * to the one defined in the network definition. + */ + if (networkAllocateActualDevice(def, net) < 0) + goto cleanup; + + actualType = virDomainNetGetActualType(net); + if (actualType == VIR_DOMAIN_NET_TYPE_HOSTDEV && + net->type == VIR_DOMAIN_NET_TYPE_NETWORK) { + /* Each type='hostdev' network device must also have a + * corresponding entry in the hostdevs array. For netdevs + * that are hardcoded as type='hostdev', this is already + * done by the parser, but for those allocated from a + * network / determined at runtime, we need to do it + * separately. + */ + virDomainHostdevDefPtr hostdev = virDomainNetGetActualHostdev(net); + virDomainHostdevSubsysPCIPtr pcisrc = &hostdev->source.subsys.u.pci; + + if (hostdev->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS && + hostdev->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI) + pcisrc->backend = VIR_DOMAIN_HOSTDEV_PCI_BACKEND_XEN; + + if (virDomainHostdevInsert(def, hostdev) < 0) + goto cleanup; + } + } + ret = 0; + cleanup: + return ret; +} /* * Start a domain through libxenlight. @@ -992,6 +1035,9 @@ libxlDomainStart(libxlDriverPrivatePtr driver, virDomainObjPtr vm, vm, true) < 0) goto cleanup; + if (libxlNetworkPrepareDevices(vm->def) < 0) + goto cleanup; + if (libxlBuildDomainConfig(driver->reservedGraphicsPorts, vm->def, cfg->ctx, &d_config) < 0) goto cleanup; diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 4a9134e..6aca042 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -3047,6 +3047,12 @@ libxlDomainAttachHostPCIDevice(libxlDriverPrivatePtr driver, libxl_device_pci_init(&pcidev); + /* For those allocated from a network pool/ determined at runtime, it's + * not handled by libxlDomainDeviceDefPostParse as hostdev, we need to + * set backend correctly. + */ + pcisrc->backend = VIR_DOMAIN_HOSTDEV_PCI_BACKEND_XEN; + if (virDomainHostdevFind(vm->def, hostdev, &found) >= 0) { virReportError(VIR_ERR_OPERATION_FAILED, _("target pci device %.4x:%.2x:%.2x.%.1x already exists"), @@ -3388,6 +3394,12 @@ libxlDomainDetachHostPCIDevice(libxlDriverPrivatePtr driver, libxl_device_pci_init(&pcidev); + /* For those allocated from a network pool/ determined at runtime, it's + * not handled by libxlDomainDeviceDefPostParse as hostdev, we need to + * set backend correctly. + */ + pcisrc->backend = VIR_DOMAIN_HOSTDEV_PCI_BACKEND_XEN; + idx = virDomainHostdevFind(vm->def, hostdev, &detach); if (idx < 0) { virReportError(VIR_ERR_OPERATION_FAILED, diff --git a/tests/Makefile.am b/tests/Makefile.am index ee16666..6a9fb19 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -526,6 +526,9 @@ endif ! WITH_XEN if WITH_LIBXL libxl_LDADDS = ../src/libvirt_driver_libxl_impl.la +if WITH_NETWORK +libxl_LDADDS += ../src/libvirt_driver_network_impl.la +endif WITH_NETWORK libxl_LDADDS += $(LDADDS) xlconfigtest_SOURCES = \ -- 1.8.5.6

3 2

[libvirt] [PATCH] docs: List possible GIC versions
by Andrea Bolognani 20 Feb '16

20 Feb '16

Recent changes to the handling of GIC version, specifically commit 2a7b11eafb67, have clearly defined what values are acceptable for the version attribute of the <gic> element. Update the documentation accordingly. --- docs/formatdomain.html.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index e96798f..faee603 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -1577,7 +1577,8 @@ Controller instead of APIC in order to handle interrupts. For example, the 'aarch64' architecture uses <code>gic</code> instead of <code>apic</code>. The optional - attribute <code>version</code> specifies the GIC version; + attribute <code>version</code> specifies the GIC version (one of + <code>2</code>, <code>3</code> and <code>host</code>); however, it may not be supported by all hypervisors. <span class="since">Since 1.2.16</span> </dd> -- 2.5.0

2 6

[libvirt] [PATCH 0/2] tweak iothread/emulator pinning setting
by Peter Krempa 19 Feb '16

19 Feb '16

Per review feedback ... Peter Krempa (2): qemu: emulatorpin: Always set affinity when pinning emulator thread qemu: iothreadpin: Always set affinity when pinning iothread src/qemu/qemu_driver.c | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) -- 2.6.2

2 3

[libvirt] [PATCH 0/6] vcpu info refactors - part 3a
by Peter Krempa 19 Feb '16

19 Feb '16

A short dump of patches that are separate enough which can be reviewed while I'm working on other things. Peter Krempa (6): virsh: cmdVcpuPin: Simplify handling of API flags util: Use virBitmapIsBitSet in freebsd impl of virProcessSetAffinity qemu: vcpupin: Don't overwrite errors from functions setting pinning qemu: vcpupin: Always set affinity even when cgroups are supported qemu: qemuDomainGetStatsVcpu: Fix output for possible sparse vCPU settings virsh: cpupin: Extract getter code into a separate function src/qemu/qemu_driver.c | 23 +++------ src/util/virprocess.c | 5 +- tools/virsh-domain.c | 134 +++++++++++++++++++++++++++---------------------- 3 files changed, 82 insertions(+), 80 deletions(-) -- 2.6.2

2 11

[libvirt] [PATCH 0/3] domain: AddImplicitControllers in PostParse
by Cole Robinson 19 Feb '16

19 Feb '16

Move virDomainDefAddImplicitControllers to virDomainDefPostParse so PostParse users don't need to open code it. Patch #1 makes the change, and adjusts some xen output to match Patch #2 is an unrelated cleanup, but it will clash with patch #3 Patch #3 drops a now redundant AddImplicitControllers call in qemu_parse_command.c, which reorders the test output a bit Cole Robinson (3): domain: add implicit controllers from post parse qemu: parse: rename qemuCaps->caps qemu: parse: drop redundant AddImplicitControllers src/conf/domain_conf.c | 7 +++---- src/qemu/qemu_parse_command.c | 19 ++++++++----------- src/qemu/qemu_parse_command.h | 4 ++-- tests/qemuargv2xmldata/qemuargv2xml-boot-cdrom.xml | 2 +- tests/qemuargv2xmldata/qemuargv2xml-boot-floppy.xml | 2 +- tests/qemuargv2xmldata/qemuargv2xml-boot-network.xml | 2 +- .../qemuargv2xmldata/qemuargv2xml-clock-localtime.xml | 2 +- tests/qemuargv2xmldata/qemuargv2xml-clock-utc.xml | 2 +- .../qemuargv2xmldata/qemuargv2xml-console-compat.xml | 2 +- .../qemuargv2xml-disk-cdrom-empty.xml | 2 +- tests/qemuargv2xmldata/qemuargv2xml-disk-cdrom.xml | 2 +- .../qemuargv2xml-disk-drive-boot-cdrom.xml | 2 +- .../qemuargv2xml-disk-drive-boot-disk.xml | 2 +- .../qemuargv2xml-disk-drive-cache-directsync.xml | 2 +- .../qemuargv2xml-disk-drive-cache-unsafe.xml | 2 +- .../qemuargv2xml-disk-drive-cache-v2-none.xml | 2 +- .../qemuargv2xml-disk-drive-cache-v2-wb.xml | 2 +- .../qemuargv2xml-disk-drive-cache-v2-wt.xml | 2 +- .../qemuargv2xml-disk-drive-error-policy-enospace.xml | 2 +- .../qemuargv2xml-disk-drive-error-policy-stop.xml | 2 +- ...gv2xml-disk-drive-error-policy-wreport-rignore.xml | 2 +- .../qemuargv2xml-disk-drive-fmt-qcow.xml | 2 +- .../qemuargv2xml-disk-drive-network-nbd-export.xml | 2 +- ...emuargv2xml-disk-drive-network-nbd-ipv6-export.xml | 2 +- .../qemuargv2xml-disk-drive-network-nbd-ipv6.xml | 2 +- .../qemuargv2xml-disk-drive-network-nbd-unix.xml | 2 +- .../qemuargv2xml-disk-drive-network-nbd.xml | 2 +- .../qemuargv2xml-disk-drive-network-rbd-auth.xml | 2 +- .../qemuargv2xml-disk-drive-network-rbd-ceph-env.xml | 2 +- .../qemuargv2xml-disk-drive-network-rbd-ipv6.xml | 2 +- .../qemuargv2xml-disk-drive-network-rbd.xml | 2 +- .../qemuargv2xml-disk-drive-network-sheepdog.xml | 2 +- tests/qemuargv2xmldata/qemuargv2xml-disk-floppy.xml | 2 +- tests/qemuargv2xmldata/qemuargv2xml-disk-many.xml | 2 +- tests/qemuargv2xmldata/qemuargv2xml-disk-usb.xml | 2 +- tests/qemuargv2xmldata/qemuargv2xml-disk-virtio.xml | 2 +- tests/qemuargv2xmldata/qemuargv2xml-disk-xenvbd.xml | 2 +- .../qemuargv2xml-graphics-sdl-fullscreen.xml | 2 +- tests/qemuargv2xmldata/qemuargv2xml-graphics-sdl.xml | 2 +- .../qemuargv2xml-graphics-vnc-policy.xml | 2 +- .../qemuargv2xml-graphics-vnc-sasl.xml | 2 +- .../qemuargv2xml-graphics-vnc-socket.xml | 2 +- .../qemuargv2xml-graphics-vnc-tls.xml | 2 +- tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc.xml | 2 +- .../qemuargv2xml-hostdev-pci-address.xml | 2 +- .../qemuargv2xml-hostdev-usb-address.xml | 2 +- .../qemuargv2xmldata/qemuargv2xml-input-usbmouse.xml | 2 +- .../qemuargv2xmldata/qemuargv2xml-input-usbtablet.xml | 2 +- .../qemuargv2xml-machine-core-off.xml | 2 +- .../qemuargv2xmldata/qemuargv2xml-machine-core-on.xml | 2 +- tests/qemuargv2xmldata/qemuargv2xml-migrate.xml | 2 +- tests/qemuargv2xmldata/qemuargv2xml-misc-acpi.xml | 2 +- .../qemuargv2xmldata/qemuargv2xml-misc-disable-s3.xml | 2 +- .../qemuargv2xml-misc-disable-suspends.xml | 2 +- .../qemuargv2xmldata/qemuargv2xml-misc-enable-s4.xml | 2 +- .../qemuargv2xmldata/qemuargv2xml-misc-no-reboot.xml | 2 +- tests/qemuargv2xmldata/qemuargv2xml-misc-uuid.xml | 2 +- .../qemuargv2xmldata/qemuargv2xml-net-eth-ifname.xml | 2 +- tests/qemuargv2xmldata/qemuargv2xml-net-eth.xml | 2 +- tests/qemuargv2xmldata/qemuargv2xml-net-user.xml | 2 +- tests/qemuargv2xmldata/qemuargv2xml-net-virtio.xml | 2 +- .../qemuargv2xmldata/qemuargv2xml-nographics-vga.xml | 2 +- tests/qemuargv2xmldata/qemuargv2xml-nosharepages.xml | 2 +- tests/qemuargv2xmldata/qemuargv2xml-parallel-tcp.xml | 2 +- tests/qemuargv2xmldata/qemuargv2xml-pseries-disk.xml | 2 +- .../qemuargv2xmldata/qemuargv2xml-qemu-ns-no-env.xml | 2 +- tests/qemuargv2xmldata/qemuargv2xml-restore-v2.xml | 2 +- tests/qemuargv2xmldata/qemuargv2xml-serial-dev.xml | 2 +- tests/qemuargv2xmldata/qemuargv2xml-serial-file.xml | 2 +- tests/qemuargv2xmldata/qemuargv2xml-serial-many.xml | 2 +- tests/qemuargv2xmldata/qemuargv2xml-serial-pty.xml | 2 +- .../qemuargv2xml-serial-tcp-telnet.xml | 2 +- tests/qemuargv2xmldata/qemuargv2xml-serial-tcp.xml | 2 +- tests/qemuargv2xmldata/qemuargv2xml-serial-udp.xml | 2 +- tests/qemuargv2xmldata/qemuargv2xml-serial-unix.xml | 2 +- tests/qemuargv2xmldata/qemuargv2xml-serial-vc.xml | 2 +- tests/qemuargv2xmldata/qemuargv2xml-smp.xml | 2 +- tests/qemuargv2xmldata/qemuargv2xml-sound.xml | 2 +- tests/qemuargv2xmldata/qemuargv2xml-watchdog.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml | 1 + tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.xml | 1 + tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.xml | 1 + tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.xml | 1 + tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml | 1 + tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.xml | 1 + tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml | 1 + .../sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.xml | 1 + .../sexpr2xml-fv-serial-dev-2nd-port.xml | 1 + tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml | 1 + tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml | 1 + tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml | 1 + tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml | 1 + tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml | 1 + .../sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.xml | 1 + tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml | 1 + tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml | 1 + tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml | 1 + tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml | 1 + tests/sexpr2xmldata/sexpr2xml-fv-sound.xml | 1 + tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml | 1 + tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml | 1 + tests/sexpr2xmldata/sexpr2xml-fv-utc.xml | 1 + tests/sexpr2xmldata/sexpr2xml-fv-v2.xml | 1 + tests/sexpr2xmldata/sexpr2xml-fv.xml | 1 + tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml | 1 + tests/sexpr2xmldata/sexpr2xml-vif-rate.xml | 1 + .../test-fullvirt-direct-kernel-boot-bogus-extra.xml | 1 + .../test-fullvirt-direct-kernel-boot-extra.xml | 1 + .../xlconfigdata/test-fullvirt-direct-kernel-boot.xml | 1 + tests/xlconfigdata/test-fullvirt-multiusb.xml | 1 + tests/xlconfigdata/test-new-disk.xml | 1 + tests/xlconfigdata/test-spice-features.xml | 1 + tests/xlconfigdata/test-spice.xml | 1 + tests/xlconfigdata/test-vif-rate.xml | 1 + tests/xmconfigdata/test-escape-paths.xml | 1 + tests/xmconfigdata/test-fullvirt-default-feature.xml | 1 + tests/xmconfigdata/test-fullvirt-force-hpet.xml | 1 + tests/xmconfigdata/test-fullvirt-force-nohpet.xml | 1 + tests/xmconfigdata/test-fullvirt-localtime.xml | 1 + tests/xmconfigdata/test-fullvirt-net-netfront.xml | 1 + tests/xmconfigdata/test-fullvirt-new-cdrom.xml | 1 + tests/xmconfigdata/test-fullvirt-parallel-tcp.xml | 1 + .../xmconfigdata/test-fullvirt-serial-dev-2-ports.xml | 1 + .../test-fullvirt-serial-dev-2nd-port.xml | 1 + tests/xmconfigdata/test-fullvirt-serial-file.xml | 1 + tests/xmconfigdata/test-fullvirt-serial-null.xml | 1 + tests/xmconfigdata/test-fullvirt-serial-pipe.xml | 1 + tests/xmconfigdata/test-fullvirt-serial-pty.xml | 1 + tests/xmconfigdata/test-fullvirt-serial-stdio.xml | 1 + .../xmconfigdata/test-fullvirt-serial-tcp-telnet.xml | 1 + tests/xmconfigdata/test-fullvirt-serial-tcp.xml | 1 + tests/xmconfigdata/test-fullvirt-serial-udp.xml | 1 + tests/xmconfigdata/test-fullvirt-serial-unix.xml | 1 + tests/xmconfigdata/test-fullvirt-sound.xml | 1 + tests/xmconfigdata/test-fullvirt-usbmouse.xml | 1 + tests/xmconfigdata/test-fullvirt-usbtablet.xml | 1 + tests/xmconfigdata/test-fullvirt-utc.xml | 1 + tests/xmconfigdata/test-no-source-cdrom.xml | 1 + tests/xmconfigdata/test-pci-devs.xml | 1 + 139 files changed, 149 insertions(+), 93 deletions(-) -- 2.5.0

3 9

[libvirt] [PATCH 0/9] Fix race conditions with qemuProcessStop
by Jiri Denemark 19 Feb '16

19 Feb '16

Jiri Denemark (9): qemu: Export qemuDomainObjBeginNestedJob qemu: End nested jobs properly qemu: Pass async job to qemuProcessInit qemu: Introduce qemuProcessBeginStopJob qemu: Start an async job for processGuestPanicEvent qemu: Process monitor EOF in a job qemu: Simplify error handling in qemuProcessReconnect qemu: Avoid calling qemuProcessStop without a job Check for active domain in virDomainObjWait src/conf/domain_conf.c | 7 ++ src/qemu/qemu_domain.c | 9 +-- src/qemu/qemu_domain.h | 5 ++ src/qemu/qemu_driver.c | 179 +++++++++++++++++++++++-------------------- src/qemu/qemu_migration.c | 9 ++- src/qemu/qemu_monitor.c | 14 +++- src/qemu/qemu_monitor.h | 2 + src/qemu/qemu_process.c | 191 +++++++++++++++++++++++++++++----------------- src/qemu/qemu_process.h | 6 ++ 9 files changed, 254 insertions(+), 168 deletions(-) -- 2.7.1

2 18

[libvirt] [PATCH] test: qemuxml2argv: Drop QEMU_CAPS_DEVICE uses
by Andrea Bolognani 19 Feb '16

19 Feb '16

Since commit 51045df01b3c, the QEMU_CAPS_DEVICE capability is enabled automatically and shouldn't be passed as an argument to DO_TEST(); however, commit 998a936c4c1a accidentally introduced few such uses. --- tests/qemuxml2argvtest.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 349e6ed..bb80c22 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1700,18 +1700,18 @@ mymain(void) QEMU_CAPS_MACH_VIRT_GIC_VERSION); DO_TEST_FAILURE("aarch64-gic-v3", QEMU_CAPS_KVM, QEMU_CAPS_MACHINE_OPT, QEMU_CAPS_CPU_HOST); - DO_TEST("aarch64-gic-host", QEMU_CAPS_DEVICE, + DO_TEST("aarch64-gic-host", QEMU_CAPS_KVM, QEMU_CAPS_MACHINE_OPT, QEMU_CAPS_CPU_HOST, QEMU_CAPS_MACH_VIRT_GIC_VERSION); - DO_TEST_FAILURE("aarch64-gic-host", QEMU_CAPS_DEVICE, + DO_TEST_FAILURE("aarch64-gic-host", QEMU_CAPS_KVM, QEMU_CAPS_MACHINE_OPT, QEMU_CAPS_CPU_HOST); - DO_TEST_PARSE_ERROR("aarch64-gic-invalid", QEMU_CAPS_DEVICE, + DO_TEST_PARSE_ERROR("aarch64-gic-invalid", QEMU_CAPS_KVM, QEMU_CAPS_MACHINE_OPT, QEMU_CAPS_CPU_HOST, QEMU_CAPS_MACH_VIRT_GIC_VERSION); - DO_TEST_FAILURE("aarch64-gic-not-virt", QEMU_CAPS_DEVICE, + DO_TEST_FAILURE("aarch64-gic-not-virt", QEMU_CAPS_KVM, QEMU_CAPS_MACHINE_OPT, QEMU_CAPS_CPU_HOST, QEMU_CAPS_MACH_VIRT_GIC_VERSION); - DO_TEST_FAILURE("aarch64-gic-not-arm", QEMU_CAPS_DEVICE, + DO_TEST_FAILURE("aarch64-gic-not-arm", QEMU_CAPS_KVM, QEMU_CAPS_MACHINE_OPT, QEMU_CAPS_CPU_HOST, QEMU_CAPS_MACH_VIRT_GIC_VERSION); -- 2.5.0

2 2

[libvirt] [PATCH] qemu: add spice opengl support
by Marc-André Lureau 19 Feb '16

19 Feb '16

Add Spice graphics gl attribute. qemu 2.6 should have -spice gl=on argument to enable opengl rendering context (patches on the ML). This is necessary to actually enable virgl rendering. Add a qemuxml2argv test for virtio-gpu + spice with virgl. Signed-off-by: Marc-André Lureau <marcandre.lureau(a)redhat.com> --- docs/formatdomain.html.in | 6 +++ docs/schemas/domaincommon.rng | 5 +++ src/conf/domain_conf.c | 19 ++++++++++ src/conf/domain_conf.h | 1 + src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 11 ++++++ tests/qemucapabilitiesdata/caps_2.5.0-1.caps | 1 + tests/qemucapabilitiesdata/caps_2.5.0-1.replies | 4 ++ .../qemuxml2argv-video-virtio-gpu-spice-gl.args | 24 ++++++++++++ .../qemuxml2argv-video-virtio-gpu-spice-gl.xml | 36 ++++++++++++++++++ tests/qemuxml2argvtest.c | 6 +++ .../qemuxml2xmlout-video-virtio-gpu-spice-gl.xml | 43 ++++++++++++++++++++++ tests/qemuxml2xmltest.c | 1 + 14 files changed, 160 insertions(+) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-virtio-gpu-spice-gl.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-virtio-gpu-spice-gl.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-video-virtio-gpu-spice-gl.xml diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index e96798f..cb2c178 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -4991,6 +4991,12 @@ qemu-kvm -net nic,model=? /dev/null 0.8.8</span>); and <code>usbredir</code> (<span class="since">since 0.9.12</span>). </p> + <p> + Spice may provide accelerated server-side rendering with + OpenGL. You can enable or disable OpenGL support explicitly with + the <code>gl</code> attribute. + (<span class="since">since 1.3.2</span>). + </p> <pre> <graphics type='spice' port='-1' tlsPort='-1' autoport='yes'> <channel name='main' mode='secure'/> diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 67af93a..d4672d0 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -2711,6 +2711,11 @@ </choice> </attribute> </optional> + <optional> + <attribute name="gl"> + <ref name="virYesNo"/> + </attribute> + </optional> <interleave> <ref name="listenElements"/> <zeroOrMore> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index acd58a1..0976e09 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -10779,6 +10779,7 @@ virDomainGraphicsDefParseXML(xmlNodePtr node, char *port = virXMLPropString(node, "port"); char *tlsPort; char *autoport; + char *gl; char *defaultMode; int defaultModeVal; @@ -10813,6 +10814,20 @@ virDomainGraphicsDefParseXML(xmlNodePtr node, VIR_FREE(autoport); } + if ((gl = virXMLPropString(node, "gl")) != NULL) { + int glVal; + + if ((glVal = virTristateBoolTypeFromString(gl)) <= 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("unknown gl value '%s'"), gl); + VIR_FREE(gl); + goto error; + } + + def->data.spice.gl = glVal; + VIR_FREE(gl); + } + def->data.spice.defaultMode = VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_MODE_ANY; if ((defaultMode = virXMLPropString(node, "defaultMode")) != NULL) { @@ -21032,6 +21047,10 @@ virDomainGraphicsDefFormat(virBufferPtr buf, break; case VIR_DOMAIN_GRAPHICS_TYPE_SPICE: + if (def->data.spice.gl) + virBufferAsprintf(buf, " gl='%s'", + virTristateBoolTypeToString(def->data.spice.gl)); + if (def->data.spice.port) virBufferAsprintf(buf, " port='%d'", def->data.spice.port); diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 1de3be3..d3b3ed2 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1586,6 +1586,7 @@ struct _virDomainGraphicsDef { int streaming; int copypaste; /* enum virTristateBool */ int filetransfer; /* enum virTristateBool */ + int gl; /* enum virTristateBool */ } spice; } data; /* nListens, listens, and *port are only useful if type is vnc, diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 3099e34..cab4d7d 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -314,6 +314,7 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST, "vserport-change-event", /* 210 */ "virtio-balloon-pci.deflate-on-oom", + "spice-gl", ); @@ -2625,6 +2626,7 @@ static struct virQEMUCapsCommandLineProps virQEMUCapsCommandLine[] = { { "machine", "aes-key-wrap", QEMU_CAPS_AES_KEY_WRAP }, { "machine", "dea-key-wrap", QEMU_CAPS_DEA_KEY_WRAP }, { "chardev", "append", QEMU_CAPS_CHARDEV_FILE_APPEND }, + { "spice", "gl", QEMU_CAPS_SPICE_GL }, }; static int diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index e5353de..0c857d2 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -343,6 +343,7 @@ typedef enum { QEMU_CAPS_VSERPORT_CHANGE, /* VSERPORT_CHANGE event */ QEMU_CAPS_VIRTIO_BALLOON_AUTODEFLATE, /* virtio-balloon-{device,pci,ccw}. * deflate-on-oom */ + QEMU_CAPS_SPICE_GL, /* -spice gl */ QEMU_CAPS_LAST /* this must always be the last item */ } virQEMUCapsFlags; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index b751f04..666dfc6 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -6047,6 +6047,17 @@ qemuBuildGraphicsSPICECommandLine(virQEMUDriverConfigPtr cfg, } } + if (graphics->data.spice.gl) { + if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_SPICE_GL)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("This QEMU doesn't support spice OpenGL")); + goto error; + } + + virBufferAsprintf(&opt, ",gl=%s", + virTristateSwitchTypeToString(graphics->data.spice.gl)); + } + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_SEAMLESS_MIGRATION)) { /* If qemu supports seamless migration turn it * unconditionally on. If migration destination diff --git a/tests/qemucapabilitiesdata/caps_2.5.0-1.caps b/tests/qemucapabilitiesdata/caps_2.5.0-1.caps index 931bc4f..679d65a 100644 --- a/tests/qemucapabilitiesdata/caps_2.5.0-1.caps +++ b/tests/qemucapabilitiesdata/caps_2.5.0-1.caps @@ -172,4 +172,5 @@ <flag name='ich9-disable-s4'/> <flag name='vserport-change-event'/> <flag name='virtio-balloon-pci.deflate-on-oom'/> + <flag name='spice-gl'/> </qemuCaps> diff --git a/tests/qemucapabilitiesdata/caps_2.5.0-1.replies b/tests/qemucapabilitiesdata/caps_2.5.0-1.replies index 7b692b5..07aadba 100644 --- a/tests/qemucapabilitiesdata/caps_2.5.0-1.replies +++ b/tests/qemucapabilitiesdata/caps_2.5.0-1.replies @@ -3345,6 +3345,10 @@ { "parameters": [ { + "name": "gl", + "type": "boolean" + }, + { "name": "seamless-migration", "type": "boolean" }, diff --git a/tests/qemuxml2argvdata/qemuxml2argv-video-virtio-gpu-spice-gl.args b/tests/qemuxml2argvdata/qemuxml2argv-video-virtio-gpu-spice-gl.args new file mode 100644 index 0000000..1361784 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-video-virtio-gpu-spice-gl.args @@ -0,0 +1,24 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=spice \ +/usr/bin/qemu \ +-name QEMUGuest1 \ +-S \ +-M pc \ +-m 1024 \ +-smp 1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-drive file=/var/lib/libvirt/images/QEMUGuest1,format=qcow2,\ +if=none,id=drive-ide0-0-0,cache=none \ +-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ +-spice port=0,gl=on \ +-device virtio-vga,id=video0,virgl=on,bus=pci.0,addr=0x2 \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-video-virtio-gpu-spice-gl.xml b/tests/qemuxml2argvdata/qemuxml2argv-video-virtio-gpu-spice-gl.xml new file mode 100644 index 0000000..07afad2 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-video-virtio-gpu-spice-gl.xml @@ -0,0 +1,36 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>1048576</memory> + <currentMemory unit='KiB'>1048576</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='file' device='disk'> + <driver name='qemu' type='qcow2' cache='none'/> + <source file='/var/lib/libvirt/images/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <controller type='ide' index='0'/> + <controller type='usb' index='0'/> + <controller type='pci' index='0' model='pci-root'/> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <graphics type='spice' gl='yes' autoport='no'/> + <video> + <model type='virtio' heads='1'> + <acceleration accel3d='yes'/> + </model> + </video> + <memballoon model='virtio'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 349e6ed..542141a 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1458,6 +1458,12 @@ mymain(void) QEMU_CAPS_DEVICE_VIRTIO_GPU, QEMU_CAPS_DEVICE_VIRTIO_GPU_VIRGL, QEMU_CAPS_DEVICE_VIDEO_PRIMARY); + DO_TEST("video-virtio-gpu-spice-gl", QEMU_CAPS_DEVICE, + QEMU_CAPS_DEVICE_VIRTIO_GPU, + QEMU_CAPS_DEVICE_VIRTIO_GPU_VIRGL, + QEMU_CAPS_SPICE, + QEMU_CAPS_SPICE_GL, + QEMU_CAPS_DEVICE_VIDEO_PRIMARY); DO_TEST_PARSE_ERROR("video-invalid", NONE); DO_TEST("virtio-rng-default", QEMU_CAPS_DEVICE_VIRTIO_RNG, diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-video-virtio-gpu-spice-gl.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-video-virtio-gpu-spice-gl.xml new file mode 100644 index 0000000..51b8a1e --- /dev/null +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-video-virtio-gpu-spice-gl.xml @@ -0,0 +1,43 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>1048576</memory> + <currentMemory unit='KiB'>1048576</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='file' device='disk'> + <driver name='qemu' type='qcow2' cache='none'/> + <source file='/var/lib/libvirt/images/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <controller type='ide' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> + </controller> + <controller type='usb' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> + </controller> + <controller type='pci' index='0' model='pci-root'/> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <graphics type='spice' gl='yes' autoport='no'/> + <video> + <model type='virtio' heads='1'> + <acceleration accel3d='yes'/> + </model> + <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> + </video> + <memballoon model='virtio'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </memballoon> + </devices> +</domain> diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 56dc821..d24ad2b 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -751,6 +751,7 @@ mymain(void) DO_TEST("video-virtio-gpu-device"); DO_TEST("video-virtio-gpu-virgl"); + DO_TEST("video-virtio-gpu-spice-gl"); DO_TEST("virtio-input"); DO_TEST("virtio-input-passthrough"); -- 2.5.0

3 5

[libvirt] [PATCH] Use correct pci addresses during interface-detach[v2]
by Nitesh Konkar 19 Feb '16

19 Feb '16

The virsh attach virsh detach interface command fails when both live and config are set and when the interface gets attached to different pci slots on live and config xml respectively. When we attach an interface with both --live and --config, the first time they get the same PCI slots, but the second time onwards it differs and hence the virsh detach-interface --live --config command fails. This patch makes sure that when both --live --config are set , qemuDomainDetachDeviceFlags is called twice, once with config xml and once with live xml. Steps to see the issue: virsh attach-interface --domain DomainName --type network --source default --mac 52:54:00:4b:76:5f --live --config virsh detach-interface --domain DomainName --type network --mac 52:54:00:4b:76:5f --live --config virsh attach-interface --domain DomainName --type network --source default --mac 52:54:00:4b:76:5f --live --config virsh detach-interface --domain DomainName --type network --mac 52:54:00:4b:76:5f --live --config Signed-off-by:nitkon12@linux.vnet.ibm.com --- tools/virsh-domain.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 62acecb..43c8436 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -10815,7 +10815,7 @@ cmdDetachInterface(vshControl *ctl, const vshCmd *cmd) char buf[64]; int diff_mac; size_t i; - int ret; + int ret, flag_live_config_both = 0; bool functionReturn = false; unsigned int flags = VIR_DOMAIN_AFFECT_CURRENT; bool current = vshCommandOptBool(cmd, "current"); @@ -10830,7 +10830,7 @@ cmdDetachInterface(vshControl *ctl, const vshCmd *cmd) if (config || persistent) flags |= VIR_DOMAIN_AFFECT_CONFIG; - if (live) + if (!(config || persistent) && live) // Only Live flags |= VIR_DOMAIN_AFFECT_LIVE; if (!(dom = virshCommandOptDomain(ctl, cmd, NULL))) @@ -10851,6 +10851,8 @@ cmdDetachInterface(vshControl *ctl, const vshCmd *cmd) else doc = virDomainGetXMLDesc(dom, 0); + forlivexml: + if (!doc) goto cleanup; @@ -10921,6 +10923,14 @@ cmdDetachInterface(vshControl *ctl, const vshCmd *cmd) if (ret != 0) { vshError(ctl, "%s", _("Failed to detach interface")); } else { + if ((config || persistent) && live && flag_live_config_both == 0) {//executed only when live config both in cmd. + doc = virDomainGetXMLDesc(dom, 0); + flag_live_config_both=1; //Need to execute this code only once + flags |= VIR_DOMAIN_AFFECT_LIVE; //set live flag + flags &= (~VIR_DOMAIN_AFFECT_CONFIG ); // need to unset config flag as config xml detach is already done. + mac=NULL; + goto forlivexml; + } vshPrint(ctl, "%s", _("Interface detached successfully\n")); functionReturn = true; } -- 1.8.3.1

1 0

[libvirt] [PATCH v2] admin: Fix memory leak in remoteAdminConnectClose
by Erik Skultety 19 Feb '16

19 Feb '16

When virt-admin is run with valgrind, this kind of output can be obtained: HEAP SUMMARY: in use at exit: 134,589 bytes in 1,031 blocks total heap usage: 2,667 allocs, 1,636 frees, 496,755 bytes allocated 88 bytes in 1 blocks are definitely lost in loss record 82 of 128 at 0x4C2A9C7: calloc (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so) by 0x52F6D1F: virAllocVar (viralloc.c:560) by 0x5350268: virObjectNew (virobject.c:193) by 0x53503E0: virObjectLockableNew (virobject.c:219) by 0x4E3BBCB: virAdmConnectNew (datatypes.c:832) by 0x4E38495: virAdmConnectOpen (libvirt-admin.c:209) by 0x10C541: vshAdmConnect (virt-admin.c:107) by 0x10C7B2: vshAdmReconnect (virt-admin.c:163) by 0x10CC7C: cmdConnect (virt-admin.c:298) by 0x110838: vshCommandRun (vsh.c:1224) by 0x10DFD8: main (virt-admin.c:862) LEAK SUMMARY: definitely lost: 88 bytes in 1 blocks indirectly lost: 0 bytes in 0 blocks possibly lost: 0 bytes in 0 blocks still reachable: 134,501 bytes in 1,030 blocks suppressed: 0 bytes in 0 blocks This is because virNetClientSetCloseCallback was being reinitialized incorrectly. By resetting the callbacks in a proper way, the leak is fixed. --- src/admin/admin_remote.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/admin/admin_remote.c b/src/admin/admin_remote.c index e634fa7..3745b9e 100644 --- a/src/admin/admin_remote.c +++ b/src/admin/admin_remote.c @@ -180,7 +180,9 @@ remoteAdminConnectClose(virAdmConnectPtr conn) goto done; } - virNetClientSetCloseCallback(priv->client, NULL, NULL, NULL); + virNetClientSetCloseCallback(priv->client, NULL, conn->closeCallback, + virObjectFreeCallback); + virNetClientClose(priv->client); rv = 0; -- 2.4.3

2 2

[libvirt] VMware driver: SessionIsActive API / Sessions.ValidateSession permission
by Richard W.M. Jones 19 Feb '16

19 Feb '16

The VMware driver currently calls the SessionIsActive API, which requires the vCenter Sessions.ValidateSession permission. https://libvirt.org/git/?p=libvirt.git;a=blob;f=src/esx/esx_vi.c;h=af822b14… This causes a problem that you have to give this permission to any libvirt client accessing VMware, and you have to give it from the very top level of vCenter, all the way down through the Cluster, Folder, hypervisor levels. This has caused a bit of pushback from virt-v2v users who consider that the SessionIsActive API is an "admin" API which they don't want to give out to roles using v2v. Is calling SessionIsActive necessary? From my (very limited) understanding, it seems as if we might use 'SessionManager. currentSession' property instead, which doesn't require admin permissions. Actually the code [see link above] already does this when ctx->hasSessionIsActive is false, but that doesn't apply to modern vCenter. See also https://libvirt.org/git/?p=libvirt.git;a=commitdiff;h=5699034b65afd49d91dff… which doesn't really explain why this was added. Also, why is it even necessary to check if the session is active here? Shouldn't we just log in unconditionally? Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming and virtualization blog: http://rwmj.wordpress.com libguestfs lets you edit virtual machines. Supports shell scripting, bindings from many languages. http://libguestfs.org

2 4

[libvirt] [PATCH v2 0/5] Add virtio-gpu & virgl support
by Marc-André Lureau 19 Feb '16

19 Feb '16

The following series allow using virtio-gpu and virgl if qemu support it. Ths Spice bits are not yet in qemu 2.5, but should make it in 2.6 and I added the RFC patches that are expected to not change much. v1->v2: addressing Ján Tomko review - update accel2d/accel3d to be tristate and fix its usage - use a single QEMU_CAPS_DEVICE_VIRTIO_GPU cap for -device virtio-gpu-* & virtio-vga - remove qemu legacy, -vga support or command line parsing - add xml2xml tests - squash xml2argvtests with their respecitve feature addition commits - update libvirt version in doc - update commit messages Marc-André Lureau (5): Replace support{2d,3d} with accel{2d,3d} domain: replace bool accel{2d,3d} with a tristate qemu: add virtio video device qemu: add virtio-gpu virgl support RFC qemu: add spice opengl support docs/formatdomain.html.in | 11 +- docs/schemas/domaincommon.rng | 6 + src/conf/domain_conf.c | 84 +- src/conf/domain_conf.h | 6 +- src/qemu/qemu_capabilities.c | 12 + src/qemu/qemu_capabilities.h | 3 + src/qemu/qemu_command.c | 40 +- src/vbox/vbox_common.c | 18 +- src/vz/vz_sdk.c | 2 +- tests/qemucapabilitiesdata/caps_1.2.2-1.replies | 22 +- tests/qemucapabilitiesdata/caps_1.3.1-1.replies | 22 +- tests/qemucapabilitiesdata/caps_1.4.2-1.replies | 22 +- tests/qemucapabilitiesdata/caps_1.5.3-1.replies | 22 +- tests/qemucapabilitiesdata/caps_1.6.0-1.replies | 22 +- tests/qemucapabilitiesdata/caps_1.6.50-1.replies | 22 +- tests/qemucapabilitiesdata/caps_2.1.1-1.replies | 22 +- tests/qemucapabilitiesdata/caps_2.4.0-1.caps | 1 + tests/qemucapabilitiesdata/caps_2.4.0-1.replies | 95 +- tests/qemucapabilitiesdata/caps_2.5.0-1.caps | 168 + tests/qemucapabilitiesdata/caps_2.5.0-1.replies | 4043 ++++++++++++++++++++ tests/qemucapabilitiestest.c | 1 + .../qemuxml2argv-video-virtio-gpu-device.args | 23 + .../qemuxml2argv-video-virtio-gpu-device.xml | 31 + .../qemuxml2argv-video-virtio-gpu-spice-gl.args | 23 + .../qemuxml2argv-video-virtio-gpu-spice-gl.xml | 36 + .../qemuxml2argv-video-virtio-gpu-virgl.args | 23 + .../qemuxml2argv-video-virtio-gpu-virgl.xml | 33 + tests/qemuxml2argvtest.c | 14 + tests/qemuxml2xmltest.c | 4 + 29 files changed, 4732 insertions(+), 99 deletions(-) create mode 100644 tests/qemucapabilitiesdata/caps_2.5.0-1.caps create mode 100644 tests/qemucapabilitiesdata/caps_2.5.0-1.replies create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-virtio-gpu-device.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-virtio-gpu-device.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-virtio-gpu-spice-gl.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-virtio-gpu-spice-gl.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-virtio-gpu-virgl.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-virtio-gpu-virgl.xml -- 2.5.0

4 16

[libvirt] [PATCH] admin: Fix memory leak in remoteAdminConnectClose
by Erik Skultety 19 Feb '16

19 Feb '16

When virt-admin is run with valgrind, this kind of output can be obtained: HEAP SUMMARY: in use at exit: 134,589 bytes in 1,031 blocks total heap usage: 2,667 allocs, 1,636 frees, 496,755 bytes allocated 88 bytes in 1 blocks are definitely lost in loss record 82 of 128 at 0x4C2A9C7: calloc (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so) by 0x52F6D1F: virAllocVar (viralloc.c:560) by 0x5350268: virObjectNew (virobject.c:193) by 0x53503E0: virObjectLockableNew (virobject.c:219) by 0x4E3BBCB: virAdmConnectNew (datatypes.c:832) by 0x4E38495: virAdmConnectOpen (libvirt-admin.c:209) by 0x10C541: vshAdmConnect (virt-admin.c:107) by 0x10C7B2: vshAdmReconnect (virt-admin.c:163) by 0x10CC7C: cmdConnect (virt-admin.c:298) by 0x110838: vshCommandRun (vsh.c:1224) by 0x10DFD8: main (virt-admin.c:862) LEAK SUMMARY: definitely lost: 88 bytes in 1 blocks indirectly lost: 0 bytes in 0 blocks possibly lost: 0 bytes in 0 blocks still reachable: 134,501 bytes in 1,030 blocks suppressed: 0 bytes in 0 blocks This is because virNetClientSetCloseCallback was being reinitialized incorrectly. By resetting the callbacks in a proper way, the leak itself is fixed, however we should still dispose of the client object properly by issuing virObjectUnref on it. --- src/admin/admin_remote.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/admin/admin_remote.c b/src/admin/admin_remote.c index e634fa7..e174e88 100644 --- a/src/admin/admin_remote.c +++ b/src/admin/admin_remote.c @@ -180,7 +180,11 @@ remoteAdminConnectClose(virAdmConnectPtr conn) goto done; } - virNetClientSetCloseCallback(priv->client, NULL, NULL, NULL); + virNetClientSetCloseCallback(priv->client, NULL, conn->closeCallback, + virObjectFreeCallback); + virNetClientClose(priv->client); + virObjectUnref(priv->client); + priv->client = NULL; rv = 0; -- 2.4.3

1 1

[libvirt] Libvirtd and OSX... with QEMU
by Justin Clift 18 Feb '16

18 Feb '16

Heyas, Interestingly on OSX, starting libvirtd (1.3.1) indicates it can see the installed QEMU. However, it crashes out shortly afterwards with a weird error: 2016-01-17 22:02:17.159+0000: 18446744073709551615: error : virEventPollRunOnce:648 : Unable to poll on file handles: Bad file descriptor Does anyone know what that might be about, and/or how to capture more meaningful info? :) Regards and best wishes, Justin Clift

2 6

[libvirt] [PATCH v2 00/10] Reorganizing qemu_command.c continued
by John Ferlan 18 Feb '16

18 Feb '16

v1: http://www.redhat.com/archives/libvir-list/2016-February/msg00804.html v2 changes: Patch 1 makes changes as requested from review. Patches 2-7 are v1's 4-10 take a different approach by creating qemuBuildXXXXCommandLine helper routines. Patches 8-10 are new, but follow the others... John Ferlan (10): qemu: Make basic upfront checks before create command qemu: Rename qemuBuildMachineArgStr qemu: Rename qemuBuildCpuArgStr to qemuBuildCpuCommandLine qemu: Introduce qemuBuildMemCommandLine qemu: Rename qemuBuildSmpArgStr to qemuBuildSmpCommandLine qemu: Introduce qemuBuildIOThreadCommandLine qemu: Introduce qemuBuildNumaCommandLine qemu: Introduce qemuBuildSmbiosCommandLine qemu: Introduce qemuBuildSgaCommandLine qemu: Introduce qemuBuildMonitorCommandLine src/qemu/qemu_command.c | 740 ++++++++++++++++++++++++++++-------------------- 1 file changed, 434 insertions(+), 306 deletions(-) -- 2.5.0

3 22

[libvirt] [PATCHv3 0/2] notify about reverting to a snapshot
by Dmitry Andreev 18 Feb '16

18 Feb '16

Reverting to snapshot may change domain configuration but there will be no events about that. Lack of the event become a problem for virt-manager https://bugzilla.redhat.com/show_bug.cgi?id=1081148 This patch-set introduces new event and emits it in qemuDomainRevertToSnapshot. v3: [2/2] event is emited only in the case when stopped domain is reverted to a stopped domain. Dmitry Andreev (2): Introduce new VIR_DOMAIN_EVENT_DEFINED_FROM_SNAPSHOT sub-event qemu: emit 'defined' event after reverted to snapshot without state changes examples/object-events/event-test.c | 2 ++ include/libvirt/libvirt-domain.h | 1 + src/qemu/qemu_driver.c | 8 +++++++- tools/virsh-domain.c | 3 ++- 4 files changed, 12 insertions(+), 2 deletions(-) -- 1.8.3.1

3 5

[libvirt] [PATCH] qemu: cgroup: fix cgroup permission logic
by Bjoern Walk 18 Feb '16

18 Feb '16

Fix logic error introduced in commit d6c91b3c which essentially broke starting any domain. Signed-off-by: Bjoern Walk <bwalk(a)linux.vnet.ibm.com> --- src/qemu/qemu_cgroup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c index 53642a1..f3c5fbb 100644 --- a/src/qemu/qemu_cgroup.c +++ b/src/qemu/qemu_cgroup.c @@ -65,7 +65,7 @@ qemuSetupImagePathCgroup(virDomainObjPtr vm, if (!virCgroupHasController(priv->cgroup, VIR_CGROUP_CONTROLLER_DEVICES)) return 0; - if (readonly) + if (!readonly) perms |= VIR_CGROUP_DEVICE_WRITE; VIR_DEBUG("Allow path %s, perms: %s", -- 2.3.0

2 1

[libvirt] [PATCH v2] virsh: Remove <backingStore> when changing cdrom media source
by Peter Krempa 18 Feb '16

18 Feb '16

Since the code is changing the source image path by modifying the existing XML snippet the <backingStore> stays in place. As <backingStore> is relevant to the <source> part of the image, the update of that part makes the element invalid. CD/floppy images usually don't have a backing chain and the element is currently ignored though but it might start being used in the future so let's start behaving correctly. Drop the <backingStore> subtree once we want to update the XML. Before this patch, you'd get: $ virsh change-media --eject --print-xml 10 hdc <disk type="file" device="cdrom"> <driver name="qemu" type="qcow2"/> <backingStore type="file" index="1"> <format type="qcow2"/> <source file="/var/lib/libvirt/images/vm.1436949097"/> <backingStore/> </backingStore> <target dev="hdc" bus="ide"/> ... </disk> After: $ virsh change-media --eject --print-xml 10 hdc <disk type="file" device="cdrom"> <driver name="qemu" type="qcow2"/> <target dev="hdc" bus="ide"/> ... </disk> --- Notes: v2: - adapted to new version of code - fixed use after free from previous version - added more text to commit message tools/virsh-domain.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index bf65a60..83edb21 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -11052,6 +11052,7 @@ virshUpdateDiskXML(xmlNodePtr disk_node, { xmlNodePtr tmp = NULL; xmlNodePtr source = NULL; + xmlNodePtr backingStore = NULL; xmlNodePtr target_node = NULL; xmlNodePtr text_node = NULL; char *device_type = NULL; @@ -11092,13 +11093,22 @@ virshUpdateDiskXML(xmlNodePtr disk_node, if (xmlStrEqual(tmp->name, BAD_CAST "target")) target_node = tmp; + if (xmlStrEqual(tmp->name, BAD_CAST "backingStore")) + backingStore = tmp; + /* * We've found all we needed. */ - if (source && target_node) + if (source && target_node && backingStore) break; } + /* drop the <backingStore> subtree since it would become invalid */ + if (backingStore) { + xmlUnlinkNode(backingStore); + xmlFreeNode(backingStore); + } + if (type == VIRSH_UPDATE_DISK_XML_EJECT) { if (!source) { vshError(NULL, _("The disk device '%s' doesn't have media"), target); -- 2.6.2

2 1

[libvirt] [PATCH] qemu: Kill VIR_WRAPPER_SHELL_PREFIX
by Peter Krempa 18 Feb '16

18 Feb '16

The migration code now doesn't need it, so remove the macros and the configure code that is detecting it. --- configure.ac | 50 ------------------------------------------------- src/qemu/qemu_monitor.h | 13 ------------- 2 files changed, 63 deletions(-) diff --git a/configure.ac b/configure.ac index 7d74f53..93d347c 100644 --- a/configure.ac +++ b/configure.ac @@ -1111,56 +1111,6 @@ dnl LIBVIRT_DRIVER_CHECK_BHYVE -dnl -dnl check for shell that understands <> redirection without truncation, -dnl needed by src/qemu/qemu_monitor_{text,json}.c. -dnl -if test "$with_qemu" = yes; then - lv_wrapper_shell= - AC_CACHE_CHECK([for shell that supports <> redirection], - [lv_cv_wrapper_shell], - [ - # If cross-compiling, guess that /bin/sh is good enough except for - # Linux, where it might be dash 0.5.5 which is known broken; and on - # Linux, we have a good chance that /bin/bash will exist. - # If we guess wrong, a user can override the cache variable. - # Going through /bin/bash is a slight slowdown if /bin/sh works. - if test "$cross_compiling" = yes; then - case $host_os in - linux*) lv_cv_wrapper_shell=/bin/bash ;; - *) lv_cv_wrapper_shell=/bin/sh ;; - esac - else - for lv_cv_wrapper_shell in /bin/sh bash ksh zsh none; do - test $lv_cv_wrapper_shell = none && - AC_MSG_ERROR([could not find decent shell]) - echo a > conftest.a - ($lv_cv_wrapper_shell -c ': 1<>conftest.a') 2>/dev/null && - case `cat conftest.a`.$lv_cv_wrapper_shell in - a./*) break;; dnl /bin/sh is good enough - a.*) dnl bash, ksh, and zsh all understand 'command', use that - dnl to determine the absolute path of the shell - lv_cv_wrapper_shell=`$lv_cv_wrapper_shell -c \ - "command -v $lv_cv_wrapper_shell"` - case $lv_cv_wrapper_shell in - /*) break;; - esac - ;; - esac - done - rm -f conftest.a - fi - ]) - if test "x$lv_cv_wrapper_shell" != x/bin/sh; then - lv_wrapper_shell=$lv_cv_wrapper_shell - fi - if test "x$lv_wrapper_shell" != x; then - AC_DEFINE_UNQUOTED([VIR_WRAPPER_SHELL], ["$lv_wrapper_shell"], - [Define to the absolute path of a shell that does not truncate on - <> redirection, if /bin/sh does not fit the bill]) - fi -fi - dnl dnl check for kernel headers required by src/bridge.c diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index 134cbb6..d1a667a 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -926,17 +926,4 @@ int qemuMonitorGetMemoryDeviceInfo(qemuMonitorPtr mon, int qemuMonitorMigrateIncoming(qemuMonitorPtr mon, const char *uri); -/** - * When running two dd process and using <> redirection, we need a - * shell that will not truncate files. These two strings serve that - * purpose. - */ -# ifdef VIR_WRAPPER_SHELL -# define VIR_WRAPPER_SHELL_PREFIX VIR_WRAPPER_SHELL " -c '" -# define VIR_WRAPPER_SHELL_SUFFIX "'" -# else -# define VIR_WRAPPER_SHELL_PREFIX /* nothing */ -# define VIR_WRAPPER_SHELL_SUFFIX /* nothing */ -# endif - #endif /* QEMU_MONITOR_H */ -- 2.6.2

2 1

[libvirt] [PATCH 0/5] tests: qemuargv2xml: Enabling REGENERATE_OUTPUT
by Cole Robinson 18 Feb '16

18 Feb '16

This reworks qemuargv2xml and lxcconf2xml tests to allow use of VIR_TEST_REGENERATE_OUTPUT Cole Robinson (5): tests: qemuargv2xml: Remove unneeded XML blanking tests: qemuargv2xml: Remove UUID randomness tests: qemuargv2xml: hardcode disk auth usage= tests: qemuargv2xml: Drop memory XML blanking tests: lxcconf2xml: Drop XML blanking tests/lxcconf2xmltest.c | 22 +++------ tests/qemuargv2xmldata/qemuargv2xml-boot-cdrom.xml | 4 +- .../qemuargv2xmldata/qemuargv2xml-boot-floppy.xml | 4 +- .../qemuargv2xmldata/qemuargv2xml-boot-network.xml | 4 +- .../qemuargv2xml-clock-localtime.xml | 4 +- tests/qemuargv2xmldata/qemuargv2xml-clock-utc.xml | 4 +- .../qemuargv2xml-console-compat.xml | 4 +- .../qemuargv2xml-disk-cdrom-empty.xml | 4 +- tests/qemuargv2xmldata/qemuargv2xml-disk-cdrom.xml | 4 +- .../qemuargv2xml-disk-drive-boot-cdrom.xml | 4 +- .../qemuargv2xml-disk-drive-boot-disk.xml | 4 +- .../qemuargv2xml-disk-drive-cache-v2-none.xml | 4 +- .../qemuargv2xml-disk-drive-network-iscsi-auth.xml | 2 +- .../qemuargv2xml-disk-drive-network-rbd-auth.xml | 2 +- .../qemuargv2xml-graphics-vnc-policy.xml | 4 +- .../qemuargv2xml-graphics-vnc-sasl.xml | 4 +- .../qemuargv2xml-graphics-vnc-socket.xml | 4 +- .../qemuargv2xml-graphics-vnc-tls.xml | 4 +- .../qemuargv2xml-graphics-vnc-websocket.xml | 4 +- .../qemuargv2xmldata/qemuargv2xml-graphics-vnc.xml | 4 +- .../qemuargv2xml-hostdev-pci-address.xml | 6 +-- .../qemuargv2xmldata/qemuargv2xml-hyperv-panic.xml | 4 +- tests/qemuargv2xmldata/qemuargv2xml-hyperv.xml | 4 +- .../qemuargv2xmldata/qemuargv2xml-kvm-features.xml | 4 +- tests/qemuargv2xmldata/qemuargv2xml-kvmclock.xml | 4 +- .../qemuargv2xml-machine-aeskeywrap-off-argv.xml | 4 +- .../qemuargv2xml-machine-aeskeywrap-on-argv.xml | 4 +- .../qemuargv2xml-machine-core-off.xml | 4 +- .../qemuargv2xml-machine-core-on.xml | 4 +- .../qemuargv2xml-machine-deakeywrap-off-argv.xml | 4 +- .../qemuargv2xml-machine-deakeywrap-on-argv.xml | 4 +- .../qemuargv2xml-machine-keywrap-none-argv.xml | 4 +- .../qemuargv2xml-misc-disable-s3.xml | 6 +-- .../qemuargv2xml-misc-disable-suspends.xml | 6 +-- .../qemuargv2xml-misc-enable-s4.xml | 6 +-- .../qemuargv2xml-misc-no-reboot.xml | 4 +- .../qemuargv2xml-net-eth-ifname.xml | 4 +- tests/qemuargv2xmldata/qemuargv2xml-net-eth.xml | 4 +- .../qemuargv2xmldata/qemuargv2xml-nosharepages.xml | 4 +- .../qemuargv2xmldata/qemuargv2xml-parallel-tcp.xml | 4 +- .../qemuargv2xmldata/qemuargv2xml-pseries-disk.xml | 2 +- .../qemuargv2xml-pseries-nvram.xml | 2 +- .../qemuargv2xml-reboot-timeout-disabled.xml | 4 +- .../qemuargv2xml-reboot-timeout-enabled.xml | 4 +- tests/qemuargv2xmldata/qemuargv2xml-serial-dev.xml | 4 +- .../qemuargv2xml-serial-tcp-telnet.xml | 4 +- tests/qemuargv2xmldata/qemuargv2xml-serial-tcp.xml | 4 +- tests/qemuargv2xmldata/qemuargv2xml-serial-vc.xml | 4 +- tests/qemuargv2xmldata/qemuargv2xml-watchdog.xml | 4 +- tests/qemuargv2xmltest.c | 54 ++++++++++++---------- 50 files changed, 133 insertions(+), 135 deletions(-) -- 2.5.0

2 8

[libvirt] [PATCH] qemu: Move PORT definitions to qemu_conf.c
by Cole Robinson 18 Feb '16

18 Feb '16

Which is the only user. That was the only reason for including qemu_command.h, though we need to explicitly include qemu_domain.h afterwards. --- Had this sitting in a branch. jferlan: this is in your neck of the woods, not sure if it's going to conflict with any of your reorg patches though... src/qemu/qemu_command.h | 16 ---------------- src/qemu/qemu_conf.c | 18 +++++++++++++++++- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h index 776954e..fb684d0 100644 --- a/src/qemu/qemu_command.h +++ b/src/qemu/qemu_command.h @@ -39,22 +39,6 @@ # define QEMU_DRIVE_HOST_PREFIX "drive-" # define QEMU_FSDEV_HOST_PREFIX "fsdev-" -/* These are only defaults, they can be changed now in qemu.conf and - * explicitly specified port is checked against these two (makes - * sense to limit the values). - * - * This limitation is mentioned in qemu.conf, so bear in mind that the - * configuration file should reflect any changes made to these values. - */ -# define QEMU_REMOTE_PORT_MIN 5900 -# define QEMU_REMOTE_PORT_MAX 65535 - -# define QEMU_WEBSOCKET_PORT_MIN 5700 -# define QEMU_WEBSOCKET_PORT_MAX 65535 - -# define QEMU_MIGRATION_PORT_MIN 49152 -# define QEMU_MIGRATION_PORT_MAX 49215 - VIR_ENUM_DECL(qemuVideo) typedef struct _qemuBuildCommandLineCallbacks qemuBuildCommandLineCallbacks; diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 14683f5..fd3055f 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -36,8 +36,8 @@ #include "virerror.h" #include "qemu_conf.h" -#include "qemu_command.h" #include "qemu_capabilities.h" +#include "qemu_domain.h" #include "viruuid.h" #include "virbuffer.h" #include "virconf.h" @@ -58,6 +58,22 @@ VIR_LOG_INIT("qemu.qemu_conf"); +/* These are only defaults, they can be changed now in qemu.conf and + * explicitly specified port is checked against these two (makes + * sense to limit the values). + * + * This limitation is mentioned in qemu.conf, so bear in mind that the + * configuration file should reflect any changes made to these values. + */ +#define QEMU_REMOTE_PORT_MIN 5900 +#define QEMU_REMOTE_PORT_MAX 65535 + +#define QEMU_WEBSOCKET_PORT_MIN 5700 +#define QEMU_WEBSOCKET_PORT_MAX 65535 + +#define QEMU_MIGRATION_PORT_MIN 49152 +#define QEMU_MIGRATION_PORT_MAX 49215 + static virClassPtr virQEMUDriverConfigClass; static void virQEMUDriverConfigDispose(void *obj); -- 2.5.0

2 2

[libvirt] [PATCH] libvirt-guests: emit most messages to stderr
by Michael Chapman 17 Feb '16

17 Feb '16

Some of the shell functions in this script (e.g. check_guests_shutdown) produce output that is captured and processed by other parts of the script. Any error messages from these shell functions must go to stderr, not stdout. Rather than trying to determine which messages are safe for stdout and which are not (and maintaining this safety as the script is refactored), simplify things by emitting all messages to stderr, except for the output from gueststatus(), rh_status() and usage(). Signed-off-by: Michael Chapman <mike(a)very.puzzling.org> --- tools/libvirt-guests.sh.in | 94 +++++++++++++++++++++++----------------------- 1 file changed, 47 insertions(+), 47 deletions(-) diff --git a/tools/libvirt-guests.sh.in b/tools/libvirt-guests.sh.in index 7f74b85..80b1ec7 100644 --- a/tools/libvirt-guests.sh.in +++ b/tools/libvirt-guests.sh.in @@ -92,16 +92,16 @@ test_connect() i=${CONNECT_RETRIES} while [ $i -gt 0 ]; do - run_virsh "$uri" connect 2>/dev/null + run_virsh "$uri" connect >/dev/null 2>/dev/null if [ $? -eq 0 ]; then return 0; fi sleep ${RETRIES_SLEEP} - eval_gettext "Unable to connect to libvirt currently. Retrying .. \$i" + eval_gettext "Unable to connect to libvirt currently. Retrying .. \$i" >&2 i=$(($i-1)) done - eval_gettext "Can't connect to \$uri. Skipping." - echo + eval_gettext "Can't connect to \$uri. Skipping." >&2 + echo >&2 return 1 } @@ -163,8 +163,8 @@ start() { [ -f "$LISTFILE" ] || { started; return 0; } if [ "x$ON_BOOT" != xstart ]; then - gettext "libvirt-guests is configured not to start any guests on boot" - echo + gettext "libvirt-guests is configured not to start any guests on boot" >&2 + echo >&2 rm -f "$LISTFILE" started return 0 @@ -187,19 +187,19 @@ start() { done set +f if ! "$configured"; then - eval_gettext "Ignoring guests on \$uri URI"; echo + eval_gettext "Ignoring guests on \$uri URI" >&2; echo >&2 continue fi test_connect "$uri" || continue - eval_gettext "Resuming guests on \$uri URI..."; echo + eval_gettext "Resuming guests on \$uri URI..." >&2; echo >&2 for guest in $list; do name=$(guest_name "$uri" "$guest") - eval_gettext "Resuming guest \$name: " + eval_gettext "Resuming guest \$name: " >&2 if guest_is_on "$uri" "$guest"; then if "$guest_running"; then - gettext "already active"; echo + gettext "already active" >&2; echo >&2 else if "$isfirst"; then isfirst=false @@ -208,7 +208,7 @@ start() { fi retval run_virsh "$uri" start $bypass "$name" \ >/dev/null && \ - gettext "done"; echo + gettext "done" >&2; echo >&2 if "$sync_time"; then run_virsh "$uri" domtime --sync "$name" >/dev/null fi @@ -234,7 +234,7 @@ suspend_guest() bypass= slept=0 test "x$BYPASS_CACHE" = x0 || bypass=--bypass-cache - printf '%s...\n' "$label" + printf '%s...\n' "$label" >&2 run_virsh "$uri" managedsave $bypass "$guest" >/dev/null & virsh_pid=$! while true; do @@ -246,9 +246,9 @@ suspend_guest() progress=$(run_virsh_c "$uri" domjobinfo "$guest" 2>/dev/null | \ awk '/^Data processed:/{print $3, $4}') if [ -n "$progress" ]; then - printf '%s%s\n' "$label" "$progress" + printf '%s%s\n' "$label" "$progress" >&2 else - printf '%s%s\n' "$label" "..." + printf '%s%s\n' "$label" "..." >&2 fi fi done @@ -264,8 +264,8 @@ shutdown_guest() guest=$2 name=$(guest_name "$uri" "$guest") - eval_gettext "Starting shutdown on guest: \$name" - echo + eval_gettext "Starting shutdown on guest: \$name" >&2 + echo >&2 retval run_virsh "$uri" shutdown "$guest" >/dev/null || return timeout=$SHUTDOWN_TIMEOUT check_timeout=false @@ -283,24 +283,24 @@ shutdown_guest() if $check_timeout; then if [ $(($timeout % 5)) -eq 0 ]; then - printf "$format" "$name" "$timeout" + printf "$format" "$name" "$timeout" >&2 fi timeout=$(($timeout - 1)) else slept=$(($slept + 1)) if [ $(($slept % 5)) -eq 0 ]; then - printf "$format" "$name" + printf "$format" "$name" >&2 fi fi done if guest_is_on "$uri" "$guest"; then if "$guest_running"; then - eval_gettext "Shutdown of guest \$name failed to complete in time." + eval_gettext "Shutdown of guest \$name failed to complete in time." >&2 else - eval_gettext "Shutdown of guest \$name complete." + eval_gettext "Shutdown of guest \$name complete." >&2 fi - echo + echo >&2 fi } @@ -313,8 +313,8 @@ shutdown_guest_async() guest=$2 name=$(guest_name "$uri" "$guest") - eval_gettext "Starting shutdown on guest: \$name" - echo + eval_gettext "Starting shutdown on guest: \$name" >&2 + echo >&2 retval run_virsh "$uri" shutdown "$guest" > /dev/null } @@ -337,8 +337,8 @@ check_guests_shutdown() guests_up= for guest in $guests; do if ! guest_is_on "$uri" "$guest" >/dev/null 2>&1; then - eval_gettext "Failed to determine state of guest: \$guest. Not tracking it anymore." - echo + eval_gettext "Failed to determine state of guest: \$guest. Not tracking it anymore." >&2 + echo >&2 continue fi if "$guest_running"; then @@ -363,8 +363,8 @@ print_guests_shutdown() esac name=$(guest_name "$uri" "$guest") - eval_gettext "Shutdown of guest \$name complete." - echo + eval_gettext "Shutdown of guest \$name complete." >&2 + echo >&2 done } @@ -404,18 +404,18 @@ shutdown_guests_parallel() if $check_timeout; then if [ $(($timeout % 5)) -eq 0 ]; then - printf "$format" $(($guestcount + $shutdowncount)) "$timeout" + printf "$format" $(($guestcount + $shutdowncount)) "$timeout" >&2 fi timeout=$(($timeout - 1)) if [ $timeout -le 0 ]; then - eval_gettext "Timeout expired while shutting down domains"; echo + eval_gettext "Timeout expired while shutting down domains" >&2; echo >&2 RETVAL=1 return fi else slept=$(($slept + 1)) if [ $(($slept % 5)) -eq 0 ]; then - printf "$format" $(($guestcount + $shutdowncount)) + printf "$format" $(($guestcount + $shutdowncount)) >&2 fi fi @@ -435,8 +435,8 @@ stop() { if [ "x$ON_SHUTDOWN" = xshutdown ]; then suspending=false if [ $SHUTDOWN_TIMEOUT -lt 0 ]; then - gettext "SHUTDOWN_TIMEOUT must be equal or greater than 0" - echo + gettext "SHUTDOWN_TIMEOUT must be equal or greater than 0" >&2 + echo >&2 RETVAL=6 return fi @@ -449,21 +449,21 @@ stop() { test_connect "$uri" || continue - eval_gettext "Running guests on \$uri URI: " + eval_gettext "Running guests on \$uri URI: " >&2 list=$(list_guests "$uri") if [ $? -eq 0 ]; then empty=true for uuid in $list; do - "$empty" || printf ", " - printf %s "$(guest_name "$uri" "$uuid")" + "$empty" || printf ", " >&2 + printf %s "$(guest_name "$uri" "$uuid")" >&2 empty=false done if "$empty"; then - gettext "no running guests." + gettext "no running guests." >&2 fi - echo + echo >&2 fi if "$suspending"; then @@ -472,26 +472,26 @@ stop() { empty=true for uuid in $transient; do if "$empty"; then - eval_gettext "Not suspending transient guests on URI: \$uri: " + eval_gettext "Not suspending transient guests on URI: \$uri: " >&2 empty=false else - printf ", " + printf ", " >&2 fi - printf %s "$(guest_name "$uri" "$uuid")" + printf %s "$(guest_name "$uri" "$uuid")" >&2 done - echo + echo >&2 # reload domain list to contain only persistent guests list=$(list_guests "$uri" "--persistent") if [ $? -ne 0 ]; then - eval_gettext "Failed to list persistent guests on \$uri" - echo + eval_gettext "Failed to list persistent guests on \$uri" >&2 + echo >&2 RETVAL=1 set +f return fi else - gettext "Failed to list transient guests" - echo + gettext "Failed to list transient guests" >&2 + echo >&2 RETVAL=1 set +f return @@ -507,9 +507,9 @@ stop() { if [ -s "$LISTFILE" ]; then while read uri list; do if "$suspending"; then - eval_gettext "Suspending guests on \$uri URI..."; echo + eval_gettext "Suspending guests on \$uri URI..." >&2; echo >&2 else - eval_gettext "Shutting down guests on \$uri URI..."; echo + eval_gettext "Shutting down guests on \$uri URI..." >&2; echo >&2 fi if [ "$PARALLEL_SHUTDOWN" -gt 1 ] && -- 2.4.3

2 3

[libvirt] [PATCH 0/6] NSS module for libvirt
by Michal Privoznik 17 Feb '16

17 Feb '16

Are you tired of remembering IP addresses for your domains? Do you have enough of configuring static IPs so that you can add them to your hosts file? Then libvirt NSS module is exactly what you need! NSS does a lot in a Linux host. These patches aim at translating domain names into IP addresses. All you need to do, is install libnss_libvirt.so.2 (e.g. via 'make install' ran from source dir), enable the module in nsswitch.conf: $ grep libvirt /etc/nsswitch.conf hosts: files dns libvirt and you're all set. Now you can just: $ ping $mydomain $ ssh user@$mydomain or anything you'd like. The only limitation is that it has to be libvirt who has assigned the domain IP address. The limitation comes from implementation in which '/var/lib/libvirt/dnsmasq/*.status' files are parsed when looking up a hostname. What's beautiful on this feature is that it helps any users regardless of their systemd attitude. On systemd hosts there already exists a similar module 'mymachines' which takes its data from machined. And libvirt does communicate with machined when creating a domain. But unfortunately at that time we know nothing about guest's IPs and therefore do not tell them to machined, which in turn can't tell anything to mymachines module. To make things worse, machined seems to be lacking an API to tell it the addresses later on when libvirt finds out. Therefore even systemd distros will benefit from this feature. If the feature makes its way in, I'll describe all the steps in a wiki (hence, no documentation in this patch set - although, if you have a bright idea where should I put it, I'm all ears). Enjoy! Michal Privoznik (6): Export virLease* functions for leases file handling virjson: Resolve const correctness Initial support for NSS plugin skeleton nss: Implement _nss_libvirt_gethostbyname3_r Implement _nss_libvirt_gethostbyname4_r nss: Introduce a test cfg.mk | 2 +- configure.ac | 2 + m4/virt-nss.m4 | 51 ++++++ po/POTFILES.in | 1 + src/Makefile.am | 1 + src/libvirt_private.syms | 6 + src/network/leaseshelper.c | 271 +-------------------------- src/util/virjson.c | 58 +++--- src/util/virjson.h | 54 +++--- src/util/virlease.c | 304 ++++++++++++++++++++++++++++++ src/util/virlease.h | 44 +++++ tests/Makefile.am | 18 ++ tests/nssdata/virbr0.status | 14 ++ tests/nssmock.c | 140 ++++++++++++++ tests/nsstest.c | 184 +++++++++++++++++++ tools/Makefile.am | 45 +++++ tools/nss/libvirt_nss.c | 436 ++++++++++++++++++++++++++++++++++++++++++++ tools/nss/libvirt_nss.h | 52 ++++++ tools/nss/libvirt_nss.syms | 12 ++ 19 files changed, 1368 insertions(+), 327 deletions(-) create mode 100644 m4/virt-nss.m4 create mode 100644 src/util/virlease.c create mode 100644 src/util/virlease.h create mode 100644 tests/nssdata/virbr0.status create mode 100644 tests/nssmock.c create mode 100644 tests/nsstest.c create mode 100644 tools/nss/libvirt_nss.c create mode 100644 tools/nss/libvirt_nss.h create mode 100644 tools/nss/libvirt_nss.syms -- 2.4.10

3 14

[libvirt] devAlias correct parsing
by Alexander Burluka 17 Feb '16

17 Feb '16

Hello, I would be grateful if you help me with next thing: I've successfully subscribed on VIR_DOMAIN_EVENT_ID_TRAY_CHANGE event in my application (QEMU based). It perfectly works and returns to me an device alias (e.g. "drive-scsi0-0-1-0"). Of course I can split this string by delimiter '-'. However, I've found private virDomainDefFindDevice function within libvirt and seems that its make correct parsing. How can I use it in my code? Thank you! -- Regards, Alexander Burluka

2 2

[libvirt] [PATCH] vircgroup: Update virCgroupDenyDevicePath stub
by Michal Privoznik 17 Feb '16

17 Feb '16

In cf113e8d we changed the declaration of virCgroupAllowDevicePath() and virCgroupDenyDevicePath(). However, while updating the stub for non-cgroup platforms for the former we forgot to update the latter too causing a build failure. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Pushed under trivial and build-breaker rules. src/util/vircgroup.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index d032c60..38398fd 100644 --- a/src/util/vircgroup.c +++ b/src/util/vircgroup.c @@ -4689,7 +4689,8 @@ virCgroupDenyDevice(virCgroupPtr group ATTRIBUTE_UNUSED, int virCgroupDenyDevicePath(virCgroupPtr group ATTRIBUTE_UNUSED, const char *path ATTRIBUTE_UNUSED, - int perms ATTRIBUTE_UNUSED) + int perms ATTRIBUTE_UNUSED, + bool ignoreEacces ATTRIBUTE_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Control groups not supported on this platform")); -- 2.4.10

1 0

[libvirt] [PATCH 0/2] Clean up rest of migration code
by Peter Krempa 17 Feb '16

17 Feb '16

As requested in review. Peter Krempa (2): qemu: monitor: Remove unused qemuMonitorMigrateToFile qemu: Remove unnecessary calculations in qemuDomainSaveMemory src/qemu/qemu_driver.c | 30 ++---------------------- src/qemu/qemu_monitor.c | 61 ------------------------------------------------- src/qemu/qemu_monitor.h | 17 -------------- 3 files changed, 2 insertions(+), 106 deletions(-) -- 2.6.2

2 3

[libvirt] [PATCH 00/10] Reorganizing qemu_command.c continued
by John Ferlan 17 Feb '16

17 Feb '16

Figure I'll do these in smaller chunks - it's a large module. Suffice to say there's a lot of "movement" and patches for each is tedius, but I hope in the end it will be easier to deal with. For the most part all patches are primarily code motion, although git diff may have you believe otherwise. Essentially, I'm starting at the top of qemuBuildCommandLine and working my way through either moving functions in a top down order from the beginning of the module or more usually creating a qemuBuildXXXXCommandLine function and calling it from the main processing code. I did not "manage" any of the QEMU_CAPS_DEVICE changes (e.g, remove code), but I could while I'm at if that's desired. Hopefully not many people are touching this module right now ;-)! John Ferlan (10): qemu: Move qemuDeviceDriveHostAlias qemu: Remove local emulator qemu: Make basic upfront checks before creating command qemu: Reorganize -machine arguments qemu: Reorganize -cpu arguments qemu: Reorganize qemuBuildDomainLoaderCommandLine call qemu: Reorganize -m arguments qemu: Reorganize -smp argument qemu: Reorganize IOThread -object arguments qemu: Reorganize -numa arguments src/qemu/qemu_alias.c | 16 + src/qemu/qemu_alias.h | 4 + src/qemu/qemu_command.c | 9010 ++++++++++++++++++++++++----------------------- src/qemu/qemu_command.h | 3 - src/qemu/qemu_hotplug.c | 6 +- 5 files changed, 4583 insertions(+), 4456 deletions(-) -- 2.5.0

2 18

[libvirt] [PATCH] syms: add forgotten virAdmConnectClass symbol
by Erik Skultety 17 Feb '16

17 Feb '16

Although it currently doesn't cause any linking issues, the symbol should be exported correctly according to our conventions. --- Pushed under trivial rule. src/libvirt_admin_private.syms | 1 + 1 file changed, 1 insertion(+) diff --git a/src/libvirt_admin_private.syms b/src/libvirt_admin_private.syms index ffaf4f3..f22137b 100644 --- a/src/libvirt_admin_private.syms +++ b/src/libvirt_admin_private.syms @@ -12,6 +12,7 @@ xdr_admin_connect_list_servers_ret; xdr_admin_connect_open_args; # datatypes.h +virAdmConnectClass; virAdmGetServer; virAdmServerClass; -- 2.4.3

1 0

[libvirt] [PATCH v4 0/7] admin: Introduce server listing API
by Erik Skultety 17 Feb '16

17 Feb '16

Since v3: - refactors to virHashForEach and hash iterators - servers are now stored in a hash table instead of an array - added forgotten virObjectLock in remoteAdminConnectListServers Erik Skultety (7): util: Add a return value to void hash iterators util: Refactor virHashForEach so it returns as soon as an iterator fails virnetdaemon: Store servers in a hash table admin: Move admin_server.{h,c} to admin.{h,c} admin: Introduce virAdmServer structure admin: Introduce adminDaemonConnectListServers API virt-admin: Introduce cmdSrvList daemon/Makefile.am | 5 +- daemon/admin.c | 181 +++++++++++++++ daemon/admin.h | 36 +++ daemon/admin_server.c | 111 +++------- daemon/admin_server.h | 26 +-- daemon/libvirtd.c | 6 +- include/libvirt/libvirt-admin.h | 25 ++- po/POTFILES.in | 3 +- src/admin/admin_protocol.x | 26 ++- src/admin/admin_remote.c | 71 ++++++ src/admin_protocol-structs | 15 ++ src/conf/network_conf.c | 15 +- src/conf/nwfilter_params.c | 8 +- src/conf/snapshot_conf.c | 31 +-- src/conf/virchrdev.c | 7 +- src/conf/virdomainobjlist.c | 17 +- src/datatypes.c | 35 +++ src/datatypes.h | 38 ++++ src/libvirt-admin.c | 79 +++++++ src/libvirt_admin_private.syms | 5 + src/libvirt_admin_public.syms | 3 + src/locking/lock_daemon.c | 10 +- src/logging/log_daemon.c | 3 +- src/lxc/lxc_controller.c | 2 +- src/nwfilter/nwfilter_dhcpsnoop.c | 3 +- src/nwfilter/nwfilter_gentech_driver.c | 5 +- src/qemu/qemu_domain.c | 7 +- src/qemu/qemu_domain.h | 6 +- src/qemu/qemu_driver.c | 13 +- src/rpc/virnetdaemon.c | 225 +++++++++++++------ src/rpc/virnetdaemon.h | 8 +- src/test/test_driver.c | 14 +- src/uml/uml_driver.c | 13 +- src/util/virclosecallbacks.c | 9 +- src/util/virhash.c | 28 ++- src/util/virhash.h | 6 +- src/xen/xm_internal.c | 7 +- tests/virhashtest.c | 54 +++-- .../input-data-admin-server-names.json | 129 +++++++++++ .../virnetdaemondata/output-data-admin-nomdns.json | 8 +- .../output-data-admin-server-names.json | 126 +++++++++++ .../virnetdaemondata/output-data-anon-clients.json | 6 +- .../output-data-initial-nomdns.json | 6 +- tests/virnetdaemondata/output-data-initial.json | 6 +- .../output-data-no-keepalive-required.json | 242 +++++++++++---------- tests/virnetdaemontest.c | 63 +++--- tools/virt-admin.c | 61 ++++++ 47 files changed, 1361 insertions(+), 442 deletions(-) create mode 100644 daemon/admin.c create mode 100644 daemon/admin.h create mode 100644 tests/virnetdaemondata/input-data-admin-server-names.json create mode 100644 tests/virnetdaemondata/output-data-admin-server-names.json -- 2.4.3

2 13

[libvirt] [PATCH 00/10] Setup cgroups for firmware devices and related refactors
by Peter Krempa 17 Feb '16

17 Feb '16

Peter Krempa (10): qemu: cgroup: Remove abandoned function qemuAddToCgroup qemu: migration: Refactor code now that we assume support for fd migration util: cgroup: Instrument virCgroupDenyDevice to handle -1 device number as * util: cgroup: Drop virCgroup(Allow|Deny)DeviceMajor util: cgroup: Allow ignoring EACCES in virCgroup(Allow|Deny)DevicePath qemu: cgroup: Avoid reporting errors from inaccessible NFS volumes qemu: cgroup: Switch to qemu(Setup|Teardown)ImageCgroup qemu: cgroup: Split up qemuSetImageCgroupInternal qemu: cgroup: Extract guts of qemuSetupImageCgroupInternal qemu: cgroup: Setup cgroups for bios/firmware images src/libvirt_private.syms | 2 - src/lxc/lxc_cgroup.c | 16 ++--- src/lxc/lxc_driver.c | 9 ++- src/qemu/qemu_cgroup.c | 151 +++++++++++++++++++++++++++------------------- src/qemu/qemu_cgroup.h | 8 +-- src/qemu/qemu_driver.c | 8 +-- src/qemu/qemu_migration.c | 114 ++++++++++++---------------------- src/qemu/qemu_migration.h | 2 +- src/util/vircgroup.c | 142 ++++++++++++++----------------------------- src/util/vircgroup.h | 14 ++--- 10 files changed, 199 insertions(+), 267 deletions(-) -- 2.6.2

2 21

[libvirt] [PATCH] Revert "storageVolCreateXMLFrom: Check if backend knows how to createVol"
by Ján Tomko 17 Feb '16

17 Feb '16

This reverts commit 611a278fa46d3136b7fe5c6ab05e660ca3c8fdf4. According to the original commit message, this is dead code: It is highly unlikely that a backend will know how to create a volume from a different volume (buildVolFrom) and not know how to create an empty volume (createVol). --- src/storage/storage_driver.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index 81b1584..e0ded01 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -2037,13 +2037,6 @@ storageVolCreateXMLFrom(virStoragePoolPtr obj, if (newvol->target.capacity < origvol->target.capacity) newvol->target.capacity = origvol->target.capacity; - if (!backend->createVol) { - virReportError(VIR_ERR_NO_SUPPORT, - "%s", _("storage pool does not support volume " - "creation")); - goto cleanup; - } - if (!backend->buildVolFrom) { virReportError(VIR_ERR_NO_SUPPORT, "%s", _("storage pool does not support" -- 2.4.10

2 1

[libvirt] [PATCH 00/12] Split up qemu_command.c
by John Ferlan 17 Feb '16

17 Feb '16

Before disappearing too far down the rabbit hole... My recent foray into qemu_command.c to split out qemu_parse_command.c got me thinking that the module could use quite a bit of a reorganization. It's about 11,400 lines of all sorts of various functions. This started out as an attempt to order functions as they are used, but started turning into extracting certain API's/Helpers into other qemu_*.c modules. There's still quite a bit to do, but rather than hold onto it too long I figured I'd send what I have so far now (and keep working through while waiting for reviews). This is essentially all code motion with some function renames along the way. John Ferlan (12): qemu-command: Move qemuBuildTPMBackendStr qemu-command: Move qemuVirCommandGetFDSet qemu-command: Move qemuBuildTPMDevStr qemu-command: Move qemuVirCommandGetDevSet qemu: Move qemuPhysIfaceConnect to qemu_interface.c and rename qemu: Move qemuNetworkIfaceConnect to qemu_interface.c and rename qemu-command: Move qemuDomainSupports* functions qemu-command: Move qemuDomain*Address* functions to qemu_domain.c qemu-command: Move remaining qemuDomain* functions qemu-command: Move and rename qemuOpenVhostNet qemu-command: Move qemuNetworkPrepareDevices qemu-command: Move qemuAssign*Alias* API's into their own module po/POTFILES.in | 2 + src/Makefile.am | 1 + src/qemu/qemu_assign_alias.c | 468 +++++++ src/qemu/qemu_assign_alias.h | 60 + src/qemu/qemu_command.c | 3073 +++++------------------------------------- src/qemu/qemu_command.h | 48 - src/qemu/qemu_domain.c | 1646 ++++++++++++++++++++++ src/qemu/qemu_domain.h | 25 + src/qemu/qemu_driver.c | 1 + src/qemu/qemu_hotplug.c | 19 +- src/qemu/qemu_interface.c | 378 ++++++ src/qemu/qemu_interface.h | 22 + src/qemu/qemu_process.c | 56 +- tests/qemuhotplugtest.c | 1 + tests/qemuxml2argvtest.c | 1 + 15 files changed, 2978 insertions(+), 2823 deletions(-) create mode 100644 src/qemu/qemu_assign_alias.c create mode 100644 src/qemu/qemu_assign_alias.h -- 2.5.0

3 32

[libvirt] [PATCH] conf: Use a temporary int variable to store GIC version
by Andrea Bolognani 17 Feb '16

17 Feb '16

Since no value in the virGICVersion enumeration is negative, a clever enough compiler can report an error such as src/conf/domain_conf.c:15337:75: error: comparison of unsigned enum expression < 0 is always false [-Werror,-Wtautological-compare] if ((def->gic_version = virGICVersionTypeFromString(tmp)) < 0 || ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^ ~ virGICVersionTypeFromString() can, however, return a negative value if the input string is not part of the enumeration, so we definitely need that check. Work around the problem by storing the return value in a temporary int variable. --- Pushed under the build-breaker rule. src/conf/domain_conf.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 295bc1b..0d2957b 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -14728,7 +14728,7 @@ virDomainDefParseXML(xmlDocPtr xml, xmlNodePtr *nodes = NULL, node = NULL; char *tmp = NULL; size_t i, j; - int n, virtType; + int n, virtType, gic_version; long id = -1; virDomainDefPtr def; bool uuid_generated = false; @@ -15334,12 +15334,13 @@ virDomainDefParseXML(xmlDocPtr xml, node = ctxt->node; ctxt->node = nodes[i]; if ((tmp = virXPathString("string(./@version)", ctxt))) { - if ((def->gic_version = virGICVersionTypeFromString(tmp)) < 0 || - def->gic_version == VIR_GIC_VERSION_NONE) { + gic_version = virGICVersionTypeFromString(tmp); + if (gic_version < 0 || gic_version == VIR_GIC_VERSION_NONE) { virReportError(VIR_ERR_XML_ERROR, _("malformed gic version: %s"), tmp); goto error; } + def->gic_version = gic_version; VIR_FREE(tmp); } def->features[val] = VIR_TRISTATE_SWITCH_ON; -- 2.5.0

1 0

[libvirt] [PATCH 0/7] Improve GIC support
by Andrea Bolognani 16 Feb '16

16 Feb '16

This series was really just supposed to enable guests to use the special "host" GIC version, but I ended up changing a bunch of other stuff and adding a whole lot of new test cases. I've also made it so the GIC availability is always reflected in the domain XML, the same way other implicit devices and features work. The GIC-related definitions are in their own file: depending on whether we end up probing for host GIC support ourselves or relying on QEMU this might turn out to be a huge overkill :) Cheers. Andrea Bolognani (7): gic: Introduce virGICVersion enumeration schema: List allowed GIC versions conf: Use virGICVersion enumeration in virDomainDef qemu: Default to GIC v2 qemu: Always enable GIC on ARM virt machines tests: Reorganize and simplify GIC test cases tests: Add more GIC test cases docs/schemas/domaincommon.rng | 6 +++- src/Makefile.am | 1 + src/conf/domain_conf.c | 15 ++++---- src/conf/domain_conf.h | 3 +- src/libvirt_private.syms | 5 +++ src/qemu/qemu_command.c | 8 +++-- src/qemu/qemu_domain.c | 29 ++++++++++++++++ src/util/virgic.c | 33 ++++++++++++++++++ src/util/virgic.h | 38 ++++++++++++++++++++ .../qemuxml2argv-aarch64-aavmf-virtio-mmio.xml | 1 + .../qemuxml2argv-aarch64-gic-default.args | 1 + .../qemuxml2argv-aarch64-gic-default.xml | 22 ++++++++++++ ...gic.args => qemuxml2argv-aarch64-gic-host.args} | 13 +++---- .../qemuxml2argv-aarch64-gic-host.xml | 22 ++++++++++++ .../qemuxml2argv-aarch64-gic-invalid.xml | 22 ++++++++++++ .../qemuxml2argv-aarch64-gic-none.args | 1 + .../qemuxml2argv-aarch64-gic-none.xml | 19 ++++++++++ .../qemuxml2argv-aarch64-gic-not-arm.xml | 22 ++++++++++++ .../qemuxml2argv-aarch64-gic-not-virt.xml | 22 ++++++++++++ ...gicv3.args => qemuxml2argv-aarch64-gic-v2.args} | 12 +++---- ...h64-gic.xml => qemuxml2argv-aarch64-gic-v2.xml} | 14 ++------ .../qemuxml2argv-aarch64-gic-v3.args | 20 +++++++++++ ...4-gicv3.xml => qemuxml2argv-aarch64-gic-v3.xml} | 14 ++------ tests/qemuxml2argvtest.c | 40 ++++++++++++++++++---- .../qemuxml2xmlout-aarch64-gic-default.xml | 1 + .../qemuxml2xmlout-aarch64-gic-none.xml | 1 + tests/qemuxml2xmltest.c | 7 ++-- 27 files changed, 331 insertions(+), 61 deletions(-) create mode 100644 src/util/virgic.c create mode 100644 src/util/virgic.h create mode 120000 tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-default.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-default.xml rename tests/qemuxml2argvdata/{qemuxml2argv-aarch64-gic.args => qemuxml2argv-aarch64-gic-host.args} (57%) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-host.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-invalid.xml create mode 120000 tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-none.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-none.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-not-arm.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-not-virt.xml rename tests/qemuxml2argvdata/{qemuxml2argv-aarch64-gicv3.args => qemuxml2argv-aarch64-gic-v2.args} (55%) rename tests/qemuxml2argvdata/{qemuxml2argv-aarch64-gic.xml => qemuxml2argv-aarch64-gic-v2.xml} (61%) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-v3.args rename tests/qemuxml2argvdata/{qemuxml2argv-aarch64-gicv3.xml => qemuxml2argv-aarch64-gic-v3.xml} (61%) create mode 120000 tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gic-default.xml create mode 120000 tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gic-none.xml -- 2.5.0

3 24

[libvirt] [PATCH] qemu: fix hot unplug of PCI devices with VFIO
by Ludovic Beliveau 16 Feb '16

16 Feb '16

Currently, on hot unplug of PCI devices with VFIO driver for QEMU, libvirt is trying to restore the host devices to it's previous value (basically a chown on the previous user/group). However for devices with VFIO driver, when the device is unbinded it is removed from the /dev/vfio file system causing the restore label to fail. The fix is to not restore the label for those PCI devices since they are going to be teared down anyway. Signed-off-by: Ludovic Beliveau <ludovic.beliveau(a)windriver.com> --- diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index f8db960..f5beabd 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -2996,6 +2996,8 @@ qemuDomainRemoveHostDevice(virQEMUDriverPtr driver, int ret = -1; qemuDomainObjPrivatePtr priv = vm->privateData; char *drivestr = NULL; + virDomainHostdevSubsysPCIPtr pcisrc = NULL; + bool is_vfio = false; VIR_DEBUG("Removing host device %s from domain %p %s", hostdev->info->alias, vm, vm->def->name); @@ -3039,6 +3041,8 @@ qemuDomainRemoveHostDevice(virQEMUDriverPtr driver, switch ((virDomainHostdevSubsysType) hostdev->source.subsys.type) { case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI: + pcisrc = &hostdev->source.subsys.u.pci; + is_vfio = pcisrc->backend == VIR_DOMAIN_HOSTDEV_PCI_BACKEND_VFIO; qemuDomainRemovePCIHostDevice(driver, vm, hostdev); /* QEMU might no longer need to lock as much memory, eg. we just * detached the last VFIO device, so adjust the limit here */ @@ -3058,7 +3062,8 @@ qemuDomainRemoveHostDevice(virQEMUDriverPtr driver, if (qemuTeardownHostdevCgroup(vm, hostdev) < 0) VIR_WARN("Failed to remove host device cgroup ACL"); - if (virSecurityManagerRestoreHostdevLabel(driver->securityManager, + if (!is_vfio && + virSecurityManagerRestoreHostdevLabel(driver->securityManager, vm->def, hostdev, NULL) < 0) { VIR_WARN("Failed to restore host device labelling"); }

3 2

[libvirt] [PATCH] Spell VMware with a lowercase w
by Ján Tomko 16 Feb '16

16 Feb '16

Replace all occurrences of VMWare outside the news. --- docs/formatdomain.html.in | 2 +- docs/migration.html.in | 2 +- docs/storage.html.in | 2 +- libvirt.spec.in | 2 +- src/util/virerror.c | 2 +- src/util/virstoragefile.c | 2 +- tools/virsh.c | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index b3187bb..e96798f 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -1569,7 +1569,7 @@ <dt><code>vmport</code></dt> <dd>Depending on the <code>state</code> attribute (values <code>on</code>, <code>off</code>, default <code>on</code>) enable or disable - the emulation of VMWare IO port, for vmmouse etc. + the emulation of VMware IO port, for vmmouse etc. <span class="since">Since 1.2.16</span> </dd> <dt><code>gic</code></dt> diff --git a/docs/migration.html.in b/docs/migration.html.in index 6986cc0..8efdd7f 100644 --- a/docs/migration.html.in +++ b/docs/migration.html.in @@ -475,7 +475,7 @@ </pre> <p> - Supported by Xen, QEMU, VMWare and VirtualBox drivers + Supported by Xen, QEMU, VMware and VirtualBox drivers </p> <h3><a name="scenarionativepeer2peer">Native migration, client to and peer2peer between, two libvirtd servers</a></h3> diff --git a/docs/storage.html.in b/docs/storage.html.in index 1f01330..b0efe69 100644 --- a/docs/storage.html.in +++ b/docs/storage.html.in @@ -161,7 +161,7 @@ <li><code>qcow</code>: QEMU v1 disk image format</li> <li><code>qcow2</code>: QEMU v2 disk image format</li> <li><code>qed</code>: QEMU Enhanced Disk image format</li> - <li><code>vmdk</code>: VMWare disk image format</li> + <li><code>vmdk</code>: VMware disk image format</li> <li><code>vpc</code>: VirtualPC disk image format</li> </ul> <p> diff --git a/libvirt.spec.in b/libvirt.spec.in index dd54dfc..fc2e2cf 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -190,7 +190,7 @@ %endif # RHEL doesn't ship OpenVZ, VBox, UML, PowerHypervisor, -# VMWare, libxenserver (xenapi), libxenlight (Xen 4.1 and newer), +# VMware, libxenserver (xenapi), libxenlight (Xen 4.1 and newer), # or HyperV. %if 0%{?rhel} %define with_openvz 0 diff --git a/src/util/virerror.c b/src/util/virerror.c index 3a3ddef..e1bcf52 100644 --- a/src/util/virerror.c +++ b/src/util/virerror.c @@ -105,7 +105,7 @@ VIR_ENUM_IMPL(virErrorDomain, VIR_ERR_DOMAIN_LAST, "Audit Utils", "Sysinfo Utils", "I/O Stream Utils", - "VMWare Driver", + "VMware Driver", "Event Loop", /* 40 */ "Xen Light Driver", diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index 3e79ae1..49b1745 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -490,7 +490,7 @@ vmdk4GetBackingStore(char **res, *res = NULL; /* * Technically this should have been VMDK, since - * VMDK spec / VMWare impl only support VMDK backed + * VMDK spec / VMware impl only support VMDK backed * by VMDK. QEMU isn't following this though and * does probing on VMDK backing files, hence we set * AUTO diff --git a/tools/virsh.c b/tools/virsh.c index b96dbda..eb84dd0 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -550,7 +550,7 @@ virshShowVersion(vshControl *ctl ATTRIBUTE_UNUSED) vshPrint(ctl, " OpenVZ"); #endif #ifdef WITH_VMWARE - vshPrint(ctl, " VMWare"); + vshPrint(ctl, " VMware"); #endif #ifdef WITH_PHYP vshPrint(ctl, " PHYP"); -- 2.4.10

3 3

[libvirt] PING: [RFC] vhost-user + shared memory + NUMA
by Pavel Fedin 15 Feb '16

15 Feb '16

Hello! Sorry, but i did not get any answer to the last question. Would it be OK to require <memoryBacking> and implicitly add only shared mode ? Kind regards, Pavel Fedin Senior Engineer Samsung Electronics Research center Russia > -----Original Message----- > From: libvir-list-bounces(a)redhat.com [mailto:libvir-list-bounces@redhat.com] On Behalf Of > Pavel Fedin > Sent: Thursday, February 11, 2016 5:36 PM > To: 'Daniel P. Berrange' > Cc: 'Libvirt' > Subject: Re: [libvirt] [RFC] vhost-user + shared memory + NUMA > > Hello! > > > > Ok, then would it be a good compromise if we require <memoryBacking>, and only > implicitly > > add "shared" if we have vhost-user > > > devices? This way we would not change the way the guest memory is allocated. > > > > Adding shared implicitly *will* change the way guest memory is allocated, > > as it will have to use tmpfs to make it shared. > > You perhaps didn't get my idea. I meant - we will still need to specify <memoryBacking> with > huge pages, just no <numa>. Therefore, the memory will be allocated via file backend from > hugetlbfs. Only mode will be changed implicitly (private -> shared). > > > > IMHO being able to manually specify "shared" both in <numa> and > > > in <memoryBacking> would be ambiguous. > > > > That's not really any different to what we have already with NUMA. > > The top level setting would apply as the default, and the NUMA level > > settings override it if needed. > > Well, the only little drawback would be necessity to add "shared" by itself. This would > require additional patching to clients (e. g. openstack). > > Kind regards, > Pavel Fedin > Senior Engineer > Samsung Electronics Research center Russia > > > -- > libvir-list mailing list > libvir-list(a)redhat.com > https://www.redhat.com/mailman/listinfo/libvir-list

2 1