- Devel - libvirt List Archives

[libvirt] [PATCH] qemu: hotplug: Don't leak saved error on failure in qemuHotplugRemoveManagedPR
by Peter Krempa 23 Jul '18

23 Jul '18

If we'd fail to enter or exit the monitor the saved error would be leaked. Introduced in 8498a1e2221 . Pointed out by coverity. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/qemu/qemu_hotplug.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index fe703ab4bd..1488f0a7c2 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -354,22 +354,26 @@ qemuHotplugRemoveManagedPR(virQEMUDriverPtr driver, { qemuDomainObjPrivatePtr priv = vm->privateData; virErrorPtr orig_err; - virErrorPreserveLast(&orig_err); + int ret = -1; if (!priv->prDaemonRunning || virDomainDefHasManagedPR(vm->def)) return 0; + virErrorPreserveLast(&orig_err); + if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) < 0) - return -1; + goto cleanup; ignore_value(qemuMonitorDelObject(priv->mon, qemuDomainGetManagedPRAlias())); if (qemuDomainObjExitMonitor(driver, vm) < 0) - return -1; + goto cleanup; qemuProcessKillManagedPRDaemon(vm); - virErrorRestore(&orig_err); - return 0; + ret = 0; + cleanup: + virErrorRestore(&orig_err); + return ret; } -- 2.16.2

2 1

[libvirt] [python PATCH 0/3] rpm: misc updates to modernize spec
by Daniel P. Berrangé 23 Jul '18

23 Jul '18

Daniel P. Berrangé (3): rpm: use the versioned python2 macro names rpm: add BuildRequires on gcc rpm: update min required rhel/fedora libvirt-python.spec.in | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) -- 2.17.1

2 4

[libvirt] [PATCH] vmx: add support for hostonly interfaces
by Javier Uruen Val 23 Jul '18

23 Jul '18

Vmware fusion allows you to configure a network interface as "hostonly". This uses a private network that is not normally accessible from the physical networks on the Mac/PC. We map "hostonly" in the vmx configuration to "network" in the domain configuration. Some comments in vmx.c seem to point towards using this mapping and not other such as "internal" or something else. Added tests and configuration files from actual vmx machines configured with "hostonly". Signed-off-by: Javier Uruen Val <javi.uruen(a)gmail.com> --- src/vmx/vmx.c | 19 ++- .../vmx2xml-fusion-in-the-wild-2.vmx | 115 ++++++++++++++++++ .../vmx2xml-fusion-in-the-wild-2.xml | 34 ++++++ tests/vmx2xmltest.c | 1 + .../xml2vmx-fusion-in-the-wild-2.vmx | 36 ++++++ .../xml2vmx-fusion-in-the-wild-2.xml | 31 +++++ tests/xml2vmxtest.c | 1 + 7 files changed, 231 insertions(+), 6 deletions(-) create mode 100644 tests/vmx2xmldata/vmx2xml-fusion-in-the-wild-2.vmx create mode 100644 tests/vmx2xmldata/vmx2xml-fusion-in-the-wild-2.xml create mode 100755 tests/xml2vmxdata/xml2vmx-fusion-in-the-wild-2.vmx create mode 100644 tests/xml2vmxdata/xml2vmx-fusion-in-the-wild-2.xml diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index fe24b060d7..c812a8fb33 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -2650,6 +2650,7 @@ virVMXParseEthernet(virConfPtr conf, int controller, virDomainNetDefPtr *def) /* vmx:networkName -> def:data.bridge.brname */ if (connectionType == NULL || STRCASEEQ(connectionType, "bridged") || + STRCASEEQ(connectionType, "hostonly") || STRCASEEQ(connectionType, "custom")) { if (virVMXGetConfigString(conf, networkName_name, &networkName, true) < 0) @@ -2674,11 +2675,12 @@ virVMXParseEthernet(virConfPtr conf, int controller, virDomainNetDefPtr *def) virtualDev = NULL; networkName = NULL; } else if (STRCASEEQ(connectionType, "hostonly")) { - /* FIXME */ - virReportError(VIR_ERR_INTERNAL_ERROR, - _("No yet handled value '%s' for VMX entry '%s'"), - connectionType, connectionType_name); - goto cleanup; + (*def)->type = VIR_DOMAIN_NET_TYPE_NETWORK; + (*def)->model = virtualDev; + (*def)->data.network.name = networkName; + + virtualDev = NULL; + networkName = NULL; } else if (STRCASEEQ(connectionType, "nat")) { (*def)->type = VIR_DOMAIN_NET_TYPE_USER; (*def)->model = virtualDev; @@ -3783,6 +3785,12 @@ virVMXFormatEthernet(virDomainNetDefPtr def, int controller, case VIR_DOMAIN_NET_TYPE_USER: virBufferAsprintf(buffer, "ethernet%d.connectionType = \"nat\"\n", controller); + + break; + + case VIR_DOMAIN_NET_TYPE_NETWORK: + virBufferAsprintf(buffer, "ethernet%d.connectionType = \"hostonly\"\n", + controller); break; case VIR_DOMAIN_NET_TYPE_ETHERNET: @@ -3790,7 +3798,6 @@ virVMXFormatEthernet(virDomainNetDefPtr def, int controller, case VIR_DOMAIN_NET_TYPE_SERVER: case VIR_DOMAIN_NET_TYPE_CLIENT: case VIR_DOMAIN_NET_TYPE_MCAST: - case VIR_DOMAIN_NET_TYPE_NETWORK: case VIR_DOMAIN_NET_TYPE_INTERNAL: case VIR_DOMAIN_NET_TYPE_DIRECT: case VIR_DOMAIN_NET_TYPE_HOSTDEV: diff --git a/tests/vmx2xmldata/vmx2xml-fusion-in-the-wild-2.vmx b/tests/vmx2xmldata/vmx2xml-fusion-in-the-wild-2.vmx new file mode 100644 index 0000000000..c871cca540 --- /dev/null +++ b/tests/vmx2xmldata/vmx2xml-fusion-in-the-wild-2.vmx @@ -0,0 +1,115 @@ +.encoding = "UTF-8" +config.version = "8" +virtualHW.version = "12" +vcpu.hotadd = "TRUE" +scsi0.present = "TRUE" +scsi0.virtualDev = "lsilogic" +sata0.present = "TRUE" +memsize = "4996" +mem.hotadd = "TRUE" +scsi0:0.present = "TRUE" +scsi0:0.fileName = "Virtual Disk.vmdk" +sata0:1.present = "TRUE" +sata0:1.autodetect = "TRUE" +sata0:1.deviceType = "cdrom-image" +sata0:1.startConnected = "FALSE" +ethernet0.present = "TRUE" +ethernet0.connectionType = "hostonly" +ethernet0.virtualDev = "e1000" +ethernet0.wakeOnPcktRcv = "FALSE" +ethernet0.addressType = "generated" +ethernet0.linkStatePropagation.enable = "FALSE" +usb.present = "TRUE" +ehci.present = "TRUE" +ehci.pciSlotNumber = "35" +sound.present = "TRUE" +sound.fileName = "-1" +sound.autodetect = "TRUE" +mks.enable3d = "TRUE" +svga.graphicsMemoryKB = "786432" +pciBridge0.present = "TRUE" +pciBridge4.present = "TRUE" +pciBridge4.virtualDev = "pcieRootPort" +pciBridge4.functions = "8" +pciBridge5.present = "TRUE" +pciBridge5.virtualDev = "pcieRootPort" +pciBridge5.functions = "8" +pciBridge6.present = "TRUE" +pciBridge6.virtualDev = "pcieRootPort" +pciBridge6.functions = "8" +pciBridge7.present = "TRUE" +pciBridge7.virtualDev = "pcieRootPort" +pciBridge7.functions = "8" +vmci0.present = "TRUE" +hpet0.present = "TRUE" +usb.vbluetooth.startConnected = "TRUE" +tools.syncTime = "TRUE" +displayName = "Ubuntu16.04" +guestOS = "ubuntu-64" +nvram = "Ubuntu16.04.nvram" +virtualHW.productCompatibility = "hosted" +tools.upgrade.policy = "upgradeAtPowerCycle" +powerType.powerOff = "soft" +powerType.powerOn = "soft" +powerType.suspend = "soft" +powerType.reset = "soft" +extendedConfigFile = "Ubuntu16.04.vmxf" +uuid.bios = "56 4d 97 36 09 cb ba 6f-20 57 e7 01 50 72 7f 3f" +uuid.location = "56 4d 97 36 09 cb ba 6f-20 57 e7 01 50 72 7f 3f" +migrate.hostlog = "./Ubuntu16.04-7a77148b.hlog" +scsi0:0.redo = "" +pciBridge0.pciSlotNumber = "17" +pciBridge4.pciSlotNumber = "21" +pciBridge5.pciSlotNumber = "22" +pciBridge6.pciSlotNumber = "23" +pciBridge7.pciSlotNumber = "24" +scsi0.pciSlotNumber = "16" +usb.pciSlotNumber = "32" +ethernet0.pciSlotNumber = "33" +sound.pciSlotNumber = "34" +vmci0.pciSlotNumber = "36" +sata0.pciSlotNumber = "37" +ethernet0.generatedAddress = "00:0C:29:72:7F:3F" +ethernet0.generatedAddressOffset = "0" +vmci0.id = "1349680959" +monitor.phys_bits_used = "42" +vmotion.checkpointFBSize = "4194304" +vmotion.checkpointSVGAPrimarySize = "67108864" +cleanShutdown = "FALSE" +softPowerOff = "FALSE" +usb:1.speed = "2" +usb:1.present = "TRUE" +usb:1.deviceType = "hub" +usb:1.port = "1" +usb:1.parent = "-1" +checkpoint.vmState = "" +sata0:1.fileName = "/Users/johndoe/Downloads/ubuntu-16.04.3-desktop-amd64.iso" +gui.lastPoweredViewMode = "windowed" +svga.guestBackedPrimaryAware = "TRUE" +gui.viewModeAtPowerOn = "windowed" +tools.remindInstall = "FALSE" +toolsInstallManager.updateCounter = "2" +toolsInstallManager.lastInstallError = "0" +keyboardAndMouseProfile = "52506018-92dd-7b40-6bc7-085ea95583f4" +isolation.tools.hgfs.disable = "false" +hgfs.mapRootShare = "true" +hgfs.linkRootShare = "true" +sharedFolder0.present = "true" +sharedFolder0.enabled = "TRUE" +sharedFolder0.readAccess = "true" +sharedFolder0.writeAccess = "true" +sharedFolder0.hostPath = "/Users/johndoe/dev/vmware-shared" +sharedFolder0.guestName = "vmware-shared" +sharedFolder0.expiration = "never" +sharedFolder.maxNum = "1" +gui.exitOnCLIHLT = "TRUE" +serial0.present = "FALSE" +floppy0.present = "FALSE" +usb:0.present = "TRUE" +usb:0.deviceType = "hid" +usb:0.port = "0" +usb:0.parent = "-1" +ehci:0.present = "TRUE" +ehci:0.deviceType = "video" +ehci:0.port = "0" +ehci:0.parent = "-1" diff --git a/tests/vmx2xmldata/vmx2xml-fusion-in-the-wild-2.xml b/tests/vmx2xmldata/vmx2xml-fusion-in-the-wild-2.xml new file mode 100644 index 0000000000..2e0bf504f0 --- /dev/null +++ b/tests/vmx2xmldata/vmx2xml-fusion-in-the-wild-2.xml @@ -0,0 +1,34 @@ +<domain type='vmware'> + <name>Ubuntu16.04</name> + <uuid>564d9736-09cb-ba6f-2057-e70150727f3f</uuid> + <memory unit='KiB'>5115904</memory> + <currentMemory unit='KiB'>5115904</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64'>hvm</type> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <disk type='file' device='disk'> + <source file='[datastore] directory/Virtual Disk.vmdk'/> + <target dev='sda' bus='scsi'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <controller type='scsi' index='0' model='lsilogic'/> + <filesystem type='mount' accessmode='passthrough'> + <source dir='/Users/johndoe/dev/vmware-shared'/> + <target dir='vmware-shared'/> + </filesystem> + <interface type='network'> + <mac address='00:0c:29:72:7f:3f'/> + <source network=''/> + <model type='e1000'/> + </interface> + <video> + <model type='vmvga' vram='4096' primary='yes'/> + </video> + </devices> +</domain> diff --git a/tests/vmx2xmltest.c b/tests/vmx2xmltest.c index 7289dc91e3..0db4702519 100644 --- a/tests/vmx2xmltest.c +++ b/tests/vmx2xmltest.c @@ -280,6 +280,7 @@ mymain(void) DO_TEST("ws-in-the-wild-2", "ws-in-the-wild-2"); DO_TEST("fusion-in-the-wild-1", "fusion-in-the-wild-1"); + DO_TEST("fusion-in-the-wild-2", "fusion-in-the-wild-2"); DO_TEST("annotation", "annotation"); diff --git a/tests/xml2vmxdata/xml2vmx-fusion-in-the-wild-2.vmx b/tests/xml2vmxdata/xml2vmx-fusion-in-the-wild-2.vmx new file mode 100755 index 0000000000..a5dbf5244c --- /dev/null +++ b/tests/xml2vmxdata/xml2vmx-fusion-in-the-wild-2.vmx @@ -0,0 +1,36 @@ +.encoding = "UTF-8" +config.version = "8" +virtualHW.version = "9" +guestOS = "other-64" +uuid.bios = "56 4d 08 c1 40 dd 13 95-85 01 b3 af 47 74 24 7d" +displayName = "Windows 10 x64" +memsize = "6728" +numvcpus = "1" +scsi0.present = "true" +scsi0.virtualDev = "lsisas1068" +scsi0:0.present = "true" +scsi0:0.deviceType = "scsi-hardDisk" +scsi0:0.fileName = "/data/vmware/disk.vmdk" +floppy0.present = "false" +floppy1.present = "false" +ethernet0.present = "true" +ethernet0.virtualDev = "e1000" +ethernet0.connectionType = "hostonly" +ethernet0.addressType = "static" +ethernet0.address = "00:90:b9:dc:ea:81" +ethernet0.checkMACAddress = "false" +svga.vramSize = "4194304" +pciBridge0.present = "true" +pciBridge4.present = "true" +pciBridge4.virtualDev = "pcieRootPort" +pciBridge4.functions = "8" +pciBridge5.present = "true" +pciBridge5.virtualDev = "pcieRootPort" +pciBridge5.functions = "8" +pciBridge6.present = "true" +pciBridge6.virtualDev = "pcieRootPort" +pciBridge6.functions = "8" +pciBridge7.present = "true" +pciBridge7.virtualDev = "pcieRootPort" +pciBridge7.functions = "8" +vmci0.present = "true" diff --git a/tests/xml2vmxdata/xml2vmx-fusion-in-the-wild-2.xml b/tests/xml2vmxdata/xml2vmx-fusion-in-the-wild-2.xml new file mode 100644 index 0000000000..be988e1bd9 --- /dev/null +++ b/tests/xml2vmxdata/xml2vmx-fusion-in-the-wild-2.xml @@ -0,0 +1,31 @@ +<domain type='vmware'> + <name>Windows 10 x64</name> + <uuid>564d08c1-40dd-1395-8501-b3af4774247d</uuid> + <memory unit='KiB'>6889472</memory> + <currentMemory unit='KiB'>6889472</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64'>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> + <disk type='file' device='disk'> + <source file='/data/vmware/disk.vmdk'/> + <target dev='sda' bus='scsi'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <controller type='scsi' index='0' model='lsisas1068'/> + <interface type='network'> + <mac address='00:90:b9:dc:ea:81'/> + <source network=''/> + <model type='e1000'/> + </interface> + <video> + <model type='vmvga' vram='4096' primary='yes'/> + </video> + </devices> +</domain> diff --git a/tests/xml2vmxtest.c b/tests/xml2vmxtest.c index f6bcd7b012..e9bde580eb 100644 --- a/tests/xml2vmxtest.c +++ b/tests/xml2vmxtest.c @@ -290,6 +290,7 @@ mymain(void) DO_TEST("ws-in-the-wild-2", "ws-in-the-wild-2", 8); DO_TEST("fusion-in-the-wild-1", "fusion-in-the-wild-1", 9); + DO_TEST("fusion-in-the-wild-2", "fusion-in-the-wild-2", 9); DO_TEST("annotation", "annotation", 4); -- 2.17.1

2 1

[libvirt] [PATCH 00/24] tests: qemu: Clean up disk testing (blockdev-add saga)
by Peter Krempa 23 Jul '18

23 Jul '18

Clean up many test files and add CAPS_LATEST versions of tests which will change when we switch from -drive to -blockdev This series removes many duplicated and obsolete tests and adds much more useful CAPS_LATEST testing Peter Krempa (24): tests: qemu: Drop 'drive' from disk tests tests: qemuxml2xml: Remove duplicate test disk-copy-on-read.xml tests: qemuxml2argv: Add 'CAPS_LATEST' version of "disk-copy_on_read" tests: qemuxml2argv: Remove tests obsoleted by assuming support for '-device' tests: qemuxml2argv: Unify network cdrom source testing tests: qemuxml2argv: Unify testing of local cdroms tests: qemuxml2argv: Add 'CAPS_LATEST' data for disk-cdrom* tests tests: qemuxml2argv: Add 'CAPS_LATEST' version for 'disk-detect-zeroes' tests: qemuxml2argv: Add 'CAPS_LATEST' version of 'disk-aio' test tests: qemuxml2argv: Rename disk-write-cache test do disk-cache tests: qemu: Add xml2xml and minimal version of 'disk-cache' test tests: qemu: Unify disk cache testing tests: qemu: Unify iscsi disk source testing tests: qemuxml2argv: Add 'CAPS_LATEST' version of 'disk-network-iscsi' tests: qemu: Unify nbd disk source testing tests: qemuxml2argv: Add 'CAPS_LATEST' version of 'disk-network-nbd' tests: qemu: Remove pointless 'disk-networ-ceph-env' test tests: qemuxml2argv: Unify testing of 'disk-network-rbd' tests: qemu: Remove pointless 'disks-many' test tests: qemuxml2argv: Add CAPS_LATEST version of 'disk-floppy' and 'floppy-drive-fat' tests: qemuxml2argv: Add CAPS_LATEST version of 'disk-readonly' and 'disk-shared' tests: qemuxml2argv: Add CAPS_LATEST version of 'disk-network-gluster' tests: qemuxml2argv: Add CAPS_LATEST version of 'disk-network-sheepdog' tests: qemuxml2argv: Add CAPS_LATEST version of security-related tests ...ress-conflict.xml => disk-address-conflict.xml} | 0 tests/qemuxml2argvdata/disk-aio.x86_64-latest.args | 37 +++++++ ...-drive-boot-cdrom.args => disk-boot-cdrom.args} | 0 ...sk-drive-boot-cdrom.xml => disk-boot-cdrom.xml} | 0 ...sk-drive-boot-disk.args => disk-boot-disk.args} | 0 ...disk-drive-boot-disk.xml => disk-boot-disk.xml} | 0 tests/qemuxml2argvdata/disk-cache.args | 41 ++++++++ ..._64-2.6.0.args => disk-cache.x86_64-2.6.0.args} | 3 + ..._64-2.7.0.args => disk-cache.x86_64-2.7.0.args} | 4 + ...4-latest.args => disk-cache.x86_64-latest.args} | 4 + .../{disk-drive-write-cache.xml => disk-cache.xml} | 6 ++ tests/qemuxml2argvdata/disk-cdrom-empty.args | 28 ------ tests/qemuxml2argvdata/disk-cdrom-empty.xml | 36 ------- tests/qemuxml2argvdata/disk-cdrom-network-ftp.args | 27 ----- tests/qemuxml2argvdata/disk-cdrom-network-ftp.xml | 36 ------- .../qemuxml2argvdata/disk-cdrom-network-ftps.args | 27 ----- tests/qemuxml2argvdata/disk-cdrom-network-ftps.xml | 36 ------- .../qemuxml2argvdata/disk-cdrom-network-http.args | 27 ----- tests/qemuxml2argvdata/disk-cdrom-network-http.xml | 36 ------- .../qemuxml2argvdata/disk-cdrom-network-tftp.args | 27 ----- tests/qemuxml2argvdata/disk-cdrom-network-tftp.xml | 36 ------- ...-network-https.args => disk-cdrom-network.args} | 9 ++ .../disk-cdrom-network.x86_64-latest.args | 41 ++++++++ ...om-network-https.xml => disk-cdrom-network.xml} | 27 +++++ .../disk-cdrom-tray-no-device-cap.args | 29 ------ .../disk-cdrom-tray-no-device-cap.xml | 32 ------ .../disk-cdrom-tray.x86_64-latest.args | 39 +++++++ tests/qemuxml2argvdata/disk-cdrom.args | 4 +- .../qemuxml2argvdata/disk-cdrom.x86_64-latest.args | 35 +++++++ tests/qemuxml2argvdata/disk-cdrom.xml | 6 ++ .../disk-copy_on_read.x86_64-latest.args | 41 ++++++++ ...-detect-zeroes.args => disk-detect-zeroes.args} | 0 .../disk-detect-zeroes.x86_64-latest.args | 37 +++++++ ...ve-detect-zeroes.xml => disk-detect-zeroes.xml} | 0 .../{disk-drive-discard.args => disk-discard.args} | 0 .../{disk-drive-discard.xml => disk-discard.xml} | 0 .../disk-drive-cache-directsync.args | 30 ------ .../disk-drive-cache-directsync.xml | 37 ------- .../qemuxml2argvdata/disk-drive-cache-unsafe.args | 30 ------ tests/qemuxml2argvdata/disk-drive-cache-unsafe.xml | 37 ------- .../qemuxml2argvdata/disk-drive-cache-v2-none.args | 30 ------ .../qemuxml2argvdata/disk-drive-cache-v2-none.xml | 37 ------- tests/qemuxml2argvdata/disk-drive-cache-v2-wb.args | 30 ------ tests/qemuxml2argvdata/disk-drive-cache-v2-wb.xml | 37 ------- tests/qemuxml2argvdata/disk-drive-cache-v2-wt.args | 30 ------ tests/qemuxml2argvdata/disk-drive-cache-v2-wt.xml | 37 ------- tests/qemuxml2argvdata/disk-drive-copy-on-read.xml | 30 ------ .../disk-drive-network-iscsi-lun.args | 29 ------ .../disk-drive-network-iscsi-lun.xml | 28 ------ .../qemuxml2argvdata/disk-drive-network-iscsi.args | 32 ------ .../qemuxml2argvdata/disk-drive-network-iscsi.xml | 37 ------- .../disk-drive-network-nbd-export.args | 30 ------ .../disk-drive-network-nbd-export.xml | 37 ------- .../disk-drive-network-nbd-ipv6-export.args | 29 ------ .../disk-drive-network-nbd-ipv6-export.xml | 37 ------- .../disk-drive-network-nbd-ipv6.args | 29 ------ .../disk-drive-network-nbd-ipv6.xml | 37 ------- .../disk-drive-network-nbd-unix.args | 30 ------ .../disk-drive-network-nbd-unix.xml | 37 ------- tests/qemuxml2argvdata/disk-drive-network-nbd.args | 29 ------ tests/qemuxml2argvdata/disk-drive-network-nbd.xml | 37 ------- .../disk-drive-network-rbd-auth-AES.xml | 55 ---------- .../disk-drive-network-rbd-auth.args | 32 ------ .../disk-drive-network-rbd-auth.xml | 42 -------- .../disk-drive-network-rbd-ceph-env.args | 25 ----- .../disk-drive-network-rbd-ceph-env.xml | 39 ------- .../disk-drive-network-rbd-ipv6.args | 31 ------ .../disk-drive-network-rbd-ipv6.xml | 40 -------- .../disk-drive-readonly-no-device.args | 30 ------ .../disk-drive-readonly-no-device.xml | 32 ------ ...ve-error-policy.args => disk-error-policy.args} | 0 ...t.args => disk-error-policy.x86_64-latest.args} | 0 ...rive-error-policy.xml => disk-error-policy.xml} | 0 .../disk-floppy-tray-no-device-cap.xml | 37 ------- ...ice-cap.args => disk-floppy.x86_64-latest.args} | 20 ++-- .../{disk-drive-fmt-cow.xml => disk-fmt-cow.xml} | 0 .../{disk-drive-fmt-dir.xml => disk-fmt-dir.xml} | 0 .../{disk-drive-fmt-iso.xml => disk-fmt-iso.xml} | 0 ...disk-drive-fmt-qcow.args => disk-fmt-qcow.args} | 0 .../{disk-drive-fmt-qcow.xml => disk-fmt-qcow.xml} | 0 ...sk-ide-drive-split.args => disk-ide-split.args} | 0 ...disk-ide-drive-split.xml => disk-ide-split.xml} | 0 tests/qemuxml2argvdata/disk-many.args | 32 ------ tests/qemuxml2argvdata/disk-many.xml | 48 --------- ...work-gluster.args => disk-network-gluster.args} | 0 .../disk-network-gluster.x86_64-latest.args | 44 ++++++++ ...etwork-gluster.xml => disk-network-gluster.xml} | 0 ...disk-network-iscsi-auth-secrettype-invalid.xml} | 0 ...> disk-network-iscsi-auth-wrong-secrettype.xml} | 0 ...ork-iscsi-auth.args => disk-network-iscsi.args} | 25 +++-- .../disk-network-iscsi.x86_64-latest.args | 63 ++++++++++++ ...twork-iscsi-auth.xml => disk-network-iscsi.xml} | 26 ++++- ...rive-network-rbd.args => disk-network-nbd.args} | 21 ++-- .../disk-network-nbd.x86_64-latest.args | 46 +++++++++ tests/qemuxml2argvdata/disk-network-nbd.xml | 59 +++++++++++ ...-no-colon.xml => disk-network-rbd-no-colon.xml} | 0 .../disk-network-rbd.x86_64-2.5.0.args | 55 ++++++++++ .../disk-network-rbd.x86_64-latest.args | 61 +++++++++++ ...-drive-network-rbd.xml => disk-network-rbd.xml} | 28 ++++-- ...rk-sheepdog.args => disk-network-sheepdog.args} | 0 .../disk-network-sheepdog.x86_64-latest.args | 35 +++++++ ...work-sheepdog.xml => disk-network-sheepdog.xml} | 0 ...-both.xml => disk-network-source-auth-both.xml} | 0 ...rce-auth.args => disk-network-source-auth.args} | 0 ...=> disk-network-source-auth.x86_64-latest.args} | 38 +++---- ...ource-auth.xml => disk-network-source-auth.xml} | 0 ...work-tlsx509.args => disk-network-tlsx509.args} | 0 .../disk-network-tlsx509.x86_64-latest.args | 59 +++++++++++ ...etwork-tlsx509.xml => disk-network-tlsx509.xml} | 0 ...ve-network-vxhs.args => disk-network-vxhs.args} | 0 ...rive-network-vxhs.xml => disk-network-vxhs.xml} | 0 .../{disk-drive-no-boot.args => disk-no-boot.args} | 0 .../{disk-drive-no-boot.xml => disk-no-boot.xml} | 0 ...-readonly-disk.args => disk-readonly-disk.args} | 0 .../disk-readonly-disk.x86_64-latest.args | 34 +++++++ ...ve-readonly-disk.xml => disk-readonly-disk.xml} | 0 ...hared-locking.args => disk-shared-locking.args} | 0 ...-shared-locking.xml => disk-shared-locking.xml} | 0 ...-drive-shared-qcow.xml => disk-shared-qcow.xml} | 0 .../{disk-drive-shared.args => disk-shared.args} | 0 .../disk-shared.x86_64-latest.args | 37 +++++++ .../{disk-drive-shared.xml => disk-shared.xml} | 0 ...o-drive-queues.args => disk-virtio-queues.args} | 0 ...tio-drive-queues.xml => disk-virtio-queues.xml} | 0 .../floppy-drive-fat.x86_64-latest.args | 33 ++++++ tests/qemuxml2argvtest.c | 112 ++++++++++----------- ...sk-drive-boot-cdrom.xml => disk-boot-cdrom.xml} | 0 ...disk-drive-boot-disk.xml => disk-boot-disk.xml} | 0 .../{disk-many.xml => disk-cache.xml} | 36 ++++--- tests/qemuxml2xmloutdata/disk-cdrom-empty.xml | 40 -------- tests/qemuxml2xmloutdata/disk-cdrom.xml | 6 ++ tests/qemuxml2xmloutdata/disk-detect-zeroes.xml | 1 + .../{disk-drive-discard.xml => disk-discard.xml} | 0 .../disk-drive-cache-directsync.xml | 41 -------- .../qemuxml2xmloutdata/disk-drive-cache-unsafe.xml | 41 -------- .../disk-drive-cache-v2-none.xml | 41 -------- .../qemuxml2xmloutdata/disk-drive-cache-v2-wb.xml | 41 -------- .../qemuxml2xmloutdata/disk-drive-cache-v2-wt.xml | 41 -------- .../qemuxml2xmloutdata/disk-drive-copy-on-read.xml | 36 ------- .../disk-drive-detect-zeroes.xml | 1 - .../disk-drive-network-iscsi.xml | 41 -------- .../disk-drive-network-nbd-export.xml | 42 -------- .../disk-drive-network-nbd-ipv6-export.xml | 42 -------- .../disk-drive-network-nbd-ipv6.xml | 42 -------- .../disk-drive-network-nbd-unix.xml | 42 -------- .../qemuxml2xmloutdata/disk-drive-network-nbd.xml | 42 -------- .../disk-drive-network-rbd-auth.xml | 47 --------- .../disk-drive-network-rbd-ceph-env.xml | 44 -------- .../disk-drive-network-rbd-ipv6.xml | 45 --------- ...rive-error-policy.xml => disk-error-policy.xml} | 0 .../{disk-drive-fat.xml => disk-fat.xml} | 0 .../{disk-drive-fmt-qcow.xml => disk-fmt-qcow.xml} | 0 ...etwork-gluster.xml => disk-network-gluster.xml} | 0 ...twork-iscsi-auth.xml => disk-network-iscsi.xml} | 35 ++++++- tests/qemuxml2xmloutdata/disk-network-nbd.xml | 68 +++++++++++++ ...-drive-network-rbd.xml => disk-network-rbd.xml} | 30 ++++-- ...work-sheepdog.xml => disk-network-sheepdog.xml} | 0 ...ource-auth.xml => disk-network-source-auth.xml} | 0 ...etwork-tlsx509.xml => disk-network-tlsx509.xml} | 0 ...rive-network-vxhs.xml => disk-network-vxhs.xml} | 0 ...tio-drive-queues.xml => disk-virtio-queues.xml} | 0 tests/qemuxml2xmltest.c | 47 +++------ 162 files changed, 1184 insertions(+), 2481 deletions(-) rename tests/qemuxml2argvdata/{disk-drive-address-conflict.xml => disk-address-conflict.xml} (100%) create mode 100644 tests/qemuxml2argvdata/disk-aio.x86_64-latest.args rename tests/qemuxml2argvdata/{disk-drive-boot-cdrom.args => disk-boot-cdrom.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-boot-cdrom.xml => disk-boot-cdrom.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-boot-disk.args => disk-boot-disk.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-boot-disk.xml => disk-boot-disk.xml} (100%) create mode 100644 tests/qemuxml2argvdata/disk-cache.args rename tests/qemuxml2argvdata/{disk-drive-write-cache.x86_64-2.6.0.args => disk-cache.x86_64-2.6.0.args} (90%) rename tests/qemuxml2argvdata/{disk-drive-write-cache.x86_64-2.7.0.args => disk-cache.x86_64-2.7.0.args} (90%) rename tests/qemuxml2argvdata/{disk-drive-write-cache.x86_64-latest.args => disk-cache.x86_64-latest.args} (90%) rename tests/qemuxml2argvdata/{disk-drive-write-cache.xml => disk-cache.xml} (86%) delete mode 100644 tests/qemuxml2argvdata/disk-cdrom-empty.args delete mode 100644 tests/qemuxml2argvdata/disk-cdrom-empty.xml delete mode 100644 tests/qemuxml2argvdata/disk-cdrom-network-ftp.args delete mode 100644 tests/qemuxml2argvdata/disk-cdrom-network-ftp.xml delete mode 100644 tests/qemuxml2argvdata/disk-cdrom-network-ftps.args delete mode 100644 tests/qemuxml2argvdata/disk-cdrom-network-ftps.xml delete mode 100644 tests/qemuxml2argvdata/disk-cdrom-network-http.args delete mode 100644 tests/qemuxml2argvdata/disk-cdrom-network-http.xml delete mode 100644 tests/qemuxml2argvdata/disk-cdrom-network-tftp.args delete mode 100644 tests/qemuxml2argvdata/disk-cdrom-network-tftp.xml rename tests/qemuxml2argvdata/{disk-cdrom-network-https.args => disk-cdrom-network.args} (58%) create mode 100644 tests/qemuxml2argvdata/disk-cdrom-network.x86_64-latest.args rename tests/qemuxml2argvdata/{disk-cdrom-network-https.xml => disk-cdrom-network.xml} (52%) delete mode 100644 tests/qemuxml2argvdata/disk-cdrom-tray-no-device-cap.args delete mode 100644 tests/qemuxml2argvdata/disk-cdrom-tray-no-device-cap.xml create mode 100644 tests/qemuxml2argvdata/disk-cdrom-tray.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/disk-cdrom.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/disk-copy_on_read.x86_64-latest.args rename tests/qemuxml2argvdata/{disk-drive-detect-zeroes.args => disk-detect-zeroes.args} (100%) create mode 100644 tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-latest.args rename tests/qemuxml2argvdata/{disk-drive-detect-zeroes.xml => disk-detect-zeroes.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-discard.args => disk-discard.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-discard.xml => disk-discard.xml} (100%) delete mode 100644 tests/qemuxml2argvdata/disk-drive-cache-directsync.args delete mode 100644 tests/qemuxml2argvdata/disk-drive-cache-directsync.xml delete mode 100644 tests/qemuxml2argvdata/disk-drive-cache-unsafe.args delete mode 100644 tests/qemuxml2argvdata/disk-drive-cache-unsafe.xml delete mode 100644 tests/qemuxml2argvdata/disk-drive-cache-v2-none.args delete mode 100644 tests/qemuxml2argvdata/disk-drive-cache-v2-none.xml delete mode 100644 tests/qemuxml2argvdata/disk-drive-cache-v2-wb.args delete mode 100644 tests/qemuxml2argvdata/disk-drive-cache-v2-wb.xml delete mode 100644 tests/qemuxml2argvdata/disk-drive-cache-v2-wt.args delete mode 100644 tests/qemuxml2argvdata/disk-drive-cache-v2-wt.xml delete mode 100644 tests/qemuxml2argvdata/disk-drive-copy-on-read.xml delete mode 100644 tests/qemuxml2argvdata/disk-drive-network-iscsi-lun.args delete mode 100644 tests/qemuxml2argvdata/disk-drive-network-iscsi-lun.xml delete mode 100644 tests/qemuxml2argvdata/disk-drive-network-iscsi.args delete mode 100644 tests/qemuxml2argvdata/disk-drive-network-iscsi.xml delete mode 100644 tests/qemuxml2argvdata/disk-drive-network-nbd-export.args delete mode 100644 tests/qemuxml2argvdata/disk-drive-network-nbd-export.xml delete mode 100644 tests/qemuxml2argvdata/disk-drive-network-nbd-ipv6-export.args delete mode 100644 tests/qemuxml2argvdata/disk-drive-network-nbd-ipv6-export.xml delete mode 100644 tests/qemuxml2argvdata/disk-drive-network-nbd-ipv6.args delete mode 100644 tests/qemuxml2argvdata/disk-drive-network-nbd-ipv6.xml delete mode 100644 tests/qemuxml2argvdata/disk-drive-network-nbd-unix.args delete mode 100644 tests/qemuxml2argvdata/disk-drive-network-nbd-unix.xml delete mode 100644 tests/qemuxml2argvdata/disk-drive-network-nbd.args delete mode 100644 tests/qemuxml2argvdata/disk-drive-network-nbd.xml delete mode 100644 tests/qemuxml2argvdata/disk-drive-network-rbd-auth-AES.xml delete mode 100644 tests/qemuxml2argvdata/disk-drive-network-rbd-auth.args delete mode 100644 tests/qemuxml2argvdata/disk-drive-network-rbd-auth.xml delete mode 100644 tests/qemuxml2argvdata/disk-drive-network-rbd-ceph-env.args delete mode 100644 tests/qemuxml2argvdata/disk-drive-network-rbd-ceph-env.xml delete mode 100644 tests/qemuxml2argvdata/disk-drive-network-rbd-ipv6.args delete mode 100644 tests/qemuxml2argvdata/disk-drive-network-rbd-ipv6.xml delete mode 100644 tests/qemuxml2argvdata/disk-drive-readonly-no-device.args delete mode 100644 tests/qemuxml2argvdata/disk-drive-readonly-no-device.xml rename tests/qemuxml2argvdata/{disk-drive-error-policy.args => disk-error-policy.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-error-policy.x86_64-latest.args => disk-error-policy.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-error-policy.xml => disk-error-policy.xml} (100%) delete mode 100644 tests/qemuxml2argvdata/disk-floppy-tray-no-device-cap.xml rename tests/qemuxml2argvdata/{disk-floppy-tray-no-device-cap.args => disk-floppy.x86_64-latest.args} (53%) rename tests/qemuxml2argvdata/{disk-drive-fmt-cow.xml => disk-fmt-cow.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-fmt-dir.xml => disk-fmt-dir.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-fmt-iso.xml => disk-fmt-iso.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-fmt-qcow.args => disk-fmt-qcow.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-fmt-qcow.xml => disk-fmt-qcow.xml} (100%) rename tests/qemuxml2argvdata/{disk-ide-drive-split.args => disk-ide-split.args} (100%) rename tests/qemuxml2argvdata/{disk-ide-drive-split.xml => disk-ide-split.xml} (100%) delete mode 100644 tests/qemuxml2argvdata/disk-many.args delete mode 100644 tests/qemuxml2argvdata/disk-many.xml rename tests/qemuxml2argvdata/{disk-drive-network-gluster.args => disk-network-gluster.args} (100%) create mode 100644 tests/qemuxml2argvdata/disk-network-gluster.x86_64-latest.args rename tests/qemuxml2argvdata/{disk-drive-network-gluster.xml => disk-network-gluster.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-iscsi-auth-secrettype-invalid.xml => disk-network-iscsi-auth-secrettype-invalid.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-iscsi-auth-wrong-secrettype.xml => disk-network-iscsi-auth-wrong-secrettype.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-iscsi-auth.args => disk-network-iscsi.args} (54%) create mode 100644 tests/qemuxml2argvdata/disk-network-iscsi.x86_64-latest.args rename tests/qemuxml2argvdata/{disk-drive-network-iscsi-auth.xml => disk-network-iscsi.xml} (63%) rename tests/qemuxml2argvdata/{disk-drive-network-rbd.args => disk-network-nbd.args} (56%) create mode 100644 tests/qemuxml2argvdata/disk-network-nbd.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/disk-network-nbd.xml rename tests/qemuxml2argvdata/{disk-drive-network-rbd-no-colon.xml => disk-network-rbd-no-colon.xml} (100%) create mode 100644 tests/qemuxml2argvdata/disk-network-rbd.x86_64-2.5.0.args create mode 100644 tests/qemuxml2argvdata/disk-network-rbd.x86_64-latest.args rename tests/qemuxml2argvdata/{disk-drive-network-rbd.xml => disk-network-rbd.xml} (71%) rename tests/qemuxml2argvdata/{disk-drive-network-sheepdog.args => disk-network-sheepdog.args} (100%) create mode 100644 tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-latest.args rename tests/qemuxml2argvdata/{disk-drive-network-sheepdog.xml => disk-network-sheepdog.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-source-auth-both.xml => disk-network-source-auth-both.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-source-auth.args => disk-network-source-auth.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-rbd-auth-AES.args => disk-network-source-auth.x86_64-latest.args} (51%) rename tests/qemuxml2argvdata/{disk-drive-network-source-auth.xml => disk-network-source-auth.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-tlsx509.args => disk-network-tlsx509.args} (100%) create mode 100644 tests/qemuxml2argvdata/disk-network-tlsx509.x86_64-latest.args rename tests/qemuxml2argvdata/{disk-drive-network-tlsx509.xml => disk-network-tlsx509.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-vxhs.args => disk-network-vxhs.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-vxhs.xml => disk-network-vxhs.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-no-boot.args => disk-no-boot.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-no-boot.xml => disk-no-boot.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-readonly-disk.args => disk-readonly-disk.args} (100%) create mode 100644 tests/qemuxml2argvdata/disk-readonly-disk.x86_64-latest.args rename tests/qemuxml2argvdata/{disk-drive-readonly-disk.xml => disk-readonly-disk.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-shared-locking.args => disk-shared-locking.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-shared-locking.xml => disk-shared-locking.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-shared-qcow.xml => disk-shared-qcow.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-shared.args => disk-shared.args} (100%) create mode 100644 tests/qemuxml2argvdata/disk-shared.x86_64-latest.args rename tests/qemuxml2argvdata/{disk-drive-shared.xml => disk-shared.xml} (100%) rename tests/qemuxml2argvdata/{disk-virtio-drive-queues.args => disk-virtio-queues.args} (100%) rename tests/qemuxml2argvdata/{disk-virtio-drive-queues.xml => disk-virtio-queues.xml} (100%) create mode 100644 tests/qemuxml2argvdata/floppy-drive-fat.x86_64-latest.args rename tests/qemuxml2xmloutdata/{disk-drive-boot-cdrom.xml => disk-boot-cdrom.xml} (100%) rename tests/qemuxml2xmloutdata/{disk-drive-boot-disk.xml => disk-boot-disk.xml} (100%) rename tests/qemuxml2xmloutdata/{disk-many.xml => disk-cache.xml} (54%) delete mode 100644 tests/qemuxml2xmloutdata/disk-cdrom-empty.xml create mode 120000 tests/qemuxml2xmloutdata/disk-detect-zeroes.xml rename tests/qemuxml2xmloutdata/{disk-drive-discard.xml => disk-discard.xml} (100%) delete mode 100644 tests/qemuxml2xmloutdata/disk-drive-cache-directsync.xml delete mode 100644 tests/qemuxml2xmloutdata/disk-drive-cache-unsafe.xml delete mode 100644 tests/qemuxml2xmloutdata/disk-drive-cache-v2-none.xml delete mode 100644 tests/qemuxml2xmloutdata/disk-drive-cache-v2-wb.xml delete mode 100644 tests/qemuxml2xmloutdata/disk-drive-cache-v2-wt.xml delete mode 100644 tests/qemuxml2xmloutdata/disk-drive-copy-on-read.xml delete mode 120000 tests/qemuxml2xmloutdata/disk-drive-detect-zeroes.xml delete mode 100644 tests/qemuxml2xmloutdata/disk-drive-network-iscsi.xml delete mode 100644 tests/qemuxml2xmloutdata/disk-drive-network-nbd-export.xml delete mode 100644 tests/qemuxml2xmloutdata/disk-drive-network-nbd-ipv6-export.xml delete mode 100644 tests/qemuxml2xmloutdata/disk-drive-network-nbd-ipv6.xml delete mode 100644 tests/qemuxml2xmloutdata/disk-drive-network-nbd-unix.xml delete mode 100644 tests/qemuxml2xmloutdata/disk-drive-network-nbd.xml delete mode 100644 tests/qemuxml2xmloutdata/disk-drive-network-rbd-auth.xml delete mode 100644 tests/qemuxml2xmloutdata/disk-drive-network-rbd-ceph-env.xml delete mode 100644 tests/qemuxml2xmloutdata/disk-drive-network-rbd-ipv6.xml rename tests/qemuxml2xmloutdata/{disk-drive-error-policy.xml => disk-error-policy.xml} (100%) rename tests/qemuxml2xmloutdata/{disk-drive-fat.xml => disk-fat.xml} (100%) rename tests/qemuxml2xmloutdata/{disk-drive-fmt-qcow.xml => disk-fmt-qcow.xml} (100%) rename tests/qemuxml2xmloutdata/{disk-drive-network-gluster.xml => disk-network-gluster.xml} (100%) rename tests/qemuxml2xmloutdata/{disk-drive-network-iscsi-auth.xml => disk-network-iscsi.xml} (59%) create mode 100644 tests/qemuxml2xmloutdata/disk-network-nbd.xml rename tests/qemuxml2xmloutdata/{disk-drive-network-rbd.xml => disk-network-rbd.xml} (72%) rename tests/qemuxml2xmloutdata/{disk-drive-network-sheepdog.xml => disk-network-sheepdog.xml} (100%) rename tests/qemuxml2xmloutdata/{disk-drive-network-source-auth.xml => disk-network-source-auth.xml} (100%) rename tests/qemuxml2xmloutdata/{disk-drive-network-tlsx509.xml => disk-network-tlsx509.xml} (100%) rename tests/qemuxml2xmloutdata/{disk-drive-network-vxhs.xml => disk-network-vxhs.xml} (100%) rename tests/qemuxml2xmloutdata/{disk-virtio-drive-queues.xml => disk-virtio-queues.xml} (100%) -- 2.16.2

