- Devel - libvirt List Archives

[libvirt] [PATCH] qemu_monitor_json: Don't check existence of "return" object
by Jiri Denemark 22 Nov '16

22 Nov '16

Whenever qemuMonitorJSONCheckError returns 0, the "return" object is guaranteed to exist. Thus virJSONValueObjectGetObject will never fail to get it. On the other hand, virJSONValueObjectGetArray may fail since the "return" object may not be an array. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/qemu/qemu_monitor_json.c | 160 ++++++++----------------------------------- 1 file changed, 30 insertions(+), 130 deletions(-) diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 9e06a4d27..ef8672cad 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -1219,11 +1219,7 @@ qemuMonitorJSONGetStatus(qemuMonitorPtr mon, if (qemuMonitorJSONCheckError(cmd, reply) < 0) goto cleanup; - if (!(data = virJSONValueObjectGetObject(reply, "return"))) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("query-status reply was missing return data")); - goto cleanup; - } + data = virJSONValueObjectGetObject(reply, "return"); if (virJSONValueObjectGetBoolean(data, "running", running) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -1443,12 +1439,7 @@ int qemuMonitorJSONGetVirtType(qemuMonitorPtr mon, if (qemuMonitorJSONCheckError(cmd, reply) < 0) goto cleanup; - - if (!(data = virJSONValueObjectGetObject(reply, "return"))) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("info kvm reply was missing return data")); - goto cleanup; - } + data = virJSONValueObjectGetObject(reply, "return"); if (virJSONValueObjectGetBoolean(data, "enabled", &val) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -1609,12 +1600,7 @@ qemuMonitorJSONGetBalloonInfo(qemuMonitorPtr mon, if (qemuMonitorJSONCheckError(cmd, reply) < 0) goto cleanup; - /* Success */ - if (!(data = virJSONValueObjectGetObject(reply, "return"))) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("info balloon reply was missing return data")); - goto cleanup; - } + data = virJSONValueObjectGetObject(reply, "return"); if (virJSONValueObjectGetNumberUlong(data, "actual", &mem) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -1715,11 +1701,7 @@ int qemuMonitorJSONGetMemoryStats(qemuMonitorPtr mon, if (qemuMonitorJSONCheckError(cmd, reply) < 0) goto cleanup; - if (!(data = virJSONValueObjectGetObject(reply, "return"))) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("qom-get reply was missing return data")); - goto cleanup; - } + data = virJSONValueObjectGetObject(reply, "return"); if (!(statsdata = virJSONValueObjectGet(data, "stats"))) { VIR_DEBUG("data does not include 'stats'"); @@ -2679,11 +2661,7 @@ qemuMonitorJSONGetMigrationStatsReply(virJSONValuePtr reply, int rc; double mbps; - if (!(ret = virJSONValueObjectGetObject(reply, "return"))) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("info migration reply was missing return data")); - return -1; - } + ret = virJSONValueObjectGetObject(reply, "return"); if (!(statusstr = virJSONValueObjectGetString(ret, "status"))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -2976,11 +2954,7 @@ qemuMonitorJSONGetDumpGuestMemoryCapability(qemuMonitorPtr mon, if (qemuMonitorJSONCheckError(cmd, reply) < 0) goto cleanup; - if (!(caps = virJSONValueObjectGetObject(reply, "return"))) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("missing dump guest memory capabilities")); - goto cleanup; - } + caps = virJSONValueObjectGetObject(reply, "return"); if (!(formats = virJSONValueObjectGetArray(caps, "formats"))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -3160,11 +3134,6 @@ qemuMonitorJSONAddFd(qemuMonitorPtr mon, int fdset, int fd, const char *name) if (ret == 0) { virJSONValuePtr data = virJSONValueObjectGetObject(reply, "return"); - if (!data) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("missing return information")); - goto error; - } if (virJSONValueObjectGetNumberInt(data, "fd", &ret) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("incomplete return information")); @@ -4745,11 +4714,7 @@ int qemuMonitorJSONGetVersion(qemuMonitorPtr mon, if (qemuMonitorJSONCheckError(cmd, reply) < 0) goto cleanup; - if (!(data = virJSONValueObjectGetObject(reply, "return"))) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("query-version reply was missing 'return' data")); - goto cleanup; - } + data = virJSONValueObjectGetObject(reply, "return"); if (!(qemu = virJSONValueObjectGetObject(data, "qemu"))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -4815,13 +4780,8 @@ int qemuMonitorJSONGetMachines(qemuMonitorPtr mon, if (qemuMonitorJSONCheckError(cmd, reply) < 0) goto cleanup; - if (!(data = virJSONValueObjectGetArray(reply, "return"))) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("query-machines reply was missing return data")); - goto cleanup; - } - - if ((n = virJSONValueArraySize(data)) < 0) { + if (!(data = virJSONValueObjectGetArray(reply, "return")) || + (n = virJSONValueArraySize(data)) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("query-machines reply data was not an array")); goto cleanup; @@ -4925,13 +4885,8 @@ qemuMonitorJSONGetCPUDefinitions(qemuMonitorPtr mon, if (qemuMonitorJSONCheckError(cmd, reply) < 0) goto cleanup; - if (!(data = virJSONValueObjectGetArray(reply, "return"))) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("query-cpu-definitions reply was missing return data")); - goto cleanup; - } - - if ((n = virJSONValueArraySize(data)) < 0) { + if (!(data = virJSONValueObjectGetArray(reply, "return")) || + (n = virJSONValueArraySize(data)) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("query-cpu-definitions reply data was not an array")); goto cleanup; @@ -4998,13 +4953,8 @@ int qemuMonitorJSONGetCommands(qemuMonitorPtr mon, if (qemuMonitorJSONCheckError(cmd, reply) < 0) goto cleanup; - if (!(data = virJSONValueObjectGetArray(reply, "return"))) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("query-commands reply was missing return data")); - goto cleanup; - } - - if ((n = virJSONValueArraySize(data)) < 0) { + if (!(data = virJSONValueObjectGetArray(reply, "return")) || + (n = virJSONValueArraySize(data)) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("query-commands reply data was not an array")); goto cleanup; @@ -5068,13 +5018,8 @@ int qemuMonitorJSONGetEvents(qemuMonitorPtr mon, if (qemuMonitorJSONCheckError(cmd, reply) < 0) goto cleanup; - if (!(data = virJSONValueObjectGetArray(reply, "return"))) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("query-events reply was missing return data")); - goto cleanup; - } - - if ((n = virJSONValueArraySize(data)) < 0) { + if (!(data = virJSONValueObjectGetArray(reply, "return")) || + (n = virJSONValueArraySize(data)) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("query-events reply data was not an array")); goto cleanup; @@ -5258,11 +5203,7 @@ int qemuMonitorJSONGetKVMState(qemuMonitorPtr mon, if (qemuMonitorJSONCheckError(cmd, reply) < 0) goto cleanup; - if (!(data = virJSONValueObjectGetObject(reply, "return"))) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("query-kvm reply was missing return data")); - goto cleanup; - } + data = virJSONValueObjectGetObject(reply, "return"); if (virJSONValueObjectGetBoolean(data, "enabled", enabled) < 0 || virJSONValueObjectGetBoolean(data, "present", present) < 0) { @@ -5302,13 +5243,8 @@ int qemuMonitorJSONGetObjectTypes(qemuMonitorPtr mon, if (qemuMonitorJSONCheckError(cmd, reply) < 0) goto cleanup; - if (!(data = virJSONValueObjectGetArray(reply, "return"))) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("qom-list-types reply was missing return data")); - goto cleanup; - } - - if ((n = virJSONValueArraySize(data)) < 0) { + if (!(data = virJSONValueObjectGetArray(reply, "return")) || + (n = virJSONValueArraySize(data)) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("qom-list-types reply data was not an array")); goto cleanup; @@ -5369,13 +5305,8 @@ int qemuMonitorJSONGetObjectListPaths(qemuMonitorPtr mon, if (qemuMonitorJSONCheckError(cmd, reply) < 0) goto cleanup; - if (!(data = virJSONValueObjectGetArray(reply, "return"))) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("qom-list reply was missing return data")); - goto cleanup; - } - - if ((n = virJSONValueArraySize(data)) < 0) { + if (!(data = virJSONValueObjectGetArray(reply, "return")) || + (n = virJSONValueArraySize(data)) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("qom-list reply data was not an array")); goto cleanup; @@ -5613,13 +5544,8 @@ int qemuMonitorJSONGetObjectProps(qemuMonitorPtr mon, if (qemuMonitorJSONCheckError(cmd, reply) < 0) goto cleanup; - if (!(data = virJSONValueObjectGetArray(reply, "return"))) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("device-list-properties reply was missing return data")); - goto cleanup; - } - - if ((n = virJSONValueArraySize(data)) < 0) { + if (!(data = virJSONValueObjectGetArray(reply, "return")) || + (n = virJSONValueArraySize(data)) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("device-list-properties reply data was not an array")); goto cleanup; @@ -5673,11 +5599,7 @@ qemuMonitorJSONGetTargetArch(qemuMonitorPtr mon) if (qemuMonitorJSONCheckError(cmd, reply) < 0) goto cleanup; - if (!(data = virJSONValueObjectGetObject(reply, "return"))) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("query-target reply was missing return data")); - goto cleanup; - } + data = virJSONValueObjectGetObject(reply, "return"); if (!(arch = virJSONValueObjectGetString(data, "arch"))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -6110,14 +6032,8 @@ qemuMonitorJSONGetStringArray(qemuMonitorPtr mon, const char *qmpCmd, if (qemuMonitorJSONCheckError(cmd, reply) < 0) goto cleanup; - if (!(data = virJSONValueObjectGetArray(reply, "return"))) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("%s reply was missing return data"), - qmpCmd); - goto cleanup; - } - - if ((n = virJSONValueArraySize(data)) < 0) { + if (!(data = virJSONValueObjectGetArray(reply, "return")) || + (n = virJSONValueArraySize(data)) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("%s reply data was not an array"), qmpCmd); @@ -6329,15 +6245,9 @@ qemuMonitorJSONAttachCharDev(qemuMonitorPtr mon, goto cleanup; if (chr->type == VIR_DOMAIN_CHR_TYPE_PTY) { - virJSONValuePtr data; + virJSONValuePtr data = virJSONValueObjectGetObject(reply, "return"); const char *path; - if (!(data = virJSONValueObjectGetObject(reply, "return"))) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("chardev-add reply was missing return data")); - goto cleanup; - } - if (!(path = virJSONValueObjectGetString(data, "pty"))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("chardev-add reply was missing pty path")); @@ -6686,13 +6596,8 @@ qemuMonitorJSONGetIOThreads(qemuMonitorPtr mon, if (qemuMonitorJSONCheckError(cmd, reply) < 0) goto cleanup; - if (!(data = virJSONValueObjectGetArray(reply, "return"))) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("query-iothreads reply was missing return data")); - goto cleanup; - } - - if ((n = virJSONValueArraySize(data)) < 0) { + if (!(data = virJSONValueObjectGetArray(reply, "return")) || + (n = virJSONValueArraySize(data)) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("query-iothreads reply data was not an array")); goto cleanup; @@ -6780,13 +6685,8 @@ qemuMonitorJSONGetMemoryDeviceInfo(qemuMonitorPtr mon, if (qemuMonitorJSONCheckError(cmd, reply) < 0) goto cleanup; - if (!(data = virJSONValueObjectGetArray(reply, "return"))) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("query-memory-devices reply was missing return data")); - goto cleanup; - } - - if ((n = virJSONValueArraySize(data)) < 0) { + if (!(data = virJSONValueObjectGetArray(reply, "return")) || + (n = virJSONValueArraySize(data)) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("query-memory-devices reply data was not an array")); goto cleanup; -- 2.11.0.rc2

2 1

[libvirt] [PATCH 0/5] qemu: parse: Fix parsing of weird cpu topology specifications
by Peter Krempa 22 Nov '16

22 Nov '16

Peter Krempa (5): qemu: parse: Validate that the VM has at least one cpu qemu: parse: Allow the 'cpus=' prefix for current cpu number qemu: parse: Assign topology info earlier qemu: parse: Assign maximum cpu count from topology if not provided qemu: process: Set current vcpu count to maximum if it was not specified src/qemu/qemu_parse_command.c | 32 +++++++++++++++++++++++--------- 1 file changed, 23 insertions(+), 9 deletions(-) -- 2.10.2

3 7

[libvirt] [PATCH] docs: Use Overpass Mono as the monospace font
by Martin Kletzander 21 Nov '16

21 Nov '16

Because this makes the font the same size as the non-monospaced one, let's change those properties a little bit as well. <pre/> will be shrunk a bit and <code/> inside <p/> or <dd/> will have slightly greyer background. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- Notes: Now it looks like this: http://people.redhat.com/~mkletzan/libvirt-monofont.png docs/generic.css | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/docs/generic.css b/docs/generic.css index 02383017a91b..a6b2354df07b 100644 --- a/docs/generic.css +++ b/docs/generic.css @@ -71,3 +71,15 @@ h6 { margin-top: 0.75em; font-size: 0.8em; } + +code, pre { + font-family: LibvirtOverpassMono; +} + +dd code, p code { + background-color: #eeeeee; +} + +pre { + font-size: 90%; +} -- 2.10.2

2 1

[libvirt] [PATCH 0/4] docs: User Overpass 3.0 as a font
by Martin Kletzander 21 Nov '16

21 Nov '16

I heard Overpass 3.0 was released, so let's update to that. There are some changes that I noticed. There are more font weights than we had before. The one we decided to use is now probably the 'semibold' one. So the regular font is a little thinner, but not as much as the 'light' one. I think this time it is the perfect middle ground between the discussed variants in the previous thread. Also it makes the mono font the same size as the other font. I kinda like that, but if others don't, we can add font-size: 12px; to the style. Here is side-by-side comparison on my screen: http://people.redhat.com/~mkletzan/libvirt-newfonts.png Martin Kletzander (4): docs: Clean-up font definitions docs: Upgrade Overpass fonts to 3.0 docs: Add monospaced Overpass fonts docs: Use Overpass Mono as the monospace font docs/fonts/hinted-Overpass-Bold.woff | Bin 48136 -> 0 bytes docs/fonts/hinted-Overpass-BoldItalic.woff | Bin 51008 -> 0 bytes docs/fonts/hinted-Overpass-Italic.woff | Bin 51908 -> 0 bytes docs/fonts/hinted-Overpass-Light.woff | Bin 49452 -> 0 bytes docs/fonts/hinted-Overpass-LightItalic.woff | Bin 51752 -> 0 bytes docs/fonts/hinted-Overpass-Reg.woff | Bin 48144 -> 0 bytes docs/fonts/overpass-bold-italic.woff | Bin 0 -> 46524 bytes docs/fonts/overpass-bold.woff | Bin 0 -> 43612 bytes docs/fonts/overpass-italic.woff | Bin 0 -> 46744 bytes docs/fonts/overpass-light-italic.woff | Bin 0 -> 45844 bytes docs/fonts/overpass-light.woff | Bin 0 -> 43576 bytes docs/fonts/overpass-regular.woff | Bin 0 -> 44272 bytes docs/fonts/stylesheet.css | 49 ++++++++++++++++------------ docs/generic.css | 4 +++ 14 files changed, 32 insertions(+), 21 deletions(-) delete mode 100644 docs/fonts/hinted-Overpass-Bold.woff delete mode 100644 docs/fonts/hinted-Overpass-BoldItalic.woff delete mode 100644 docs/fonts/hinted-Overpass-Italic.woff delete mode 100644 docs/fonts/hinted-Overpass-Light.woff delete mode 100644 docs/fonts/hinted-Overpass-LightItalic.woff delete mode 100644 docs/fonts/hinted-Overpass-Reg.woff create mode 100644 docs/fonts/overpass-bold-italic.woff create mode 100644 docs/fonts/overpass-bold.woff create mode 100644 docs/fonts/overpass-italic.woff create mode 100644 docs/fonts/overpass-light-italic.woff create mode 100644 docs/fonts/overpass-light.woff create mode 100644 docs/fonts/overpass-regular.woff -- 2.10.2

3 11

[libvirt] [PATCH] tests: Adapt to gluster_debug_level in qemu.conf
by Michal Privoznik 21 Nov '16

21 Nov '16

After a944bd92 we gained support for setting gluster debug level. However, due to stupid space we haven't tested whether augeas file actually works. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu.conf | 2 +- src/qemu/test_libvirtd_qemu.aug.in | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu.conf b/src/qemu/qemu.conf index 070d37b..2b2bd60 100644 --- a/src/qemu/qemu.conf +++ b/src/qemu/qemu.conf @@ -664,4 +664,4 @@ # # Defaults to 4 # -# gluster_debug_level = 9 +#gluster_debug_level = 9 diff --git a/src/qemu/test_libvirtd_qemu.aug.in b/src/qemu/test_libvirtd_qemu.aug.in index 805fa0e..f586e95 100644 --- a/src/qemu/test_libvirtd_qemu.aug.in +++ b/src/qemu/test_libvirtd_qemu.aug.in @@ -90,3 +90,4 @@ module Test_libvirtd_qemu = { "3" = "/usr/share/AAVMF/AAVMF_CODE.fd:/usr/share/AAVMF/AAVMF_VARS.fd" } } { "stdio_handler" = "logd" } +{ "gluster_debug_level" = "9" } -- 2.8.4

2 1

[libvirt] [PATCH] util: Print pid_t as long long
by Martin Kletzander 21 Nov '16

21 Nov '16

After commit f2bf5fbb0449, MinGW strikes again. Simply print pid as any other place after commit b7d2d4af2bd5. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- Notes: Pushed under the 'build breaker' rule. src/util/virprocess.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/util/virprocess.c b/src/util/virprocess.c index f2993493d2c2..3cacc8978935 100644 --- a/src/util/virprocess.c +++ b/src/util/virprocess.c @@ -1228,7 +1228,8 @@ virProcessSetScheduler(pid_t pid, struct sched_param param = {0}; int pol = virProcessSchedTranslatePolicy(policy); - VIR_DEBUG("pid=%d, policy=%d, priority=%u", pid, policy, priority); + VIR_DEBUG("pid=%lld, policy=%d, priority=%u", + (long long) pid, policy, priority); if (!policy) return 0; @@ -1270,8 +1271,8 @@ virProcessSetScheduler(pid_t pid, if (sched_setscheduler(pid, pol, &param) < 0) { virReportSystemError(errno, - _("Cannot set scheduler parameters for pid %d"), - pid); + _("Cannot set scheduler parameters for pid %lld"), + (long long) pid); return -1; } -- 2.10.2

1 0

[libvirt] [PATCH] configure: Prefer /usr/bin over /bin for numad
by Guido Günther 20 Nov '16

20 Nov '16

On Debian systems numad gets installed to /usr/bin. However some people use usrmerge[0] which links /bin to /usr/bin. By changing the lookup order we make sure the daemon is always found in /usr/bin (with or without usrmerge installed). This allows packages built on systems with usrmerge to run on systems without usrmerge which would otherwise fail since /bin/numad would be hardcoded into libvirt. Originally-Submitted-By: Guilhem Moulin References: http://bugs.debian.org/843878 [0]: https://packages.debian.org/sid/usrmerge --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 3ff4c42..65bcd4d 100644 --- a/configure.ac +++ b/configure.ac @@ -1392,7 +1392,7 @@ AC_ARG_WITH([numad], if test "$with_numad" != "no" ; then fail=0 - AC_PATH_PROG([NUMAD], [numad], [], [/bin:/usr/bin:/usr/sbin]) + AC_PATH_PROG([NUMAD], [numad], [], [/usr/bin:/bin:/usr/sbin]) if test "$with_numad" = "check"; then test "$with_numactl" = "yes" || fail=1 -- 2.10.2

3 7

[libvirt] [PATCH RESEND v3.2 00/10] Implementation of QEMU vhost-scsi
by Eric Farman 19 Nov '16

19 Nov '16

[NOTE: Resending after a week, and rebased to apply to master after last week's application of commit 22d94ca4] This patch series provides a libvirt implementation of the vhost-scsi interface in QEMU. As near as I can see, this was discussed upstream in July 2014[1], and ended in a desire to replace a vhost-scsi controller in favor of a hostdev element instead[2]. Host setup via targetcli (SCSI LUN(s) are already defined to host): # targetcli targetcli shell version 2.1.fb35 Copyright 2011-2013 by Datera, Inc and others. For help on commands, type 'help'. /> backstores/block create name=disk1 write_back=false \ dev=/dev/disk/by-id/dm-name-36005076306ffc7630000000000002211 Created block storage object disk1 using /dev/disk/by-id/dm-name-36005076306ffc7630000000000002211. /> vhost/ create Created target naa.5001405df3e54061. Created TPG 1. /> vhost/naa.5001405df3e54061/tpg1/luns create /backstores/block/disk1 Created LUN 0. /> exit Host Filesystem Example: # ls /sys/kernel/config/target/vhost/ discovery_auth naa.5001405df3e54061 version # ls /sys/kernel/config/target/vhost/naa.5001405df3e54061/tpgt_1/lun/ lun_0 QEMU Example (snippet): -device vhost-scsi-ccw,wwpn=naa.5001405df3e54061,devno=fe.0.1000 Libvirt Example (snippet): <hostdev mode='subsystem' type='scsi_host'> <source protocol='vhost' wwpn='naa.5001405df3e54061'/> <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x1000'/> </hostdev> Guest Viewpoint: # lsscsi [1:0:1:0] disk LIO-ORG disk0 4.0 /dev/sda # dmesg | grep 1: [ 6.065735] scsi host1: Virtio SCSI HBA [ 6.093892] scsi 1:0:1:0: Direct-Access LIO-ORG disk0 4.0 PQ: 0 ANSI: 5 [ 6.313615] sd 1:0:1:0: Attached scsi generic sg0 type 0 [ 6.314981] sd 1:0:1:0: [sda] 29360128 512-byte logical blocks: (15.0 GB/14.0 GiB) [ 6.317290] sd 1:0:1:0: [sda] Write Protect is off [ 6.317566] sd 1:0:1:0: [sda] Mode Sense: 43 00 10 08 [ 6.317853] sd 1:0:1:0: [sda] Write cache: enabled, read cache: enabled, supports DPO and FUA [ 6.352722] sd 1:0:1:0: [sda] Attached SCSI disk Changelog: v3.2: - Rebase - Rebased to current master (8 November) - Minor changes to (new file) src/util/virhost.c for make syntax-check v3.1: https://www.redhat.com/archives/libvir-list/2016-October/msg01324.html - Rebase - Rebased to current master (31 October) - Included the prereq patch for the subsystem type in switch statements (oops!) v3: https://www.redhat.com/archives/libvir-list/2016-October/msg01201.html - Rebase - Rebased to current master (26 October) - Comments - Added an early patch to do some additional typecasting in the switch statements of hostdev.subsys.type - Did some reordering of patches, to hopefully flow better - Implemented an activeHostHostdevs list, which is used by the cgroup and security codepaths - doc changes -- s/2.2/2.5/ and s/HBI/HBA/ - Added a "none" protocol type for scsi_host hostdevs (which is invalid) - Restored the apparmor and selinux codepaths that got lost from v1 - Added a proper check for a valid scsi_host protocol, and saving that value within the HostdevDef struct - Fixed a compiler warning with call to virDomainPCIAddressEnsureAddr - Removed the rest of vhostfdSize, since multiple fd's are not allowed by QEMU - Fixed cleanup of vhostfd in error from building -device string - Moved the "conf" chunk from "hotplug" patch to "introduce" patch - Added xml2xml test - Added a proper calculation of "address" in virDomainAuditHostdev - Added a virFileExists check before open(/dev/vhost-scsi) - Addressed a number of lines >80 characters - Things *NOT* done (later?) - Investigation/tie-in with virsh nodedev-list stuff - Implementation of 'num_queues', 'max_sectors', and 'cmd_per_lun' (Need to research these in the virtio space, before figuring out how to apply to vhost-scsi) - Dropping the "naa." prefix of wwn - Split the "tests" patch into earlier patches - Other v2.1: https://www.redhat.com/archives/libvir-list/2016-September/msg00148.html v2: https://www.redhat.com/archives/libvir-list/2016-August/msg01028.html v1: https://www.redhat.com/archives/libvir-list/2016-July/msg01004.html [1] http://www.redhat.com/archives/libvir-list/2014-July/msg01235.html [2] http://www.redhat.com/archives/libvir-list/2014-July/msg01390.html Eric Farman (10): Cleanup switch statements on the hostdev subsystem type qemu: Introduce vhost-scsi capability Introduce a "scsi_host" hostdev type util: Management routines for scsi_host devices qemu: Add vhost-scsi string for -device parameter qemu: Allow hotplug of vhost-scsi device conf: Wire up the vhost-scsi connection from/to XML security: Include vhost-scsi in security labels tests: Introduce basic vhost-scsi test docs: Add vhost-scsi docs/formatdomain.html.in | 24 ++ docs/schemas/domaincommon.rng | 23 ++ po/POTFILES.in | 1 + src/Makefile.am | 1 + src/conf/domain_audit.c | 7 + src/conf/domain_conf.c | 102 ++++++- src/conf/domain_conf.h | 18 ++ src/libvirt_private.syms | 19 ++ src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_cgroup.c | 50 +++- src/qemu/qemu_command.c | 79 ++++++ src/qemu/qemu_command.h | 5 + src/qemu/qemu_domain_address.c | 10 + src/qemu/qemu_hostdev.c | 41 +++ src/qemu/qemu_hostdev.h | 8 + src/qemu/qemu_hotplug.c | 160 +++++++++++ src/security/security_apparmor.c | 24 +- src/security/security_dac.c | 46 ++++ src/security/security_selinux.c | 51 +++- src/util/virhost.c | 299 +++++++++++++++++++++ src/util/virhost.h | 72 +++++ src/util/virhostdev.c | 155 +++++++++++ src/util/virhostdev.h | 16 ++ tests/domaincapsschemadata/full.xml | 1 + tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 1 + .../caps_2.6.0-gicv2.aarch64.xml | 1 + .../caps_2.6.0-gicv3.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.xml | 1 + tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 1 + .../qemuxml2argv-hostdev-scsi-vhost-scsi.args | 24 ++ .../qemuxml2argv-hostdev-scsi-vhost-scsi.xml | 41 +++ tests/qemuxml2argvmock.c | 9 + tests/qemuxml2argvtest.c | 3 + .../qemuxml2xmlout-hostdev-scsi-vhost-scsi.xml | 1 + tests/qemuxml2xmltest.c | 3 + 42 files changed, 1293 insertions(+), 14 deletions(-) create mode 100644 src/util/virhost.c create mode 100644 src/util/virhost.h create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-vhost-scsi.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-vhost-scsi.xml create mode 120000 tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-scsi-vhost-scsi.xml -- 1.9.1

2 35

[libvirt] [PATCH v2 0/3] Gathering network interface statistics with openvswitch
by Mehdi Abaakouk 19 Nov '16

19 Nov '16

Hi, The new code have been moved to virnetdevopenvswitch.c I have also sent the refactoring of virstat.c Regards, Mehdi Abaakouk (3): Gathering vhostuser interface stats with ovs virstat: fix signature of virstat helper Move virstat.c code to virnetdevtap.c src/Makefile.am | 1 - src/libvirt_private.syms | 5 +- src/libxl/libxl_driver.c | 4 +- src/lxc/lxc_driver.c | 3 +- src/openvz/openvz_driver.c | 4 +- src/qemu/qemu_driver.c | 31 +++++-- src/uml/uml_driver.c | 1 - src/util/virnetdevopenvswitch.c | 106 ++++++++++++++++++++++++ src/util/virnetdevopenvswitch.h | 4 + src/util/virnetdevtap.c | 143 ++++++++++++++++++++++++++++++++ src/util/virnetdevtap.h | 3 + src/util/virstats.c | 178 ---------------------------------------- src/util/virstats.h | 31 ------- src/xen/xen_hypervisor.c | 4 +- 14 files changed, 288 insertions(+), 230 deletions(-) delete mode 100644 src/util/virstats.c delete mode 100644 src/util/virstats.h -- 2.10.2

1 3

[libvirt] [PATCH 00/14] Another round of CPU driver changes
by Jiri Denemark 19 Nov '16

19 Nov '16

This is another step in revisiting all APIs provided by the cpu driver and making them a bit more sane. As with the previous round(s), the updated APIs will gain virCPU prefix so that they can be easily distinguished from the ones that still need some work. Jiri Denemark (14): cpu: Rename cpuGetModels cpu: Rename and document cpuModelIsAllowed cpu: Rename cpuDataParse cpu: Rename cpuDataFormat cputest: Don't use preferred model for minimum match CPUs cputest: Don't use unsupported preferred model cputest: Don't use preferred model with forbidden fallback cputest: Don't use superfluous preferred model cputest: Don't use preferred CPU model at all cpu: Make models array in virCPUTranslate constant cputest: Don't test cpuGuestData cpu: Introduce virCPUConvertLegacy API cpu: Avoid adding <vendor> to custom CPUs cpu: Drop cpuGuestData src/conf/cpu_conf.c | 28 ++++- src/conf/cpu_conf.h | 3 +- src/cpu/cpu.c | 115 +++++++++++---------- src/cpu/cpu.h | 50 ++++----- src/cpu/cpu_arm.c | 12 +-- src/cpu/cpu_ppc64.c | 45 +++----- src/cpu/cpu_s390.c | 1 - src/cpu/cpu_x86.c | 36 ++----- src/libvirt_private.syms | 8 +- src/qemu/qemu_capabilities.c | 2 +- src/qemu/qemu_driver.c | 2 +- src/qemu/qemu_process.c | 6 +- src/test/test_driver.c | 2 +- tests/cputest.c | 104 ++++++++----------- .../ppc64-host+guest,ppc_models-result.xml | 2 - .../ppc64-host+guest-legacy,ppc_models-result.xml | 2 - .../cputestdata/x86-host+guest,model486-result.xml | 16 ++- .../x86-host+guest,models,Penryn-result.xml | 13 --- .../x86-host+guest,models,qemu64-result.xml | 13 --- tests/cputestdata/x86-host+guest,models-result.xml | 16 +-- tests/cputestdata/x86-host+guest-result.xml | 18 ++-- ... => x86-host+host+host-model,models-result.xml} | 3 +- tests/cputestdata/x86-host+min.xml | 1 - tests/cputestdata/x86-host+penryn-force-result.xml | 5 +- tests/cputestdata/x86-host+pentium3.xml | 1 - .../x86-host+strict-force-extra-result.xml | 31 +++--- ...-host-Haswell-noTSX+Haswell,haswell-result.xml} | 4 +- ...Haswell-noTSX+Haswell-noTSX,haswell-result.xml} | 2 +- ...86-host-Haswell-noTSX+Haswell-noTSX-result.xml} | 2 +- .../x86-host-better+pentium3,core2duo-result.xml | 21 ---- .../x86-host-better+pentium3,pentium3-result.xml | 30 ------ .../x86-host-better+pentium3-result.xml | 27 +++-- tests/cputestdata/x86-host-worse+guest-result.xml | 18 +++- tests/qemumonitorjsontest.c | 2 +- 34 files changed, 273 insertions(+), 368 deletions(-) delete mode 100644 tests/cputestdata/x86-host+guest,models,Penryn-result.xml delete mode 100644 tests/cputestdata/x86-host+guest,models,qemu64-result.xml rename tests/cputestdata/{x86-host+host+host-model,models,Penryn-result.xml => x86-host+host+host-model,models-result.xml} (89%) rename tests/cputestdata/{x86-host-Haswell-noTSX+Haswell-noTSX,haswell,Haswell-noTSX-result.xml => x86-host-Haswell-noTSX+Haswell,haswell-result.xml} (77%) rename tests/cputestdata/{x86-host-Haswell-noTSX+Haswell,haswell,Haswell-result.xml => x86-host-Haswell-noTSX+Haswell-noTSX,haswell-result.xml} (77%) rename tests/cputestdata/{x86-host-Haswell-noTSX+Haswell-noTSX,Haswell-noTSX-result.xml => x86-host-Haswell-noTSX+Haswell-noTSX-result.xml} (64%) delete mode 100644 tests/cputestdata/x86-host-better+pentium3,core2duo-result.xml delete mode 100644 tests/cputestdata/x86-host-better+pentium3,pentium3-result.xml -- 2.10.2

3 17