2 48

[libvirt] [PATCH] libvirt_iohelper: record the libvirt_iohelper's error message at virFileWrapperFdFree
by xinhua.Cao 23 Jul '18

23 Jul '18

Currently iohelper's error log is recorded in virFileWrapperFdClose. In qemuDomainSaveMemory, it usually fails at qemuMigrationSrcToFile, and then goto cleanup, so the iohelper error log is not recorded, and so is the another placement. We now record the error log of iohelper by move it to the virFileWrapperFdFree record. There is another problem here, that is, virCommandWait is also not called, but I can't evaluate this impact. So no changes have been made here. --- src/util/virfile.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/util/virfile.c b/src/util/virfile.c index 1faeebb..30456ab 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -330,9 +330,6 @@ virFileWrapperFdClose(virFileWrapperFdPtr wfd) return 0; ret = virCommandWait(wfd->cmd, NULL); - if (wfd->err_msg && *wfd->err_msg) - VIR_WARN("iohelper reports: %s", wfd->err_msg); - return ret; } @@ -351,6 +348,9 @@ virFileWrapperFdFree(virFileWrapperFdPtr wfd) if (!wfd) return; + if (wfd->err_msg && *wfd->err_msg) + VIR_WARN("iohelper reports: %s", wfd->err_msg); + VIR_FREE(wfd->err_msg); virCommandFree(wfd->cmd); -- 2.8.3

2 2

[libvirt] [PATCH v2 0/8] virStr*cpy*() related fixes and cleanups
by Andrea Bolognani 23 Jul '18

23 Jul '18

Changes from [v1]: * catch a bunch more suboptimal uses of the original API; * improve the API so that it's both more sensible and fits better with the rest of libvirt. [v1] https://www.redhat.com/archives/libvir-list/2018-July/msg01044.html Andrea Bolognani (8): src: Use virStrcpyStatic() to avoid truncation src: Use virStrcpyStatic() wherever possible src: Use VIR_STRDUP() wherever possible src: Use virStrcpy() wherever possible src: Don't rely on strncpy()-like behavior src: Make virStr*cpy*() functions return an int esx: Use memcpy() in esxVI_CURL_Debug() util: Improve virStrncpy() implementation docs/hacking.html.in | 29 +++++----- src/conf/capabilities.c | 2 +- src/conf/netdev_vport_profile_conf.c | 2 +- src/conf/nwfilter_conf.c | 3 +- src/esx/esx_driver.c | 8 +-- src/esx/esx_vi.c | 6 +- src/esx/esx_vi_types.c | 2 +- src/hyperv/hyperv_driver.c | 3 +- src/libxl/libxl_conf.c | 2 +- src/locking/lock_driver_sanlock.c | 25 ++++---- src/lxc/lxc_driver.c | 8 +-- src/nwfilter/nwfilter_dhcpsnoop.c | 2 +- src/nwfilter/nwfilter_ebiptables_driver.c | 6 +- src/nwfilter/nwfilter_learnipaddr.c | 2 +- src/openvz/openvz_conf.c | 8 +-- src/qemu/qemu_agent.c | 2 +- src/qemu/qemu_command.c | 2 +- src/qemu/qemu_monitor.c | 2 +- src/remote/remote_daemon_dispatch.c | 4 +- src/remote/remote_driver.c | 4 +- src/rpc/virnetlibsshsession.c | 4 +- src/rpc/virnetsocket.c | 4 +- src/security/security_apparmor.c | 2 +- src/security/virt-aa-helper.c | 2 +- src/test/test_driver.c | 4 +- src/uml/uml_driver.c | 4 +- src/util/virfdstream.c | 4 +- src/util/virhostcpu.c | 4 +- src/util/virhostmem.c | 6 +- src/util/virlog.c | 5 +- src/util/virnetdev.c | 12 ++-- src/util/virnetdevbridge.c | 6 +- src/util/virnetdevtap.c | 4 +- src/util/virnetdevvportprofile.c | 6 +- src/util/virstring.c | 70 +++++++++++++++-------- src/util/virstring.h | 4 +- src/util/virtypedparam.c | 8 +-- src/xenapi/xenapi_driver.c | 4 +- src/xenconfig/xen_common.c | 38 ++++++------ src/xenconfig/xen_sxpr.c | 2 +- src/xenconfig/xen_xl.c | 41 ++++++------- src/xenconfig/xen_xm.c | 2 +- 42 files changed, 179 insertions(+), 179 deletions(-) -- 2.17.1

2 9

[libvirt] [PATCH] tests: fix TLS handshake failure with TLS 1.3
by Daniel P. Berrangé 23 Jul '18

23 Jul '18

When gnutls negotiates TLS 1.3 instead of 1.2, the order of messages sent by the handshake changes. This exposed a logic bug in the test suite which caused us to wait for the server to see handshake completion, but not wait for the client to see completion. The result was the client didn't receive the certificate for verification and the test failed. This is exposed in Fedora 29 rawhide which has just enabled TLS 1.3 in its GNUTLS builds. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- tests/virnettlssessiontest.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/virnettlssessiontest.c b/tests/virnettlssessiontest.c index 7e85607181..375cc1bb02 100644 --- a/tests/virnettlssessiontest.c +++ b/tests/virnettlssessiontest.c @@ -180,7 +180,7 @@ static int testTLSSessionInit(const void *opaque) if (rv == VIR_NET_TLS_HANDSHAKE_COMPLETE) clientShake = true; } - } while (!clientShake && !serverShake); + } while (!clientShake || !serverShake); /* Finally make sure the server validation does what -- 2.17.1

2 1

[libvirt] [PATCHv4 00/15] Switch from yajl to Jansson
by Ján Tomko 23 Jul '18

23 Jul '18

Per the discussion here: https://www.redhat.com/archives/libvir-list/2017-November/msg00225.html Switch from using yajl to Jansson. v1: https://www.redhat.com/archives/libvir-list/2018-March/msg01781.html v2: https://www.redhat.com/archives/libvir-list/2018-May/msg00695.html v3: https://www.redhat.com/archives/libvir-list/2018-May/msg00850.html v4: Introduce a separate check for Jansson >= 2.8, which preserves ordering of object keys. For older platforms (e.g. Debian 8), skip tests that depend on stable ordering. All patches except for 12/15 (trivial) and 15/15 (new) were ACK'd already by either Peter or Andrea. Tested on Debian 8 with libjansson-dev 2.7. Also available on my repo: http://repo.or.cz/libvirt/jtomko.git/ jansson-skip Ján Tomko (15): build: add --with-jansson build: undef WITH_JANSSON for SETUID_RPC_CLIENT Switch from yajl to Jansson FIXUP: fix tests FIXUP: Deprecate building --with-yajl FIXUP: make nss depend on Jansson instead of yajl FIXUP: compile and link with Jansson instead of yajl FIXUP: s/WITH_YAJL/WITH_JANSSON/ FIXUP: libvirt.spec: use jansson instead of yajl Remove functions using yajl build: remove references to WITH_YAJL for SETUID_RPC_CLIENT Remove virJSONValueNewStringLen build: switch --with-qemu default from yes to check build: require Jansson if QEMU driver is enabled m4: Introduce STABLE_ORDERING_JANSSON config-post.h | 3 +- configure.ac | 3 + libvirt.spec.in | 4 +- m4/virt-driver-qemu.m4 | 9 +- m4/virt-jansson.m4 | 32 ++ m4/virt-nss.m4 | 4 +- m4/virt-yajl.m4 | 27 +- src/Makefile.am | 8 +- src/libvirt_private.syms | 1 - src/qemu/qemu_driver.c | 2 +- src/util/Makefile.inc.am | 4 +- src/util/virjson.c | 616 +++++++------------------------ src/util/virjson.h | 1 - tests/Makefile.am | 12 +- tests/cputest.c | 16 +- tests/libxlxml2domconfigtest.c | 4 +- tests/qemuagenttest.c | 2 +- tests/qemublocktest.c | 6 + tests/qemucapabilitiestest.c | 7 +- tests/qemucaps2xmltest.c | 2 +- tests/qemucommandutiltest.c | 7 +- tests/qemuhotplugtest.c | 7 +- tests/qemumigparamsdata/empty.json | 4 +- tests/qemumigparamsdata/unsupported.json | 4 +- tests/qemumigparamstest.c | 7 +- tests/qemumonitorjsontest.c | 7 +- tests/virjsontest.c | 5 + tests/virmacmaptest.c | 5 + tests/virmacmaptestdata/empty.json | 4 +- tests/virmocklibxl.c | 4 +- tests/virnetdaemontest.c | 7 +- tests/virstoragetest.c | 4 +- 32 files changed, 274 insertions(+), 554 deletions(-) create mode 100644 m4/virt-jansson.m4 -- 2.16.1

5 26

[libvirt] [PATCHv2] replace 'if' type conditions with 'switch' for VIR_NETWORK_FORWARD_
by Shi Lei 23 Jul '18

23 Jul '18

v1 patch here: https://www.redhat.com/archives/libvir-list/2018-July/msg01314.html since v1: 1. Change the type declaration of _virNetworkForwardDef.type from int to virNetworkForwardType 2. use the default case to report out of range error with virReportEnumRangeError Signed-off-by: Shi Lei <shilei.massclouds(a)gmx.com> --- src/conf/domain_conf.c | 49 ++++--- src/conf/network_conf.c | 73 +++++++--- src/conf/network_conf.h | 2 +- src/conf/virnetworkobj.c | 24 +++- src/esx/esx_network_driver.c | 19 ++- src/libvirt_private.syms | 1 + src/network/bridge_driver.c | 309 ++++++++++++++++++++++++++++--------------- src/qemu/qemu_process.c | 8 ++ 8 files changed, 329 insertions(+), 156 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 178c6d2..de08788 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -29975,40 +29975,49 @@ virDomainNetResolveActualType(virDomainNetDefPtr iface) if (!(def = virNetworkDefParseString(xml))) goto cleanup; - if ((def->forward.type == VIR_NETWORK_FORWARD_NONE) || - (def->forward.type == VIR_NETWORK_FORWARD_NAT) || - (def->forward.type == VIR_NETWORK_FORWARD_ROUTE) || - (def->forward.type == VIR_NETWORK_FORWARD_OPEN)) { + switch (def->forward.type) { + case VIR_NETWORK_FORWARD_NONE: + case VIR_NETWORK_FORWARD_NAT: + case VIR_NETWORK_FORWARD_ROUTE: + case VIR_NETWORK_FORWARD_OPEN: /* for these forward types, the actual net type really *is* * NETWORK; we just keep the info from the portgroup in * iface->data.network.actual */ ret = VIR_DOMAIN_NET_TYPE_NETWORK; + break; - } else if ((def->forward.type == VIR_NETWORK_FORWARD_BRIDGE) && - def->bridge) { - - /* <forward type='bridge'/> <bridge name='xxx'/> - * is VIR_DOMAIN_NET_TYPE_BRIDGE - */ - - ret = VIR_DOMAIN_NET_TYPE_BRIDGE; - - } else if (def->forward.type == VIR_NETWORK_FORWARD_HOSTDEV) { - + case VIR_NETWORK_FORWARD_HOSTDEV: ret = VIR_DOMAIN_NET_TYPE_HOSTDEV; + break; - } else if ((def->forward.type == VIR_NETWORK_FORWARD_BRIDGE) || - (def->forward.type == VIR_NETWORK_FORWARD_PRIVATE) || - (def->forward.type == VIR_NETWORK_FORWARD_VEPA) || - (def->forward.type == VIR_NETWORK_FORWARD_PASSTHROUGH)) { + case VIR_NETWORK_FORWARD_BRIDGE: + if (def->bridge) { + /* <forward type='bridge'/> <bridge name='xxx'/> + * is VIR_DOMAIN_NET_TYPE_BRIDGE + */ + ret = VIR_DOMAIN_NET_TYPE_BRIDGE; + break; + } + + /* intentionally fall through to the direct case for + * VIR_NETWORK_FORWARD_BRIDGE with no bridge device defined + */ + ATTRIBUTE_FALLTHROUGH; + case VIR_NETWORK_FORWARD_PRIVATE: + case VIR_NETWORK_FORWARD_VEPA: + case VIR_NETWORK_FORWARD_PASSTHROUGH: /* <forward type='bridge|private|vepa|passthrough'> are all * VIR_DOMAIN_NET_TYPE_DIRECT. */ - ret = VIR_DOMAIN_NET_TYPE_DIRECT; + break; + case VIR_NETWORK_FORWARD_LAST: + default: + virReportEnumRangeError(virNetworkForwardType, def->forward.type); + goto cleanup; } cleanup: diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index 630a87f..526291c 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -1955,21 +1955,40 @@ virNetworkDefParseXML(xmlXPathContextPtr ctxt) goto error; } break; + + case VIR_NETWORK_FORWARD_LAST: + default: + virReportEnumRangeError(virNetworkForwardType, def->forward.type); + goto error; } VIR_FREE(stp); - if (def->mtu && - (def->forward.type != VIR_NETWORK_FORWARD_NONE && - def->forward.type != VIR_NETWORK_FORWARD_NAT && - def->forward.type != VIR_NETWORK_FORWARD_ROUTE && - def->forward.type != VIR_NETWORK_FORWARD_OPEN)) { - virReportError(VIR_ERR_XML_ERROR, - _("mtu size only allowed in open, route, nat, " - "and isolated mode, not in %s (network '%s')"), - virNetworkForwardTypeToString(def->forward.type), - def->name); - goto error; + if (def->mtu) { + switch (def->forward.type) { + case VIR_NETWORK_FORWARD_NONE: + case VIR_NETWORK_FORWARD_NAT: + case VIR_NETWORK_FORWARD_ROUTE: + case VIR_NETWORK_FORWARD_OPEN: + break; + + case VIR_NETWORK_FORWARD_BRIDGE: + case VIR_NETWORK_FORWARD_PRIVATE: + case VIR_NETWORK_FORWARD_VEPA: + case VIR_NETWORK_FORWARD_PASSTHROUGH: + case VIR_NETWORK_FORWARD_HOSTDEV: + virReportError(VIR_ERR_XML_ERROR, + _("mtu size only allowed in open, route, nat, " + "and isolated mode, not in %s (network '%s')"), + virNetworkForwardTypeToString(def->forward.type), + def->name); + goto error; + + case VIR_NETWORK_FORWARD_LAST: + default: + virReportEnumRangeError(virNetworkForwardType, def->forward.type); + goto error; + } } /* Extract custom metadata */ @@ -2349,6 +2368,7 @@ virNetworkDefFormatBuf(virBufferPtr buf, char uuidstr[VIR_UUID_STRING_BUFLEN]; size_t i; bool shortforward; + bool hasbridge = false; virBufferAddLit(buf, "<network"); if (!(flags & VIR_NETWORK_XML_INACTIVE) && (def->connections > 0)) @@ -2469,22 +2489,33 @@ virNetworkDefFormatBuf(virBufferPtr buf, virBufferAddLit(buf, "</forward>\n"); } + switch (def->forward.type) { + case VIR_NETWORK_FORWARD_NONE: + case VIR_NETWORK_FORWARD_NAT: + case VIR_NETWORK_FORWARD_ROUTE: + case VIR_NETWORK_FORWARD_OPEN: + hasbridge = true; + break; + + case VIR_NETWORK_FORWARD_BRIDGE: + case VIR_NETWORK_FORWARD_PRIVATE: + case VIR_NETWORK_FORWARD_VEPA: + case VIR_NETWORK_FORWARD_PASSTHROUGH: + case VIR_NETWORK_FORWARD_HOSTDEV: + break; - if (def->forward.type == VIR_NETWORK_FORWARD_NONE || - def->forward.type == VIR_NETWORK_FORWARD_NAT || - def->forward.type == VIR_NETWORK_FORWARD_ROUTE || - def->forward.type == VIR_NETWORK_FORWARD_OPEN || - def->bridge || def->macTableManager) { + case VIR_NETWORK_FORWARD_LAST: + default: + virReportEnumRangeError(virNetworkForwardType, def->forward.type); + goto error; + } + if (hasbridge || def->bridge || def->macTableManager) { virBufferAddLit(buf, "<bridge"); virBufferEscapeString(buf, " name='%s'", def->bridge); - if (def->forward.type == VIR_NETWORK_FORWARD_NONE || - def->forward.type == VIR_NETWORK_FORWARD_NAT || - def->forward.type == VIR_NETWORK_FORWARD_ROUTE || - def->forward.type == VIR_NETWORK_FORWARD_OPEN) { + if (hasbridge) virBufferAsprintf(buf, " stp='%s' delay='%ld'", def->stp ? "on" : "off", def->delay); - } if (def->macTableManager) { virBufferAsprintf(buf, " macTableManager='%s'", virNetworkBridgeMACTableManagerTypeToString(def->macTableManager)); diff --git a/src/conf/network_conf.h b/src/conf/network_conf.h index 54c8ed1..8fa8114 100644 --- a/src/conf/network_conf.h +++ b/src/conf/network_conf.h @@ -199,7 +199,7 @@ struct _virNetworkForwardPfDef { typedef struct _virNetworkForwardDef virNetworkForwardDef; typedef virNetworkForwardDef *virNetworkForwardDefPtr; struct _virNetworkForwardDef { - int type; /* One of virNetworkForwardType constants */ + virNetworkForwardType type; bool managed; /* managed attribute for hostdev mode */ int driverName; /* enum virNetworkForwardDriverNameType */ diff --git a/src/conf/virnetworkobj.c b/src/conf/virnetworkobj.c index e00c8a7..81b53e8 100644 --- a/src/conf/virnetworkobj.c +++ b/src/conf/virnetworkobj.c @@ -1009,19 +1009,31 @@ virNetworkLoadConfig(virNetworkObjListPtr nets, goto error; } - if (def->forward.type == VIR_NETWORK_FORWARD_NONE || - def->forward.type == VIR_NETWORK_FORWARD_NAT || - def->forward.type == VIR_NETWORK_FORWARD_ROUTE || - def->forward.type == VIR_NETWORK_FORWARD_OPEN) { - + switch (def->forward.type) { + case VIR_NETWORK_FORWARD_NONE: + case VIR_NETWORK_FORWARD_NAT: + case VIR_NETWORK_FORWARD_ROUTE: + case VIR_NETWORK_FORWARD_OPEN: if (!def->mac_specified) { virNetworkSetBridgeMacAddr(def); virNetworkSaveConfig(configDir, def); } - } else { + break; + + case VIR_NETWORK_FORWARD_BRIDGE: + case VIR_NETWORK_FORWARD_PRIVATE: + case VIR_NETWORK_FORWARD_VEPA: + case VIR_NETWORK_FORWARD_PASSTHROUGH: + case VIR_NETWORK_FORWARD_HOSTDEV: /* Throw away MAC address for other forward types, * which could have been generated by older libvirt RPMs */ def->mac_specified = false; + break; + + case VIR_NETWORK_FORWARD_LAST: + default: + virReportEnumRangeError(virNetworkForwardType, def->forward.type); + goto error; } if (!(obj = virNetworkObjAssignDef(nets, def, 0))) diff --git a/src/esx/esx_network_driver.c b/src/esx/esx_network_driver.c index 04118b4..4d1b3cd 100644 --- a/src/esx/esx_network_driver.c +++ b/src/esx/esx_network_driver.c @@ -326,12 +326,27 @@ esxNetworkDefineXML(virConnectPtr conn, const char *xml) } /* FIXME: Add support for NAT */ - if (def->forward.type != VIR_NETWORK_FORWARD_NONE && - def->forward.type != VIR_NETWORK_FORWARD_BRIDGE) { + switch (def->forward.type) { + case VIR_NETWORK_FORWARD_NONE: + case VIR_NETWORK_FORWARD_BRIDGE: + break; + + case VIR_NETWORK_FORWARD_NAT: + case VIR_NETWORK_FORWARD_ROUTE: + case VIR_NETWORK_FORWARD_OPEN: + case VIR_NETWORK_FORWARD_PRIVATE: + case VIR_NETWORK_FORWARD_VEPA: + case VIR_NETWORK_FORWARD_PASSTHROUGH: + case VIR_NETWORK_FORWARD_HOSTDEV: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Unsupported forward mode '%s'"), virNetworkForwardTypeToString(def->forward.type)); goto cleanup; + + case VIR_NETWORK_FORWARD_LAST: + default: + virReportEnumRangeError(virNetworkForwardType, def->forward.type); + goto cleanup; } /* Verify that specified HostPortGroups don't exist already */ diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 1a4cf98..fc386e1 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -2369,6 +2369,7 @@ virNetDevMacVLanCreate; virNetDevMacVLanCreateWithVPortProfile; virNetDevMacVLanDelete; virNetDevMacVLanDeleteWithVPortProfile; +virNetDevMacVLanModeTypeFromString; virNetDevMacVLanReleaseName; virNetDevMacVLanReserveName; virNetDevMacVLanRestartWithVPortProfile; diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index da3c32e..a6c9111 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -485,6 +485,11 @@ networkUpdateState(virNetworkObjPtr obj, case VIR_NETWORK_FORWARD_HOSTDEV: /* so far no extra checks */ break; + + case VIR_NETWORK_FORWARD_LAST: + default: + virReportEnumRangeError(virNetworkForwardType, def->forward.type); + goto cleanup; } /* Try and read dnsmasq/radvd pids of active networks */ @@ -2088,20 +2093,37 @@ networkRefreshDaemonsHelper(virNetworkObjPtr obj, virObjectLock(obj); def = virNetworkObjGetDef(obj); - if (virNetworkObjIsActive(obj) && - ((def->forward.type == VIR_NETWORK_FORWARD_NONE) || - (def->forward.type == VIR_NETWORK_FORWARD_NAT) || - (def->forward.type == VIR_NETWORK_FORWARD_ROUTE) || - (def->forward.type == VIR_NETWORK_FORWARD_OPEN))) { - /* Only the three L3 network types that are configured by - * libvirt will have a dnsmasq or radvd daemon associated - * with them. Here we send a SIGHUP to an existing - * dnsmasq and/or radvd, or restart them if they've - * disappeared. - */ - networkRefreshDhcpDaemon(driver, obj); - networkRefreshRadvd(driver, obj); + if (virNetworkObjIsActive(obj)) { + switch (def->forward.type) { + case VIR_NETWORK_FORWARD_NONE: + case VIR_NETWORK_FORWARD_NAT: + case VIR_NETWORK_FORWARD_ROUTE: + case VIR_NETWORK_FORWARD_OPEN: + /* Only the three L3 network types that are configured by + * libvirt will have a dnsmasq or radvd daemon associated + * with them. Here we send a SIGHUP to an existing + * dnsmasq and/or radvd, or restart them if they've + * disappeared. + */ + networkRefreshDhcpDaemon(driver, obj); + networkRefreshRadvd(driver, obj); + break; + + case VIR_NETWORK_FORWARD_BRIDGE: + case VIR_NETWORK_FORWARD_PRIVATE: + case VIR_NETWORK_FORWARD_VEPA: + case VIR_NETWORK_FORWARD_PASSTHROUGH: + case VIR_NETWORK_FORWARD_HOSTDEV: + break; + + case VIR_NETWORK_FORWARD_LAST: + default: + virReportEnumRangeError(virNetworkForwardType, def->forward.type); + goto cleanup; + } } + + cleanup: virObjectUnlock(obj); return 0; } @@ -2128,20 +2150,37 @@ networkReloadFirewallRulesHelper(virNetworkObjPtr obj, virObjectLock(obj); def = virNetworkObjGetDef(obj); - if (virNetworkObjIsActive(obj) && - ((def->forward.type == VIR_NETWORK_FORWARD_NONE) || - (def->forward.type == VIR_NETWORK_FORWARD_NAT) || - (def->forward.type == VIR_NETWORK_FORWARD_ROUTE))) { - /* Only three of the L3 network types that are configured by - * libvirt need to have iptables rules reloaded. The 4th L3 - * network type, forward='open', doesn't need this because it - * has no iptables rules. - */ - networkRemoveFirewallRules(def); - if (networkAddFirewallRules(def) < 0) { - /* failed to add but already logged */ + if (virNetworkObjIsActive(obj)) { + switch (def->forward.type) { + case VIR_NETWORK_FORWARD_NONE: + case VIR_NETWORK_FORWARD_NAT: + case VIR_NETWORK_FORWARD_ROUTE: + /* Only three of the L3 network types that are configured by + * libvirt need to have iptables rules reloaded. The 4th L3 + * network type, forward='open', doesn't need this because it + * has no iptables rules. + */ + networkRemoveFirewallRules(def); + /* No need to check return value since already logged internally */ + ignore_value(networkAddFirewallRules(def)); + break; + + case VIR_NETWORK_FORWARD_OPEN: + case VIR_NETWORK_FORWARD_BRIDGE: + case VIR_NETWORK_FORWARD_PRIVATE: + case VIR_NETWORK_FORWARD_VEPA: + case VIR_NETWORK_FORWARD_PASSTHROUGH: + case VIR_NETWORK_FORWARD_HOSTDEV: + break; + + case VIR_NETWORK_FORWARD_LAST: + default: + virReportEnumRangeError(virNetworkForwardType, def->forward.type); + goto cleanup; } } + + cleanup: virObjectUnlock(obj); return 0; } @@ -2719,9 +2758,13 @@ networkCreateInterfacePool(virNetworkDefPtr netdef) case VIR_NETWORK_FORWARD_NAT: case VIR_NETWORK_FORWARD_ROUTE: case VIR_NETWORK_FORWARD_OPEN: - case VIR_NETWORK_FORWARD_LAST: /* by definition these will never be encountered here */ break; + + case VIR_NETWORK_FORWARD_LAST: + default: + virReportEnumRangeError(virNetworkForwardType, netdef->forward.type); + goto cleanup; } } @@ -2840,6 +2883,11 @@ networkStartNetwork(virNetworkDriverStatePtr driver, if (networkStartNetworkExternal(obj) < 0) goto cleanup; break; + + case VIR_NETWORK_FORWARD_LAST: + default: + virReportEnumRangeError(virNetworkForwardType, def->forward.type); + goto cleanup; } /* finally we can call the 'started' hook script if any */ @@ -2919,6 +2967,11 @@ networkShutdownNetwork(virNetworkDriverStatePtr driver, case VIR_NETWORK_FORWARD_HOSTDEV: ret = networkShutdownNetworkExternal(obj); break; + + case VIR_NETWORK_FORWARD_LAST: + default: + virReportEnumRangeError(virNetworkForwardType, def->forward.type); + return -1; } /* now that we know it's stopped call the hook if present */ @@ -3273,11 +3326,11 @@ networkValidate(virNetworkDriverStatePtr driver, /* Only the three L3 network types that are configured by libvirt * need to have a bridge device name / mac address provided */ - if (def->forward.type == VIR_NETWORK_FORWARD_NONE || - def->forward.type == VIR_NETWORK_FORWARD_NAT || - def->forward.type == VIR_NETWORK_FORWARD_ROUTE || - def->forward.type == VIR_NETWORK_FORWARD_OPEN) { - + switch (def->forward.type) { + case VIR_NETWORK_FORWARD_NONE: + case VIR_NETWORK_FORWARD_NAT: + case VIR_NETWORK_FORWARD_ROUTE: + case VIR_NETWORK_FORWARD_OPEN: /* if no bridge name was given in the config, find a name * unused by any other libvirt networks and assign it. */ @@ -3285,7 +3338,13 @@ networkValidate(virNetworkDriverStatePtr driver, return -1; virNetworkSetBridgeMacAddr(def); - } else { + break; + + case VIR_NETWORK_FORWARD_BRIDGE: + case VIR_NETWORK_FORWARD_PRIVATE: + case VIR_NETWORK_FORWARD_VEPA: + case VIR_NETWORK_FORWARD_PASSTHROUGH: + case VIR_NETWORK_FORWARD_HOSTDEV: /* They are also the only types that currently support setting * a MAC or IP address for the host-side device (bridge), DNS * configuration, or network-wide bandwidth limits. @@ -3331,6 +3390,12 @@ networkValidate(virNetworkDriverStatePtr driver, return -1; } bandwidthAllowed = false; + break; + + case VIR_NETWORK_FORWARD_LAST: + default: + virReportEnumRangeError(virNetworkForwardType, def->forward.type); + return -1; } /* we support configs with a single PF defined: @@ -3755,9 +3820,10 @@ networkUpdate(virNetworkPtr net, /* Take care of anything that must be done before updating the * live NetworkDef. */ - if (def->forward.type == VIR_NETWORK_FORWARD_NONE || - def->forward.type == VIR_NETWORK_FORWARD_NAT || - def->forward.type == VIR_NETWORK_FORWARD_ROUTE) { + switch (def->forward.type) { + case VIR_NETWORK_FORWARD_NONE: + case VIR_NETWORK_FORWARD_NAT: + case VIR_NETWORK_FORWARD_ROUTE: switch (section) { case VIR_NETWORK_SECTION_FORWARD: case VIR_NETWORK_SECTION_FORWARD_INTERFACE: @@ -3768,14 +3834,26 @@ networkUpdate(virNetworkPtr net, * old rules (and remember to load new ones after the * update). */ - if (def->forward.type != VIR_NETWORK_FORWARD_OPEN) { - networkRemoveFirewallRules(def); - needFirewallRefresh = true; - } + networkRemoveFirewallRules(def); + needFirewallRefresh = true; break; default: break; } + break; + + case VIR_NETWORK_FORWARD_OPEN: + case VIR_NETWORK_FORWARD_BRIDGE: + case VIR_NETWORK_FORWARD_PRIVATE: + case VIR_NETWORK_FORWARD_VEPA: + case VIR_NETWORK_FORWARD_PASSTHROUGH: + case VIR_NETWORK_FORWARD_HOSTDEV: + break; + + case VIR_NETWORK_FORWARD_LAST: + default: + virReportEnumRangeError(virNetworkForwardType, def->forward.type); + goto cleanup; } } @@ -4440,10 +4518,11 @@ networkAllocateActualDevice(virDomainDefPtr dom, iface->data.network.actual->trustGuestRxFilters = netdef->trustGuestRxFilters; - if ((netdef->forward.type == VIR_NETWORK_FORWARD_NONE) || - (netdef->forward.type == VIR_NETWORK_FORWARD_NAT) || - (netdef->forward.type == VIR_NETWORK_FORWARD_ROUTE) || - (netdef->forward.type == VIR_NETWORK_FORWARD_OPEN)) { + switch (netdef->forward.type) { + case VIR_NETWORK_FORWARD_NONE: + case VIR_NETWORK_FORWARD_NAT: + case VIR_NETWORK_FORWARD_ROUTE: + case VIR_NETWORK_FORWARD_OPEN: /* for these forward types, the actual net type really *is* * NETWORK; we just keep the info from the portgroup in * iface->data.network.actual @@ -4463,46 +4542,9 @@ networkAllocateActualDevice(virDomainDefPtr dom, if (networkPlugBandwidth(obj, iface) < 0) goto error; + break; - } else if ((netdef->forward.type == VIR_NETWORK_FORWARD_BRIDGE) && - netdef->bridge) { - - /* <forward type='bridge'/> <bridge name='xxx'/> - * is VIR_DOMAIN_NET_TYPE_BRIDGE - */ - - iface->data.network.actual->type = actualType = VIR_DOMAIN_NET_TYPE_BRIDGE; - if (VIR_STRDUP(iface->data.network.actual->data.bridge.brname, - netdef->bridge) < 0) - goto error; - iface->data.network.actual->data.bridge.macTableManager - = netdef->macTableManager; - - /* merge virtualports from interface, network, and portgroup to - * arrive at actual virtualport to use - */ - if (virNetDevVPortProfileMerge3(&iface->data.network.actual->virtPortProfile, - iface->virtPortProfile, - netdef->virtPortProfile, - portgroup - ? portgroup->virtPortProfile : NULL) < 0) { - goto error; - } - virtport = iface->data.network.actual->virtPortProfile; - if (virtport) { - /* only type='openvswitch' is allowed for bridges */ - if (virtport->virtPortType != VIR_NETDEV_VPORT_PROFILE_OPENVSWITCH) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("<virtualport type='%s'> not supported for network " - "'%s' which uses a bridge device"), - virNetDevVPortTypeToString(virtport->virtPortType), - netdef->name); - goto error; - } - } - - } else if (netdef->forward.type == VIR_NETWORK_FORWARD_HOSTDEV) { - + case VIR_NETWORK_FORWARD_HOSTDEV: { virDomainHostdevSubsysPCIBackendType backend; iface->data.network.actual->type = actualType = VIR_DOMAIN_NET_TYPE_HOSTDEV; @@ -4575,32 +4617,67 @@ networkAllocateActualDevice(virDomainDefPtr dom, goto error; } } + break; + } - } else if ((netdef->forward.type == VIR_NETWORK_FORWARD_BRIDGE) || - (netdef->forward.type == VIR_NETWORK_FORWARD_PRIVATE) || - (netdef->forward.type == VIR_NETWORK_FORWARD_VEPA) || - (netdef->forward.type == VIR_NETWORK_FORWARD_PASSTHROUGH)) { + case VIR_NETWORK_FORWARD_BRIDGE: + if (netdef->bridge) { + /* <forward type='bridge'/> <bridge name='xxx'/> + * is VIR_DOMAIN_NET_TYPE_BRIDGE + */ + iface->data.network.actual->type = actualType = VIR_DOMAIN_NET_TYPE_BRIDGE; + if (VIR_STRDUP(iface->data.network.actual->data.bridge.brname, + netdef->bridge) < 0) + goto error; + iface->data.network.actual->data.bridge.macTableManager + = netdef->macTableManager; + + /* merge virtualports from interface, network, and portgroup to + * arrive at actual virtualport to use + */ + if (virNetDevVPortProfileMerge3(&iface->data.network.actual->virtPortProfile, + iface->virtPortProfile, + netdef->virtPortProfile, + portgroup + ? portgroup->virtPortProfile : NULL) < 0) { + goto error; + } + virtport = iface->data.network.actual->virtPortProfile; + if (virtport) { + /* only type='openvswitch' is allowed for bridges */ + if (virtport->virtPortType != VIR_NETDEV_VPORT_PROFILE_OPENVSWITCH) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("<virtualport type='%s'> not supported for network " + "'%s' which uses a bridge device"), + virNetDevVPortTypeToString(virtport->virtPortType), + netdef->name); + goto error; + } + } + break; + } + + /* intentionally fall through to the direct case for + * VIR_NETWORK_FORWARD_BRIDGE with no bridge device defined + */ + ATTRIBUTE_FALLTHROUGH; + + case VIR_NETWORK_FORWARD_PRIVATE: + case VIR_NETWORK_FORWARD_VEPA: + case VIR_NETWORK_FORWARD_PASSTHROUGH: /* <forward type='bridge|private|vepa|passthrough'> are all * VIR_DOMAIN_NET_TYPE_DIRECT. */ /* Set type=direct and appropriate <source mode='xxx'/> */ iface->data.network.actual->type = actualType = VIR_DOMAIN_NET_TYPE_DIRECT; - switch (netdef->forward.type) { - case VIR_NETWORK_FORWARD_BRIDGE: - iface->data.network.actual->data.direct.mode = VIR_NETDEV_MACVLAN_MODE_BRIDGE; - break; - case VIR_NETWORK_FORWARD_PRIVATE: - iface->data.network.actual->data.direct.mode = VIR_NETDEV_MACVLAN_MODE_PRIVATE; - break; - case VIR_NETWORK_FORWARD_VEPA: - iface->data.network.actual->data.direct.mode = VIR_NETDEV_MACVLAN_MODE_VEPA; - break; - case VIR_NETWORK_FORWARD_PASSTHROUGH: - iface->data.network.actual->data.direct.mode = VIR_NETDEV_MACVLAN_MODE_PASSTHRU; - break; - } + + /* NO need to check the value returned from virNetDevMacVLanModeTypeFromString + * it must be valid for these forward type(bridge|private|vepa|passthrough) + */ + iface->data.network.actual->data.direct.mode = + virNetDevMacVLanModeTypeFromString(virNetworkForwardTypeToString(netdef->forward.type)); /* merge virtualports from interface, network, and portgroup to * arrive at actual virtualport to use @@ -4680,6 +4757,12 @@ networkAllocateActualDevice(virDomainDefPtr dom, dev->device.dev) < 0) goto error; } + break; + + case VIR_NETWORK_FORWARD_LAST: + default: + virReportEnumRangeError(virNetworkForwardType, netdef->forward.type); + goto error; } if (virNetworkObjMacMgrAdd(obj, driver->dnsmasqStateDir, @@ -5037,13 +5120,27 @@ networkReleaseActualDevice(virDomainDefPtr dom, } netdef = virNetworkObjGetDef(obj); - if (iface->data.network.actual && - (netdef->forward.type == VIR_NETWORK_FORWARD_NONE || - netdef->forward.type == VIR_NETWORK_FORWARD_NAT || - netdef->forward.type == VIR_NETWORK_FORWARD_ROUTE || - netdef->forward.type == VIR_NETWORK_FORWARD_OPEN) && - networkUnplugBandwidth(obj, iface) < 0) + switch (netdef->forward.type) { + case VIR_NETWORK_FORWARD_NONE: + case VIR_NETWORK_FORWARD_NAT: + case VIR_NETWORK_FORWARD_ROUTE: + case VIR_NETWORK_FORWARD_OPEN: + if (iface->data.network.actual && networkUnplugBandwidth(obj, iface) < 0) + goto error; + break; + + case VIR_NETWORK_FORWARD_BRIDGE: + case VIR_NETWORK_FORWARD_PRIVATE: + case VIR_NETWORK_FORWARD_VEPA: + case VIR_NETWORK_FORWARD_PASSTHROUGH: + case VIR_NETWORK_FORWARD_HOSTDEV: + break; + + case VIR_NETWORK_FORWARD_LAST: + default: + virReportEnumRangeError(virNetworkForwardType, netdef->forward.type); goto error; + } if ((!iface->data.network.actual) || ((actualType != VIR_DOMAIN_NET_TYPE_DIRECT) && diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index bba157b..1946a28 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -4582,6 +4582,14 @@ qemuProcessGetNetworkAddress(const char *netname, goto cleanup; } break; + + case VIR_NETWORK_FORWARD_HOSTDEV: + break; + + case VIR_NETWORK_FORWARD_LAST: + default: + virReportEnumRangeError(virNetworkForwardType, netdef->forward.type); + goto cleanup; } if (dev_name) { -- 2.7.4

2 2

[libvirt] [PATCH v2 0/6] Fixes for segfault and deadlock
by Marc Hartmayer 21 Jul '18

21 Jul '18

One way to reproduce the bugs is to set admin_max_workers=0 in libvirtd.conf, restart libvirtd, and then call: $ virt-admin server-threadpool-info admin Changelog: v1->v2: - Worked in Daniel Berrangé's comments that: 1. max_workers=0 should not be allowed for the libvirtd (patch 3) 2. it shouldn't be allowed to switch between zero and non-zero max_workers (patch 4) - Changed the deadlock fix (patch 1) - Added two small fixes (patch 5 and 6) Marc Hartmayer (6): rpc: Fix deadlock if there is no worker pool available rpc: Initialize a worker pool for max_workers=0 as well virThreadPool: Prevent switching between zero and non-zero maxWorkers daemon: Raise an error if 'max_workers' < 1 in libvirtd.conf virt-admin: Fix two error messages rpc: Fix name of include guard src/libvirt_private.syms | 4 ++ src/remote/remote_daemon_config.c | 5 +++ src/rpc/virnetserver.c | 28 ++++++++------ src/rpc/virnetserverprogram.h | 4 +- src/util/virthreadpool.c | 81 ++++++++++++++++++++++++++++++--------- src/util/virthreadpool.h | 8 ++++ tools/virt-admin.c | 5 ++- 7 files changed, 101 insertions(+), 34 deletions(-) -- 2.13.4

2 17

[libvirt] [PATCH 00/10] qemu: hotplug: Refactor for -blockdev support (blockdev-add saga)
by Peter Krempa 21 Jul '18

21 Jul '18

A bunch of refactors which could be separated from my blockdev add branch. The patches modify the disk hotplug/unplug and media change code so that we can easily add support for -blockdev later on. Peter Krempa (10): qemu: hotplug: Reuse qemuHotplugPrepareDiskAccess in qemuDomainRemoveDiskDevice qemu: hotplug: Remove pointless variable qemu: hotplug: Don't format NULL in %s in qemuHotplugPrepareDiskAccess qemu: hotplug: Prepare for multiple backing chain member hotplug qemu: hotplug: Don't leak 'disk' if VM crashes during unplug finishing qemu: hotplug: Reuse qemuHotplugDiskSourceRemove for disk backend removal qemu: hotplug: Simplify removal of managed PR infrastructure on unplug qemu: hotplug: Refactor/simplify PR managed addition to VM qemu: hotplug: Extract legacy disk media changing bits qemu: hotplug: Make qemuHotplugWaitForTrayEject reusable src/qemu/qemu_hotplug.c | 508 ++++++++++++++++++++++++++++++++++-------------- 1 file changed, 358 insertions(+), 150 deletions(-) -- 2.16.2

3 24

[libvirt] [PATCH] src: Fix memory leak in virNWFilterBindingDispose
by John Ferlan 21 Jul '18

21 Jul '18

https://bugzilla.redhat.com/show_bug.cgi?id=1603025 Commit b57a9aec neglected to VIR_FREE(binding->filtername) as seen in the following valgrind report ==6423== 17,328 bytes in 1,083 blocks are definitely lost in loss record 2,275 of 2,297 ==6423== at 0x4C29BC3: malloc (vg_replace_malloc.c:299) ==6423== by 0x83B20C9: strdup (in /usr/lib64/libc-2.17.so) ==6423== by 0x533C144: virStrdup (virstring.c:977) ==6423== by 0x54BDD53: virGetNWFilterBinding (datatypes.c:865) ==6423== by 0x318D633C: nwfilterBindingCreateXML (nwfilter_driver.c:767) ==6423== by 0x54F3FC5: virNWFilterBindingCreateXML (libvirt-nwfilter.c:701) ==6423== by 0x539CE29: virDomainConfNWFilterInstantiate (domain_nwfilter.c:116) ==6423== by 0x31E516C2: qemuInterfaceBridgeConnect (qemu_interface.c:589) ==6423== by 0x31D98B56: qemuBuildInterfaceCommandLine (qemu_command.c:8418) ==6423== by 0x31D9F783: qemuBuildNetCommandLine (qemu_command.c:8673) ==6423== by 0x31D9F783: qemuBuildCommandLine (qemu_command.c:10354) ==6423== by 0x31DE355F: qemuProcessLaunch (qemu_process.c:6292) ==6423== by 0x31DE7881: qemuProcessStart (qemu_process.c:6686) and ==6423== 17,328 bytes in 1,083 blocks are definitely lost in loss record 2,276 of 2,297 ==6423== at 0x4C29BC3: malloc (vg_replace_malloc.c:299) ==6423== by 0x83B20C9: strdup (in /usr/lib64/libc-2.17.so) ==6423== by 0x533C144: virStrdup (virstring.c:977) ==6423== by 0x54BDD53: virGetNWFilterBinding (datatypes.c:865) ==6423== by 0x318D641F: nwfilterBindingLookupByPortDev (nwfilter_driver.c:678) ==6423== by 0x54F3B63: virNWFilterBindingLookupByPortDev (libvirt-nwfilter.c:593) ==6423== by 0x539CBC5: virDomainConfNWFilterTeardownImpl.isra.0 (domain_nwfilter.c:136) ==6423== by 0x539CFA5: virDomainConfVMNWFilterTeardown (domain_nwfilter.c:170) ==6423== by 0x31DE5651: qemuProcessStop (qemu_process.c:6912) ==6423== by 0x31E37974: qemuDomainDestroyFlags (qemu_driver.c:2229) ==6423== by 0x54C24BB: virDomainDestroy (libvirt-domain.c:475) ==6423== by 0x1589A2: remoteDispatchDomainDestroy (remote_daemon_dispatch_stubs.h:4827) ==6423== by 0x1589A2: remoteDispatchDomainDestroyHelper (remote_daemon_dispatch_stubs.h:4803) Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- src/datatypes.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/datatypes.c b/src/datatypes.c index 878a1c5b5f..caf035f178 100644 --- a/src/datatypes.c +++ b/src/datatypes.c @@ -893,6 +893,7 @@ virNWFilterBindingDispose(void *obj) VIR_DEBUG("release binding %p %s", binding, binding->portdev); VIR_FREE(binding->portdev); + VIR_FREE(binding->filtername); virObjectUnref(binding->conn); } -- 2.17.1

2 1

[libvirt] [PATCH 0/2] rpm: modernize the spec file for RHEL
by Daniel P. Berrangé 21 Jul '18

21 Jul '18

Drop conditionals for RHEL-6 and assume systemd is present Daniel P. Berrangé (2): rpm: increase min required RHEL to 7 rpm: remove conditionals for systemd libvirt.spec.in | 246 ++++-------------------------------------------- 1 file changed, 20 insertions(+), 226 deletions(-) -- 2.17.1

3 4

[libvirt] [PATCH 0/9] qemu: stats/misc refactors (blockdev-add saga)
by Peter Krempa 20 Jul '18

20 Jul '18

Last lot of refactors which could be split of prior to starting it for real. Peter Krempa (9): qemu: driver: Reuse qemuDomainBlocksStatsGather in qemuDomainGetBlockInfo qemu: domain: Move out clearing of backing chain in qemuDomainDetermineDiskChain qemu: domain: Add helper for getting the disk backend alias qemu: command: use qemuDomainDiskGetBackendAlias in commandline building qemu: monitor: Add the 'query-nodes' argument for query-blockstats qemu: json: Extract gathering of block statistics qemu: monitor: Split out code to gather data from 'query-block' utils: storage: Add helper for checking if storage source is the same qemu: Replace qemuDomainDiskSourceDiffers by virStorageSourceIsSameLocation src/libvirt_private.syms | 1 + src/qemu/qemu_block.c | 2 +- src/qemu/qemu_blockjob.c | 4 +- src/qemu/qemu_command.c | 24 ++++++---- src/qemu/qemu_domain.c | 66 ++++++++++++--------------- src/qemu/qemu_domain.h | 10 +++-- src/qemu/qemu_driver.c | 47 +++++++------------- src/qemu/qemu_hotplug.c | 2 +- src/qemu/qemu_monitor.c | 8 +++- src/qemu/qemu_monitor.h | 3 +- src/qemu/qemu_monitor_json.c | 103 ++++++++++++++++++++++++++++--------------- src/qemu/qemu_monitor_json.h | 3 +- src/qemu/qemu_process.c | 7 ++- src/util/virstoragefile.c | 43 ++++++++++++++++++ src/util/virstoragefile.h | 3 ++ 15 files changed, 198 insertions(+), 128 deletions(-) -- 2.16.2

2 18

[libvirt] [PATCH] utils: storage: Add copying of PR definition to virStorageSource
by Peter Krempa 20 Jul '18

20 Jul '18

Despite the warning that virStorageSourceCopy needs to be populated on additions to the structure commit 687730540e4 neglected to implement the copy function. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/util/virstoragefile.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index 58f67278da..b6a2b415e9 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -2041,6 +2041,29 @@ virStorageSourceChainHasManagedPR(virStorageSourcePtr src) } +static virStoragePRDefPtr +virStoragePRDefCopy(virStoragePRDefPtr src) +{ + virStoragePRDefPtr copy = NULL; + virStoragePRDefPtr ret = NULL; + + if (VIR_ALLOC(copy) < 0) + return NULL; + + copy->managed = src->managed; + + if (VIR_STRDUP(copy->path, src->path) < 0 || + VIR_STRDUP(copy->mgralias, src->mgralias) < 0) + goto cleanup; + + VIR_STEAL_PTR(ret, copy); + + cleanup: + virStoragePRDefFree(copy); + return ret; +} + + virSecurityDeviceLabelDefPtr virStorageSourceGetSecurityLabelDef(virStorageSourcePtr src, const char *model) @@ -2245,6 +2268,10 @@ virStorageSourceCopy(const virStorageSource *src, !(ret->auth = virStorageAuthDefCopy(src->auth))) goto error; + if (src->pr && + !(ret->pr = virStoragePRDefCopy(src->pr))) + goto error; + if (backingChain && src->backingStore) { if (!(ret->backingStore = virStorageSourceCopy(src->backingStore, true))) -- 2.16.2

2 1

[libvirt] [PATCH] replace 'if' type conditions with 'switch' for VIR_NETWORK_FORWARD_*
by Shi Lei 20 Jul '18

20 Jul '18

Hi, everyone! For VIR_NETWORK_FORWARD_*, I try to replace 'if' type conditions with typed 'switch()'. It might be more clear. Signed-off-by: Shi Lei <shilei.massclouds(a)gmx.com> --- src/conf/domain_conf.c | 46 +++++----- src/conf/network_conf.c | 49 ++++++----- src/conf/virnetworkobj.c | 15 ++-- src/esx/esx_network_driver.c | 8 +- src/network/bridge_driver.c | 203 +++++++++++++++++++++++-------------------- 5 files changed, 178 insertions(+), 143 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 178c6d2..c02543f 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -29975,40 +29975,44 @@ virDomainNetResolveActualType(virDomainNetDefPtr iface) if (!(def = virNetworkDefParseString(xml))) goto cleanup; - if ((def->forward.type == VIR_NETWORK_FORWARD_NONE) || - (def->forward.type == VIR_NETWORK_FORWARD_NAT) || - (def->forward.type == VIR_NETWORK_FORWARD_ROUTE) || - (def->forward.type == VIR_NETWORK_FORWARD_OPEN)) { + switch (def->forward.type) { + case VIR_NETWORK_FORWARD_NONE: + case VIR_NETWORK_FORWARD_NAT: + case VIR_NETWORK_FORWARD_ROUTE: + case VIR_NETWORK_FORWARD_OPEN: /* for these forward types, the actual net type really *is* * NETWORK; we just keep the info from the portgroup in * iface->data.network.actual */ ret = VIR_DOMAIN_NET_TYPE_NETWORK; + break; - } else if ((def->forward.type == VIR_NETWORK_FORWARD_BRIDGE) && - def->bridge) { - - /* <forward type='bridge'/> <bridge name='xxx'/> - * is VIR_DOMAIN_NET_TYPE_BRIDGE - */ - - ret = VIR_DOMAIN_NET_TYPE_BRIDGE; - - } else if (def->forward.type == VIR_NETWORK_FORWARD_HOSTDEV) { - + case VIR_NETWORK_FORWARD_HOSTDEV: ret = VIR_DOMAIN_NET_TYPE_HOSTDEV; + break; + + case VIR_NETWORK_FORWARD_BRIDGE: + if (def->bridge) { + /* <forward type='bridge'/> <bridge name='xxx'/> + * is VIR_DOMAIN_NET_TYPE_BRIDGE + */ + ret = VIR_DOMAIN_NET_TYPE_BRIDGE; + break; + } - } else if ((def->forward.type == VIR_NETWORK_FORWARD_BRIDGE) || - (def->forward.type == VIR_NETWORK_FORWARD_PRIVATE) || - (def->forward.type == VIR_NETWORK_FORWARD_VEPA) || - (def->forward.type == VIR_NETWORK_FORWARD_PASSTHROUGH)) { + /* intentionally fall through to the direct case for + * VIR_NETWORK_FORWARD_BRIDGE with no bridge device defined + */ + ATTRIBUTE_FALLTHROUGH; + case VIR_NETWORK_FORWARD_PRIVATE: + case VIR_NETWORK_FORWARD_VEPA: + case VIR_NETWORK_FORWARD_PASSTHROUGH: /* <forward type='bridge|private|vepa|passthrough'> are all * VIR_DOMAIN_NET_TYPE_DIRECT. */ - ret = VIR_DOMAIN_NET_TYPE_DIRECT; - + break; } cleanup: diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index 630a87f..bafc1d3 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -1959,17 +1959,22 @@ virNetworkDefParseXML(xmlXPathContextPtr ctxt) VIR_FREE(stp); - if (def->mtu && - (def->forward.type != VIR_NETWORK_FORWARD_NONE && - def->forward.type != VIR_NETWORK_FORWARD_NAT && - def->forward.type != VIR_NETWORK_FORWARD_ROUTE && - def->forward.type != VIR_NETWORK_FORWARD_OPEN)) { - virReportError(VIR_ERR_XML_ERROR, - _("mtu size only allowed in open, route, nat, " - "and isolated mode, not in %s (network '%s')"), - virNetworkForwardTypeToString(def->forward.type), - def->name); - goto error; + if (def->mtu) { + switch (def->forward.type) { + case VIR_NETWORK_FORWARD_NONE: + case VIR_NETWORK_FORWARD_NAT: + case VIR_NETWORK_FORWARD_ROUTE: + case VIR_NETWORK_FORWARD_OPEN: + break; + + default: + virReportError(VIR_ERR_XML_ERROR, + _("mtu size only allowed in open, route, nat, " + "and isolated mode, not in %s (network '%s')"), + virNetworkForwardTypeToString(def->forward.type), + def->name); + goto error; + } } /* Extract custom metadata */ @@ -2349,6 +2354,7 @@ virNetworkDefFormatBuf(virBufferPtr buf, char uuidstr[VIR_UUID_STRING_BUFLEN]; size_t i; bool shortforward; + bool hasbridge = false; virBufferAddLit(buf, "<network"); if (!(flags & VIR_NETWORK_XML_INACTIVE) && (def->connections > 0)) @@ -2469,22 +2475,21 @@ virNetworkDefFormatBuf(virBufferPtr buf, virBufferAddLit(buf, "</forward>\n"); } + switch (def->forward.type) { + case VIR_NETWORK_FORWARD_NONE: + case VIR_NETWORK_FORWARD_NAT: + case VIR_NETWORK_FORWARD_ROUTE: + case VIR_NETWORK_FORWARD_OPEN: + hasbridge = true; + break; + } - if (def->forward.type == VIR_NETWORK_FORWARD_NONE || - def->forward.type == VIR_NETWORK_FORWARD_NAT || - def->forward.type == VIR_NETWORK_FORWARD_ROUTE || - def->forward.type == VIR_NETWORK_FORWARD_OPEN || - def->bridge || def->macTableManager) { - + if (hasbridge || def->bridge || def->macTableManager) { virBufferAddLit(buf, "<bridge"); virBufferEscapeString(buf, " name='%s'", def->bridge); - if (def->forward.type == VIR_NETWORK_FORWARD_NONE || - def->forward.type == VIR_NETWORK_FORWARD_NAT || - def->forward.type == VIR_NETWORK_FORWARD_ROUTE || - def->forward.type == VIR_NETWORK_FORWARD_OPEN) { + if (hasbridge) virBufferAsprintf(buf, " stp='%s' delay='%ld'", def->stp ? "on" : "off", def->delay); - } if (def->macTableManager) { virBufferAsprintf(buf, " macTableManager='%s'", virNetworkBridgeMACTableManagerTypeToString(def->macTableManager)); diff --git a/src/conf/virnetworkobj.c b/src/conf/virnetworkobj.c index e00c8a7..7706817 100644 --- a/src/conf/virnetworkobj.c +++ b/src/conf/virnetworkobj.c @@ -1009,19 +1009,22 @@ virNetworkLoadConfig(virNetworkObjListPtr nets, goto error; } - if (def->forward.type == VIR_NETWORK_FORWARD_NONE || - def->forward.type == VIR_NETWORK_FORWARD_NAT || - def->forward.type == VIR_NETWORK_FORWARD_ROUTE || - def->forward.type == VIR_NETWORK_FORWARD_OPEN) { - + switch (def->forward.type) { + case VIR_NETWORK_FORWARD_NONE: + case VIR_NETWORK_FORWARD_NAT: + case VIR_NETWORK_FORWARD_ROUTE: + case VIR_NETWORK_FORWARD_OPEN: if (!def->mac_specified) { virNetworkSetBridgeMacAddr(def); virNetworkSaveConfig(configDir, def); } - } else { + break; + + default: /* Throw away MAC address for other forward types, * which could have been generated by older libvirt RPMs */ def->mac_specified = false; + break; } if (!(obj = virNetworkObjAssignDef(nets, def, 0))) diff --git a/src/esx/esx_network_driver.c b/src/esx/esx_network_driver.c index 04118b4..8ea1079 100644 --- a/src/esx/esx_network_driver.c +++ b/src/esx/esx_network_driver.c @@ -326,8 +326,12 @@ esxNetworkDefineXML(virConnectPtr conn, const char *xml) } /* FIXME: Add support for NAT */ - if (def->forward.type != VIR_NETWORK_FORWARD_NONE && - def->forward.type != VIR_NETWORK_FORWARD_BRIDGE) { + switch (def->forward.type) { + case VIR_NETWORK_FORWARD_NONE: + case VIR_NETWORK_FORWARD_BRIDGE: + break; + + default: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Unsupported forward mode '%s'"), virNetworkForwardTypeToString(def->forward.type)); diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index da3c32e..5e885b5 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -2088,19 +2088,22 @@ networkRefreshDaemonsHelper(virNetworkObjPtr obj, virObjectLock(obj); def = virNetworkObjGetDef(obj); - if (virNetworkObjIsActive(obj) && - ((def->forward.type == VIR_NETWORK_FORWARD_NONE) || - (def->forward.type == VIR_NETWORK_FORWARD_NAT) || - (def->forward.type == VIR_NETWORK_FORWARD_ROUTE) || - (def->forward.type == VIR_NETWORK_FORWARD_OPEN))) { - /* Only the three L3 network types that are configured by - * libvirt will have a dnsmasq or radvd daemon associated - * with them. Here we send a SIGHUP to an existing - * dnsmasq and/or radvd, or restart them if they've - * disappeared. - */ - networkRefreshDhcpDaemon(driver, obj); - networkRefreshRadvd(driver, obj); + if (virNetworkObjIsActive(obj)) { + switch (def->forward.type) { + case VIR_NETWORK_FORWARD_NONE: + case VIR_NETWORK_FORWARD_NAT: + case VIR_NETWORK_FORWARD_ROUTE: + case VIR_NETWORK_FORWARD_OPEN: + /* Only the three L3 network types that are configured by + * libvirt will have a dnsmasq or radvd daemon associated + * with them. Here we send a SIGHUP to an existing + * dnsmasq and/or radvd, or restart them if they've + * disappeared. + */ + networkRefreshDhcpDaemon(driver, obj); + networkRefreshRadvd(driver, obj); + break; + } } virObjectUnlock(obj); return 0; @@ -2128,18 +2131,21 @@ networkReloadFirewallRulesHelper(virNetworkObjPtr obj, virObjectLock(obj); def = virNetworkObjGetDef(obj); - if (virNetworkObjIsActive(obj) && - ((def->forward.type == VIR_NETWORK_FORWARD_NONE) || - (def->forward.type == VIR_NETWORK_FORWARD_NAT) || - (def->forward.type == VIR_NETWORK_FORWARD_ROUTE))) { - /* Only three of the L3 network types that are configured by - * libvirt need to have iptables rules reloaded. The 4th L3 - * network type, forward='open', doesn't need this because it - * has no iptables rules. - */ - networkRemoveFirewallRules(def); - if (networkAddFirewallRules(def) < 0) { - /* failed to add but already logged */ + if (virNetworkObjIsActive(obj)) { + switch (def->forward.type) { + case VIR_NETWORK_FORWARD_NONE: + case VIR_NETWORK_FORWARD_NAT: + case VIR_NETWORK_FORWARD_ROUTE: + /* Only three of the L3 network types that are configured by + * libvirt need to have iptables rules reloaded. The 4th L3 + * network type, forward='open', doesn't need this because it + * has no iptables rules. + */ + networkRemoveFirewallRules(def); + if (networkAddFirewallRules(def) < 0) { + /* failed to add but already logged */ + } + break; } } virObjectUnlock(obj); @@ -3273,11 +3279,11 @@ networkValidate(virNetworkDriverStatePtr driver, /* Only the three L3 network types that are configured by libvirt * need to have a bridge device name / mac address provided */ - if (def->forward.type == VIR_NETWORK_FORWARD_NONE || - def->forward.type == VIR_NETWORK_FORWARD_NAT || - def->forward.type == VIR_NETWORK_FORWARD_ROUTE || - def->forward.type == VIR_NETWORK_FORWARD_OPEN) { - + switch (def->forward.type) { + case VIR_NETWORK_FORWARD_NONE: + case VIR_NETWORK_FORWARD_NAT: + case VIR_NETWORK_FORWARD_ROUTE: + case VIR_NETWORK_FORWARD_OPEN: /* if no bridge name was given in the config, find a name * unused by any other libvirt networks and assign it. */ @@ -3285,7 +3291,9 @@ networkValidate(virNetworkDriverStatePtr driver, return -1; virNetworkSetBridgeMacAddr(def); - } else { + break; + + default: /* They are also the only types that currently support setting * a MAC or IP address for the host-side device (bridge), DNS * configuration, or network-wide bandwidth limits. @@ -3331,6 +3339,7 @@ networkValidate(virNetworkDriverStatePtr driver, return -1; } bandwidthAllowed = false; + break; } /* we support configs with a single PF defined: @@ -3755,9 +3764,10 @@ networkUpdate(virNetworkPtr net, /* Take care of anything that must be done before updating the * live NetworkDef. */ - if (def->forward.type == VIR_NETWORK_FORWARD_NONE || - def->forward.type == VIR_NETWORK_FORWARD_NAT || - def->forward.type == VIR_NETWORK_FORWARD_ROUTE) { + switch (def->forward.type) { + case VIR_NETWORK_FORWARD_NONE: + case VIR_NETWORK_FORWARD_NAT: + case VIR_NETWORK_FORWARD_ROUTE: switch (section) { case VIR_NETWORK_SECTION_FORWARD: case VIR_NETWORK_SECTION_FORWARD_INTERFACE: @@ -3768,14 +3778,13 @@ networkUpdate(virNetworkPtr net, * old rules (and remember to load new ones after the * update). */ - if (def->forward.type != VIR_NETWORK_FORWARD_OPEN) { - networkRemoveFirewallRules(def); - needFirewallRefresh = true; - } + networkRemoveFirewallRules(def); + needFirewallRefresh = true; break; default: break; } + break; } } @@ -4440,10 +4449,11 @@ networkAllocateActualDevice(virDomainDefPtr dom, iface->data.network.actual->trustGuestRxFilters = netdef->trustGuestRxFilters; - if ((netdef->forward.type == VIR_NETWORK_FORWARD_NONE) || - (netdef->forward.type == VIR_NETWORK_FORWARD_NAT) || - (netdef->forward.type == VIR_NETWORK_FORWARD_ROUTE) || - (netdef->forward.type == VIR_NETWORK_FORWARD_OPEN)) { + switch (netdef->forward.type) { + case VIR_NETWORK_FORWARD_NONE: + case VIR_NETWORK_FORWARD_NAT: + case VIR_NETWORK_FORWARD_ROUTE: + case VIR_NETWORK_FORWARD_OPEN: /* for these forward types, the actual net type really *is* * NETWORK; we just keep the info from the portgroup in * iface->data.network.actual @@ -4463,46 +4473,9 @@ networkAllocateActualDevice(virDomainDefPtr dom, if (networkPlugBandwidth(obj, iface) < 0) goto error; + break; - } else if ((netdef->forward.type == VIR_NETWORK_FORWARD_BRIDGE) && - netdef->bridge) { - - /* <forward type='bridge'/> <bridge name='xxx'/> - * is VIR_DOMAIN_NET_TYPE_BRIDGE - */ - - iface->data.network.actual->type = actualType = VIR_DOMAIN_NET_TYPE_BRIDGE; - if (VIR_STRDUP(iface->data.network.actual->data.bridge.brname, - netdef->bridge) < 0) - goto error; - iface->data.network.actual->data.bridge.macTableManager - = netdef->macTableManager; - - /* merge virtualports from interface, network, and portgroup to - * arrive at actual virtualport to use - */ - if (virNetDevVPortProfileMerge3(&iface->data.network.actual->virtPortProfile, - iface->virtPortProfile, - netdef->virtPortProfile, - portgroup - ? portgroup->virtPortProfile : NULL) < 0) { - goto error; - } - virtport = iface->data.network.actual->virtPortProfile; - if (virtport) { - /* only type='openvswitch' is allowed for bridges */ - if (virtport->virtPortType != VIR_NETDEV_VPORT_PROFILE_OPENVSWITCH) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("<virtualport type='%s'> not supported for network " - "'%s' which uses a bridge device"), - virNetDevVPortTypeToString(virtport->virtPortType), - netdef->name); - goto error; - } - } - - } else if (netdef->forward.type == VIR_NETWORK_FORWARD_HOSTDEV) { - + case VIR_NETWORK_FORWARD_HOSTDEV: { virDomainHostdevSubsysPCIBackendType backend; iface->data.network.actual->type = actualType = VIR_DOMAIN_NET_TYPE_HOSTDEV; @@ -4575,12 +4548,55 @@ networkAllocateActualDevice(virDomainDefPtr dom, goto error; } } + break; + } + + case VIR_NETWORK_FORWARD_BRIDGE: + if (netdef->bridge) { + /* <forward type='bridge'/> <bridge name='xxx'/> + * is VIR_DOMAIN_NET_TYPE_BRIDGE + */ + + iface->data.network.actual->type = actualType = VIR_DOMAIN_NET_TYPE_BRIDGE; + if (VIR_STRDUP(iface->data.network.actual->data.bridge.brname, + netdef->bridge) < 0) + goto error; + iface->data.network.actual->data.bridge.macTableManager + = netdef->macTableManager; + + /* merge virtualports from interface, network, and portgroup to + * arrive at actual virtualport to use + */ + if (virNetDevVPortProfileMerge3(&iface->data.network.actual->virtPortProfile, + iface->virtPortProfile, + netdef->virtPortProfile, + portgroup + ? portgroup->virtPortProfile : NULL) < 0) { + goto error; + } + virtport = iface->data.network.actual->virtPortProfile; + if (virtport) { + /* only type='openvswitch' is allowed for bridges */ + if (virtport->virtPortType != VIR_NETDEV_VPORT_PROFILE_OPENVSWITCH) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("<virtualport type='%s'> not supported for network " + "'%s' which uses a bridge device"), + virNetDevVPortTypeToString(virtport->virtPortType), + netdef->name); + goto error; + } + } + break; + } - } else if ((netdef->forward.type == VIR_NETWORK_FORWARD_BRIDGE) || - (netdef->forward.type == VIR_NETWORK_FORWARD_PRIVATE) || - (netdef->forward.type == VIR_NETWORK_FORWARD_VEPA) || - (netdef->forward.type == VIR_NETWORK_FORWARD_PASSTHROUGH)) { + /* intentionally fall through to the direct case for + * VIR_NETWORK_FORWARD_BRIDGE with no bridge device defined + */ + ATTRIBUTE_FALLTHROUGH; + case VIR_NETWORK_FORWARD_PRIVATE: + case VIR_NETWORK_FORWARD_VEPA: + case VIR_NETWORK_FORWARD_PASSTHROUGH: /* <forward type='bridge|private|vepa|passthrough'> are all * VIR_DOMAIN_NET_TYPE_DIRECT. */ @@ -4680,6 +4696,7 @@ networkAllocateActualDevice(virDomainDefPtr dom, dev->device.dev) < 0) goto error; } + break; } if (virNetworkObjMacMgrAdd(obj, driver->dnsmasqStateDir, @@ -5037,13 +5054,15 @@ networkReleaseActualDevice(virDomainDefPtr dom, } netdef = virNetworkObjGetDef(obj); - if (iface->data.network.actual && - (netdef->forward.type == VIR_NETWORK_FORWARD_NONE || - netdef->forward.type == VIR_NETWORK_FORWARD_NAT || - netdef->forward.type == VIR_NETWORK_FORWARD_ROUTE || - netdef->forward.type == VIR_NETWORK_FORWARD_OPEN) && - networkUnplugBandwidth(obj, iface) < 0) - goto error; + switch (netdef->forward.type) { + case VIR_NETWORK_FORWARD_NONE: + case VIR_NETWORK_FORWARD_NAT: + case VIR_NETWORK_FORWARD_ROUTE: + case VIR_NETWORK_FORWARD_OPEN: + if (iface->data.network.actual && networkUnplugBandwidth(obj, iface) < 0) + goto error; + break; + } if ((!iface->data.network.actual) || ((actualType != VIR_DOMAIN_NET_TYPE_DIRECT) && -- 2.7.4

2 2

[libvirt] [PATCH] tools: Fix typo generating adapter_wwpn field
by John Ferlan 20 Jul '18

20 Jul '18

https://bugzilla.redhat.com/show_bug.cgi?id=1601377 Fix typo from commit id d45bee449 for the parent_wwpn field resulting in parent_wwnn being printed twice. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- tools/virsh-pool.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/virsh-pool.c b/tools/virsh-pool.c index cc49a5b96d..6faff781b2 100644 --- a/tools/virsh-pool.c +++ b/tools/virsh-pool.c @@ -371,7 +371,7 @@ virshBuildPoolXML(vshControl *ctl, if (adapterParent) virBufferAsprintf(&buf, " parent='%s'", adapterParent); else if (adapterParentWwnn && adapterParentWwpn) - virBufferAsprintf(&buf, " parent_wwnn='%s' parent_wwnn='%s'", + virBufferAsprintf(&buf, " parent_wwnn='%s' parent_wwpn='%s'", adapterParentWwnn, adapterParentWwpn); else if (adapterParentFabricWwn) virBufferAsprintf(&buf, " parent_fabric_wwn='%s'", -- 2.17.1

2 1

[libvirt] [PATCH v2] util: set OOM in virCopyLastError if error is not set
by Nikolay Shirokovskiy 20 Jul '18

20 Jul '18

virCopyLastError is intended to be used after last error is set. However due to virLastErrorObject failures (very unlikely through as thread local error is allocated on first use) we can have zero fields in a copy as a result. In particular code field can be set to VIR_ERR_OK. In some places (qemu monitor, qemu agent and qemu migaration code for example) we use copy result as a flag and this leads to bugs. Let's set OOM-like error in copy in case of virLastErrorObject failures. Signed-off-by: Nikolay Shirokovskiy <nshirokovskiy(a)virtuozzo.com> --- Changes from v1: - check @to - set OMM error instead of using virErrorGenericFailure src/util/virerror.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/src/util/virerror.c b/src/util/virerror.c index f198f27..737ea92 100644 --- a/src/util/virerror.c +++ b/src/util/virerror.c @@ -366,19 +366,25 @@ virSetError(virErrorPtr newerr) * * One will need to free the result with virResetError() * - * Returns 0 if no error was found and the error code otherwise and -1 in case - * of parameter error. + * Returns error code or -1 in case of parameter error. */ int virCopyLastError(virErrorPtr to) { virErrorPtr err = virLastErrorObject(); + + if (!to) + return -1; + /* We can't guarantee caller has initialized it to zero */ memset(to, 0, sizeof(*to)); - if (err) + if (err) { virCopyError(err, to); - else - virResetError(to); + } else { + to->code = VIR_ERR_NO_MEMORY; + to->domain = VIR_FROM_NONE; + to->level = VIR_ERR_ERROR; + } return to->code; } -- 1.8.3.1

2 6

[libvirt] [PATCH] build: Fix accidental revert of .gnulib update
by John Ferlan 20 Jul '18

20 Jul '18

Commit id 1bff5bbe25eb7a7e7a4e0067c4ca7cbc1cb34999 accidentally reverted .gnulib back to d6397dde2e127e246e3eeb5254a21f42cac783c8 which was two updates ago. Update to the latest 68df637b5f1b5c10370f6981d2a43a5cf74368df which includes three changes since the previous fetch of cdbf3d385a32ff904c96f20c26f3470bd8345248. > autoupdate > hard-locale: simplify by removing hard-locale.m4 > gnulib-tool: limit line length for git send-email Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- Pushing under this I know fixes some previous build breaking issue and of course it's a .gnulib maint, so that's reason #2. .gnulib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gnulib b/.gnulib index d6397dde2e..68df637b5f 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit d6397dde2e127e246e3eeb5254a21f42cac783c8 +Subproject commit 68df637b5f1b5c10370f6981d2a43a5cf74368df -- 2.17.1

1 0

[libvirt] [PATCH] virt-xml-validate: Add schema for nwfilterbinding
by Han Han 20 Jul '18

20 Jul '18

Add nwfilterbinding schema in virt-xml-validate for autoprobing. Add document of nwfilterbinding schema in tools/virt-xml-validate.pod. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1600330 Signed-off-by: Han Han <hhan(a)redhat.com> --- tools/virt-xml-validate.in | 3 +++ tools/virt-xml-validate.pod | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/tools/virt-xml-validate.in b/tools/virt-xml-validate.in index 81fde4d832..7513413189 100644 --- a/tools/virt-xml-validate.in +++ b/tools/virt-xml-validate.in @@ -77,6 +77,9 @@ if [ -z "$TYPE" ]; then *device*) TYPE="nodedev" ;; + *filterbinding*) + TYPE="nwfilterbinding" + ;; *filter*) TYPE="nwfilter" ;; diff --git a/tools/virt-xml-validate.pod b/tools/virt-xml-validate.pod index f8e67503fd..a51a57002a 100644 --- a/tools/virt-xml-validate.pod +++ b/tools/virt-xml-validate.pod @@ -52,6 +52,10 @@ The schema for the XML format used to declare driver capabilities The schema for the XML format used by network traffic filters +=item C<nwfilterbinding> + +The schema for XML format used by network filter bindings. + =item C<secret> The schema for the XML format used by secrets descriptions -- 2.17.1

2 1

[libvirt] [java PATCH 0/1] *** Add support for sendng Qemu Guest Agent Commands ***
by Wido den Hollander 20 Jul '18

20 Jul '18

*** BLURB HERE *** Wido den Hollander (1): Add support for Qemu Guest Agent commands src/main/java/org/libvirt/Domain.java | 34 ++++++ src/main/java/org/libvirt/Library.java | 3 + .../java/org/libvirt/jna/LibvirtQemu.java | 16 +++ .../java/org/libvirt/qemu/QemuCommand.java | 106 ++++++++++++++++++ .../org/libvirt/qemu/TestQemuCommand.java | 24 ++++ 5 files changed, 183 insertions(+) create mode 100644 src/main/java/org/libvirt/jna/LibvirtQemu.java create mode 100644 src/main/java/org/libvirt/qemu/QemuCommand.java create mode 100644 src/test/java/org/libvirt/qemu/TestQemuCommand.java -- 2.17.1

1 1

[libvirt] [dockerfiles PATCH] Refresh after switch from yajl to jansson
by Andrea Bolognani 19 Jul '18

19 Jul '18

The corresponding libvirt-jenkins-ci commit is d2bbe1eee61a. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Pushed under the Dockerfile refresh rule. buildenv-centos-7.Dockerfile | 4 ++-- buildenv-debian-8.Dockerfile | 2 +- buildenv-debian-9.Dockerfile | 2 +- buildenv-debian-sid.Dockerfile | 2 +- buildenv-fedora-27.Dockerfile | 2 +- buildenv-fedora-28.Dockerfile | 2 +- buildenv-fedora-rawhide.Dockerfile | 2 +- buildenv-ubuntu-16.Dockerfile | 2 +- buildenv-ubuntu-18.Dockerfile | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/buildenv-centos-7.Dockerfile b/buildenv-centos-7.Dockerfile index 5d92bfa..2c4c26d 100644 --- a/buildenv-centos-7.Dockerfile +++ b/buildenv-centos-7.Dockerfile @@ -23,6 +23,7 @@ ENV PACKAGES audit-libs-devel \ gnutls-devel \ iproute \ iscsi-initiator-utils \ + jansson-devel \ libacl-devel \ libattr-devel \ libblkid-devel \ @@ -63,8 +64,7 @@ ENV PACKAGES audit-libs-devel \ scrub \ sudo \ systemtap-sdt-devel \ - vim \ - yajl-devel + vim RUN yum install -y ${PACKAGES} && \ yum autoremove -y && \ yum clean all -y diff --git a/buildenv-debian-8.Dockerfile b/buildenv-debian-8.Dockerfile index 0766cc9..8a8c3b0 100644 --- a/buildenv-debian-8.Dockerfile +++ b/buildenv-debian-8.Dockerfile @@ -29,6 +29,7 @@ ENV PACKAGES augeas-tools \ libdevmapper-dev \ libfuse-dev \ libgnutls28-dev \ + libjansson-dev \ libnetcf-dev \ libnl-3-dev \ libnl-route-3-dev \ @@ -50,7 +51,6 @@ ENV PACKAGES augeas-tools \ libxen-dev \ libxml2-dev \ libxml2-utils \ - libyajl-dev \ lvm2 \ make \ nfs-common \ diff --git a/buildenv-debian-9.Dockerfile b/buildenv-debian-9.Dockerfile index e106574..c3af421 100644 --- a/buildenv-debian-9.Dockerfile +++ b/buildenv-debian-9.Dockerfile @@ -29,6 +29,7 @@ ENV PACKAGES augeas-tools \ libdevmapper-dev \ libfuse-dev \ libgnutls28-dev \ + libjansson-dev \ libnetcf-dev \ libnl-3-dev \ libnl-route-3-dev \ @@ -50,7 +51,6 @@ ENV PACKAGES augeas-tools \ libxen-dev \ libxml2-dev \ libxml2-utils \ - libyajl-dev \ lvm2 \ make \ nfs-common \ diff --git a/buildenv-debian-sid.Dockerfile b/buildenv-debian-sid.Dockerfile index c3a18be..a922457 100644 --- a/buildenv-debian-sid.Dockerfile +++ b/buildenv-debian-sid.Dockerfile @@ -29,6 +29,7 @@ ENV PACKAGES augeas-tools \ libdevmapper-dev \ libfuse-dev \ libgnutls28-dev \ + libjansson-dev \ libnetcf-dev \ libnl-3-dev \ libnl-route-3-dev \ @@ -50,7 +51,6 @@ ENV PACKAGES augeas-tools \ libxen-dev \ libxml2-dev \ libxml2-utils \ - libyajl-dev \ lvm2 \ make \ nfs-common \ diff --git a/buildenv-fedora-27.Dockerfile b/buildenv-fedora-27.Dockerfile index 4e5173f..2f35a2e 100644 --- a/buildenv-fedora-27.Dockerfile +++ b/buildenv-fedora-27.Dockerfile @@ -27,6 +27,7 @@ ENV PACKAGES audit-libs-devel \ iproute \ iproute-tc \ iscsi-initiator-utils \ + jansson-devel \ libacl-devel \ libattr-devel \ libblkid-devel \ @@ -71,7 +72,6 @@ ENV PACKAGES audit-libs-devel \ vim \ wireshark-devel \ xen-devel \ - yajl-devel \ zfs-fuse RUN yum install -y ${PACKAGES} && \ yum autoremove -y && \ diff --git a/buildenv-fedora-28.Dockerfile b/buildenv-fedora-28.Dockerfile index d051d65..f4f7198 100644 --- a/buildenv-fedora-28.Dockerfile +++ b/buildenv-fedora-28.Dockerfile @@ -26,6 +26,7 @@ ENV PACKAGES audit-libs-devel \ iproute \ iproute-tc \ iscsi-initiator-utils \ + jansson-devel \ libacl-devel \ libattr-devel \ libblkid-devel \ @@ -71,7 +72,6 @@ ENV PACKAGES audit-libs-devel \ vim \ wireshark-devel \ xen-devel \ - yajl-devel \ zfs-fuse RUN yum install -y ${PACKAGES} && \ yum autoremove -y && \ diff --git a/buildenv-fedora-rawhide.Dockerfile b/buildenv-fedora-rawhide.Dockerfile index 56d59a1..189ea59 100644 --- a/buildenv-fedora-rawhide.Dockerfile +++ b/buildenv-fedora-rawhide.Dockerfile @@ -26,6 +26,7 @@ ENV PACKAGES audit-libs-devel \ iproute \ iproute-tc \ iscsi-initiator-utils \ + jansson-devel \ libacl-devel \ libattr-devel \ libblkid-devel \ @@ -95,7 +96,6 @@ ENV PACKAGES audit-libs-devel \ vim \ wireshark-devel \ xen-devel \ - yajl-devel \ zfs-fuse RUN yum install -y ${PACKAGES} && \ yum autoremove -y && \ diff --git a/buildenv-ubuntu-16.Dockerfile b/buildenv-ubuntu-16.Dockerfile index d2ece05..bc387a1 100644 --- a/buildenv-ubuntu-16.Dockerfile +++ b/buildenv-ubuntu-16.Dockerfile @@ -29,6 +29,7 @@ ENV PACKAGES augeas-tools \ libdevmapper-dev \ libfuse-dev \ libgnutls28-dev \ + libjansson-dev \ libnetcf-dev \ libnl-3-dev \ libnl-route-3-dev \ @@ -51,7 +52,6 @@ ENV PACKAGES augeas-tools \ libxen-dev \ libxml2-dev \ libxml2-utils \ - libyajl-dev \ lvm2 \ make \ nfs-common \ diff --git a/buildenv-ubuntu-18.Dockerfile b/buildenv-ubuntu-18.Dockerfile index fdf97eb..2a15f14 100644 --- a/buildenv-ubuntu-18.Dockerfile +++ b/buildenv-ubuntu-18.Dockerfile @@ -29,6 +29,7 @@ ENV PACKAGES augeas-tools \ libdevmapper-dev \ libfuse-dev \ libgnutls28-dev \ + libjansson-dev \ libnetcf-dev \ libnl-3-dev \ libnl-route-3-dev \ @@ -51,7 +52,6 @@ ENV PACKAGES augeas-tools \ libxen-dev \ libxml2-dev \ libxml2-utils \ - libyajl-dev \ lvm2 \ make \ nfs-common \ -- 2.17.1

1 0

[libvirt] [jenkins-ci PATCH 0/4] guests: Replace yajl with jansson
by Andrea Bolognani 19 Jul '18

19 Jul '18

Andrea Bolognani (4): guests: Install jansson for libvirt guests: Don't install yajl for libvirt guests: Remove yajl mapping guests: Remove yajl kludge guests/tasks/kludges.yml | 2 -- guests/vars/mappings.yml | 10 +++++----- guests/vars/projects/libvirt.yml | 2 +- 3 files changed, 6 insertions(+), 8 deletions(-) -- 2.17.1

2 5

[libvirt] [PATCH v4] qemu: fix broken autostart symlink after renaming domain.
by Julio Faracco 19 Jul '18

19 Jul '18

If a domain is configured to start on boot, it has a symlink to the domain definition inside the autostart directory. If you rename this domain, the definition is renamed too. The symlink need to be pointed to this renamed file. This commit recreates the symlink after renaming the XML file. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1594985 Signed-off-by: Julio Faracco <jcfaracco(a)gmail.com> --- src/qemu/qemu_driver.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 25170f6f26..09af231dfc 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -20917,6 +20917,8 @@ qemuDomainRenameCallback(virDomainObjPtr vm, char *old_dom_name = NULL; char *new_dom_cfg_file = NULL; char *old_dom_cfg_file = NULL; + char *new_dom_autostart_link = NULL; + char *old_dom_autostart_link = NULL; virCheckFlags(0, ret); @@ -20937,6 +20939,14 @@ qemuDomainRenameCallback(virDomainObjPtr vm, vm->def->name))) goto cleanup; + if (vm->autostart) { + if (!(new_dom_autostart_link = virDomainConfigFile(cfg->autostartDir, + new_dom_name)) || + !(old_dom_autostart_link = virDomainConfigFile(cfg->autostartDir, + vm->def->name))) + goto cleanup; + } + event_old = virDomainEventLifecycleNewFromObj(vm, VIR_DOMAIN_EVENT_UNDEFINED, VIR_DOMAIN_EVENT_UNDEFINED_RENAMED); @@ -20949,6 +20959,23 @@ qemuDomainRenameCallback(virDomainObjPtr vm, if (virDomainSaveConfig(cfg->configDir, driver->caps, vm->def) < 0) goto rollback; + if (vm->autostart) { + if (virFileIsLink(old_dom_autostart_link) && + unlink(old_dom_autostart_link) < 0) { + virReportSystemError(errno, + _("Failed to delete symlink '%s'"), + old_dom_autostart_link); + goto rollback; + } + + if (symlink(new_dom_cfg_file, new_dom_autostart_link) < 0) { + virReportSystemError(errno, + _("Failed to create symlink '%s to '%s'"), + new_dom_autostart_link, new_dom_cfg_file); + goto rollback; + } + } + if (virFileExists(old_dom_cfg_file) && unlink(old_dom_cfg_file) < 0) { virReportSystemError(errno, @@ -20963,6 +20990,8 @@ qemuDomainRenameCallback(virDomainObjPtr vm, ret = 0; cleanup: + VIR_FREE(old_dom_autostart_link); + VIR_FREE(new_dom_autostart_link); VIR_FREE(old_dom_cfg_file); VIR_FREE(new_dom_cfg_file); VIR_FREE(old_dom_name); @@ -20982,6 +21011,11 @@ qemuDomainRenameCallback(virDomainObjPtr vm, if (virFileExists(new_dom_cfg_file)) unlink(new_dom_cfg_file); + if (vm->autostart) { + if (virFileExists(new_dom_autostart_link)) + unlink(new_dom_autostart_link); + } + goto cleanup; } -- 2.17.1

2 1

[libvirt] [dockerfiles PATCH] refresh: Add refresh script
by Andrea Bolognani 19 Jul '18

19 Jul '18

This calls lcitool, part of the libvirt-jenkins-ci project, to refresh the Dockerfiles so that they contain up to date information about build requirements. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- refresh | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100755 refresh diff --git a/refresh b/refresh new file mode 100755 index 0000000..7aa2151 --- /dev/null +++ b/refresh @@ -0,0 +1,30 @@ +#!/bin/sh + +die() { + test "$1" && echo "$1" >&2 + exit 1 +} + +me="$0" +here=$(pwd) + +ci_repo="$1" + +cd "$ci_repo/guests/" >/dev/null 2>&1 || { + die "Usage: $me path/to/libvirt-jenkins-ci.git" +} + +for host in $(./lcitool -a hosts) +do + projects="libvirt" + dockerfile="$here/buildenv-${host#libvirt-}.Dockerfile" + + case "$host" in + libvirt-fedora-rawhide) projects="libvirt,libvirt+mingw" ;; + libvirt-freebsd-*) continue ;; + esac + + ./lcitool -a dockerfile -h "$host" -p "$projects" >"$dockerfile" || { + die "$me: Failed to refresh Dockerfile for $host" + } +done -- 2.17.1

2 1

[libvirt] CPU Support
by Hetz Ben Hamo 19 Jul '18

19 Jul '18

Hi, I've been looking at the CPU list and although I see lots of CPU's, I cannot find 2 CPU families: * AMD Ryzen * AMD Threadripper Although EPYC has been added recently. Are there any missing details which preventing adding those CPU's to the list? Thanks

5 4

[libvirt] [RFC PATCHv2 00/10] x86 RDT Cache Monitoring Technology (CMT)
by Wang Huaqiang 19 Jul '18

19 Jul '18

This is the V2 of RFC and the POC source code for introducing x86 RDT CMT feature, thanks Martin Kletzander for his review and constructive suggestion for V1. This series is trying to provide the similar functions of the perf event based CMT, MBMT and MBML features in reporting cache occupancy, total memory bandwidth utilization and local memory bandwidth utilization information in livirt. Firstly we focus on cmt. x86 RDT Cache Monitoring Technology (CMT) provides a medthod to track the cache occupancy information per CPU thread. We are leveraging the implementation of kernel resctrl filesystem and create our patches on top of that. Describing the functionality from a high level: 1. Extend the output of 'domstats' and report CMT inforamtion. Comparing with perf event based CMT implementation in libvirt, this series extends the output of command 'domstat' and reports cache occupancy information like these: <pre> [root@dl-c200 libvirt]# virsh domstats vm3 --cpu-resource Domain: 'vm3' cpu.cacheoccupancy.vcpus_2.value=4415488 cpu.cacheoccupancy.vcpus_2.vcpus=2 cpu.cacheoccupancy.vcpus_1.value=7839744 cpu.cacheoccupancy.vcpus_1.vcpus=1 cpu.cacheoccupancy.vcpus_0,3.value=53796864 cpu.cacheoccupancy.vcpus_0,3.vcpus=0,3 </pre> The vcpus have been arragned into three monitoring groups, these three groups cover vcpu 1, vcpu 2 and vcpus 0,3 respectively. Take an example, the 'cpu.cacheoccupancy.vcpus_0,3.value' reports the cache occupancy information for vcpu 0 and vcpu 3, the 'cpu.cacheoccupancy.vcpus_0,3.vcpus' represents the vcpu group information. To address Martin's suggestion "beware as 1-4 is something else than 1,4 so you need to differentiate that.", the content of 'vcpus' (cpu.cacheoccupancy.<groupname>.vcpus=xxx) has been specially processed, if vcpus is a continous range, e.g. 0-2, then the output of cpu.cacheoccupancy.vcpus_0-2.vcpus will be like 'cpu.cacheoccupancy.vcpus_0-2.vcpus=0,1,2' instead of 'cpu.cacheoccupancy.vcpus_0-2.vcpus=0-2'. Please note that 'vcpus_0-2' is a name of this monitoring group, could be specified any other word from the XML configuration file or lively changed with the command introduced in following part. 2. A new command 'cpu-resource' for live changing CMT groups. A virsh tool has been introduced in this series to dynamically create, destroy monitoring groups as well as showing the existing grouping status. The general command interface is like this: <pre> [root@dl-c200 libvirt]# virsh help cpu-resource NAME cpu-resource - get or set hardware CPU RDT monitoring group SYNOPSIS cpu-resource <domain> [--group-name <string>] [--vcpulist <string>] [--create] [--destroy] [--live] [--config] [--current] DESCRIPTION Create or destroy CPU resource monitoring group. To get current CPU resource monitoring group status: virsh # cpu-resource [domain] OPTIONS [--domain] <string> domain name, id or uuid --group-name <string> group name to manipulate --vcpulist <string> ids of vcpus to manipulate --create Create CPU resctrl monitoring group for functions such as monitoring cache occupancy --destroy Destroy CPU resctrl monitoring group --live modify/get running state --config modify/get persistent configuration --current affect current domain </pre> This command provides live interface of changing resource monitoring group and keeping the result in persistent domain XML configuration file. 3. XML configuration changes for keeping CMT groups. To keep the monitoring group information and monitoring CPU cache resource utilization information at launch time, XML configuration file has been changed by adding a new element <resmongroup>: <pre> # Add a new element <cputune> <resmongroup vcpus='0-2'/> <resmongroup vcpus='3'/> </cputune> </pre> 4. About the naming used in this series for RDT CMT technology. About the wording and naming used in this series for Intel RDT CMT technology, 'RDT', 'CMT' and 'resctrl' are currently used names in Intel documents and kernel namespace in the context of CPU resource, but they are pretty confusing for system administrator. But 'Resource Control' or 'Monitoring' is a not good choice either, the scope of these two phrases are too big which normally cover lots of aspects other than CPU cache and memory hbandwidth. Intel 'RDT' is technology emphasizing on the resource allocation and monitoring within the scope CPU, I would like to use the term 'cpu-resource' here to describe the technology that these patches' are trying to address. This series is focusing on CPU cache occupancy monitoring(CMT), and this naming seems has a wider scope than CMT, we could add the similar resource monitoring part for technologies of MBML and MBMT under the framework that introduced in these patches. This naming is also applicable to technology of CPU resource allocation, it is possible to add some command by adding some arguments to allocate cache or memory bandwidth at run time. 5. About emulator and io threads CMT Currently, it is not possible to allocate an dedicated amount of cache or memory bandwidth for emulator or io threads. so the resource monitoring for emulator or io threads is not considered in this series. Could be planned in next stage. Changes since v1: A lot of things changed, mainly * report cache occupancy information based on vcpu group instead of whole domain. * be possible to destroy vcpu group at run time * XML configuration file changed * change naming for describing 'RDT CMT' to 'cpu-resource' Wang Huaqiang (10): util: add Intel x86 RDT/CMT support conf: introduce <resmongroup> element tests: add tests for validating <resmongroup> libvirt: add public APIs for resource monitoring group qemu: enable resctrl monitoring at booting stage remote: add remote protocol for resctrl monitoring qemu: add interfaces for dynamically manupulating resctl mon groups tool: add command cpuresource to interact with cpu resources tools: show cpu cache occupancy information in domstats news: add Intel x86 RDT CMT feature docs/formatdomain.html.in | 17 + docs/news.xml | 10 + docs/schemas/domaincommon.rng | 14 + include/libvirt/libvirt-domain.h | 14 + src/conf/domain_conf.c | 320 ++++++++++++++++++ src/conf/domain_conf.h | 25 ++ src/driver-hypervisor.h | 13 + src/libvirt-domain.c | 96 ++++++ src/libvirt_private.syms | 13 + src/libvirt_public.syms | 6 + src/qemu/qemu_driver.c | 357 +++++++++++++++++++++ src/qemu/qemu_process.c | 45 ++- src/remote/remote_daemon_dispatch.c | 45 +++ src/remote/remote_driver.c | 4 +- src/remote/remote_protocol.x | 31 +- src/remote_protocol-structs | 16 + src/util/virresctrl.c | 338 +++++++++++++++++++ src/util/virresctrl.h | 40 +++ tests/genericxml2xmlindata/cachetune-cdp.xml | 3 + tests/genericxml2xmlindata/cachetune-small.xml | 2 + tests/genericxml2xmlindata/cachetune.xml | 2 + .../resmongroup-colliding-cachetune.xml | 34 ++ tests/genericxml2xmltest.c | 3 + tools/virsh-domain-monitor.c | 7 + tools/virsh-domain.c | 139 ++++++++ 25 files changed, 1588 insertions(+), 6 deletions(-) create mode 100644 tests/genericxml2xmlindata/resmongroup-colliding-cachetune.xml -- 2.7.4

4 19

[libvirt] [PATCH v3 0/2] Change virFileIsCDROM to check cdrom status
by Han Han 19 Jul '18

19 Jul '18

v2: https://www.redhat.com/archives/libvir-list/2018-July/msg00655.html v1: https://www.redhat.com/archives/libvir-list/2018-July/msg00103.html Rename virFileIsCDROM to virFileCheckCDROM and add new argument filled with cdrom status. Now it could be used to get cdrom status. In libvirt, it gives general Input/Output error when reading a not ready cdrom backend vol. This error should be replaced with warning just like the warning of lacking backing file. Han Han (2): util: Refactor virFileIsCDROM to virFileCheckCDROM storage: Improve error handling on cdrom backend src/libvirt_private.syms | 2 +- src/qemu/qemu_domain.c | 4 ++-- src/storage/storage_util.c | 8 ++++++++ src/util/virfile.c | 41 ++++++++++++++++++++++++++++++++------ src/util/virfile.h | 13 +++++++++++- 5 files changed, 58 insertions(+), 10 deletions(-) -- 2.17.1

2 4

[libvirt] [PATCH] locking: don't create qemu-sanlock.conf file when QEMU isn't enabled
by Daniel P. Berrangé 19 Jul '18

19 Jul '18

The test targets result in the qemu-sanlock.conf file being created when sanlock is enabled, even if QEMU is not enabled. As a result it never gets cleaned up when distclean is run, breaking distcheck. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/locking/Makefile.inc.am | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) Pushed as a build fix for when jansson isn't available (which turns off QEMU) diff --git a/src/locking/Makefile.inc.am b/src/locking/Makefile.inc.am index 649c769e00..f2eb2efb7b 100644 --- a/src/locking/Makefile.inc.am +++ b/src/locking/Makefile.inc.am @@ -156,10 +156,10 @@ sanlock_la_LDFLAGS = $(AM_LDFLAGS_MOD_NOUNDEF) sanlock_la_LIBADD = -lsanlock_client libvirt.la ../gnulib/lib/libgnu.la augeas_DATA += locking/libvirt_sanlock.aug -augeastest_DATA += test_libvirt_sanlock.aug -CLEANFILES += test_libvirt_sanlock.aug if WITH_QEMU +augeastest_DATA += test_libvirt_sanlock.aug +CLEANFILES += test_libvirt_sanlock.aug nodist_conf_DATA += locking/qemu-sanlock.conf BUILT_SOURCES += locking/qemu-sanlock.conf DISTCLEANFILES += locking/qemu-sanlock.conf @@ -213,6 +213,7 @@ if WITH_SANLOCK endif WITH_SANLOCK if WITH_SANLOCK +if WITH_QEMU test_libvirt_sanlock.aug: locking/test_libvirt_sanlock.aug.in \ locking/qemu-sanlock.conf $(AUG_GENTEST) $(AM_V_GEN)$(AUG_GENTEST) locking/qemu-sanlock.conf $< $@ @@ -221,6 +222,9 @@ check-augeas-sanlock: test_libvirt_sanlock.aug $(AM_V_GEN)if test -x '$(AUGPARSE)'; then \ '$(AUGPARSE)' -I $(srcdir)/locking test_libvirt_sanlock.aug; \ fi +else ! WITH_QEMU +check-augeas-sanlock: +endif ! WITH_QEMU else ! WITH_SANLOCK check-augeas-sanlock: endif ! WITH_SANLOCK -- 2.17.1

1 0

[libvirt] [PATCH v2 0/3] Introduce new video model type 'none'
by Erik Skultety 19 Jul '18

19 Jul '18

v1 here https://www.redhat.com/archives/libvir-list/2018-June/msg01793.html Since v1: - there were only small fixes needed as per the review - decided not to split the patch as requested by the reviewer because the first patch would contain 90% of the changes, both in qemu driver and domain_conf to make the test suite happy (PCI address auto-assignment issues) and a single hunk in qemu_command.c in the second patch to actually enable the feature - this just wasn't worth doing, better keep it together in this case - added some tiny reword patch 1 - added a news update Erik Skultety (3): docs: Rephrase the mediated devices hostdev section a bit conf: Introduce new video type 'none' docs: news: Provide an update about the video type 'none' docs/formatdomain.html.in | 23 ++++++--- docs/news.xml | 14 ++++++ docs/schemas/domaincommon.rng | 1 + src/conf/domain_conf.c | 55 ++++++++++++++++------ src/conf/domain_conf.h | 1 + src/qemu/qemu_command.c | 14 ++++-- src/qemu/qemu_domain.c | 3 ++ src/qemu/qemu_domain_address.c | 10 ++++ tests/domaincapsschemadata/full.xml | 1 + .../video-invalid-multiple-devices.xml | 33 +++++++++++++ tests/qemuxml2argvdata/video-none-device.args | 27 +++++++++++ tests/qemuxml2argvdata/video-none-device.xml | 39 +++++++++++++++ tests/qemuxml2argvtest.c | 4 +- tests/qemuxml2xmloutdata/video-none-device.xml | 42 +++++++++++++++++ tests/qemuxml2xmltest.c | 1 + 15 files changed, 243 insertions(+), 25 deletions(-) create mode 100644 tests/qemuxml2argvdata/video-invalid-multiple-devices.xml create mode 100644 tests/qemuxml2argvdata/video-none-device.args create mode 100644 tests/qemuxml2argvdata/video-none-device.xml create mode 100644 tests/qemuxml2xmloutdata/video-none-device.xml -- 2.14.4

2 9

[libvirt] [PATCH v4 00/10] Enable vfio-pci 'property' for mediated device
by Erik Skultety 19 Jul '18

19 Jul '18

RFC here: https://www.redhat.com/archives/libvir-list/2018-May/msg02218.html Since v1 [1]: - remodeled egl-headless to be a standalone graphics element instead of a result of some automagic with graphic's <gl> element - pushed the first 5 simple fixes that were RB'd - fixed some nits raised during review Since v2 [2] - converted the 'display' and 'egl-headless' PostParse callbacks in patches 2 and 6 to Validate callbacks as they should have been since the beginning (see the RFC) - some minor nits - added a standalone patch substituting some 'error' labels with 'cleanup' as requested during review Since v3 [3]: - all of the patches got a RB, but there were some comments that made me send another version - the only major change was to move the default 'display' choice from qemu_command.c back to a PostParse callback, so now we format display='off' by default to every domain that utilized an mdev [1] https://www.redhat.com/archives/libvir-list/2018-June/msg01740.html [2] https://www.redhat.com/archives/libvir-list/2018-July/msg00485.html [3] https://www.redhat.com/archives/libvir-list/2018-July/msg00698.html Erik Skultety (9): qemu: qemuBuildHostdevCommandLine: Use a helper variable mdevsrc qemu: caps: Introduce a capability for egl-headless qemu: Introduce a new graphics display type 'headless' qemu: caps: Add vfio-pci.display capability conf: Introduce virDomainGraphicsDefHasOpenGL helper conf: Replace 'error' with 'cleanup' in virDomainHostdevDefParseXMLSubsys conf: Introduce new <hostdev> attribute 'display' qemu: command: Enable formatting vfio-pci.display option onto cmdline docs: Update news about the VNC console enablement for mdevs Katerina Koukiou (1): docs: formatdomain: unify naming for CPUs/vCPUs docs/formatdomain.html.in | 137 ++++++++++++------ docs/news.xml | 10 ++ docs/schemas/domaincommon.rng | 8 ++ src/conf/domain_conf.c | 106 +++++++++++--- src/conf/domain_conf.h | 5 + src/libvirt_private.syms | 1 + src/libxl/libxl_conf.c | 1 + src/qemu/qemu_capabilities.c | 10 ++ src/qemu/qemu_capabilities.h | 4 + src/qemu/qemu_command.c | 23 ++- src/qemu/qemu_domain.c | 154 ++++++++++++++++++++- src/qemu/qemu_driver.c | 2 + src/qemu/qemu_hotplug.c | 1 + src/qemu/qemu_process.c | 4 + src/vmx/vmx.c | 1 + tests/domaincapsschemadata/full.xml | 1 + tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml | 2 + tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 2 + tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 2 + tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 2 + tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 2 + tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml | 2 + tests/qemuxml2argvdata/graphics-egl-headless.args | 26 ++++ tests/qemuxml2argvdata/graphics-egl-headless.xml | 31 +++++ .../qemuxml2argvdata/graphics-sdl-egl-headless.xml | 35 +++++ .../graphics-spice-egl-headless.args | 31 +++++ .../graphics-spice-egl-headless.xml | 36 +++++ .../graphics-spice-invalid-egl-headless.xml | 37 +++++ .../graphics-vnc-egl-headless.args | 28 ++++ .../qemuxml2argvdata/graphics-vnc-egl-headless.xml | 37 +++++ .../hostdev-mdev-display-missing-graphics.xml | 35 +++++ ...v-display-spice-egl-headless.x86_64-latest.args | 37 +++++ .../hostdev-mdev-display-spice-egl-headless.xml | 40 ++++++ ...ev-mdev-display-spice-opengl.x86_64-latest.args | 36 +++++ .../hostdev-mdev-display-spice-opengl.xml | 41 ++++++ ...dev-display-vnc-egl-headless.x86_64-latest.args | 37 +++++ .../hostdev-mdev-display-vnc-egl-headless.xml | 40 ++++++ .../hostdev-mdev-display-vnc.x86_64-latest.args | 36 +++++ .../qemuxml2argvdata/hostdev-mdev-display-vnc.xml | 39 ++++++ tests/qemuxml2argvdata/hostdev-mdev-display.xml | 39 ++++++ tests/qemuxml2argvtest.c | 24 ++++ .../graphics-spice-egl-headless.xml | 44 ++++++ .../graphics-vnc-egl-headless.xml | 42 ++++++ tests/qemuxml2xmloutdata/hostdev-mdev-display.xml | 47 +++++++ tests/qemuxml2xmltest.c | 3 + 51 files changed, 1214 insertions(+), 73 deletions(-) create mode 100644 tests/qemuxml2argvdata/graphics-egl-headless.args create mode 100644 tests/qemuxml2argvdata/graphics-egl-headless.xml create mode 100644 tests/qemuxml2argvdata/graphics-sdl-egl-headless.xml create mode 100644 tests/qemuxml2argvdata/graphics-spice-egl-headless.args create mode 100644 tests/qemuxml2argvdata/graphics-spice-egl-headless.xml create mode 100644 tests/qemuxml2argvdata/graphics-spice-invalid-egl-headless.xml create mode 100644 tests/qemuxml2argvdata/graphics-vnc-egl-headless.args create mode 100644 tests/qemuxml2argvdata/graphics-vnc-egl-headless.xml create mode 100644 tests/qemuxml2argvdata/hostdev-mdev-display-missing-graphics.xml create mode 100644 tests/qemuxml2argvdata/hostdev-mdev-display-spice-egl-headless.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/hostdev-mdev-display-spice-egl-headless.xml create mode 100644 tests/qemuxml2argvdata/hostdev-mdev-display-spice-opengl.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/hostdev-mdev-display-spice-opengl.xml create mode 100644 tests/qemuxml2argvdata/hostdev-mdev-display-vnc-egl-headless.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/hostdev-mdev-display-vnc-egl-headless.xml create mode 100644 tests/qemuxml2argvdata/hostdev-mdev-display-vnc.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/hostdev-mdev-display-vnc.xml create mode 100644 tests/qemuxml2argvdata/hostdev-mdev-display.xml create mode 100644 tests/qemuxml2xmloutdata/graphics-spice-egl-headless.xml create mode 100644 tests/qemuxml2xmloutdata/graphics-vnc-egl-headless.xml create mode 100644 tests/qemuxml2xmloutdata/hostdev-mdev-display.xml -- 2.14.4

3 19

[libvirt] [PATCH] Add DOMAIN_MEMORY_STAT_DISK_CACHES constant
by Daniel P. Berrangé 18 Jul '18

18 Jul '18

Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- domain.go | 1 + domain_compat.h | 6 ++++++ 2 files changed, 7 insertions(+) Pushed as a build fix diff --git a/domain.go b/domain.go index cc0285b..6a9e2a1 100644 --- a/domain.go +++ b/domain.go @@ -377,6 +377,7 @@ const ( DOMAIN_MEMORY_STAT_RSS = DomainMemoryStatTags(C.VIR_DOMAIN_MEMORY_STAT_RSS) DOMAIN_MEMORY_STAT_USABLE = DomainMemoryStatTags(C.VIR_DOMAIN_MEMORY_STAT_USABLE) DOMAIN_MEMORY_STAT_LAST_UPDATE = DomainMemoryStatTags(C.VIR_DOMAIN_MEMORY_STAT_LAST_UPDATE) + DOMAIN_MEMORY_STAT_DISK_CACHES = DomainMemoryStatTags(C.VIR_DOMAIN_MEMORY_STAT_DISK_CACHES) DOMAIN_MEMORY_STAT_NR = DomainMemoryStatTags(C.VIR_DOMAIN_MEMORY_STAT_NR) ) diff --git a/domain_compat.h b/domain_compat.h index 345505c..f23670c 100644 --- a/domain_compat.h +++ b/domain_compat.h @@ -1046,4 +1046,10 @@ int virDomainGetLaunchSecurityInfoCompat(virDomainPtr domain, #define VIR_DOMAIN_LAUNCH_SECURITY_SEV_MEASUREMENT "sev-measurement" #endif +/* 4.6.0 */ + +#ifndef VIR_DOMAIN_MEMORY_STAT_DISK_CACHES +#define VIR_DOMAIN_MEMORY_STAT_DISK_CACHES 10 +#endif + #endif /* LIBVIRT_GO_DOMAIN_COMPAT_H__ */ -- 2.17.1

1 1

[libvirt] [perl PATCH] Add VIR_DOMAIN_MEMORY_STAT_DISK_CACHES constant
by Daniel P. Berrangé 18 Jul '18

18 Jul '18

Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- Changes | 2 +- lib/Sys/Virt.xs | 5 +++++ lib/Sys/Virt/Domain.pm | 4 ++++ 3 files changed, 10 insertions(+), 1 deletion(-) Pushed as a build fix diff --git a/Changes b/Changes index 74bbb22..4c77425 100644 --- a/Changes +++ b/Changes @@ -2,7 +2,7 @@ Revision history for perl module Sys::Virt 4.6.0 2018-00-00 - - XXX + - Add VIR_DOMAIN_MEMORY_STAT_DISK_CACHES 4.5.0 2018-07-03 diff --git a/lib/Sys/Virt.xs b/lib/Sys/Virt.xs index 40134d3..14967d7 100644 --- a/lib/Sys/Virt.xs +++ b/lib/Sys/Virt.xs @@ -5850,6 +5850,10 @@ memory_stats(dom, flags=0) case VIR_DOMAIN_MEMORY_STAT_USABLE: (void)hv_store (RETVAL, "usable", 6, virt_newSVll(stats[i].val), 0); break; + + case VIR_DOMAIN_MEMORY_STAT_DISK_CACHES: + (void)hv_store (RETVAL, "disk_caches", 11, virt_newSVll(stats[i].val), 0); + break; } } Safefree(stats); @@ -9040,6 +9044,7 @@ BOOT: REGISTER_CONSTANT(VIR_DOMAIN_MEMORY_STAT_RSS, MEMORY_STAT_RSS); REGISTER_CONSTANT(VIR_DOMAIN_MEMORY_STAT_LAST_UPDATE, MEMORY_STAT_LAST_UPDATE); REGISTER_CONSTANT(VIR_DOMAIN_MEMORY_STAT_USABLE, MEMORY_STAT_USABLE); + REGISTER_CONSTANT(VIR_DOMAIN_MEMORY_STAT_DISK_CACHES, MEMORY_STAT_DISK_CACHES); REGISTER_CONSTANT_STR(VIR_DOMAIN_BLOCK_IOTUNE_TOTAL_BYTES_SEC, BLOCK_IOTUNE_TOTAL_BYTES_SEC); diff --git a/lib/Sys/Virt/Domain.pm b/lib/Sys/Virt/Domain.pm index 284c38c..8eee18c 100644 --- a/lib/Sys/Virt/Domain.pm +++ b/lib/Sys/Virt/Domain.pm @@ -3903,6 +3903,10 @@ Amount of usable memory Time of last stats refresh from guest +=item Sys::Virt::Domain::MEMORY_STAT_DISK_CACHES + +Disk cache size + =back =head2 DOMAIN LIST CONSTANTS -- 2.17.1

1 0

[libvirt] [PATCH] test: Implement virConnectListAllInterfaces
by Cole Robinson 18 Jul '18

18 Jul '18

This adds some generic virinterfaceobj code, roughly matching what is used by other stateful drivers like network, storage, etc. Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- src/conf/virinterfaceobj.c | 105 +++++++++++++++++++++++++++++++++++++ src/conf/virinterfaceobj.h | 7 +++ src/libvirt_private.syms | 1 + src/test/test_driver.c | 15 ++++++ 4 files changed, 128 insertions(+) diff --git a/src/conf/virinterfaceobj.c b/src/conf/virinterfaceobj.c index a1d7346eb2..87ce188117 100644 --- a/src/conf/virinterfaceobj.c +++ b/src/conf/virinterfaceobj.c @@ -241,6 +241,111 @@ virInterfaceObjListFindByName(virInterfaceObjListPtr interfaces, return obj; } +#define MATCH(FLAG) (flags & (FLAG)) +static bool +virInterfaceMatch(virInterfaceObjPtr obj, + unsigned int flags) +{ + /* filter by active state */ + if (MATCH(VIR_CONNECT_LIST_INTERFACES_FILTERS_ACTIVE) && + !((MATCH(VIR_CONNECT_LIST_INTERFACES_ACTIVE) && + virInterfaceObjIsActive(obj)) || + (MATCH(VIR_CONNECT_LIST_INTERFACES_INACTIVE) && + !virInterfaceObjIsActive(obj)))) + return false; + + return true; +} +#undef MATCH + + +struct virInterfaceObjListData { + virConnectPtr conn; + virInterfacePtr *ifaces; + virInterfaceObjListFilter filter; + unsigned int flags; + int nifaces; + bool error; +}; + +static int +virInterfaceObjListPopulate(void *payload, + const void *name ATTRIBUTE_UNUSED, + void *opaque) +{ + struct virInterfaceObjListData *data = opaque; + virInterfaceObjPtr obj = payload; + virInterfacePtr iface = NULL; + + if (data->error) + return 0; + + virObjectLock(obj); + + if (data->filter && + !data->filter(data->conn, obj->def)) + goto cleanup; + + if (!virInterfaceMatch(obj, data->flags)) + goto cleanup; + + if (!data->ifaces) { + data->nifaces++; + goto cleanup; + } + + if (!(iface = virGetInterface(data->conn, obj->def->name, obj->def->mac))) { + data->error = true; + goto cleanup; + } + + data->ifaces[data->nifaces++] = iface; + + cleanup: + virObjectUnlock(obj); + return 0; +} + + +int +virInterfaceObjListExport(virConnectPtr conn, + virInterfaceObjListPtr ifaceobjs, + virInterfacePtr **ifaces, + virInterfaceObjListFilter filter, + unsigned int flags) +{ + int ret = -1; + struct virInterfaceObjListData data = { + .conn = conn, .ifaces = NULL, .filter = filter, .flags = flags, + .nifaces = 0, .error = false }; + + virObjectRWLockRead(ifaceobjs); + if (ifaces && VIR_ALLOC_N(data.ifaces, + virHashSize(ifaceobjs->objsName) + 1) < 0) + goto cleanup; + + virHashForEach(ifaceobjs->objsName, virInterfaceObjListPopulate, &data); + + if (data.error) + goto cleanup; + + if (data.ifaces) { + /* trim the array to the final size */ + ignore_value(VIR_REALLOC_N(data.ifaces, data.nifaces + 1)); + *ifaces = data.ifaces; + data.ifaces = NULL; + } + + ret = data.nifaces; + cleanup: + virObjectRWUnlock(ifaceobjs); + while (data.ifaces && data.nifaces) + virObjectUnref(data.ifaces[--data.nifaces]); + + VIR_FREE(data.ifaces); + return ret; +} + void virInterfaceObjListDispose(void *obj) diff --git a/src/conf/virinterfaceobj.h b/src/conf/virinterfaceobj.h index 799d38038f..33d2dda05d 100644 --- a/src/conf/virinterfaceobj.h +++ b/src/conf/virinterfaceobj.h @@ -82,4 +82,11 @@ virInterfaceObjListGetNames(virInterfaceObjListPtr interfaces, char **const names, int maxnames); +int +virInterfaceObjListExport(virConnectPtr conn, + virInterfaceObjListPtr ifaceobjs, + virInterfacePtr **ifaces, + virInterfaceObjListFilter filter, + unsigned int flags); + #endif /* __VIRINTERFACEOBJ_H__ */ diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index e688981c3e..ec5ed0cc81 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -961,6 +961,7 @@ virInterfaceObjGetDef; virInterfaceObjIsActive; virInterfaceObjListAssignDef; virInterfaceObjListClone; +virInterfaceObjListExport; virInterfaceObjListFindByMACString; virInterfaceObjListFindByName; virInterfaceObjListGetNames; diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 5494d51017..951d9c4151 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -3828,6 +3828,20 @@ testConnectListDefinedInterfaces(virConnectPtr conn, } +static int +testConnectListAllInterfaces(virConnectPtr conn, + virInterfacePtr **ifaces, + unsigned int flags) +{ + testDriverPtr privconn = conn->privateData; + + virCheckFlags(VIR_CONNECT_LIST_INTERFACES_FILTERS_ACTIVE, -1); + + return virInterfaceObjListExport(conn, privconn->ifaces, ifaces, + NULL, flags); +} + + static virInterfacePtr testInterfaceLookupByName(virConnectPtr conn, const char *name) @@ -6944,6 +6958,7 @@ static virInterfaceDriver testInterfaceDriver = { .connectListInterfaces = testConnectListInterfaces, /* 0.7.0 */ .connectNumOfDefinedInterfaces = testConnectNumOfDefinedInterfaces, /* 0.7.0 */ .connectListDefinedInterfaces = testConnectListDefinedInterfaces, /* 0.7.0 */ + .connectListAllInterfaces = testConnectListAllInterfaces, /* 4.6.0 */ .interfaceLookupByName = testInterfaceLookupByName, /* 0.7.0 */ .interfaceLookupByMACString = testInterfaceLookupByMACString, /* 0.7.0 */ .interfaceGetXMLDesc = testInterfaceGetXMLDesc, /* 0.7.0 */ -- 2.17.1

2 1

[libvirt] [PATCHv2] examples: Add clean-traffic-gateway into nwfilters
by Ales Musil 18 Jul '18

18 Jul '18

The filter purpose is to simulate isolated private VLAN. The behavior can be achieved by limiting network traffic to traffic between VM and gateway. Because there is no concept of the PVLAN in the linux bridge. The filter also contains parts from clean-traffic to prevent VM from spoofing its IP and MAC address. To use this filter the user just needs to set the GATEWAY_MAC variable to gateway MAC address. Signed-off-by: Ales Musil <amusil(a)redhat.com> --- examples/xml/nwfilter/clean-traffic-gateway.xml | 34 +++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 examples/xml/nwfilter/clean-traffic-gateway.xml diff --git a/examples/xml/nwfilter/clean-traffic-gateway.xml b/examples/xml/nwfilter/clean-traffic-gateway.xml new file mode 100644 index 0000000..b8c2040 --- /dev/null +++ b/examples/xml/nwfilter/clean-traffic-gateway.xml @@ -0,0 +1,34 @@ +<filter name='clean-traffic-gateway'> +  + <filterref filter='no-mac-spoofing'/> + +  + <filterref filter='no-ip-spoofing'/> + +  + <filterref filter='no-arp-spoofing'/> + +  + <rule action='accept' direction='inout' priority='-500'> + <mac protocolid='arp'/> + </rule> + +  + <rule action='accept' direction='in'> + <mac match='yes' srcmacaddr='$GATEWAY_MAC'/> + </rule> + +  + <rule action='accept' direction='out'> + <mac match='yes' dstmacaddr='$GATEWAY_MAC'/> + </rule> + +  + <filterref filter='no-other-l2-traffic'/> + +  + <filterref filter='qemu-announce-self'/> +</filter> -- 1.8.3.1

2 1

[libvirt] [PATCH 0/3] support VLan for virtual network based on 8021q kernel module
by Shi Lei 18 Jul '18

18 Jul '18

Support VLan for virtual network based on 8021q kernel module other than ovs backend. Insert vlan-device into the datapath of the network traffic: (outside of host) <--> physical_interface <--> vlan-dev(with VLAN-Tag) <--> bridge <--> guests Then VLAN-Tag will be applied to the guest's network traffic. The VLan network acts as real layer-2 switch which provides 'access' port to guest. 1. Create VLan network by setting mode='vlan' on the forward element, for example: ... <network> <name>vlan10</name> <forward mode="vlan" dev="eth0"/> <vlan> <tag id="10"/> </vlan> </network> ... The mode attribute of <forward> should be 'vlan' (this patch added). The dev attribute of <forward> specifies a physical interface which forwards traffice between this VLan-network and outside. The id attribue of the vlan tag indicates VLAN-Tag. Both vlan element and tag element should be unique in this xml. A guest connects to this VLan network by setting its xml like this: <interface type='network'> <source network='vlan10'/> </interface> 2. We can enable dhcp for VLan network according to the current way, for example: ... <network> ... <ip address="192.168.126.2" netmask="255.255.255.0"> <dhcp> <range start="192.168.126.120" end="192.168.126.129"/> </dhcp> </ip> </network> ... 3. This can help to build Cross-Host VLan network for guests. We can simplify the work to implement vlan-net of management app (e.g. OpenStack). 1) Distribute the xml of VLan network to all hosts, then 'virsh net-create ...' on each host locally. 2) Makesure the outside switch's port linked to the physical interface (specified by the dev of <forward>) is 'trunk' mode. 3) For each VLan network, ONLY one host can 'net-create' network with ip and dhcp element to avoid dhcp conflict. Shi Lei (3): add functions: load(verify) 8021q module, create/destroy vlan-dev support new forward mode of vlan for virtual network fix other functions to add VIR_NETWORK_FORWARD_VLAN configure.ac | 5 +- src/conf/domain_conf.c | 1 + src/conf/network_conf.c | 12 ++- src/conf/network_conf.h | 1 + src/conf/virnetworkobj.c | 1 + src/libvirt_private.syms | 4 + src/network/bridge_driver.c | 80 ++++++++++++++++-- src/qemu/qemu_process.c | 1 + src/util/virnetdev.c | 195 ++++++++++++++++++++++++++++++++++++++++++++ src/util/virnetdev.h | 14 ++++ 10 files changed, 301 insertions(+), 13 deletions(-) -- 2.7.4

2 10

[libvirt] [PATCH 0/4] qemu: vnc: switch to tls-creds-x509
by Ján Tomko 18 Jul '18

18 Jul '18

Ján Tomko (4): tests: qemu: Remove disk from graphics-vnc-tls FIXDOWN: copy graphics-vnc-tls args to versioned paths tests: qemu: test more versions for graphics-vnc-tls qemu: vnc: switch to tls-creds-x509 src/qemu/qemu_command.c | 26 +++++++++++++---- tests/qemuxml2argvdata/graphics-vnc-tls.args | 2 -- .../graphics-vnc-tls.x86_64-2.4.0.args | 28 ++++++++++++++++++ .../graphics-vnc-tls.x86_64-latest.args | 33 ++++++++++++++++++++++ tests/qemuxml2argvdata/graphics-vnc-tls.xml | 6 ---- tests/qemuxml2argvtest.c | 2 ++ tests/qemuxml2xmloutdata/graphics-vnc-tls.xml | 6 ---- 7 files changed, 83 insertions(+), 20 deletions(-) create mode 100644 tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args create mode 100644 tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args -- 2.16.1

3 10

[libvirt] [PATCH] spec: remove libcgroup and cgconfig
by Pavel Hrdina 18 Jul '18

18 Jul '18

RHEL-6/CentOS-6 is no longer supported, let's remove dependency on libcgroup and code that enables/starts cgconfig service. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1602407 Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- libvirt.spec.in | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 6f0d399064..6f360c5579 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -80,7 +80,6 @@ # A few optional bits off by default, we enable later %define with_fuse 0%{!?_without_fuse:0} -%define with_cgconfig 0%{!?_without_cgconfig:0} %define with_sanlock 0%{!?_without_sanlock:0} %define with_systemd 0%{!?_without_systemd:0} %define with_numad 0%{!?_without_numad:0} @@ -216,11 +215,6 @@ %endif %endif -# Pull in cgroups config system -%if %{with_qemu} || %{with_lxc} - %define with_cgconfig 0%{!?_without_cgconfig:1} -%endif - # Force QEMU to run as non-root %define qemu_user qemu %define qemu_group qemu @@ -496,9 +490,6 @@ Requires: polkit >= 0.112 %else Requires: polkit >= 0.93 %endif -%if %{with_cgconfig} -Requires: libcgroup -%endif %ifarch %{ix86} x86_64 ia64 # For virConnectGetSysinfo Requires: dmidecode @@ -1490,16 +1481,6 @@ if [ $1 -eq 1 ] ; then fi %endif %else - %if %{with_cgconfig} -# Starting with Fedora 16/RHEL-7, systemd automounts all cgroups, -# and cgconfig is no longer a necessary service. - %if 0%{?rhel} && 0%{?rhel} < 7 -if [ "$1" -eq "1" ]; then -/sbin/chkconfig cgconfig on -fi - %endif - %endif - /sbin/chkconfig --add libvirtd /sbin/chkconfig --add virtlogd /sbin/chkconfig --add virtlockd -- 2.17.1

2 1

[libvirt] [PATCH] docs: formatdomain: unify naming for CPUs/vCPUs
by Katerina Koukiou 18 Jul '18

18 Jul '18

CPU is an acronym and should be written in uppercase when part of plain text and not refering to an element. Signed-off-by: Katerina Koukiou <kkoukiou(a)redhat.com> --- As asked in the review here https://www.redhat.com/archives/libvir-list/2018-July/msg01093.html docs/formatdomain.html.in | 84 +++++++++++++++++++-------------------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index b00971a945..d08ede9ab5 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -631,45 +631,45 @@ </dd> <dt><code>vcpus</code></dt> <dd> - The vcpus element allows to control state of individual vcpus. + The vcpus element allows to control state of individual vCPUs. The <code>id</code> attribute specifies the vCPU id as used by libvirt - in other places such as vcpu pinning, scheduler information and NUMA - assignment. Note that the vcpu ID as seen in the guest may differ from - libvirt ID in certain cases. Valid IDs are from 0 to the maximum vcpu + in other places such as vCPU pinning, scheduler information and NUMA + assignment. Note that the vCPU ID as seen in the guest may differ from + libvirt ID in certain cases. Valid IDs are from 0 to the maximum vCPU count as set by the <code>vcpu</code> element minus 1. The <code>enabled</code> attribute allows to control the state of the - vcpu. Valid values are <code>yes</code> and <code>no</code>. + vCPU. Valid values are <code>yes</code> and <code>no</code>. - <code>hotpluggable</code> controls whether given vcpu can be hotplugged - and hotunplugged in cases when the cpu is enabled at boot. Note that - all disabled vcpus must be hotpluggable. Valid values are + <code>hotpluggable</code> controls whether given vCPU can be hotplugged + and hotunplugged in cases when the CPU is enabled at boot. Note that + all disabled vCPUs must be hotpluggable. Valid values are <code>yes</code> and <code>no</code>. - <code>order</code> allows to specify the order to add the online vcpus. - For hypervisors/platforms that require to insert multiple vcpus at once - the order may be duplicated across all vcpus that need to be - enabled at once. Specifying order is not necessary, vcpus are then + <code>order</code> allows to specify the order to add the online vCPUs. + For hypervisors/platforms that require to insert multiple vCPUs at once + the order may be duplicated across all vCPUs that need to be + enabled at once. Specifying order is not necessary, vCPUs are then added in an arbitrary order. If order info is used, it must be used for - all online vcpus. Hypervisors may clear or update ordering information + all online vCPUs. Hypervisors may clear or update ordering information during certain operations to assure valid configuration. - Note that hypervisors may create hotpluggable vcpus differently from - boot vcpus thus special initialization may be necessary. + Note that hypervisors may create hotpluggable vCPUs differently from + boot vCPUs thus special initialization may be necessary. - Hypervisors may require that vcpus enabled on boot which are not + Hypervisors may require that vCPUs enabled on boot which are not hotpluggable are clustered at the beginning starting with ID 0. It may - be also required that vcpu 0 is always present and non-hotpluggable. + be also required that vCPU 0 is always present and non-hotpluggable. - Note that providing state for individual cpus may be necessary to enable + Note that providing state for individual CPUs may be necessary to enable support of addressable vCPU hotplug and this feature may not be supported by all hypervisors. - For QEMU the following conditions are required. Vcpu 0 needs to be - enabled and non-hotpluggable. On PPC64 along with it vcpus that are in - the same core need to be enabled as well. All non-hotpluggable cpus - present at boot need to be grouped after vcpu 0. + For QEMU the following conditions are required. vCPU 0 needs to be + enabled and non-hotpluggable. On PPC64 along with it vCPUs that are in + the same core need to be enabled as well. All non-hotpluggable CPUs + present at boot need to be grouped after vCPU 0. Since 2.2.0 (QEMU only) </dd> </dl> @@ -774,11 +774,11 @@ <dt><code>vcpupin</code></dt> <dd> The optional <code>vcpupin</code> element specifies which of host's - physical CPUs the domain VCPU will be pinned to. If this is omitted, + physical CPUs the domain vCPU will be pinned to. If this is omitted, and attribute <code>cpuset</code> of element <code>vcpu</code> is not specified, the vCPU is pinned to all the physical CPUs by default. It contains two required attributes, the attribute <code>vcpu</code> - specifies vcpu id, and the attribute <code>cpuset</code> is same as + specifies vCPU id, and the attribute <code>cpuset</code> is same as attribute <code>cpuset</code> of element <code>vcpu</code>. (NB: Only qemu driver support) Since 0.9.0 @@ -786,7 +786,7 @@ <dt><code>emulatorpin</code></dt> <dd> The optional <code>emulatorpin</code> element specifies which of host - physical CPUs the "emulator", a subset of a domain not including vcpu + physical CPUs the "emulator", a subset of a domain not including vCPU or iothreads will be pinned to. If this is omitted, and attribute <code>cpuset</code> of element <code>vcpu</code> is not specified, "emulator" is pinned to all the physical CPUs by default. It contains @@ -820,7 +820,7 @@ <dt><code>period</code></dt> <dd> The optional <code>period</code> element specifies the enforcement - interval(unit: microseconds). Within <code>period</code>, each vcpu of + interval(unit: microseconds). Within <code>period</code>, each vCPU of the domain will not be allowed to consume more than <code>quota</code> worth of runtime. The value should be in range [1000, 1000000]. A period with value 0 means no value. @@ -835,7 +835,7 @@ vCPU threads, which means that it is not bandwidth controlled. The value should be in range [1000, 18446744073709551] or less than 0. A quota with value 0 means no value. You can use this feature to ensure that all - vcpus run at the same speed. + vCPUs run at the same speed. Only QEMU driver support since 0.9.4, LXC since 0.9.10 </dd> @@ -864,7 +864,7 @@ <dd> The optional <code>emulator_period</code> element specifies the enforcement interval(unit: microseconds). Within <code>emulator_period</code>, emulator - threads(those excluding vcpus) of the domain will not be allowed to consume + threads(those excluding vCPUs) of the domain will not be allowed to consume more than <code>emulator_quota</code> worth of runtime. The value should be in range [1000, 1000000]. A period with value 0 means no value. Only QEMU driver support since 0.10.0 @@ -873,9 +873,9 @@ <dd> The optional <code>emulator_quota</code> element specifies the maximum allowed bandwidth(unit: microseconds) for domain's emulator threads(those - excluding vcpus). A domain with <code>emulator_quota</code> as any negative + excluding vCPUs). A domain with <code>emulator_quota</code> as any negative value indicates that the domain has infinite bandwidth for emulator threads - (those excluding vcpus), which means that it is not bandwidth controlled. + (those excluding vCPUs), which means that it is not bandwidth controlled. The value should be in range [1000, 18446744073709551] or less than 0. A quota with value 0 means no value. Only QEMU driver support since 0.10.0 @@ -2131,13 +2131,13 @@ QEMU, the user-configurable extended TSEG feature was unavailable up to and including <code>pc-q35-2.9</code>. Starting with <code>pc-q35-2.10</code> the feature is available, with default size - 16 MiB. That should suffice for up to roughly 272 VCPUs, 5 GiB guest + 16 MiB. That should suffice for up to roughly 272 vCPUs, 5 GiB guest RAM in total, no hotplug memory range, and 32 GiB of 64-bit PCI MMIO - aperture. Or for 48 VCPUs, with 1TB of guest RAM, no hotplug DIMM + aperture. Or for 48 vCPUs, with 1TB of guest RAM, no hotplug DIMM range, and 32GB of 64-bit PCI MMIO aperture. The values may also vary based on the loader the VM is using. - Additional size might be needed for significantly higher VCPU counts + Additional size might be needed for significantly higher vCPU counts or increased address space (that can be memory, maxMemory, 64-bit PCI MMIO aperture size; roughly 8 MiB of TSEG per 1 TiB of address space) which can also be rounded up. @@ -2147,7 +2147,7 @@ documentation of the guest OS or loader (if there is any), or test this by trial-and-error changing the value until the VM boots successfully. Yet another guiding value for users might be the fact - that 48 MiB should be enough for pretty large guests (240 VCPUs and + that 48 MiB should be enough for pretty large guests (240 vCPUs and 4TB guest RAM), but it is on purpose not set as default as 48 MiB of unavailable RAM might be too much for small guests (e.g. with 512 MiB of RAM). @@ -2425,7 +2425,7 @@ </tr> <tr> <td><code>cpu_cycles</code></td> - <td>the count of cpu cycles (total/elapsed)</td> + <td>the count of CPU cycles (total/elapsed)</td> <td><code>perf.cpu_cycles</code></td> </tr> <tr> @@ -2460,25 +2460,25 @@ </tr> <tr> <td><code>stalled_cycles_frontend</code></td> - <td>the count of stalled cpu cycles in the frontend of the instruction + <td>the count of stalled CPU cycles in the frontend of the instruction processor pipeline by applications running on the platform</td> <td><code>perf.stalled_cycles_frontend</code></td> </tr> <tr> <td><code>stalled_cycles_backend</code></td> - <td>the count of stalled cpu cycles in the backend of the instruction + <td>the count of stalled CPU cycles in the backend of the instruction processor pipeline by applications running on the platform</td> <td><code>perf.stalled_cycles_backend</code></td> </tr> <tr> <td><code>ref_cpu_cycles</code></td> - <td>the count of total cpu cycles not affected by CPU frequency scaling + <td>the count of total CPU cycles not affected by CPU frequency scaling by applications running on the platform</td> <td><code>perf.ref_cpu_cycles</code></td> </tr> <tr> <td><code>cpu_clock</code></td> - <td>the count of cpu clock time, as measured by a monotonic + <td>the count of CPU clock time, as measured by a monotonic high-resolution per-CPU timer, by applications running on the platform</td> <td><code>perf.cpu_clock</code></td> @@ -2505,7 +2505,7 @@ </tr> <tr> <td><code>cpu_migrations</code></td> - <td>the count of cpu migrations, that is, where the process + <td>the count of CPU migrations, that is, where the process moved from one logical processor to another, by applications running on the platform</td> <td><code>perf.cpu_migrations</code></td> @@ -5621,8 +5621,8 @@ qemu-kvm -net nic,model=? /dev/null The resulting difference, according to the qemu developer who added the option is: "bh makes tx more asynchronous and reduces latency, but potentially causes more processor bandwidth - contention since the cpu doing the tx isn't necessarily the - cpu where the guest generated the packets." + contention since the CPU doing the tx isn't necessarily the + CPU where the guest generated the packets." In general you should leave this option alone, unless you are very certain you know what you are doing. -- 2.17.1

2 1

[libvirt] [dbus PATCH] tests: Explicitly spawn a session libvirt-dbus instance
by Andrea Bolognani 18 Jul '18

18 Jul '18

Tests are performed using the session D-Bus instance, so we should launch libvirt-dbus in session mode as well. This was working fine when running the tests as a regular user, because in that case libvirt-dbus would default to session mode, but fail when running them as root because libvirt-dbus would run in system mode and consequently not show up on the session bus. Of course building and runnning the test suite as root is a pretty bad idea in general, but a lot of distributions run at least part of their package build steps with pretend root privileges (eg. fakeroot), so we have to make sure it works in that scenario too. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- tests/libvirttest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/libvirttest.py b/tests/libvirttest.py index 3741abd..4653055 100644 --- a/tests/libvirttest.py +++ b/tests/libvirttest.py @@ -33,7 +33,7 @@ class BaseTestClass(): """Start libvirt-dbus for each test function """ os.environ['LIBVIRT_DEBUG'] = '3' - self.libvirt_dbus = subprocess.Popen([exe]) + self.libvirt_dbus = subprocess.Popen([exe, '--session']) self.bus = dbus.SessionBus() for i in range(10): -- 2.17.1

2 1

[libvirt] [jenkins-ci PATCH v2 00/12] lcitool: Rewrite in Python (and add Dockefile generator)
by Andrea Bolognani 18 Jul '18

18 Jul '18

Read the initial cover letter for background and motivations. Changes from [v1]: * add Dockerfile generator; * rename the 'list' action to 'hosts' to better fit along with the additional 'projects' action; * always list items in alphabetical order; * move some generic functions to an Util class. [v1] https://www.redhat.com/archives/libvir-list/2018-July/msg00717.html Andrea Bolognani (12): lcitool: Drop shell implementation lcitool: Stub out Python implementation lcitool: Add tool configuration handling lcitool: Add inventory handling lcitool: Implement the 'hosts' action lcitool: Implement the 'install' action lcitool: Implement the 'update' action guests: Update documentation guests: Add Docker-related information to the inventory lcitool: Add projects information handling lcitool: Implement the 'projects' action lcitool: Implement the 'dockerfile' action guests/README.markdown | 8 +- guests/host_vars/libvirt-centos-7/docker.yml | 2 + guests/host_vars/libvirt-debian-8/docker.yml | 2 + guests/host_vars/libvirt-debian-9/docker.yml | 2 + .../host_vars/libvirt-debian-sid/docker.yml | 2 + guests/host_vars/libvirt-fedora-27/docker.yml | 2 + guests/host_vars/libvirt-fedora-28/docker.yml | 2 + .../libvirt-fedora-rawhide/docker.yml | 2 + guests/host_vars/libvirt-ubuntu-16/docker.yml | 2 + guests/host_vars/libvirt-ubuntu-18/docker.yml | 2 + guests/lcitool | 722 ++++++++++++------ 11 files changed, 521 insertions(+), 227 deletions(-) create mode 100644 guests/host_vars/libvirt-centos-7/docker.yml create mode 100644 guests/host_vars/libvirt-debian-8/docker.yml create mode 100644 guests/host_vars/libvirt-debian-9/docker.yml create mode 100644 guests/host_vars/libvirt-debian-sid/docker.yml create mode 100644 guests/host_vars/libvirt-fedora-27/docker.yml create mode 100644 guests/host_vars/libvirt-fedora-28/docker.yml create mode 100644 guests/host_vars/libvirt-fedora-rawhide/docker.yml create mode 100644 guests/host_vars/libvirt-ubuntu-16/docker.yml create mode 100644 guests/host_vars/libvirt-ubuntu-18/docker.yml -- 2.17.1

3 30

[libvirt] [PATCH 0/2] Some additions/fixes in formatdomain docs
by Katerina Koukiou 18 Jul '18

18 Jul '18

Katerina Koukiou (2): docs: formatdomain: add info about global_period and global_quota for cputune docs: formatdomain: clarify period cputune subelement docs/formatdomain.html.in | 31 ++++++++++++++++++++++++++----- 1 file changed, 26 insertions(+), 5 deletions(-) -- 2.17.1

4 7

[libvirt] [jenkins-ci PATCH v3 00/12] lcitool: Rewrite in Python (and add Dockefile generator)
by Andrea Bolognani 18 Jul '18

18 Jul '18

pylint is reasonably happy with the script now: $ pylint lcitool No config file found, using default configuration ************* Module lcitool C: 1, 0: Missing module docstring (missing-docstring) C: 37, 0: Missing class docstring (missing-docstring) C: 47, 4: Missing method docstring (missing-docstring) W:108,15: Catching too general exception Exception (broad-except) R:427, 4: Too many branches (14/12) (too-many-branches) R:289, 0: Too few public methods (1/2) (too-few-public-methods) ------------------------------------------------------------------- Your code has been rated at 9.21/10 (previous run: 9.21/10, +0.00) The remaining issues are not considered blockers and will be addressed, if at all, later down the line. Changes from [v2]: * address review comments; * improve pycodestyle and pylint compliance; * replace FSF address with an URL. Changes from [v1]: * add Dockerfile generator; * rename the 'list' action to 'hosts' to better fit along with the additional 'projects' action; * always list items in alphabetical order; * move some generic functions to an Util class. [v2] https://www.redhat.com/archives/libvir-list/2018-July/msg00795.html [v1] https://www.redhat.com/archives/libvir-list/2018-July/msg00717.html Andrea Bolognani (12): lcitool: Drop shell implementation lcitool: Stub out Python implementation lcitool: Add tool configuration handling lcitool: Add inventory handling lcitool: Implement the 'hosts' action lcitool: Implement the 'install' action lcitool: Implement the 'update' action guests: Update documentation guests: Add Docker-related information to the inventory lcitool: Add projects information handling lcitool: Implement the 'projects' action lcitool: Implement the 'dockerfile' action guests/README.markdown | 8 +- guests/host_vars/libvirt-centos-7/docker.yml | 2 + guests/host_vars/libvirt-debian-8/docker.yml | 2 + guests/host_vars/libvirt-debian-9/docker.yml | 2 + .../host_vars/libvirt-debian-sid/docker.yml | 2 + guests/host_vars/libvirt-fedora-27/docker.yml | 2 + guests/host_vars/libvirt-fedora-28/docker.yml | 2 + .../libvirt-fedora-rawhide/docker.yml | 2 + guests/host_vars/libvirt-ubuntu-16/docker.yml | 2 + guests/host_vars/libvirt-ubuntu-18/docker.yml | 2 + guests/lcitool | 730 ++++++++++++------ 11 files changed, 529 insertions(+), 227 deletions(-) create mode 100644 guests/host_vars/libvirt-centos-7/docker.yml create mode 100644 guests/host_vars/libvirt-debian-8/docker.yml create mode 100644 guests/host_vars/libvirt-debian-9/docker.yml create mode 100644 guests/host_vars/libvirt-debian-sid/docker.yml create mode 100644 guests/host_vars/libvirt-fedora-27/docker.yml create mode 100644 guests/host_vars/libvirt-fedora-28/docker.yml create mode 100644 guests/host_vars/libvirt-fedora-rawhide/docker.yml create mode 100644 guests/host_vars/libvirt-ubuntu-16/docker.yml create mode 100644 guests/host_vars/libvirt-ubuntu-18/docker.yml -- 2.17.1

2 13

[libvirt] [PATCH] qemu: stop qemu progress when restore failed
by Jie Wang 18 Jul '18

18 Jul '18

>From 29482622218f525f0133be0b7db74835174035d9 Mon Sep 17 00:00:00 2001 From: Jie Wang <wangjie88(a)huawei.com> Date: Thu, 5 Jul 2018 09:52:03 +0800 Subject: [PATCH] qemu: stop qemu progress when restore failed if qemuProcessStartCPUs perform failed in qemuDomainSaveImageStartVM, we need to stop qemu progress, otherwise will remains a wild VM which can't be managed by libvirt. Signed-off-by: Jie Wang <wangjie88.huawei.com> --- src/qemu/qemu_driver.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 9a35e04a85..639b57316d 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -6621,6 +6621,8 @@ qemuDomainSaveImageStartVM(virConnectPtr conn, if (virGetLastErrorCode() == VIR_ERR_OK) virReportError(VIR_ERR_OPERATION_FAILED, "%s", _("failed to resume domain")); + + qemuProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_FAILED, asyncJob, 0); goto cleanup; } if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm, driver->caps) < 0) { -- 2.15.0.windows.1

4 5

[libvirt] [PATCH v4 0/6] Support network stats for VF representor interface
by Jai Singh Rana 18 Jul '18

18 Jul '18

With availability of switchdev model in linux, it is possible to capture stats for SR-IOV device with interface_type as 'hostdev' provided device supports VF represontor in switchdev mode on host. These stats are supported by adding helper APIs for getting/verifying VF representor name based on PCI Bus:Device:Function information in domains 'hostdev' structure and querying required net sysfs directory and file entries on host according to switchdev model. These helper APIs are then used in qemu/conf to get the interface stats for VF representor of pci SR-IOV device. V4 includes changes based on feedback received for v3 patchset. Added new generic API for linux is added to fetch stats from /proc/net/dev which will be used by tap and hostdev devices. Also introduced new API to retrieve net def from given domain based on the given hostdev which supports network. [1] https://www.kernel.org/doc/Documentation/networking/switchdev.txt V3: https://www.redhat.com/archives/libvir-list/2018-April/msg00306.html Jai Singh Rana (6): util: Add helper function to clean extra spaces in string util: Add generic API to fetch network stats from procfs util: Add helper APIs to get/verify VF Representor name conf: util: Add API to find net def given its domain's hostdev qemu: Network stats support for VF Representor docs: Update news about Network stats support for VF Representor docs/news.xml | 9 ++ po/POTFILES | 1 + src/conf/domain_conf.c | 43 +++++++ src/conf/domain_conf.h | 2 + src/libvirt_private.syms | 11 ++ src/qemu/qemu_driver.c | 34 ++++- src/util/Makefile.inc.am | 2 + src/util/virhostdev.c | 4 +- src/util/virhostdev.h | 11 ++ src/util/virnetdev.c | 202 ++++++++++++++++++++++++++++- src/util/virnetdev.h | 5 + src/util/virnetdevhostdev.c | 300 ++++++++++++++++++++++++++++++++++++++++++++ src/util/virnetdevhostdev.h | 34 +++++ src/util/virnetdevtap.c | 71 +---------- src/util/virstring.c | 36 ++++++ src/util/virstring.h | 3 + 16 files changed, 691 insertions(+), 77 deletions(-) create mode 100644 src/util/virnetdevhostdev.c create mode 100644 src/util/virnetdevhostdev.h -- 2.13.7

2 12

[libvirt] [PATCH 0/3] virStr*cpy*() related fixes and cleanups
by Andrea Bolognani 17 Jul '18

17 Jul '18

1/3 contains bug fixes, 2/3 a bunch of cleanups and 3/3 makes libvirt build again on MinGW. Andrea Bolognani (3): src: Use virStrcpyStatic() to avoid truncation src: Use virStrcpyStatic() wherever possible m4: Work around MinGW detection of strncpy() usage cfg.mk | 2 +- m4/virt-compile-warnings.m4 | 5 +++++ src/conf/nwfilter_conf.c | 3 +-- src/esx/esx_driver.c | 4 +--- src/hyperv/hyperv_driver.c | 3 +-- src/util/virfdstream.c | 2 +- src/util/virlog.c | 5 ++--- src/util/virnetdev.c | 3 +-- src/xenconfig/xen_xl.c | 17 ++++------------- 9 files changed, 17 insertions(+), 27 deletions(-) -- 2.17.1

2 5

Re: [libvirt] opening tap devices that are created in a container
by Roman Mohr 17 Jul '18

17 Jul '18

On Wed, Jul 11, 2018 at 12:10 PM <nert@wheatley> wrote: > On Mon, Jul 09, 2018 at 05:00:49PM -0400, Jason Baron wrote: > > > > > >On 07/08/2018 02:01 AM, Martin Kletzander wrote: > >> On Thu, Jul 05, 2018 at 06:24:20PM +0200, Roman Mohr wrote: > >>> On Thu, Jul 5, 2018 at 4:20 PM Jason Baron <jbaron(a)akamai.com> wrote: > >>> > >>>> Hi, > >>>> > >>>> Opening tap devices, such as macvtap, that are created in containers > is > >>>> problematic because the interface for opening tap devices is via > >>>> /dev/tapNN and devtmpfs is not typically mounted inside a container as > >>>> its not namespace aware. It is possible to do a mknod() in the > >>>> container, once the tap devices are created, however, since the tap > >>>> devices are created dynamically its not possible to apriori allow > access > >>>> to certain major/minor numbers, since we don't know what these are > going > >>>> to be. In addition, its desirable to not allow the mknod capability in > >>>> containers. This behavior, I think is somewhat inconsistent with the > >>>> tuntap driver where one can create tuntap devices inside a container > by > >>>> first opening /dev/net/tun and then using them by supplying the tuntap > >>>> device name via the ioctl(TUNSETIFF). And since TUNSETIFF validates > the > >>>> network namespace, one is limited to opening network devices that > belong > >>>> to your current network namespace. > >>>> > >>>> Here are some options to this issue, that I wanted to get feedback > >>>> about, and just wondering if anybody else has run into this. > >>>> > >>>> 1) > >>>> > >>>> Don't create the tap device, such as macvtap in the container. > Instead, > >>>> create the tap device outside of the container and then move it into > the > >>>> desired container network namespace. In addition, do a mknod() for the > >>>> corresponding /dev/tapNN device from outside the container before > doing > >>>> chroot(). > >>>> > >>>> This solution still doesn't allow tap devices to be created inside the > >>>> container. Thus, in the case of kubevirt, which runs libvirtd inside > of > >>>> a container, it would mean changing libvirtd to open existing tap > >>>> devices (as opposed to the current behavior of creating new ones). > This > >>>> would not require any kernel changes, but as mentioned seems > >>>> inconsistent with the tuntap interface. > >>>> > >>> > >>> For KubeVirt, apart from how exactly the device ends up in the > >>> container, I > >>> would want to pursue a way where all network preparations which require > >>> privileges happens from a privileged process *outside* of the > container. > >>> Like CNI solutions do it. They run outside, have privileges and then > >>> create > >>> devices in the right network/mount namespace or move them there. The > >>> final > >>> goal for KubeVirt is that our pod with the qemu process is completely > >>> unprivileged and privileged setup happens from outside. > >>> > >>> As a consequence, and depending on which route Dan pursues with the > >>> restructured libvirt, I would assume that either a privileged > >>> libvirtd-part > >>> outside of containers creates the devices by entering the right > >>> namespaces, > >>> or that libvirt in the container can consume pre-created tun/tap > devices, > >>> like qemu. > >>> > >> > >> That would be nice, but as far as I understand there will always be a > >> need for > >> some privileges if you want to use a tap device. It's nice that CNI > >> does that > >> and all the containers can run unprivileged, but that's because they do > >> not open > >> the tap device and they do not do any privileged operations on it. But > >> QEMU > >> needs to. So the only way would be passing an opened fd to the > >> container or > >> opening the tap device there and making the fd usable for one process in > >> the > >> container. Is this already supported for some type of containers in > >> some way? > >> > >> Martin > > > >Hi, > > > >So another option here call it #3 is to pass open fds via unix sockets. > >If there are privileged operations that QEMU is trying to do with the fd > >though, how will opening it first and then passing it to an unprivileged > >QEMU address that? Is the opener doing those operations first? > > > > Sorry for the confusion, but QEMU is not doing any privileged operations. > I got > confused by the fact that anyone can open and do a R/W on a tap device. > But it > looks like that's on purpose. No capabilities are needed for opening > /dev/net/tun and calling ioctl(TUNSETIFF) with existing name and then > doing R/W > operations on it. It just works. > > Correct me if I'm wrong, but to sum it all up, the only things that we > need to > figure out (which might possibly be solved by ideas in the other thread) > are: > > tap: > - Existence of /dev/net/tun > - Having permissions to open it (0666 by default, shouldn't be a nig deal) > - Knowing the device name > > macvtap: > - Existence of /dev/tapXX > - Having permissions to open /dev/tapXX > - One of the following: > - Knowing the device name (and being able to translate it using a > netlink socket) > - Knowing the the device index > > The rest should be an implementation detail. > > Am I right? Did I miss anything? At least from the KubeVirt use-case that sounds to be the things which we would need to solve the networking setup in a similar way like the Container Network Interface implementations solve the setup in k8s. Best Regards, Roman

1 0

[libvirt] opening tap devices that are created in a container
by Jason Baron 17 Jul '18

17 Jul '18

Hi, Opening tap devices, such as macvtap, that are created in containers is problematic because the interface for opening tap devices is via /dev/tapNN and devtmpfs is not typically mounted inside a container as its not namespace aware. It is possible to do a mknod() in the container, once the tap devices are created, however, since the tap devices are created dynamically its not possible to apriori allow access to certain major/minor numbers, since we don't know what these are going to be. In addition, its desirable to not allow the mknod capability in containers. This behavior, I think is somewhat inconsistent with the tuntap driver where one can create tuntap devices inside a container by first opening /dev/net/tun and then using them by supplying the tuntap device name via the ioctl(TUNSETIFF). And since TUNSETIFF validates the network namespace, one is limited to opening network devices that belong to your current network namespace. Here are some options to this issue, that I wanted to get feedback about, and just wondering if anybody else has run into this. 1) Don't create the tap device, such as macvtap in the container. Instead, create the tap device outside of the container and then move it into the desired container network namespace. In addition, do a mknod() for the corresponding /dev/tapNN device from outside the container before doing chroot(). This solution still doesn't allow tap devices to be created inside the container. Thus, in the case of kubevirt, which runs libvirtd inside of a container, it would mean changing libvirtd to open existing tap devices (as opposed to the current behavior of creating new ones). This would not require any kernel changes, but as mentioned seems inconsistent with the tuntap interface. 2) Add a new kernel interface for tap devices similar to how /dev/net/tun currently works. It might be nice to use TUNSETIFF for tap devices, but because tap devices have different fops they can't be easily switched after open(). So the suggestion is a new ioctl (TUNGETFDBYNAME?), where the tap device name is supplied and a new fd (distinct from the fd returned by the open of /dev/net/tun) is returned as an output field as part of the new ioctl parameter. It may not make sense to have this new ioctl call for /dev/net/tun since its really about opening a tap device, so it may make sense to introduce it as part of a new device, such as /dev/net/tap. This new ioctl could be used for macvtap and ipvtap (or any tap device). I think it might also improve performance for tuntap devices themselves, if they are opened this way since currently all tun operations such as read() and write() take a reference count on the underlying tuntap device, since it can be changed via TUNSETIFF. I tested this interface out, so I can provide the kernel changes if that's helpful for clarification. Thanks, -Jason

4 8

[libvirt] [PATCH] qemu: hotplug: don't overwrite error message in qemuDomainAttachNetDevice
by Katerina Koukiou 17 Jul '18

17 Jul '18

Since commit f14c37, virDomainConfVMNWFilterTeardown is reporting errors thus any previously reported error gets overwritten. We need to save the errors in qemuDomainAttachNetDevice before calling this function when we are in cleanup code. https://bugzilla.redhat.com/show_bug.cgi?id=1598311 Signed-off-by: Katerina Koukiou <kkoukiou(a)redhat.com> --- src/qemu/qemu_hotplug.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 3dfa51b0a0..2e13cab233 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -793,6 +793,7 @@ qemuDomainAttachNetDevice(virQEMUDriverPtr driver, bool charDevPlugged = false; bool netdevPlugged = false; char *netdev_name; + virErrorPtr save_error = NULL; /* preallocate new slot for device */ if (VIR_REALLOC_N(vm->def->nets, vm->def->nnets + 1) < 0) @@ -1074,7 +1075,9 @@ qemuDomainAttachNetDevice(virQEMUDriverPtr driver, qemuDomainReleaseDeviceAddress(vm, &net->info, NULL); if (iface_connected) { + virErrorPreserveLast(&save_error); virDomainConfNWFilterTeardown(net); + virErrorRestore(&save_error); if (virDomainNetGetActualType(net) == VIR_DOMAIN_NET_TYPE_DIRECT) { ignore_value(virNetDevMacVLanDeleteWithVPortProfile( -- 2.15.0

3 2

[libvirt] [PATCH v3 0/8] Enable vfio-pci 'property' for mediated device
by Erik Skultety 17 Jul '18

17 Jul '18

RFC here: https://www.redhat.com/archives/libvir-list/2018-May/msg02218.html Since v1 [1]: - remodeled egl-headless to be a standalone graphics element instead of a result of some automagic with graphic's <gl> element - pushed the first 5 simple fixes that were RB'd - fixed some nits raised during review Since v2 [2] - converted the 'display' and 'egl-headless' PostParse callbacks in patches 2 and 6 to Validate callbacks as they should have been since the beginning (see the RFC) - some minor nits - added a standalone patch substituting some 'error' labels with 'cleanup' as requested during review [1] https://www.redhat.com/archives/libvir-list/2018-June/msg01740.html [2] https://www.redhat.com/archives/libvir-list/2018-July/msg00485.html Erik Skultety (8): qemu: caps: Introduce a capability for egl-headless conf: Introduce a new graphics display type 'headless' qemu: caps: Add vfio-pci.display capability conf: Introduce virDomainGraphicsDefHasOpenGL helper conf: Replace 'error' with 'cleanup' in virDomainHostdevDefParseXMLSubsys conf: Introduce new <hostdev> attribute 'display' qemu: command: Enable formatting vfio-pci.display option onto cmdline docs: Update news about the VNC console enablement for mdevs docs/formatdomain.html.in | 53 +++++++++- docs/news.xml | 10 ++ docs/schemas/domaincommon.rng | 8 ++ src/conf/domain_conf.c | 106 ++++++++++++++++---- src/conf/domain_conf.h | 5 + src/libvirt_private.syms | 1 + src/libxl/libxl_conf.c | 1 + src/qemu/qemu_capabilities.c | 10 ++ src/qemu/qemu_capabilities.h | 4 + src/qemu/qemu_command.c | 60 +++++++++++- src/qemu/qemu_domain.c | 107 ++++++++++++++++++++- src/qemu/qemu_driver.c | 2 + src/qemu/qemu_hotplug.c | 1 + src/qemu/qemu_process.c | 4 + src/vmx/vmx.c | 1 + tests/domaincapsschemadata/full.xml | 1 + tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml | 2 + tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 2 + tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 2 + tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 2 + tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 2 + tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml | 2 + tests/qemuxml2argvdata/graphics-egl-headless.args | 26 +++++ tests/qemuxml2argvdata/graphics-egl-headless.xml | 31 ++++++ .../qemuxml2argvdata/graphics-sdl-egl-headless.xml | 35 +++++++ .../graphics-spice-egl-headless.args | 31 ++++++ .../graphics-spice-egl-headless.xml | 36 +++++++ .../graphics-spice-invalid-egl-headless.xml | 37 +++++++ .../graphics-vnc-egl-headless.args | 28 ++++++ .../qemuxml2argvdata/graphics-vnc-egl-headless.xml | 37 +++++++ .../hostdev-mdev-display-missing-graphics.xml | 35 +++++++ .../hostdev-mdev-display-spice-egl-headless.args | 32 ++++++ .../hostdev-mdev-display-spice-egl-headless.xml | 40 ++++++++ .../hostdev-mdev-display-spice-opengl.args | 31 ++++++ .../hostdev-mdev-display-spice-opengl.xml | 41 ++++++++ .../hostdev-mdev-display-vnc-egl-headless.args | 32 ++++++ .../hostdev-mdev-display-vnc-egl-headless.xml | 40 ++++++++ .../qemuxml2argvdata/hostdev-mdev-display-vnc.args | 31 ++++++ .../qemuxml2argvdata/hostdev-mdev-display-vnc.xml | 39 ++++++++ tests/qemuxml2argvdata/hostdev-mdev-display.xml | 39 ++++++++ tests/qemuxml2argvtest.c | 48 +++++++++ .../graphics-spice-egl-headless.xml | 44 +++++++++ .../graphics-vnc-egl-headless.xml | 42 ++++++++ .../hostdev-mdev-display-active.xml | 47 +++++++++ tests/qemuxml2xmltest.c | 4 + 50 files changed, 1168 insertions(+), 29 deletions(-) create mode 100644 tests/qemuxml2argvdata/graphics-egl-headless.args create mode 100644 tests/qemuxml2argvdata/graphics-egl-headless.xml create mode 100644 tests/qemuxml2argvdata/graphics-sdl-egl-headless.xml create mode 100644 tests/qemuxml2argvdata/graphics-spice-egl-headless.args create mode 100644 tests/qemuxml2argvdata/graphics-spice-egl-headless.xml create mode 100644 tests/qemuxml2argvdata/graphics-spice-invalid-egl-headless.xml create mode 100644 tests/qemuxml2argvdata/graphics-vnc-egl-headless.args create mode 100644 tests/qemuxml2argvdata/graphics-vnc-egl-headless.xml create mode 100644 tests/qemuxml2argvdata/hostdev-mdev-display-missing-graphics.xml create mode 100644 tests/qemuxml2argvdata/hostdev-mdev-display-spice-egl-headless.args create mode 100644 tests/qemuxml2argvdata/hostdev-mdev-display-spice-egl-headless.xml create mode 100644 tests/qemuxml2argvdata/hostdev-mdev-display-spice-opengl.args create mode 100644 tests/qemuxml2argvdata/hostdev-mdev-display-spice-opengl.xml create mode 100644 tests/qemuxml2argvdata/hostdev-mdev-display-vnc-egl-headless.args create mode 100644 tests/qemuxml2argvdata/hostdev-mdev-display-vnc-egl-headless.xml create mode 100644 tests/qemuxml2argvdata/hostdev-mdev-display-vnc.args create mode 100644 tests/qemuxml2argvdata/hostdev-mdev-display-vnc.xml create mode 100644 tests/qemuxml2argvdata/hostdev-mdev-display.xml create mode 100644 tests/qemuxml2xmloutdata/graphics-spice-egl-headless.xml create mode 100644 tests/qemuxml2xmloutdata/graphics-vnc-egl-headless.xml create mode 100644 tests/qemuxml2xmloutdata/hostdev-mdev-display-active.xml -- 2.14.4

2 17

[libvirt] [PATCH v3 0/1] qemu: Add entry for balloon stat stat-disk-caches
by Tomáš Golembiovský 17 Jul '18

17 Jul '18

v3: changes suggested by John Ferlan - updated commit message - fixed units (bytes -> kB) in one comment - NOTE: Various spelling is used throughout libvirt (kb/kB/KiB) interchangeably with the same meaning. I tried to keep the spelling consistent with the context around the place where the change occurred. - updated qemuDomainGetStatsBalloon() - moved the entry in virsh output to last position - updated virsh.pod v2: - moved item to last position in array - documented item also in libvirt-domain.c - added item to virsh listing Tomáš Golembiovský (1): qemu: Add entry for balloon stat stat-disk-caches include/libvirt/libvirt-domain.h | 9 ++++++++- src/libvirt-domain.c | 3 +++ src/qemu/qemu_driver.c | 1 + src/qemu/qemu_monitor_json.c | 2 ++ tools/virsh-domain-monitor.c | 2 ++ tools/virsh.pod | 5 +++++ 6 files changed, 21 insertions(+), 1 deletion(-) -- 2.17.1

2 5

[libvirt] [PATCH v3] qemu: fix broken autostart symlink after renaming domain.
by Julio Faracco 17 Jul '18

17 Jul '18

If a domain is configured to start on boot, it has a symlink to the domain definition inside the autostart directory. If you rename this domain, the definition is renamed too. The symlink need to be pointed to this renamed file. This commit recreates the symlink after renaming the XML file. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1594985 Signed-off-by: Julio Faracco <jcfaracco(a)gmail.com> --- src/qemu/qemu_driver.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 8fae46370e..6bbea324b9 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -20914,6 +20914,8 @@ qemuDomainRenameCallback(virDomainObjPtr vm, char *old_dom_name = NULL; char *new_dom_cfg_file = NULL; char *old_dom_cfg_file = NULL; + char *new_dom_autostart_link = NULL; + char *old_dom_autostart_link = NULL; virCheckFlags(0, ret); @@ -20934,6 +20936,22 @@ qemuDomainRenameCallback(virDomainObjPtr vm, vm->def->name))) goto cleanup; + if (vm->autostart) { + if (!(new_dom_autostart_link = virDomainConfigFile(cfg->autostartDir, + new_dom_name)) || + !(old_dom_autostart_link = virDomainConfigFile(cfg->autostartDir, + vm->def->name))) + goto cleanup; + + if (virFileIsLink(old_dom_autostart_link) && + unlink(old_dom_autostart_link) < 0) { + virReportSystemError(errno, + _("Failed to delete symlink '%s'"), + old_dom_autostart_link); + goto cleanup; + } + } + event_old = virDomainEventLifecycleNewFromObj(vm, VIR_DOMAIN_EVENT_UNDEFINED, VIR_DOMAIN_EVENT_UNDEFINED_RENAMED); @@ -20946,6 +20964,16 @@ qemuDomainRenameCallback(virDomainObjPtr vm, if (virDomainSaveConfig(cfg->configDir, driver->caps, vm->def) < 0) goto rollback; + + if (vm->autostart) { + if (symlink(new_dom_cfg_file, new_dom_autostart_link) < 0) { + virReportSystemError(errno, + _("Failed to create symlink '%s to '%s'"), + new_dom_autostart_link, new_dom_cfg_file); + goto rollback; + } + } + if (virFileExists(old_dom_cfg_file) && unlink(old_dom_cfg_file) < 0) { virReportSystemError(errno, @@ -20960,6 +20988,8 @@ qemuDomainRenameCallback(virDomainObjPtr vm, ret = 0; cleanup: + VIR_FREE(old_dom_autostart_link); + VIR_FREE(new_dom_autostart_link); VIR_FREE(old_dom_cfg_file); VIR_FREE(new_dom_cfg_file); VIR_FREE(old_dom_name); @@ -20979,6 +21009,18 @@ qemuDomainRenameCallback(virDomainObjPtr vm, if (virFileExists(new_dom_cfg_file)) unlink(new_dom_cfg_file); + if (vm->autostart) { + if (virFileExists(new_dom_autostart_link)) + unlink(new_dom_autostart_link); + + if (!virFileExists(old_dom_autostart_link) && + symlink(old_dom_cfg_file, old_dom_autostart_link) < 0) { + virReportSystemError(errno, + _("Failed to create symlink '%s to '%s'"), + old_dom_autostart_link, old_dom_cfg_file); + } + } + goto cleanup; } -- 2.17.1

2 2

[libvirt] [PATCH v2 0/2] tests: Add/Update QEMU caps data for 2.11+ on x86_64
by Erik Skultety 17 Jul '18

17 Jul '18

Since v1: - regenerated domaincapsschemadata to satisfy the test suite Erik Skultety (2): tests: Add capabilities data for QEMU 2.11 x86_64 tests: Update capabilities data for QEMU 2.12+ x86_64 tests/domaincapsschemadata/qemu_2.12.0.x86_64.xml | 37 +- .../caps_2.11.0.x86_64.replies | 19416 +++++++++++++++++++ tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml | 961 + .../caps_2.12.0.x86_64.replies | 539 +- tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 183 +- .../qemucapabilitiesdata/caps_3.0.0.x86_64.replies | 219 +- tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml | 57 +- tests/qemucapabilitiestest.c | 1 + 8 files changed, 20807 insertions(+), 606 deletions(-) create mode 100644 tests/qemucapabilitiesdata/caps_2.11.0.x86_64.replies create mode 100644 tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml -- 2.14.4

2 5

[libvirt] [PATCH] maint: update to latest gnulib
by Michal Privoznik 17 Jul '18

17 Jul '18

The changelog is quite long because we haven't updated gnulib in a while. Anyway, among the new changes you'll find GCC 8 support, faster build time, mingw fixes and many others. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Pushed under "gnulib update" rule. .gnulib | 2 +- bootstrap | 266 ++++++++++++++++++++++++++++++++++++-------------------------- 2 files changed, 155 insertions(+), 113 deletions(-) diff --git a/.gnulib b/.gnulib index d6397dde2e..5b78831df0 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit d6397dde2e127e246e3eeb5254a21f42cac783c8 +Subproject commit 5b78831df03b49408676227604cf16f90dee07ac diff --git a/bootstrap b/bootstrap index 92be11439a..ed3b0a4b70 100755 --- a/bootstrap +++ b/bootstrap @@ -1,6 +1,6 @@ #! /bin/sh # Print a version string. -scriptversion=2018-03-07.03; # UTC +scriptversion=2018-07-01.02; # UTC # Bootstrap this package from checked-out sources. @@ -47,6 +47,8 @@ PERL="${PERL-perl}" me=$0 +default_gnulib_url=git://git.sv.gnu.org/gnulib + usage() { cat <<EOF Usage: $me [OPTION]... @@ -76,6 +78,37 @@ contents are read as shell variables to configure the bootstrap. For build prerequisites, environment variables like \$AUTOCONF and \$AMTAR are honored. +Gnulib sources can be fetched in various ways: + + * If this package is in a git repository with a 'gnulib' submodule + configured, then that submodule is initialized and updated and sources + are fetched from there. If \$GNULIB_SRCDIR is set (directly or via + --gnulib-srcdir) and is a git repository, then it is used as a reference. + + * Otherwise, if \$GNULIB_SRCDIR is set (directly or via --gnulib-srcdir), + then sources are fetched from that local directory. If it is a git + repository and \$GNULIB_REVISION is set, then that revision is checked + out. + + * Otherwise, if this package is in a git repository with a 'gnulib' + submodule configured, then that submodule is initialized and updated and + sources are fetched from there. + + * Otherwise, if the 'gnulib' directory does not exist, Gnulib sources are + cloned into that directory using git from \$GNULIB_URL, defaulting to + $default_gnulib_url. + If \$GNULIB_REVISION is set, then that revision is checked out. + + * Otherwise, the existing Gnulib sources in the 'gnulib' directory are + used. If it is a git repository and \$GNULIB_REVISION is set, then that + revision is checked out. + +If you maintain a package and want to pin a particular revision of the +Gnulib sources that has been tested with your package, then there are two +possible approaches: either configure a 'gnulib' submodule with the +appropriate revision, or set \$GNULIB_REVISION (and if necessary +\$GNULIB_URL) in $me.conf. + Running without arguments will suffice in most cases. EOF } @@ -109,9 +142,6 @@ die() { warn_ "$@"; exit 1; } # Configuration. -# Name of the Makefile.am -gnulib_mk=gnulib.mk - # List of gnulib modules needed. gnulib_modules= @@ -170,7 +200,15 @@ source_base=lib m4_base=m4 doc_base=doc tests_base=tests -gnulib_extra_files='' +gnulib_extra_files=" + build-aux/install-sh + build-aux/mdate-sh + build-aux/texinfo.tex + build-aux/depcomp + build-aux/config.guess + build-aux/config.sub + doc/INSTALL +" # Additional gnulib-tool options to use. Use "\newline" to break lines. gnulib_tool_option_extras= @@ -264,24 +302,18 @@ case "$0" in *) test -r "$0.conf" && . ./"$0.conf" ;; esac -# Extra files from gnulib, which override files from other sources. -test -z "${gnulib_extra_files}" && \ - gnulib_extra_files=" - build-aux/install-sh - build-aux/mdate-sh - build-aux/texinfo.tex - build-aux/depcomp - build-aux/config.guess - build-aux/config.sub - doc/INSTALL -" - if test "$vc_ignore" = auto; then vc_ignore= test -d .git && vc_ignore=.gitignore test -d CVS && vc_ignore="$vc_ignore .cvsignore" fi +if test x"$gnulib_modules$gnulib_files$gnulib_extra_files" = x; then + use_gnulib=false +else + use_gnulib=true +fi + # Translate configuration into internal form. # Parse options. @@ -612,85 +644,94 @@ git_modules_config () { test -f .gitmodules && git config --file .gitmodules "$@" } -if $use_git; then - gnulib_path=$(git_modules_config submodule.gnulib.path) - test -z "$gnulib_path" && gnulib_path=gnulib -fi - -# Get gnulib files. Populate $GNULIB_SRCDIR, possibly updating a -# submodule, for use in the rest of the script. - -case ${GNULIB_SRCDIR--} in --) - # Note that $use_git is necessarily true in this case. - if git_modules_config submodule.gnulib.url >/dev/null; then - echo "$0: getting gnulib files..." - git submodule init -- "$gnulib_path" || exit $? - git submodule update -- "$gnulib_path" || exit $? - - elif [ ! -d "$gnulib_path" ]; then - echo "$0: getting gnulib files..." - - trap cleanup_gnulib 1 2 13 15 - - shallow= - git clone -h 2>&1 | grep -- --depth > /dev/null && shallow='--depth 2' - git clone $shallow git://git.sv.gnu.org/gnulib "$gnulib_path" || - cleanup_gnulib - - trap - 1 2 13 15 +if $use_gnulib; then + if $use_git; then + gnulib_path=$(git_modules_config submodule.gnulib.path) + test -z "$gnulib_path" && gnulib_path=gnulib fi - GNULIB_SRCDIR=$gnulib_path - ;; -*) - # Use GNULIB_SRCDIR directly or as a reference. - if $use_git && test -d "$GNULIB_SRCDIR"/.git && \ - git_modules_config submodule.gnulib.url >/dev/null; then - echo "$0: getting gnulib files..." - if git submodule -h|grep -- --reference > /dev/null; then - # Prefer the one-liner available in git 1.6.4 or newer. - git submodule update --init --reference "$GNULIB_SRCDIR" \ - "$gnulib_path" || exit $? - else - # This fallback allows at least git 1.5.5. - if test -f "$gnulib_path"/gnulib-tool; then - # Since file already exists, assume submodule init already complete. - git submodule update -- "$gnulib_path" || exit $? - else - # Older git can't clone into an empty directory. - rmdir "$gnulib_path" 2>/dev/null - git clone --reference "$GNULIB_SRCDIR" \ - "$(git_modules_config submodule.gnulib.url)" "$gnulib_path" \ - && git submodule init -- "$gnulib_path" \ - && git submodule update -- "$gnulib_path" \ - || exit $? + + # Get gnulib files. Populate $GNULIB_SRCDIR, possibly updating a + # submodule, for use in the rest of the script. + + case ${GNULIB_SRCDIR--} in + -) + # Note that $use_git is necessarily true in this case. + if git_modules_config submodule.gnulib.url >/dev/null; then + echo "$0: getting gnulib files..." + git submodule init -- "$gnulib_path" || exit $? + git submodule update -- "$gnulib_path" || exit $? + + elif [ ! -d "$gnulib_path" ]; then + echo "$0: getting gnulib files..." + + trap cleanup_gnulib 1 2 13 15 + + shallow= + if test -z "$GNULIB_REVISION"; then + git clone -h 2>&1 | grep -- --depth > /dev/null && shallow='--depth 2' fi + git clone $shallow ${GNULIB_URL:-$default_gnulib_url} "$gnulib_path" \ + || cleanup_gnulib + + trap - 1 2 13 15 fi GNULIB_SRCDIR=$gnulib_path + ;; + *) + # Use GNULIB_SRCDIR directly or as a reference. + if $use_git && test -d "$GNULIB_SRCDIR"/.git && \ + git_modules_config submodule.gnulib.url >/dev/null; then + echo "$0: getting gnulib files..." + if git submodule -h|grep -- --reference > /dev/null; then + # Prefer the one-liner available in git 1.6.4 or newer. + git submodule update --init --reference "$GNULIB_SRCDIR" \ + "$gnulib_path" || exit $? + else + # This fallback allows at least git 1.5.5. + if test -f "$gnulib_path"/gnulib-tool; then + # Since file already exists, assume submodule init already complete. + git submodule update -- "$gnulib_path" || exit $? + else + # Older git can't clone into an empty directory. + rmdir "$gnulib_path" 2>/dev/null + git clone --reference "$GNULIB_SRCDIR" \ + "$(git_modules_config submodule.gnulib.url)" "$gnulib_path" \ + && git submodule init -- "$gnulib_path" \ + && git submodule update -- "$gnulib_path" \ + || exit $? + fi + fi + GNULIB_SRCDIR=$gnulib_path + fi + ;; + esac + + if test -d "$GNULIB_SRCDIR"/.git && test -n "$GNULIB_REVISION" \ + && ! git_modules_config submodule.gnulib.url >/dev/null; then + (cd "$GNULIB_SRCDIR" && git checkout "$GNULIB_REVISION") || cleanup_gnulib fi - ;; -esac -# $GNULIB_SRCDIR now points to the version of gnulib to use, and -# we no longer need to use git or $gnulib_path below here. + # $GNULIB_SRCDIR now points to the version of gnulib to use, and + # we no longer need to use git or $gnulib_path below here. + + if $bootstrap_sync; then + cmp -s "$0" "$GNULIB_SRCDIR/build-aux/bootstrap" || { + echo "$0: updating bootstrap and restarting..." + case $(sh -c 'echo "$1"' -- a) in + a) ignored=--;; + *) ignored=ignored;; + esac + exec sh -c \ + 'cp "$1" "$2" && shift && exec "${CONFIG_SHELL-/bin/sh}" "$@"' \ + $ignored "$GNULIB_SRCDIR/build-aux/bootstrap" \ + "$0" "$@" --no-bootstrap-sync + } + fi -if $bootstrap_sync; then - cmp -s "$0" "$GNULIB_SRCDIR/build-aux/bootstrap" || { - echo "$0: updating bootstrap and restarting..." - case $(sh -c 'echo "$1"' -- a) in - a) ignored=--;; - *) ignored=ignored;; - esac - exec sh -c \ - 'cp "$1" "$2" && shift && exec "${CONFIG_SHELL-/bin/sh}" "$@"' \ - $ignored "$GNULIB_SRCDIR/build-aux/bootstrap" \ - "$0" "$@" --no-bootstrap-sync - } + gnulib_tool=$GNULIB_SRCDIR/gnulib-tool + <$gnulib_tool || exit $? fi -gnulib_tool=$GNULIB_SRCDIR/gnulib-tool -<$gnulib_tool || exit $? - # Get translations. download_po_files() { @@ -898,32 +939,33 @@ fi # Import from gnulib. -gnulib_tool_options="\ - --import\ - --no-changelog\ - --aux-dir $build_aux\ - --doc-base $doc_base\ - --lib $gnulib_name\ - --m4-base $m4_base/\ - --source-base $source_base/\ - --tests-base $tests_base\ - --local-dir $local_gl_dir\ - $gnulib_tool_option_extras\ -" -if test $use_libtool = 1; then - case "$gnulib_tool_options " in - *' --libtool '*) ;; - *) gnulib_tool_options="$gnulib_tool_options --libtool" ;; - esac -fi -echo "$0: $gnulib_tool $gnulib_tool_options --import ..." -$gnulib_tool $gnulib_tool_options --import $gnulib_modules \ - || die "gnulib-tool failed" +if $use_gnulib; then + gnulib_tool_options="\ + --no-changelog\ + --aux-dir=$build_aux\ + --doc-base=$doc_base\ + --lib=$gnulib_name\ + --m4-base=$m4_base/\ + --source-base=$source_base/\ + --tests-base=$tests_base\ + --local-dir=$local_gl_dir\ + $gnulib_tool_option_extras\ + " + if test $use_libtool = 1; then + case "$gnulib_tool_options " in + *' --libtool '*) ;; + *) gnulib_tool_options="$gnulib_tool_options --libtool" ;; + esac + fi + echo "$0: $gnulib_tool $gnulib_tool_options --import ..." + $gnulib_tool $gnulib_tool_options --import $gnulib_modules \ + || die "gnulib-tool failed" -for file in $gnulib_files; do - symlink_to_dir "$GNULIB_SRCDIR" $file \ - || die "failed to symlink $file" -done + for file in $gnulib_files; do + symlink_to_dir "$GNULIB_SRCDIR" $file \ + || die "failed to symlink $file" + done +fi bootstrap_post_import_hook \ || die "bootstrap_post_import_hook failed" -- 2.16.4

3 3

[libvirt] [PATCH] Update to latest gnulib to fix ffs() detection on mingw
by Daniel P. Berrangé 17 Jul '18

17 Jul '18

ffs() was not correctly detected on mingw with previous gnulib rebase: https://lists.gnu.org/archive/html/bug-gnulib/2018-07/msg00061.html. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- .gnulib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Pushed as a mingw build fix diff --git a/.gnulib b/.gnulib index 5b78831df0..cdbf3d385a 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit 5b78831df03b49408676227604cf16f90dee07ac +Subproject commit cdbf3d385a32ff904c96f20c26f3470bd8345248 -- 2.17.1

1 0

[libvirt] [PATCH] AUTHORS: Add Katerina Koukiou
by Ján Tomko 17 Jul '18

17 Jul '18

$ git log --format=oneline --committer=kkoukiou | wc -l 3 Also set up the mailmap entry to avoid duplicates in the generated authors file. Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- .mailmap | 1 + AUTHORS.in | 1 + 2 files changed, 2 insertions(+) diff --git a/.mailmap b/.mailmap index 913395b89c..311a10a8e9 100644 --- a/.mailmap +++ b/.mailmap @@ -42,6 +42,7 @@ <mnestratov(a)virtuozzo.com> <mnestratov(a)parallels.com> <nshirokovskiy(a)virtuozzo.com> <nshirokovskiy(a)parallels.com> <jyang(a)redhat.com> <osier(a)yunify.com> +<kkoukiou(a)redhat.com> <k.koukiou(a)googlemail.com> # Name consolidation: # Preferred author spelling <preferred email> diff --git a/AUTHORS.in b/AUTHORS.in index 62afa56e27..fbac54c48d 100644 --- a/AUTHORS.in +++ b/AUTHORS.in @@ -25,6 +25,7 @@ Ján Tomko <jtomko(a)redhat.com> Jim Fehlig <jfehlig(a)suse.com> Jiří Denemark <jdenemar(a)redhat.com> John Ferlan <jferlan(a)redhat.com> +Katerina Koukiou <kkoukiou(a)redhat.com> Laine Stump <laine(a)redhat.com> Mark McLoughlin <markmc(a)redhat.com> Martin Kletzander <mkletzan(a)redhat.com> -- 2.16.1

2 1

[libvirt] [PATCH 0/2] tests: Add/Update QEMU caps data for 2.11+ on x86_64
by Erik Skultety 17 Jul '18

17 Jul '18

Erik Skultety (2): tests: Add capabilities data for QEMU 2.11 x86_64 tests: Update capabilities data for QEMU 2.12+ x86_64 .../caps_2.11.0.x86_64.replies | 19416 +++++++++++++++++++ tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml | 961 + .../caps_2.12.0.x86_64.replies | 539 +- tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 183 +- .../qemucapabilitiesdata/caps_3.0.0.x86_64.replies | 219 +- tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml | 57 +- tests/qemucapabilitiestest.c | 1 + 7 files changed, 20790 insertions(+), 586 deletions(-) create mode 100644 tests/qemucapabilitiesdata/caps_2.11.0.x86_64.replies create mode 100644 tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml -- 2.14.4

1 3

[libvirt] [PATCH] qemu: qemu_driver: Fix setting global_period cputune element
by Katerina Koukiou 16 Jul '18

16 Jul '18

When VIR_DOMAIN_SCHEDULER_GLOBAL_PERIOD is matched "cputune.global_period" should be updated and not "cputune.period". Signed-off-by: Katerina Koukiou <kkoukiou(a)redhat.com> --- src/qemu/qemu_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 5de9aaefbb..8fae46370e 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -10556,7 +10556,7 @@ qemuDomainSetSchedulerParametersFlags(virDomainPtr dom, } if (persistentDef) - persistentDefCopy->cputune.period = value_ul; + persistentDefCopy->cputune.global_period = value_ul; } else if (STREQ(param->field, VIR_DOMAIN_SCHEDULER_GLOBAL_QUOTA)) { SCHED_RANGE_CHECK(value_l, VIR_DOMAIN_SCHEDULER_GLOBAL_QUOTA, -- 2.17.1

2 1

[libvirt] [PATCH] New virsh feature: domif-setlink --domain --interface --state completer
by Simon Kobyda 16 Jul '18

16 Jul '18

After you go through command mentioned above, completer finds what state the device is currently in, and suggests an opposite state. --- tools/virsh-completer.c | 73 ++++++++++++++++++++++++++++++++++++++++- tools/virsh-completer.h | 4 +++ tools/virsh-domain.c | 1 + 3 files changed, 77 insertions(+), 1 deletion(-) diff --git a/tools/virsh-completer.c b/tools/virsh-completer.c index 2327e08340..e32fd82211 100644 --- a/tools/virsh-completer.c +++ b/tools/virsh-completer.c @@ -32,6 +32,7 @@ #include "internal.h" #include "virutil.h" #include "viralloc.h" +#include "virmacaddr.h" #include "virstring.h" #include "virxml.h" @@ -750,7 +751,6 @@ virshDomainEventNameCompleter(vshControl *ctl ATTRIBUTE_UNUSED, return NULL; } - char ** virshPoolEventNameCompleter(vshControl *ctl ATTRIBUTE_UNUSED, const vshCmd *cmd ATTRIBUTE_UNUSED, @@ -776,6 +776,77 @@ virshPoolEventNameCompleter(vshControl *ctl ATTRIBUTE_UNUSED, return NULL; } +char ** +virshDomainInterfaceStateCompleter(vshControl *ctl ATTRIBUTE_UNUSED, + const vshCmd *cmd ATTRIBUTE_UNUSED, + unsigned int flags) +{ + virshControlPtr priv = ctl->privData; + const char *iface = NULL; + char **ret = NULL; + xmlDocPtr xml = NULL; + virMacAddr macaddr; + char *state = NULL; + char *xpath = NULL; + char macstr[18] = ""; + xmlXPathContextPtr ctxt = NULL; + xmlNodePtr *interfaces = NULL; + int ninterfaces; + + virCheckFlags(0, NULL); + + if (!priv->conn || virConnectIsAlive(priv->conn) <= 0) + return NULL; + + if (vshCommandOptStringReq(ctl, cmd, "interface", &iface) < 0) + goto cleanup; + + if (virshDomainGetXML(ctl, cmd, flags, &xml, &ctxt) < 0) + goto cleanup; + + /* normalize the mac addr */ + if (virMacAddrParse(iface, &macaddr) == 0) + virMacAddrFormat(&macaddr, macstr); + + if (virAsprintf(&xpath, "/domain/devices/interface[(mac/@address = '%s') or " + " (target/@dev = '%s')]", + macstr, iface) < 0) + goto cleanup; + + if ((ninterfaces = virXPathNodeSet(xpath, ctxt, &interfaces)) < 0) + goto cleanup; + + if (ninterfaces != 1) + goto cleanup; + + ctxt->node = interfaces[0]; + + if (VIR_ALLOC_N(ret, 2) < 0) + goto error; + + if ((state = virXPathString("string(./link/@state)", ctxt)) && + STREQ(state, "down")) { + if (VIR_STRDUP(ret[0], "up") < 0) + goto error; + } else { + if (VIR_STRDUP(ret[0], "down") < 0) + goto error; + } + + cleanup: + VIR_FREE(state); + VIR_FREE(interfaces); + VIR_FREE(xpath); + xmlXPathFreeContext(ctxt); + xmlFreeDoc(xml); + return ret; + + error: + virStringListFree(ret); + ret = NULL; + goto cleanup; +} + char ** virshNodedevEventNameCompleter(vshControl *ctl ATTRIBUTE_UNUSED, diff --git a/tools/virsh-completer.h b/tools/virsh-completer.h index 1c14bb2a54..b4fd2a86c6 100644 --- a/tools/virsh-completer.h +++ b/tools/virsh-completer.h @@ -94,6 +94,10 @@ char ** virshPoolEventNameCompleter(vshControl *ctl, const vshCmd *cmd, unsigned int flags); +char ** virshDomainInterfaceStateCompleter(vshControl *ctl, + const vshCmd *cmd, + unsigned int flags); + char ** virshNodedevEventNameCompleter(vshControl *ctl, const vshCmd *cmd, unsigned int flags); diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 3959b5475b..8adec1d9b1 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -3064,6 +3064,7 @@ static const vshCmdOptDef opts_domif_setlink[] = { {.name = "state", .type = VSH_OT_DATA, .flags = VSH_OFLAG_REQ, + .completer = virshDomainInterfaceStateCompleter, .help = N_("new state of the device") }, {.name = "persistent", -- 2.17.1

3 3

[libvirt] [PATCH] util: Drop virArgvToString()
by Andrea Bolognani 16 Jul '18

16 Jul '18

The last use has been removed in 026ae4933c6a. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- src/libvirt_private.syms | 1 - src/util/virstring.c | 27 --------------------------- src/util/virstring.h | 2 -- 3 files changed, 30 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index e688981c3e..1caecb96b6 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -2876,7 +2876,6 @@ virStorageFileBackendRegister; # util/virstring.h -virArgvToString; virAsprintfInternal; virSkipSpaces; virSkipSpacesAndBackslash; diff --git a/src/util/virstring.c b/src/util/virstring.c index 15f367af7c..31e71d7535 100644 --- a/src/util/virstring.c +++ b/src/util/virstring.c @@ -917,33 +917,6 @@ virStringIsEmpty(const char *str) return str[0] == '\0'; } -char * -virArgvToString(const char *const *argv) -{ - int len; - size_t i; - char *ret, *p; - - for (len = 1, i = 0; argv[i]; i++) - len += strlen(argv[i]) + 1; - - if (VIR_ALLOC_N(ret, len) < 0) - return NULL; - p = ret; - - for (i = 0; argv[i]; i++) { - if (i != 0) - *(p++) = ' '; - - strcpy(p, argv[i]); - p += strlen(argv[i]); - } - - *p = '\0'; - - return ret; -} - /** * virStrdup: * @dest: where to store duplicated string diff --git a/src/util/virstring.h b/src/util/virstring.h index 726e02b98c..14948fdf1c 100644 --- a/src/util/virstring.h +++ b/src/util/virstring.h @@ -65,8 +65,6 @@ char *virStringListGetFirstWithPrefix(char **strings, const char *prefix) ATTRIBUTE_NONNULL(2); -char *virArgvToString(const char *const *argv); - int virStrToLong_i(char const *s, char **end_ptr, int base, -- 2.17.1

3 2

[libvirt] [PATCH] util: Remove ATTRIBUTE_NONNULL from virNetDevTapInterfaceStats
by John Ferlan 16 Jul '18

16 Jul '18

Commit id 318d54e520 altered the code to check for a NULL first parameter, but neglected to alter the prototype. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- Pushed under the trivial rule and as a Coverity build breaker. src/util/virnetdevtap.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/virnetdevtap.h b/src/util/virnetdevtap.h index 727368fe95..37f9367ff4 100644 --- a/src/util/virnetdevtap.h +++ b/src/util/virnetdevtap.h @@ -94,6 +94,6 @@ int virNetDevTapCreateInBridgePort(const char *brname, int virNetDevTapInterfaceStats(const char *ifname, virDomainInterfaceStatsPtr stats, bool swapped) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_RETURN_CHECK; #endif /* __VIR_NETDEV_TAP_H__ */ -- 2.17.1

1 0

Re: [libvirt] [Qemu-devel] [PULL 25/26] block: Remove deprecated -drive option serial
by Christian Borntraeger 16 Jul '18

16 Jul '18

On 06/15/2018 04:21 PM, Kevin Wolf wrote: > The -drive option serial was deprecated in QEMU 2.10. It's time to > remove it. > > Tests need to be updated to set the serial number with -global instead > of using the -drive option. libvirt 4.5 still creates those (at least on s390x) <disk type='file' device='disk'> <driver name='qemu' type='qcow2' cache='none' io='native' iothread='1'/> <source file='/var/lib/libvirt/qemu/image.zhyp137'/> <target dev='hda' bus='virtio'/> <serial>skel</serial> <boot order='1'/> <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0000'/> </disk> -> [...] -drive file=/var/lib/libvirt/qemu/image.zhyp137,format=qcow2,if=none,id=drive-virtio-disk0,serial=skel,cache=none,aio=native -device virtio-blk-ccw,iothread=iothread1,scsi=off,devno=fe.0.0000,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1,write-cache=on [...] 2018-06-22T11:25:20.946024Z qemu-system-s390x: -drive file=/var/lib/libvirt/qemu/image.zhyp137,format=qcow2,if=none,id=drive-virtio-disk0,serial=skel,cache=none,aio=native: Block format 'qcow2' does not support the option 'serial' 2018-06-22 11:25:21.098+0000: shutting down, reason=failed So it seems that this breaks s390x.

10 81

[libvirt] [PATCH v2 0/9] Resolve libvirtd hang on termination with connected long running client
by John Ferlan 16 Jul '18

16 Jul '18

v1: https://www.redhat.com/archives/libvir-list/2018-January/msg00624.html Cannot recall differences from v1. Since so much changed since v1, figured it'd be easier to just repost to continue the discussion. John Ferlan (9): libvirtd: Alter refcnt processing for domain server objects libvirtd: Alter refcnt processing for server program objects util: Introduce virThreadPoolQuitRequested rpc: Introduce virNetServerQuitRequested rpc: Introduce virNetServerWorkerCount daemon: Add quit_timeout period rpc: Alter virNetDaemonQuit processing docs: Add news article for libvirtd issue APPLY ONLY FOR TESTING PURPOSES docs/news.xml | 12 +++++ src/libvirt_private.syms | 1 + src/libvirt_remote.syms | 3 ++ src/qemu/qemu_driver.c | 5 ++ src/remote/libvirtd.aug | 1 + src/remote/libvirtd.conf | 8 +++ src/remote/remote_daemon.c | 40 ++++++++++----- src/remote/remote_daemon_config.c | 5 ++ src/remote/remote_daemon_config.h | 2 + src/remote/test_libvirtd.aug.in | 1 + src/rpc/virnetdaemon.c | 82 ++++++++++++++++++++++++++++++- src/rpc/virnetdaemon.h | 4 ++ src/rpc/virnetserver.c | 50 +++++++++++++++++++ src/rpc/virnetserver.h | 4 ++ src/util/virthreadpool.c | 51 ++++++++++++++++--- src/util/virthreadpool.h | 2 + 16 files changed, 250 insertions(+), 21 deletions(-) -- 2.17.1

3 13

[libvirt] [PATCH 0/9] extend virsh domstate to show additional information
by Bjoern Walk 16 Jul '18

16 Jul '18

This patch series introduces the ability to save additional information for the domain state and exposes this information in virsh domstate. For example in the case of QEMU guest panic events, we can provide additional information like the crash reason or register state of the domain. This information usually gets logged in the domain log but for debugging it is useful to have it accessible from the client. Therefore, let's introduce a new public API function, virDomainGetStateParams, an extensible version of virDomainGetState, which returns the complete state of the domain, including newly introduced additional information. Let's also extend virsh domstate and introduce a new parameter --info to show the domain state, reason and additional information when available. virsh # domstate --info guest-1 crashed (panicked: disabled-wait core='1' psw-mask='0x000000000010f146' \ psw-addr='0x0002000180000000') Bjoern Walk (9): conf: add info to virDomainStateReason conf: set/retrieve state information lib: introduce virDomainGetStateParams function remote: implement remoteDomainGetStateParams qemu: implement qemuDomainGetStateParams qemu: set state information for guest panic event virsh: domstate: report detailed state if available news: add entry for virDomainGetStateParams qemu: fix order of S390 panic event information docs/news.xml | 11 ++++++ include/libvirt/libvirt-domain.h | 24 ++++++++++++ src/conf/domain_conf.c | 16 +++++++- src/conf/domain_conf.h | 7 ++++ src/driver-hypervisor.h | 7 ++++ src/libvirt-domain.c | 56 ++++++++++++++++++++++++++ src/libvirt_private.syms | 1 + src/libvirt_public.syms | 5 +++ src/qemu/qemu_driver.c | 61 ++++++++++++++++++++++++++++- src/qemu/qemu_monitor.c | 39 ++++++++++++++++-- src/qemu/qemu_monitor.h | 1 + src/remote/remote_daemon_dispatch.c | 1 - src/remote/remote_driver.c | 1 + src/remote/remote_protocol.x | 20 +++++++++- src/remote_protocol-structs | 11 ++++++ tools/virsh-domain-monitor.c | 31 ++++++++++++--- tools/virsh.pod | 5 ++- 17 files changed, 281 insertions(+), 16 deletions(-) -- 2.17.0

3 13

[libvirt] [PATCH] qemu: hotplug: report error when changing rom enabled attr for net iface
by Katerina Koukiou 16 Jul '18

16 Jul '18

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1599513 Signed-off-by: Katerina Koukiou <kkoukiou(a)redhat.com> --- src/qemu/qemu_hotplug.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 3dfa51b0a0..bb50d19c85 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -3222,6 +3222,11 @@ qemuDomainChangeNet(virQEMUDriverPtr driver, _("cannot modify network device boot index setting")); goto cleanup; } + if (olddev->info.romenabled != newdev->info.romenabled) { + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", + _("cannot modify network device rom enabled setting")); + goto cleanup; + } /* (end of device info checks) */ if (STRNEQ_NULLABLE(olddev->filter, newdev->filter) || -- 2.15.0

3 2

[libvirt] [PATCH v2] qemu: fix broken autostart symlink after renaming domain.
by Julio Faracco 16 Jul '18

16 Jul '18

If a domain is configured to start on boot, it has a symlink to the domain definition inside the autostart directory. If you rename this domain, the definition is renamed too. The symlink need to be pointed to this renamed file. This commit recreates the symlink after renaming the XML file. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1594985 Signed-off-by: Julio Faracco <jcfaracco(a)gmail.com> --- src/qemu/qemu_driver.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 5de9aaefbb..a4df482c9e 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -20914,6 +20914,8 @@ qemuDomainRenameCallback(virDomainObjPtr vm, char *old_dom_name = NULL; char *new_dom_cfg_file = NULL; char *old_dom_cfg_file = NULL; + char *new_dom_autostart_link = NULL; + char *old_dom_autostart_link = NULL; virCheckFlags(0, ret); @@ -20934,6 +20936,30 @@ qemuDomainRenameCallback(virDomainObjPtr vm, vm->def->name))) goto cleanup; + if (vm->autostart) { + if (!(new_dom_autostart_link = virDomainConfigFile(cfg->autostartDir, + new_dom_name)) || + !(old_dom_autostart_link = virDomainConfigFile(cfg->autostartDir, + vm->def->name))) + goto cleanup; + + if (unlink(old_dom_autostart_link) < 0 && + errno != ENOENT && + errno != ENOTDIR) { + virReportSystemError(errno, + _("Failed to delete symlink '%s'"), + old_dom_autostart_link); + goto cleanup; + } + + if (symlink(new_dom_cfg_file, new_dom_autostart_link) < 0) { + virReportSystemError(errno, + _("Failed to create symlink '%s to '%s'"), + new_dom_autostart_link, new_dom_cfg_file); + goto cleanup; + } + } + event_old = virDomainEventLifecycleNewFromObj(vm, VIR_DOMAIN_EVENT_UNDEFINED, VIR_DOMAIN_EVENT_UNDEFINED_RENAMED); @@ -20960,6 +20986,8 @@ qemuDomainRenameCallback(virDomainObjPtr vm, ret = 0; cleanup: + VIR_FREE(old_dom_autostart_link); + VIR_FREE(new_dom_autostart_link); VIR_FREE(old_dom_cfg_file); VIR_FREE(new_dom_cfg_file); VIR_FREE(old_dom_name); -- 2.17.1

2 1

[libvirt] [PATCH] qemu: fix broken autostart symlink after renaming domain.
by Julio Faracco 16 Jul '18

16 Jul '18

If a domain is configured to start on boot, it has a symlink to the domain definition inside the autostart directory. If you rename this domain, the definition is renamed too. The symlink need to be pointed to this renamed file. This commit recreates the symlink after renaming the XML file. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1594985 Signed-off-by: Julio Faracco <jcfaracco(a)gmail.com> --- src/qemu/qemu_driver.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 5de9aaefbb..15abb861ec 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -20914,6 +20914,8 @@ qemuDomainRenameCallback(virDomainObjPtr vm, char *old_dom_name = NULL; char *new_dom_cfg_file = NULL; char *old_dom_cfg_file = NULL; + char *new_dom_autostart_link = NULL; + char *old_dom_autostart_link = NULL; virCheckFlags(0, ret); @@ -20934,6 +20936,30 @@ qemuDomainRenameCallback(virDomainObjPtr vm, vm->def->name))) goto cleanup; + if (vm->autostart) { + if (!(new_dom_autostart_link = virDomainConfigFile(cfg->autostartDir, + new_dom_name)) || + !(old_dom_autostart_link = virDomainConfigFile(cfg->autostartDir, + vm->def->name))) + goto cleanup; + + if (unlink(old_dom_autostart_link) < 0 && + errno != ENOENT && + errno != ENOTDIR) { + virReportSystemError(errno, + _("Failed to delete symlink '%s'"), + old_dom_autostart_link); + goto cleanup; + } + + if (symlink(new_dom_cfg_file, new_dom_autostart_link) < 0) { + virReportSystemError(errno, + _("Failed to create symlink '%s to '%s'"), + new_dom_autostart_link, new_dom_cfg_file); + goto cleanup; + } + } + event_old = virDomainEventLifecycleNewFromObj(vm, VIR_DOMAIN_EVENT_UNDEFINED, VIR_DOMAIN_EVENT_UNDEFINED_RENAMED); @@ -20960,6 +20986,8 @@ qemuDomainRenameCallback(virDomainObjPtr vm, ret = 0; cleanup: + VIR_FREE(old_dom_autostart_link); + VIR_FREE(new_dom_autostart_link); VIR_FREE(old_dom_cfg_file); VIR_FREE(new_dom_cfg_file); VIR_FREE(old_dom_name); -- 2.17.1

1 0

[libvirt] [PATCH] virmodule: Fix virModuleLoad stub
by Michal Privoznik 15 Jul '18

15 Jul '18

When building without dlfcn.h we are providing a virModuleLoad() stub which is supposed to report an error. However, the format string in virReportSystemError() call there requires two strings but we are passing just one. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Pushed under build breaker and trivial rules. src/util/virmodule.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/util/virmodule.c b/src/util/virmodule.c index b19a787e4f..533cfefc77 100644 --- a/src/util/virmodule.c +++ b/src/util/virmodule.c @@ -142,14 +142,14 @@ virModuleLoad(const char *path, #else /* ! HAVE_DLFCN_H */ int -virModuleLoad(const char *path ATTRIBUTE_UNUSED, +virModuleLoad(const char *path, const char *regfunc ATTRIBUTE_UNUSED, bool required) { VIR_DEBUG("dlopen not available on this platform"); if (required) { virReportSystemError(ENOSYS, - _("Failed to find module '%s': %s"), path); + _("Failed to find module '%s'"), path); return -1; } else { /* Since we have no dlopen(), but definition we have no -- 2.16.4

1 0

[libvirt] [PATCH 0/2] Add alias support in sub-commands of virsh
by Han Han 15 Jul '18

15 Jul '18

Support to set alias with --alias in virsh attach-disk and attach-interface. Han Han (2): virsh: Support alias in attach-disk virsh: Support alias in attach-interface tools/virsh-domain.c | 30 ++++++++++++++++++++++++++++-- tools/virsh.pod | 7 +++++-- 2 files changed, 33 insertions(+), 4 deletions(-) -- 2.17.1

1 2

[libvirt] [PATCH] util: remove unused variable inside virFileReadValueString().
by Julio Faracco 15 Jul '18

15 Jul '18

The commit 69b937f0358 introduced VIR_AUTOFREE and this macro removed VIR_FREE. This change showed that 'str' variable was not being used inside this method. This commit removes this unused variable. Signed-off-by: Julio Faracco <jcfaracco(a)gmail.com> --- src/util/virfile.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/util/virfile.c b/src/util/virfile.c index 6b94885a87..1faeebbdb5 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -4228,7 +4228,6 @@ int virFileReadValueString(char **value, const char *format, ...) { int ret; - VIR_AUTOFREE(char *) str = NULL; VIR_AUTOFREE(char *) path = NULL; va_list ap; -- 2.17.1

2 1

[libvirt] [PATCH v4 00/31] use GNU C's cleanup attribute in src/util (batch I)
by Sukrit Bhatnagar 15 Jul '18

15 Jul '18

This series of patches first introduces a new set of macros which help in using GNU C's __attribute__((cleanup)) in the code. Then a few syntax-check rules are added which help in ensuring correct usage of the newly introduced cleanup macros. Then the patches modify a few files in src/util to use VIR_AUTOFREE and VIR_AUTOPTR for automatic freeing of memory and get rid of some VIR_FREE macro invocations and *Free function calls. Sukrit Bhatnagar (31): util: alloc: add macros for implementing automatic cleanup functionality cfg.mk: variable initialization when declared with cleanup macro util: string: define cleanup function using VIR_DEFINE_AUTOPTR_FUNC util: command: define cleanup function using VIR_DEFINE_AUTOPTR_FUNC util: command: remove redundant include directive util: command: use VIR_AUTOFREE instead of VIR_FREE for scalar types util: command: use VIR_AUTOPTR for aggregate types util: file: define cleanup function using VIR_DEFINE_AUTOPTR_FUNC util: file: remove redundant include directive util: file: use VIR_AUTOFREE instead of VIR_FREE for scalar types util: file: use VIR_AUTOPTR for aggregate types util: authconfig: define cleanup function using VIR_DEFINE_AUTOPTR_FUNC util: authconfig: remove redundant include directive util: authconfig: use VIR_AUTOFREE instead of VIR_FREE for scalar types util: auth: remove redundant include directive util: auth: use VIR_AUTOFREE instead of VIR_FREE for scalar types util: auth: use VIR_AUTOPTR for aggregate types util: json: define cleanup function using VIR_DEFINE_AUTOPTR_FUNC util: json: remove redundant include directive util: json: use VIR_AUTOFREE instead of VIR_FREE for scalar types util: json: use VIR_AUTOPTR for aggregate types util: bitmap: define cleanup function using VIR_DEFINE_AUTOPTR_FUNC util: bitmap: remove redundant include directive util: bitmap: use VIR_AUTOPTR for aggregate types util: iohelper: use VIR_AUTOFREE instead of VIR_FREE for scalar types util: arptable: use VIR_AUTOFREE instead of VIR_FREE for scalar types util: audit: use VIR_AUTOFREE instead of VIR_FREE for scalar types util: fcp: use VIR_AUTOFREE instead of VIR_FREE for scalar types util: eventpoll: use VIR_AUTOFREE instead of VIR_FREE for scalar types util: filecache: use VIR_AUTOFREE instead of VIR_FREE for scalar types util: identity: use VIR_AUTOFREE instead of VIR_FREE for scalar types cfg.mk | 11 ++ src/util/iohelper.c | 4 +- src/util/viralloc.h | 42 ++++++ src/util/virarptable.c | 14 +- src/util/viraudit.c | 3 +- src/util/virauth.c | 61 +++------ src/util/virauthconfig.c | 35 ++--- src/util/virauthconfig.h | 3 + src/util/virbitmap.c | 8 +- src/util/virbitmap.h | 3 + src/util/vircommand.c | 51 +++----- src/util/vircommand.h | 2 + src/util/vireventpoll.c | 7 +- src/util/virfcp.c | 20 +-- src/util/virfile.c | 327 ++++++++++++++++------------------------------- src/util/virfile.h | 3 + src/util/virfilecache.c | 35 ++--- src/util/viridentity.c | 52 ++++---- src/util/virjson.c | 68 +++------- src/util/virjson.h | 3 + src/util/virstring.h | 5 + 21 files changed, 292 insertions(+), 465 deletions(-) -- 1.8.3.1

2 34

[libvirt] [PATCH 0/4] Fix and improve hugepage code
by Pavel Hrdina 14 Jul '18

14 Jul '18

Pavel Hrdina (4): tests: Add additional hugepage tests to cover current state conf: Move hugepage XML validation check out of qemu_command conf: Move hugepages validation out of XML parser conf: Introduce virDomainDefPostParseMemtune src/conf/domain_conf.c | 134 +++++++++++++----- src/qemu/qemu_command.c | 34 ----- tests/qemuxml2argvdata/hugepages-pages10.args | 26 ++++ tests/qemuxml2argvdata/hugepages-pages10.xml | 30 ++++ tests/qemuxml2argvdata/hugepages-pages9.xml | 31 ++++ .../seclabel-dynamic-none-relabel.xml | 2 +- tests/qemuxml2argvtest.c | 14 +- .../qemuxml2xmloutdata/hugepages-pages10.xml | 30 ++++ tests/qemuxml2xmloutdata/hugepages-pages4.xml | 1 - .../seclabel-dynamic-none-relabel.xml | 2 +- tests/qemuxml2xmltest.c | 2 +- 11 files changed, 228 insertions(+), 78 deletions(-) create mode 100644 tests/qemuxml2argvdata/hugepages-pages10.args create mode 100644 tests/qemuxml2argvdata/hugepages-pages10.xml create mode 100644 tests/qemuxml2argvdata/hugepages-pages9.xml create mode 100644 tests/qemuxml2xmloutdata/hugepages-pages10.xml delete mode 120000 tests/qemuxml2xmloutdata/hugepages-pages4.xml -- 2.17.1

2 14

[libvirt] [REPOST PATCHv2 0/2] Alter qemu live/cold device attach algorithm
by John Ferlan 14 Jul '18

14 Jul '18

REPOST of: https://www.redhat.com/archives/libvir-list/2018-June/msg00965.html Resolves conflicts with commit 5e9b150f and 4ad54a417 (adding @live and restoring the @action to virDomainDefCompatibleDevice method). The only change from the previous posting is an update to the commit message in patch 1 to futher describe why the alteration is being done and what the comparable is. John Ferlan (2): qemu: Check for existing hostdev address for cold attach device qemu: Use the correct vm def on cold attach src/qemu/qemu_driver.c | 58 +++++++++++++++++++++++++------------------------- 1 file changed, 29 insertions(+), 29 deletions(-) -- 2.14.4

2 8

[libvirt] [PATCH 0/2] Fix libvirt for kernels without DM support
by Michal Privoznik 14 Jul '18

14 Jul '18

*** BLURB HERE *** Michal Prívozník (2): virDevMapperGetTargetsImpl: Be tolerant to kernels without DM support qemu_cgroup: Allow/disallow devmapper control iff available src/qemu/qemu_cgroup.c | 36 +++++++++++++++++++----------------- src/util/virdevmapper.c | 8 +++++++- 2 files changed, 26 insertions(+), 18 deletions(-) -- 2.16.4

2 3

[libvirt] [PATCH v2] virnetdevtap: Don't crash on !ifname in virNetDevTapInterfaceStats
by Michal Privoznik 13 Jul '18

13 Jul '18

https://bugzilla.redhat.com/show_bug.cgi?id=1595184 Some domain <interfaces/> do not have a name (because they are not TAP devices). Therefore, if virNetDevTapInterfaceStats(net->ifname, ...) is called an instant crash occurs. In Linux version of the function strlen() is called over the name and in BSD version STREQ() is called. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- diff to v1: - changed the error message - fixed check in BSD version src/util/virnetdevtap.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/util/virnetdevtap.c b/src/util/virnetdevtap.c index bd0710ad2e..3118ca18e8 100644 --- a/src/util/virnetdevtap.c +++ b/src/util/virnetdevtap.c @@ -691,6 +691,12 @@ virNetDevTapInterfaceStats(const char *ifname, FILE *fp; char line[256], *colon; + if (!ifname) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Interface name not provided")); + return -1; + } + fp = fopen("/proc/net/dev", "r"); if (!fp) { virReportSystemError(errno, "%s", @@ -768,6 +774,12 @@ virNetDevTapInterfaceStats(const char *ifname, struct if_data *ifd; int ret = -1; + if (!ifname) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Interface name not provided")); + return -1; + } + if (getifaddrs(&ifap) < 0) { virReportSystemError(errno, "%s", _("Could not get interface list")); -- 2.16.4

2 1

[libvirt] [PATCH 0/6] tests: qemu: Fix testing QMP commands against the schema
by Peter Krempa 13 Jul '18

13 Jul '18

I was trying to add some new commands and made a typo. The tests did not catch it. I must have messed up something when sending the original schema validation impl. Peter Krempa (6): tests: qemuschema: Fix copy-paste error in function name tests: qemuschema: Add line break to debug message tests: qemumonitorutils: Don't crash on wrong monitor command tests: qemumonitorjson: Raise the necessary debug level for QAPI schema checks tests: qemumonitorjson: Fix schema testing of monitor commands tests: qemumonitorjson: Do QMP schema validation for DO_TEST_GEN tests/qemumonitorjsontest.c | 10 ++++++---- tests/qemumonitortestutils.c | 3 ++- tests/testutilsqemuschema.c | 10 +++++----- 3 files changed, 13 insertions(+), 10 deletions(-) -- 2.16.2

2 8

[libvirt] [PATCH] virnetdevtap: Don't crash on !ifname in virNetDevTapInterfaceStats
by Michal Privoznik 13 Jul '18

13 Jul '18

https://bugzilla.redhat.com/show_bug.cgi?id=1595184 Some domain <interfaces/> do not have a name (because they are not TAP devices). Therefore, if virNetDevTapInterfaceStats(net->ifname, ...) is called an instant crash occurs. In Linux version of the function strlen() is called over the name and in BSD version STREQ() is called. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/util/virnetdevtap.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/util/virnetdevtap.c b/src/util/virnetdevtap.c index bd0710ad2e..2123ffe718 100644 --- a/src/util/virnetdevtap.c +++ b/src/util/virnetdevtap.c @@ -691,6 +691,12 @@ virNetDevTapInterfaceStats(const char *ifname, FILE *fp; char line[256], *colon; + if (!ifname) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Interface not found")); + return -1; + } + fp = fopen("/proc/net/dev", "r"); if (!fp) { virReportSystemError(errno, "%s", @@ -781,7 +787,7 @@ virNetDevTapInterfaceStats(const char *ifname, if (ifa->ifa_addr->sa_family != AF_LINK) continue; - if (STREQ(ifa->ifa_name, ifname)) { + if (STREQ_NULLABLE(ifa->ifa_name, ifname)) { ifd = (struct if_data *)ifa->ifa_data; if (swapped) { stats->tx_bytes = ifd->ifi_ibytes; -- 2.16.4

2 1

[libvirt] [jenkins-ci PATCH] guests: Stop using search() as a filter
by Andrea Bolognani 13 Jul '18

13 Jul '18

Recent versions of Ansible complain about this, and suggest to replace 'result|search' with 'result is search'. Since f17097c7af59, however, we've been including operating system information in the inventory: this allows us to drop our use of search() entirely. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- guests/tasks/bootstrap.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/guests/tasks/bootstrap.yml b/guests/tasks/bootstrap.yml index 24848c8..d7abb86 100644 --- a/guests/tasks/bootstrap.yml +++ b/guests/tasks/bootstrap.yml @@ -2,21 +2,19 @@ - name: Bootstrap the pkgng package manager raw: env ASSUME_ALWAYS_YES=YES pkg bootstrap when: - - inventory_hostname|search('freebsd') + - package_format == 'pkg' - name: Bootstrap Ansible raw: yum install -y python2 when: - - ( inventory_hostname|search('centos') or - inventory_hostname|search('fedora') ) + - package_format == 'rpm' - name: Bootstrap Ansible raw: apt-get install -y python when: - - ( inventory_hostname|search('debian') or - inventory_hostname|search('ubuntu') ) + - package_format == 'deb' - name: Bootstrap Ansible raw: pkg install -y python2 when: - - inventory_hostname|search('freebsd') + - package_format == 'pkg' -- 2.17.1

2 1

[libvirt] [PATCH v2 0/2] test: Implement virConnectListAllNodeDevices
by Cole Robinson 13 Jul '18

13 Jul '18

v1: https://www.redhat.com/archives/libvir-list/2018-February/msg01135.html virnodedeviceobj.c generic ListAll infrastructure is not stateless and will try to refresh nodedev scsi/pci/etc. config. Understandable this doesn't play well with the test driver. Trying to untangle it is a bit tough though. This series adds a way to skip touching the host so we can implement ListAllDevices in the test driver, which we want for virt-manager and libvirt-dbus test suites Cole Robinson (2): conf: nodedev: Don't refresh host caps in testdriver test: Implement virConnectListAllNodeDevices src/conf/virnodedeviceobj.c | 13 ++++++++++++- src/conf/virnodedeviceobj.h | 4 ++++ src/test/test_driver.c | 15 +++++++++++++++ 3 files changed, 31 insertions(+), 1 deletion(-) -- 2.17.1

2 4

[libvirt] [jenkins-ci PATCH] guests: List all known guests in inventory
by Andrea Bolognani 13 Jul '18

13 Jul '18

Users will probably want to only work with a subset of guests but, like any other customization, that should be handled with local tweaks. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- guests/inventory | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/guests/inventory b/guests/inventory index 6ea43d9..9838d7c 100644 --- a/guests/inventory +++ b/guests/inventory @@ -1,8 +1,12 @@ libvirt-centos-7 libvirt-debian-8 libvirt-debian-9 +libvirt-debian-sid libvirt-fedora-27 libvirt-fedora-28 libvirt-fedora-rawhide libvirt-freebsd-10 libvirt-freebsd-11 +libvirt-freebsd-current +libvirt-ubuntu-16 +libvirt-ubuntu-18 -- 2.17.1

2 4

[libvirt] [PATCH] docs: schema: Add missing <alias> to vsock device
by Han Han 13 Jul '18

13 Jul '18

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1600345 Signed-off-by: Han Han <hhan(a)redhat.com> --- docs/schemas/domaincommon.rng | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index bd687ce9d3..f24a56392a 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -4234,6 +4234,9 @@ <optional> <ref name="address"/> </optional> + <optional> + <ref name="alias"/> + </optional> </interleave> </element> </define> -- 2.17.1

2 1

[libvirt] [PATCH] virsh.pod: Fix typo of nwfilter-binding-undefine
by Han Han 13 Jul '18

13 Jul '18

Rename nwfilter-binding-undefine to nwfilter-binding-delete. Signed-off-by: Han Han <hhan(a)redhat.com> --- tools/virsh.pod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/virsh.pod b/tools/virsh.pod index 4c6e21fc22..771e99591e 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -4828,7 +4828,7 @@ of the network filters directly. Associate a network port with a network filter. The network filter backend will immediately attempt to instantiate the filter rules on the port. -=item B<nwfilter-binding-undefine> I<port-name> +=item B<nwfilter-binding-delete> I<port-name> Disassociate a network port from a network filter. The network filter backend will immediately tear down the filter rules that exist on the -- 2.17.1

2 1

[libvirt] [PATCH v3 00/35] use GNU C's cleanup attribute in src/util (batch I)
by Sukrit Bhatnagar 13 Jul '18

13 Jul '18

This series of patches first introduces a new set of macros which help in using GNU C's __attribute__((cleanup)) in the code. Then a few syntax-check rules are added which help in ensuring correct usage of the newly introduced cleanup macros. Then the patches modify a few files in src/util to use VIR_AUTOFREE and VIR_AUTOPTR for automatic freeing of memory and get rid of some VIR_FREE macro invocations and *Free function calls. Sukrit Bhatnagar (35): util: alloc: add macros for implementing automatic cleanup functionality cfg.mk: variable initialization when declared with cleanup macro cfg.mk: correct spacing between type and asterisk in VIR_AUTOFREE cfg.mk: single variable declaration per line when using cleanup macro cfg.mk: no trailing semicolon at line invoking VIR_DEFINE_* cleanup macro util: string: introduce typedef for string util: string: define cleanup function using VIR_DEFINE_AUTOPTR_FUNC util: command: define cleanup function using VIR_DEFINE_AUTOPTR_FUNC util: command: remove redundant include directive util: command: use VIR_AUTOFREE instead of VIR_FREE for scalar types util: command: use VIR_AUTOPTR for aggregate types util: file: define cleanup function using VIR_DEFINE_AUTOPTR_FUNC util: file: remove redundant include directive util: file: use VIR_AUTOFREE instead of VIR_FREE for scalar types util: file: use VIR_AUTOPTR for aggregate types util: authconfig: define cleanup function using VIR_DEFINE_AUTOPTR_FUNC util: authconfig: remove redundant include directive util: authconfig: use VIR_AUTOFREE instead of VIR_FREE for scalar types util: auth: remove redundant include directive util: auth: use VIR_AUTOFREE instead of VIR_FREE for scalar types util: auth: use VIR_AUTOPTR for aggregate types util: json: define cleanup function using VIR_DEFINE_AUTOPTR_FUNC util: json: remove redundant include directive util: json: use VIR_AUTOFREE instead of VIR_FREE for scalar types util: json: use VIR_AUTOPTR for aggregate types util: bitmap: define cleanup function using VIR_DEFINE_AUTOPTR_FUNC util: bitmap: remove redundant include directive util: bitmap: use VIR_AUTOPTR for aggregate types util: iohelper: use VIR_AUTOFREE instead of VIR_FREE for scalar types util: arptable: use VIR_AUTOFREE instead of VIR_FREE for scalar types util: audit: use VIR_AUTOFREE instead of VIR_FREE for scalar types util: fcp: use VIR_AUTOFREE instead of VIR_FREE for scalar types util: eventpoll: use VIR_AUTOFREE instead of VIR_FREE for scalar types util: filecache: use VIR_AUTOFREE instead of VIR_FREE for scalar types util: identity: use VIR_AUTOFREE instead of VIR_FREE for scalar types cfg.mk | 37 ++++++ src/util/iohelper.c | 4 +- src/util/viralloc.h | 44 +++++++ src/util/virarptable.c | 14 +- src/util/viraudit.c | 3 +- src/util/virauth.c | 61 +++------ src/util/virauthconfig.c | 35 ++--- src/util/virauthconfig.h | 3 + src/util/virbitmap.c | 8 +- src/util/virbitmap.h | 3 + src/util/vircommand.c | 47 ++----- src/util/vircommand.h | 2 + src/util/vireventpoll.c | 7 +- src/util/virfcp.c | 20 +-- src/util/virfile.c | 327 ++++++++++++++++------------------------------- src/util/virfile.h | 3 + src/util/virfilecache.c | 35 ++--- src/util/viridentity.c | 52 ++++---- src/util/virjson.c | 68 +++------- src/util/virjson.h | 3 + src/util/virstring.h | 5 + 21 files changed, 319 insertions(+), 462 deletions(-) -- 1.8.3.1

3 69

[libvirt] [PATCH] qemu: Fix ATTRIBUTE_NONNULL for qemuMonitorAddObject
by John Ferlan 13 Jul '18

13 Jul '18

Commit id fac0dacd was trying to make things more robust; however, the ATTRIBUTE_NONNULL(1) would be for the @mon, not the intended (2) and the @props argument as described in the commit message. Found by Coverity build. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- Pushed as trivial and Coverity build breaker. src/qemu/qemu_monitor.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index e8ed2d044c..81474a04f6 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -824,7 +824,7 @@ int qemuMonitorCreateObjectProps(virJSONValuePtr *propsret, int qemuMonitorAddObject(qemuMonitorPtr mon, virJSONValuePtr *props, char **alias) - ATTRIBUTE_NONNULL(1); + ATTRIBUTE_NONNULL(2); int qemuMonitorDelObject(qemuMonitorPtr mon, const char *objalias); -- 2.17.1

1 0

[libvirt] [PATCH v2] New virsh feature: domif-setlink --domain --interface --state completer
by Simon Kobyda 13 Jul '18

13 Jul '18

After you go through command mentioned above, completer finds what state the device is currently in, and suggests an opposite state. Signed-off-by: Simon Kobyda <skobyda(a)redhat.com> --- Changes in V2: - Added "Signed-off-by" - Changed format of commit message to make it more readable tools/virsh-completer.c | 73 ++++++++++++++++++++++++++++++++++++++++- tools/virsh-completer.h | 4 +++ tools/virsh-domain.c | 1 + 3 files changed, 77 insertions(+), 1 deletion(-) diff --git a/tools/virsh-completer.c b/tools/virsh-completer.c index 2327e08340..e32fd82211 100644 --- a/tools/virsh-completer.c +++ b/tools/virsh-completer.c @@ -32,6 +32,7 @@ #include "internal.h" #include "virutil.h" #include "viralloc.h" +#include "virmacaddr.h" #include "virstring.h" #include "virxml.h" @@ -750,7 +751,6 @@ virshDomainEventNameCompleter(vshControl *ctl ATTRIBUTE_UNUSED, return NULL; } - char ** virshPoolEventNameCompleter(vshControl *ctl ATTRIBUTE_UNUSED, const vshCmd *cmd ATTRIBUTE_UNUSED, @@ -776,6 +776,77 @@ virshPoolEventNameCompleter(vshControl *ctl ATTRIBUTE_UNUSED, return NULL; } +char ** +virshDomainInterfaceStateCompleter(vshControl *ctl ATTRIBUTE_UNUSED, + const vshCmd *cmd ATTRIBUTE_UNUSED, + unsigned int flags) +{ + virshControlPtr priv = ctl->privData; + const char *iface = NULL; + char **ret = NULL; + xmlDocPtr xml = NULL; + virMacAddr macaddr; + char *state = NULL; + char *xpath = NULL; + char macstr[18] = ""; + xmlXPathContextPtr ctxt = NULL; + xmlNodePtr *interfaces = NULL; + int ninterfaces; + + virCheckFlags(0, NULL); + + if (!priv->conn || virConnectIsAlive(priv->conn) <= 0) + return NULL; + + if (vshCommandOptStringReq(ctl, cmd, "interface", &iface) < 0) + goto cleanup; + + if (virshDomainGetXML(ctl, cmd, flags, &xml, &ctxt) < 0) + goto cleanup; + + /* normalize the mac addr */ + if (virMacAddrParse(iface, &macaddr) == 0) + virMacAddrFormat(&macaddr, macstr); + + if (virAsprintf(&xpath, "/domain/devices/interface[(mac/@address = '%s') or " + " (target/@dev = '%s')]", + macstr, iface) < 0) + goto cleanup; + + if ((ninterfaces = virXPathNodeSet(xpath, ctxt, &interfaces)) < 0) + goto cleanup; + + if (ninterfaces != 1) + goto cleanup; + + ctxt->node = interfaces[0]; + + if (VIR_ALLOC_N(ret, 2) < 0) + goto error; + + if ((state = virXPathString("string(./link/@state)", ctxt)) && + STREQ(state, "down")) { + if (VIR_STRDUP(ret[0], "up") < 0) + goto error; + } else { + if (VIR_STRDUP(ret[0], "down") < 0) + goto error; + } + + cleanup: + VIR_FREE(state); + VIR_FREE(interfaces); + VIR_FREE(xpath); + xmlXPathFreeContext(ctxt); + xmlFreeDoc(xml); + return ret; + + error: + virStringListFree(ret); + ret = NULL; + goto cleanup; +} + char ** virshNodedevEventNameCompleter(vshControl *ctl ATTRIBUTE_UNUSED, diff --git a/tools/virsh-completer.h b/tools/virsh-completer.h index 1c14bb2a54..b4fd2a86c6 100644 --- a/tools/virsh-completer.h +++ b/tools/virsh-completer.h @@ -94,6 +94,10 @@ char ** virshPoolEventNameCompleter(vshControl *ctl, const vshCmd *cmd, unsigned int flags); +char ** virshDomainInterfaceStateCompleter(vshControl *ctl, + const vshCmd *cmd, + unsigned int flags); + char ** virshNodedevEventNameCompleter(vshControl *ctl, const vshCmd *cmd, unsigned int flags); diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 3959b5475b..8adec1d9b1 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -3064,6 +3064,7 @@ static const vshCmdOptDef opts_domif_setlink[] = { {.name = "state", .type = VSH_OT_DATA, .flags = VSH_OFLAG_REQ, + .completer = virshDomainInterfaceStateCompleter, .help = N_("new state of the device") }, {.name = "persistent", -- 2.17.1

2 1

[libvirt] [PATCH 0/8] qemu: Sanitize monitor code to create snapshots
by Peter Krempa 13 Jul '18

13 Jul '18

Require that the 'transaction' command is present for external snapshots to work and remove the various hacks which were present to make it work without that. Peter Krempa (8): qemu: snapshot: Require support of 'transaction' command for external snapshots qemu: snapshot: Remove monitor code now that 'transaction' is always used qemu: snapshot: Unify conditions checking whether snapshot needs to be taken qemu: snapshot: Audit actual disk snapshot creation qemu: monitor: Add API to help creating 'transaction' arguments qemu: block: Create helper for creating data for legacy snapshots qemu: monitor: Remove old external snapshot code qemu: monitor: Remove old code for dual handling of 'transaction' data src/qemu/qemu_block.c | 37 +++++++++++++ src/qemu/qemu_block.h | 6 ++ src/qemu/qemu_driver.c | 128 ++++++++++++------------------------------- src/qemu/qemu_monitor.c | 17 ------ src/qemu/qemu_monitor.h | 6 -- src/qemu/qemu_monitor_json.c | 125 +++++++++++++++++++----------------------- src/qemu/qemu_monitor_json.h | 12 ++-- 7 files changed, 138 insertions(+), 193 deletions(-) -- 2.16.2

2 16

[libvirt] [PATCH v2] completer: Doesn't alloc enough space for null terminated array of strings
by Simon Kobyda 13 Jul '18

13 Jul '18

Functions virshSecretEventNameCompleter, virshPoolEventNameCompleter, virshNodedevEventNameCompleter allocates only enough space for array of N strings. However these are null terminated strings, so program needs to alloc space for array of N+1 strings. How to replicate error: valgrind virsh, use completer for '-nodedev-event --event' or '-pool-event --event' or '-secret-event --event'. Signed-off-by: Simon Kobyda <skobyda(a)redhat.com> --- Changes in V2: - Added "Signed-off-by" - Changed format of commit message to make it more readable tools/virsh-completer.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/virsh-completer.c b/tools/virsh-completer.c index 2327e08340..be59ea2e82 100644 --- a/tools/virsh-completer.c +++ b/tools/virsh-completer.c @@ -709,7 +709,7 @@ virshSecretEventNameCompleter(vshControl *ctl ATTRIBUTE_UNUSED, virCheckFlags(0, NULL); - if (VIR_ALLOC_N(ret, VIR_SECRET_EVENT_ID_LAST) < 0) + if (VIR_ALLOC_N(ret, VIR_SECRET_EVENT_ID_LAST + 1) < 0) goto error; for (i = 0; i < VIR_SECRET_EVENT_ID_LAST; i++) { @@ -761,7 +761,7 @@ virshPoolEventNameCompleter(vshControl *ctl ATTRIBUTE_UNUSED, virCheckFlags(0, NULL); - if (VIR_ALLOC_N(ret, VIR_STORAGE_POOL_EVENT_ID_LAST) < 0) + if (VIR_ALLOC_N(ret, VIR_STORAGE_POOL_EVENT_ID_LAST + 1) < 0) goto error; for (i = 0; i < VIR_STORAGE_POOL_EVENT_ID_LAST; i++) { @@ -787,7 +787,7 @@ virshNodedevEventNameCompleter(vshControl *ctl ATTRIBUTE_UNUSED, virCheckFlags(0, NULL); - if (VIR_ALLOC_N(ret, VIR_NODE_DEVICE_EVENT_ID_LAST) < 0) + if (VIR_ALLOC_N(ret, VIR_NODE_DEVICE_EVENT_ID_LAST + 1) < 0) goto error; for (i = 0; i < VIR_NODE_DEVICE_EVENT_ID_LAST; i++) { -- 2.17.1

2 1

[libvirt] [PATCH] completer: Doesn't alloc enough space for null terminated array of strings
by Simon Kobyda 12 Jul '18

12 Jul '18

Functions virshSecretEventNameCompleter, virshPoolEventNameCompleter, virshNodedevEventNameCompleter allocates only enough space for array of N strings. However these are null terminated strings, so program needs to alloc space for array of N+1 strings. How to replicate error: valgrind virsh, use completer for '-nodedev-event --event' or '-pool-event --event' or '-secret-event --event'. --- tools/virsh-completer.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/virsh-completer.c b/tools/virsh-completer.c index 2327e08340..be59ea2e82 100644 --- a/tools/virsh-completer.c +++ b/tools/virsh-completer.c @@ -709,7 +709,7 @@ virshSecretEventNameCompleter(vshControl *ctl ATTRIBUTE_UNUSED, virCheckFlags(0, NULL); - if (VIR_ALLOC_N(ret, VIR_SECRET_EVENT_ID_LAST) < 0) + if (VIR_ALLOC_N(ret, VIR_SECRET_EVENT_ID_LAST + 1) < 0) goto error; for (i = 0; i < VIR_SECRET_EVENT_ID_LAST; i++) { @@ -761,7 +761,7 @@ virshPoolEventNameCompleter(vshControl *ctl ATTRIBUTE_UNUSED, virCheckFlags(0, NULL); - if (VIR_ALLOC_N(ret, VIR_STORAGE_POOL_EVENT_ID_LAST) < 0) + if (VIR_ALLOC_N(ret, VIR_STORAGE_POOL_EVENT_ID_LAST + 1) < 0) goto error; for (i = 0; i < VIR_STORAGE_POOL_EVENT_ID_LAST; i++) { @@ -787,7 +787,7 @@ virshNodedevEventNameCompleter(vshControl *ctl ATTRIBUTE_UNUSED, virCheckFlags(0, NULL); - if (VIR_ALLOC_N(ret, VIR_NODE_DEVICE_EVENT_ID_LAST) < 0) + if (VIR_ALLOC_N(ret, VIR_NODE_DEVICE_EVENT_ID_LAST + 1) < 0) goto error; for (i = 0; i < VIR_NODE_DEVICE_EVENT_ID_LAST; i++) { -- 2.17.1

2 1

[libvirt] [PATCH] examples: Add clean-traffic-gateway into nwfilters
by Ales Musil 12 Jul '18

12 Jul '18

This filter should be used to limit traffic between VMs based on their MAC adddresses. The MAC address can be set with GATEWAY_MAC and mask with GATEWAY_MAC_MASK variable. Signed-off-by: Ales Musil <amusil(a)redhat.com> --- examples/xml/nwfilter/clean-traffic-gateway.xml | 36 +++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 examples/xml/nwfilter/clean-traffic-gateway.xml diff --git a/examples/xml/nwfilter/clean-traffic-gateway.xml b/examples/xml/nwfilter/clean-traffic-gateway.xml new file mode 100644 index 0000000..d1e7c81 --- /dev/null +++ b/examples/xml/nwfilter/clean-traffic-gateway.xml @@ -0,0 +1,36 @@ +<filter name='clean-traffic-gateway'> +  + <filterref filter='no-mac-spoofing'/> + +  + <filterref filter='no-ip-spoofing'/> + +  + <filterref filter='no-arp-spoofing'/> + +  + <rule action='accept' direction='inout' priority='-500'> + <mac protocolid='arp'/> + </rule> + +  + <rule action='accept' direction='in'> + <mac match='yes' srcmacaddr='$GATEWAY_MAC' + srcmacmask='$GATEWAY_MAC_MASK'/> + </rule> + +  + <rule action='accept' direction='out'> + <mac match='yes' dstmacaddr='$GATEWAY_MAC' + dstmacmask='$GATEWAY_MAC_MASK'/> + </rule> + +  + <filterref filter='no-other-l2-traffic'/> + +  + <filterref filter='qemu-announce-self'/> +</filter> -- 1.8.3.1

1 0

[libvirt] [PATCH v1] storage: prefer using newDef to save configfile
by Shichangkuo 12 Jul '18

12 Jul '18

When re-defining an active storage pool, the configfile has not changed. This issue was introduced by bfcd8fc, storage: Use virStoragePoolObjGetDef accessor for driver. So we prefer using newDef to save configfile. Signed-off-by: shichangkuo <shi.changkuo(a)h3c.com> --- src/storage/storage_driver.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index 254818e..8070d15 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -810,13 +810,14 @@ storagePoolDefineXML(virConnectPtr conn, if (!(obj = virStoragePoolObjAssignDef(driver->pools, newDef))) goto cleanup; - newDef = NULL; + newDef = virStoragePoolObjGetNewDef(obj); def = virStoragePoolObjGetDef(obj); - if (virStoragePoolObjSaveDef(driver, obj, def) < 0) { + if (virStoragePoolObjSaveDef(driver, obj, newDef ? newDef : def) < 0) { virStoragePoolObjRemove(driver->pools, obj); virObjectUnref(obj); obj = NULL; + newDef = NULL; goto cleanup; } @@ -826,6 +827,7 @@ storagePoolDefineXML(virConnectPtr conn, VIR_INFO("Defining storage pool '%s'", def->name); pool = virGetStoragePool(conn, def->name, def->uuid, NULL, NULL); + newDef = NULL; cleanup: virObjectEventStateQueue(driver->storageEventState, event); -- 1.7.9.5 ------------------------------------------------------------------------------------------------------------------------------------- 本邮件及其附件含有新华三集团的保密信息，仅限于发送给上面地址中列出的个人或群组。禁止任何其他人以任何形式使用（包括但不限于全部或部分地泄露、复制、或散发）本邮件中的信息。如果您错收了本邮件，请您立即电话或邮件通知发件人并删除本邮件！ This e-mail and its attachments contain confidential information from New H3C, which is intended only for the person or entity whose address is listed above. Any use of the information contained herein in any way (including, but not limited to, total or partial disclosure, reproduction, or dissemination) by persons other than the intended recipient(s) is prohibited. If you receive this e-mail in error, please notify the sender by phone or email immediately and delete it!

1 0

Re: [libvirt] opening tap devices that are created in a container
by Jason Baron 12 Jul '18

12 Jul '18

On 07/11/2018 06:10 AM, nert@wheatley wrote: > On Mon, Jul 09, 2018 at 05:00:49PM -0400, Jason Baron wrote: >> >> >> On 07/08/2018 02:01 AM, Martin Kletzander wrote: >>> On Thu, Jul 05, 2018 at 06:24:20PM +0200, Roman Mohr wrote: >>>> On Thu, Jul 5, 2018 at 4:20 PM Jason Baron <jbaron(a)akamai.com> wrote: >>>> >>>>> Hi, >>>>> >>>>> Opening tap devices, such as macvtap, that are created in >>>>> containers is >>>>> problematic because the interface for opening tap devices is via >>>>> /dev/tapNN and devtmpfs is not typically mounted inside a container as >>>>> its not namespace aware. It is possible to do a mknod() in the >>>>> container, once the tap devices are created, however, since the tap >>>>> devices are created dynamically its not possible to apriori allow >>>>> access >>>>> to certain major/minor numbers, since we don't know what these are >>>>> going >>>>> to be. In addition, its desirable to not allow the mknod capability in >>>>> containers. This behavior, I think is somewhat inconsistent with the >>>>> tuntap driver where one can create tuntap devices inside a >>>>> container by >>>>> first opening /dev/net/tun and then using them by supplying the tuntap >>>>> device name via the ioctl(TUNSETIFF). And since TUNSETIFF validates >>>>> the >>>>> network namespace, one is limited to opening network devices that >>>>> belong >>>>> to your current network namespace. >>>>> >>>>> Here are some options to this issue, that I wanted to get feedback >>>>> about, and just wondering if anybody else has run into this. >>>>> >>>>> 1) >>>>> >>>>> Don't create the tap device, such as macvtap in the container. >>>>> Instead, >>>>> create the tap device outside of the container and then move it >>>>> into the >>>>> desired container network namespace. In addition, do a mknod() for the >>>>> corresponding /dev/tapNN device from outside the container before >>>>> doing >>>>> chroot(). >>>>> >>>>> This solution still doesn't allow tap devices to be created inside the >>>>> container. Thus, in the case of kubevirt, which runs libvirtd >>>>> inside of >>>>> a container, it would mean changing libvirtd to open existing tap >>>>> devices (as opposed to the current behavior of creating new ones). >>>>> This >>>>> would not require any kernel changes, but as mentioned seems >>>>> inconsistent with the tuntap interface. >>>>> >>>> >>>> For KubeVirt, apart from how exactly the device ends up in the >>>> container, I >>>> would want to pursue a way where all network preparations which require >>>> privileges happens from a privileged process *outside* of the >>>> container. >>>> Like CNI solutions do it. They run outside, have privileges and then >>>> create >>>> devices in the right network/mount namespace or move them there. The >>>> final >>>> goal for KubeVirt is that our pod with the qemu process is completely >>>> unprivileged and privileged setup happens from outside. >>>> >>>> As a consequence, and depending on which route Dan pursues with the >>>> restructured libvirt, I would assume that either a privileged >>>> libvirtd-part >>>> outside of containers creates the devices by entering the right >>>> namespaces, >>>> or that libvirt in the container can consume pre-created tun/tap >>>> devices, >>>> like qemu. >>>> >>> >>> That would be nice, but as far as I understand there will always be a >>> need for >>> some privileges if you want to use a tap device. It's nice that CNI >>> does that >>> and all the containers can run unprivileged, but that's because they do >>> not open >>> the tap device and they do not do any privileged operations on it. But >>> QEMU >>> needs to. So the only way would be passing an opened fd to the >>> container or >>> opening the tap device there and making the fd usable for one process in >>> the >>> container. Is this already supported for some type of containers in >>> some way? >>> >>> Martin >> >> Hi, >> >> So another option here call it #3 is to pass open fds via unix sockets. >> If there are privileged operations that QEMU is trying to do with the fd >> though, how will opening it first and then passing it to an unprivileged >> QEMU address that? Is the opener doing those operations first? >> > > Sorry for the confusion, but QEMU is not doing any privileged > operations. I got > confused by the fact that anyone can open and do a R/W on a tap device. > But it > looks like that's on purpose. No capabilities are needed for opening > /dev/net/tun and calling ioctl(TUNSETIFF) with existing name and then > doing R/W > operations on it. It just works. > > Correct me if I'm wrong, but to sum it all up, the only things that we > need to > figure out (which might possibly be solved by ideas in the other thread) > are: > > tap: > - Existence of /dev/net/tun > - Having permissions to open it (0666 by default, shouldn't be a nig deal) > - Knowing the device name > > macvtap: > - Existence of /dev/tapXX > - Having permissions to open /dev/tapXX > - One of the following: > - Knowing the device name (and being able to translate it using a > netlink socket) > - Knowing the the device index > Right - from the device name one can grab the device index using SIOCGIFINDEX and then use that to access /dev/tap{device index}. Since devtmpfs is not mounted in containers (since its not namespaced) and mknod() is I think often not allowed, the mknod() has to happen by a privileged process when the the container is being created. In addition, libvirtd would need to be changed to open this existing device (currently it only opens macvtap devices that it creates). This is option #1. > The rest should be an implementation detail. > > Am I right? Did I miss anything? I don't think so, I'm interested if option #1 is workable or if there is interest in option #2 which is to do something like /dev/net/tun in the kernel for macvtap devices. Since as Daniel pointed out something like option #1 is going to be needed anyways to work on older kernels it seems like the best option? Thanks, -Jason

1 0

[libvirt] [PATCH] Changed LPC slot from 1 to 31
by Ivan Mishonov 12 Jul '18

12 Jul '18

--- src/bhyve/bhyve_command.c | 2 +- src/bhyve/bhyve_device.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/bhyve/bhyve_command.c b/src/bhyve/bhyve_command.c index 802997bd2d..e595b3d6c1 100644 --- a/src/bhyve/bhyve_command.c +++ b/src/bhyve/bhyve_command.c @@ -329,7 +329,7 @@ static int bhyveBuildLPCArgStr(const virDomainDef *def ATTRIBUTE_UNUSED, virCommandPtr cmd) { - virCommandAddArgList(cmd, "-s", "1,lpc", NULL); + virCommandAddArgList(cmd, "-s", "31,lpc", NULL); return 0; } diff --git a/src/bhyve/bhyve_device.c b/src/bhyve/bhyve_device.c index 03aa6c93bd..2ed3013552 100644 --- a/src/bhyve/bhyve_device.c +++ b/src/bhyve/bhyve_device.c @@ -48,9 +48,9 @@ bhyveCollectPCIAddress(virDomainDefPtr def ATTRIBUTE_UNUSED, if (addr->domain == 0 && addr->bus == 0) { if (addr->slot == 0) { return 0; - } else if (addr->slot == 1) { + } else if (addr->slot == 31) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("PCI bus 0 slot 1 is reserved for the implicit " + _("PCI bus 0 slot 31 is reserved for the implicit " "LPC PCI-ISA bridge")); return -1; } -- 2.18.0

3 3

[libvirt] [jenkins-ci PATCH 0/8] lcitool: Rewrite in Python
by Andrea Bolognani 12 Jul '18

12 Jul '18

While the previous implementation has served us well, it was very quickly cobbled together using a language that's not really suitable for the purpose; the fact that we had to embed a Perl (previously Python) script in there is a clear indication that we had outgrown the language pretty much from the get go, and while I'm weirdly proud of the hackish way I implemented inventory handling I'll take a proper YAML parser instead any day :) The new implementation is not quite a drop-in replacement, but getting used to it should take very little time; most importantly, the new command line syntax lends itself to being extended in ways that had simply been impossible previously, and we're going to take advantage of the fact very soon when we integrate the Dockerfile generator (see [1]) and [secret feature redacted]. We also get some minor but neat improvements like much better host list handling and XDG_CONFIG_HOME support. The script is compatible with both Python 2.7 and Python 3, and doesn't rely on any downstream patch being applied to the former. I'm absolutely not great at Python, so any input on style and such will be greatly appreciated. [1] https://www.redhat.com/archives/libvir-list/2018-June/msg01238.html Andrea Bolognani (8): lcitool: Drop shell implementation lcitool: Stub out Python implementation lcitool: Add tool configuration handling lcitool: Add inventory handling lcitool: Implement the 'list' action lcitool: Implement the 'install' action lcitool: Implement the 'update' action guests: Update documentation guests/README.markdown | 8 +- guests/lcitool | 585 +++++++++++++++++++++++++---------------- 2 files changed, 366 insertions(+), 227 deletions(-) -- 2.17.1

1 8

[libvirt] Shared memoryBacking
by Marc-André Lureau 11 Jul '18

11 Jul '18

Hi, While trying to add vhost-user-gpu support to libvirt, I am wondering how the guest should be configured to enable domain memory sharing. Naively, I thought this alone should work: <memoryBacking> <access mode='shared'/> </memoryBacking> But it doesn't seem to produce memory-backend-file share=on or memory-backend-memfd (the later would be better for my case) Any opinion on how to change that? thanks -- Marc-André Lureau

1 0

[libvirt] [PATCH v2 0/7] Enable vfio-pci 'property' for mediated device
by Erik Skultety 11 Jul '18

11 Jul '18

RFC here: https://www.redhat.com/archives/libvir-list/2018-May/msg02218.html Since v1 [1]: - remodeled egl-headless to be a standalone graphics element instead of a result of some automagic with graphic's <gl> element - pushed the first 5 simple fixes that were RB'd - fixed some nits raised during review [1] https://www.redhat.com/archives/libvir-list/2018-June/msg01740.html Erik Skultety (7): qemu: caps: Introduce a capability for egl-headless conf: Introduce a new graphics display type 'headless' qemu: caps: Add vfio-pci.display capability conf: Introduce virDomainGraphicsDefHasOpenGL helper conf: Introduce new <hostdev> attribute 'display' qemu: command: Enable formatting vfio-pci.display option onto cmdline docs: Update news about the VNC console enablement for mdevs docs/formatdomain.html.in | 52 ++++++++- docs/news.xml | 10 ++ docs/schemas/domaincommon.rng | 8 ++ src/conf/domain_conf.c | 67 ++++++++++- src/conf/domain_conf.h | 5 + src/libvirt_private.syms | 1 + src/libxl/libxl_conf.c | 1 + src/qemu/qemu_capabilities.c | 8 ++ src/qemu/qemu_capabilities.h | 2 + src/qemu/qemu_command.c | 59 +++++++++- src/qemu/qemu_domain.c | 122 ++++++++++++++++++++- src/qemu/qemu_driver.c | 2 + src/qemu/qemu_hotplug.c | 1 + src/qemu/qemu_process.c | 4 + src/vmx/vmx.c | 1 + tests/domaincapsschemadata/full.xml | 1 + tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml | 2 + tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 2 + tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 2 + tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 2 + tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 2 + tests/qemuxml2argvdata/graphics-egl-headless.args | 26 +++++ tests/qemuxml2argvdata/graphics-egl-headless.xml | 31 ++++++ .../qemuxml2argvdata/graphics-sdl-egl-headless.xml | 35 ++++++ .../graphics-spice-egl-headless.args | 31 ++++++ .../graphics-spice-egl-headless.xml | 36 ++++++ .../graphics-spice-invalid-egl-headless.xml | 37 +++++++ .../graphics-vnc-egl-headless.args | 28 +++++ .../qemuxml2argvdata/graphics-vnc-egl-headless.xml | 37 +++++++ .../hostdev-mdev-display-missing-graphics.xml | 35 ++++++ .../hostdev-mdev-display-spice-egl-headless.args | 32 ++++++ .../hostdev-mdev-display-spice-egl-headless.xml | 40 +++++++ .../hostdev-mdev-display-spice-opengl.args | 31 ++++++ .../hostdev-mdev-display-spice-opengl.xml | 41 +++++++ .../hostdev-mdev-display-vnc-egl-headless.args | 32 ++++++ .../hostdev-mdev-display-vnc-egl-headless.xml | 40 +++++++ .../qemuxml2argvdata/hostdev-mdev-display-vnc.args | 31 ++++++ .../qemuxml2argvdata/hostdev-mdev-display-vnc.xml | 39 +++++++ tests/qemuxml2argvdata/hostdev-mdev-display.xml | 39 +++++++ tests/qemuxml2argvtest.c | 48 ++++++++ .../graphics-spice-egl-headless.xml | 44 ++++++++ .../graphics-vnc-egl-headless.xml | 42 +++++++ .../hostdev-mdev-display-active.xml | 47 ++++++++ .../hostdev-mdev-display-inactive.xml | 47 ++++++++ tests/qemuxml2xmltest.c | 4 + 50 files changed, 1202 insertions(+), 10 deletions(-) create mode 100644 tests/qemuxml2argvdata/graphics-egl-headless.args create mode 100644 tests/qemuxml2argvdata/graphics-egl-headless.xml create mode 100644 tests/qemuxml2argvdata/graphics-sdl-egl-headless.xml create mode 100644 tests/qemuxml2argvdata/graphics-spice-egl-headless.args create mode 100644 tests/qemuxml2argvdata/graphics-spice-egl-headless.xml create mode 100644 tests/qemuxml2argvdata/graphics-spice-invalid-egl-headless.xml create mode 100644 tests/qemuxml2argvdata/graphics-vnc-egl-headless.args create mode 100644 tests/qemuxml2argvdata/graphics-vnc-egl-headless.xml create mode 100644 tests/qemuxml2argvdata/hostdev-mdev-display-missing-graphics.xml create mode 100644 tests/qemuxml2argvdata/hostdev-mdev-display-spice-egl-headless.args create mode 100644 tests/qemuxml2argvdata/hostdev-mdev-display-spice-egl-headless.xml create mode 100644 tests/qemuxml2argvdata/hostdev-mdev-display-spice-opengl.args create mode 100644 tests/qemuxml2argvdata/hostdev-mdev-display-spice-opengl.xml create mode 100644 tests/qemuxml2argvdata/hostdev-mdev-display-vnc-egl-headless.args create mode 100644 tests/qemuxml2argvdata/hostdev-mdev-display-vnc-egl-headless.xml create mode 100644 tests/qemuxml2argvdata/hostdev-mdev-display-vnc.args create mode 100644 tests/qemuxml2argvdata/hostdev-mdev-display-vnc.xml create mode 100644 tests/qemuxml2argvdata/hostdev-mdev-display.xml create mode 100644 tests/qemuxml2xmloutdata/graphics-spice-egl-headless.xml create mode 100644 tests/qemuxml2xmloutdata/graphics-vnc-egl-headless.xml create mode 100644 tests/qemuxml2xmloutdata/hostdev-mdev-display-active.xml create mode 100644 tests/qemuxml2xmloutdata/hostdev-mdev-display-inactive.xml -- 2.14.4

2 18

[libvirt] [PATCH v3 0/5] Making libvirt aware of a server need
by Marcos Paulo de Souza 11 Jul '18

11 Jul '18

Hi guys, this is the third version of the patchset to add a new member to virConnectDriver in order to simplfy the check for a server. Now, libvirt does the work inside virConnectOpenInternal after getting the correct driver from the URI. v2: https://www.redhat.com/archives/libvir-list/2018-July/msg00501.html v1: https://www.redhat.com/archives/libvir-list/2018-July/msg00393.html Changes from v2: * patch 2: Move check for remoteOnly member just before calling connectOpen * (only patch 2 changed in v2) Changes from v1: * Adapted the code following ideas from Matthias Bolte Marcos Paulo de Souza (5): driver.h: Add remoteOnly member to virConnectDriver struct libvirt.c: Return error when remoteOnly is set but server is empty esx_driver: Set remoteOnly member of virConnectDriver hyperv_driver: Set remoteOnly member of virConnectDriver phyp_driver: Set remoteOnly member of virConnectDriver src/driver.h | 2 ++ src/esx/esx_driver.c | 8 +------- src/hyperv/hyperv_driver.c | 8 +------- src/libvirt.c | 7 +++++++ src/phyp/phyp_driver.c | 7 +------ 5 files changed, 12 insertions(+), 20 deletions(-) -- 2.17.1

2 7

[libvirt] [PATCH python] Implement virDomainGetStateParams API
by Bjoern Walk 11 Jul '18

11 Jul '18

From: Marc Hartmayer <mhartmay(a)linux.ibm.com> This patch adds the Python binding for the virDomainGetStateParams API. The Python side can be generated automatically, the C side not. Reviewed-by: Bjoern Walk <bwalk(a)linux.vnet.ibm.com> Signed-off-by: Marc Hartmayer <mhartmay(a)linux.ibm.com> --- generator.py | 1 + libvirt-override-api.xml | 6 ++++++ libvirt-override.c | 38 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 45 insertions(+) diff --git a/generator.py b/generator.py index bd7ff112..1f6ffb9a 100755 --- a/generator.py +++ b/generator.py @@ -495,6 +495,7 @@ skip_impl = ( 'virConnectBaselineHypervisorCPU', 'virDomainGetLaunchSecurityInfo', 'virNodeGetSEVInfo', + 'virDomainGetStateParams', ) lxc_skip_impl = ( diff --git a/libvirt-override-api.xml b/libvirt-override-api.xml index 4e8d6c03..c49e244c 100644 --- a/libvirt-override-api.xml +++ b/libvirt-override-api.xml @@ -746,5 +746,11 @@ <arg name='conn' type='virConnectPtr' info='pointer to hypervisor connection'/> <arg name='flags' type='int' info='unused, always pass 0'/> </function> + <function name='virDomainGetStateParams' file='python'> + <info>Extract domain state. Each state is accompanied by a reason (if known) and optional detailed information.</info> + <arg name='dom' type='virDomainPtr' info='pointer to the domain'/> + <arg name='flags' type='unsigned int' info='extra flags; not used yet, so callers should always pass 0'/> + <return type='char *' info="dictionary of state data"/> + </function> </symbols> </api> diff --git a/libvirt-override.c b/libvirt-override.c index e74c7dda..355b9fd5 100644 --- a/libvirt-override.c +++ b/libvirt-override.c @@ -9881,6 +9881,41 @@ libvirt_virNodeGetSEVInfo(PyObject *self ATTRIBUTE_UNUSED, #endif /* LIBVIR_CHECK_VERSION(4, 5, 0) */ +#if LIBVIR_CHECK_VERSION(4, 6, 0) +static PyObject * +libvirt_virDomainGetStateParams(PyObject *self ATTRIBUTE_UNUSED, + PyObject *args) +{ + PyObject *pyobj_domain; + virDomainPtr domain; + virTypedParameterPtr params = NULL; + int nparams = 0; + unsigned int flags; + int i_retval; + PyObject *ret = NULL; + + if (!PyArg_ParseTuple(args, (char *)"OI:virDomainGetStateParams", + &pyobj_domain, &flags)) + return NULL; + domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain); + + LIBVIRT_BEGIN_ALLOW_THREADS; + i_retval = virDomainGetStateParams(domain, &params, &nparams, flags); + LIBVIRT_END_ALLOW_THREADS; + + if (i_retval < 0) { + ret = VIR_PY_NONE; + goto cleanup; + } + + ret = getPyVirTypedParameter(params, nparams); +cleanup: + virTypedParamsFree(params, nparams); + return ret; +} +#endif /* LIBVIR_CHECK_VERSION(4, 6, 0) */ + + /************************************************************************ * * * The registration stuff * @@ -10124,6 +10159,9 @@ static PyMethodDef libvirtMethods[] = { {(char *) "virDomainGetLaunchSecurityInfo", libvirt_virDomainGetLaunchSecurityInfo, METH_VARARGS, NULL}, {(char *) "virNodeGetSEVInfo", libvirt_virNodeGetSEVInfo, METH_VARARGS, NULL}, #endif /* LIBVIR_CHECK_VERSION(4, 5, 0) */ +#if LIBVIR_CHECK_VERSION(4, 6, 0) + {(char *) "virDomainGetStateParams", libvirt_virDomainGetStateParams, METH_VARARGS, NULL}, +#endif /* LIBVIR_CHECK_VERSION(4, 6, 0) */ {NULL, NULL, 0, NULL} }; -- 2.17.0

1 0

[libvirt] [PATCH] storage: prefer using newDef to save configfile
by Shichangkuo 11 Jul '18

11 Jul '18

When re-defining an active storage pool, the configfile has not changed. This issue was introduced by bfcd8fc9, storage: Use virStoragePoolObjGetDef accessor for driver. So we prefer using newDef to save configfile. Signed-off-by: Changkuo Shi <shi.changkuo(a)h3c.com> --- src/storage/storage_driver.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index b0de96d..fab3c5b 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -844,13 +844,14 @@ storagePoolDefineXML(virConnectPtr conn, if (!(obj = virStoragePoolObjAssignDef(driver->pools, newDef))) goto cleanup; - newDef = NULL; + newDef = virStoragePoolObjGetNewDef(obj); def = virStoragePoolObjGetDef(obj); - if (virStoragePoolObjSaveDef(driver, obj, def) < 0) { + if (virStoragePoolObjSaveDef(driver, obj, newDef ? newDef : def) < 0) { virStoragePoolObjRemove(driver->pools, obj); virObjectUnref(obj); obj = NULL; + newDef = NULL; goto cleanup; } @@ -860,6 +861,7 @@ storagePoolDefineXML(virConnectPtr conn, VIR_INFO("Defining storage pool '%s'", def->name); pool = virGetStoragePool(conn, def->name, def->uuid, NULL, NULL); + newDef = NULL; cleanup: if (event) -- 1.7.9.5 ------------------------------------------------------------------------------------------------------------------------------------- 本邮件及其附件含有新华三集团的保密信息，仅限于发送给上面地址中列出的个人或群组。禁止任何其他人以任何形式使用（包括但不限于全部或部分地泄露、复制、或散发）本邮件中的信息。如果您错收了本邮件，请您立即电话或邮件通知发件人并删除本邮件！ This e-mail and its attachments contain confidential information from New H3C, which is intended only for the person or entity whose address is listed above. Any use of the information contained herein in any way (including, but not limited to, total or partial disclosure, reproduction, or dissemination) by persons other than the intended recipient(s) is prohibited. If you receive this e-mail in error, please notify the sender by phone or email immediately and delete it!

2 3

[libvirt] [PATCH 0/2] qemu: Support vhost-vsock-ccw
by Boris Fiuczynski 11 Jul '18

11 Jul '18

Support the vhost-vsock-ccw device on S390. Boris Fiuczynski (2): qemu: Add ccw support for vhost-vsock news: Update for vhost-vsock-ccw support docs/news.xml | 8 +++++ src/qemu/qemu_command.c | 15 +++++++-- src/qemu/qemu_domain_address.c | 7 +++- .../vhost-vsock-ccw-auto.args | 27 ++++++++++++++++ .../qemuxml2argvdata/vhost-vsock-ccw-auto.xml | 25 +++++++++++++++ tests/qemuxml2argvdata/vhost-vsock-ccw.args | 27 ++++++++++++++++ tests/qemuxml2argvdata/vhost-vsock-ccw.xml | 32 +++++++++++++++++++ tests/qemuxml2argvtest.c | 4 +++ .../vhost-vsock-ccw-auto.xml | 32 +++++++++++++++++++ tests/qemuxml2xmloutdata/vhost-vsock-ccw.xml | 1 + tests/qemuxml2xmltest.c | 5 +++ 11 files changed, 180 insertions(+), 3 deletions(-) create mode 100644 tests/qemuxml2argvdata/vhost-vsock-ccw-auto.args create mode 100644 tests/qemuxml2argvdata/vhost-vsock-ccw-auto.xml create mode 100644 tests/qemuxml2argvdata/vhost-vsock-ccw.args create mode 100644 tests/qemuxml2argvdata/vhost-vsock-ccw.xml create mode 100644 tests/qemuxml2xmloutdata/vhost-vsock-ccw-auto.xml create mode 120000 tests/qemuxml2xmloutdata/vhost-vsock-ccw.xml -- 2.17.0

2 4

[libvirt] [PATCH v2 0/2] Change virFileIsCDROM to check cdrom status
by Han Han 11 Jul '18

11 Jul '18

v1 link: https://www.redhat.com/archives/libvir-list/2018-July/msg00103.html Refactor virFileIsCDROM to virFileCheckCDROM and now it could be used to store cdrom status. In libvirt, it gives general Input/Output error when reading a not ready cdrom backend vol. This error should be replaced with warning just like the warning of lacking backing file. Han Han (2): util: Refactor virFileIsCDROM to virFileCheckCDROM storage: Improve error handling on cdrom backend src/libvirt_private.syms | 2 +- src/qemu/qemu_domain.c | 4 ++-- src/storage/storage_util.c | 15 ++++++++++++- src/util/virfile.c | 44 ++++++++++++++++++++++++++++++++------ src/util/virfile.h | 11 +++++++++- 5 files changed, 65 insertions(+), 11 deletions(-) -- 2.17.1

2 5