- Devel - libvirt List Archives

[libvirt] [PATCH v2 0/4] Support for new watchdog model diag288 and action inject-nmi
by Boris Fiuczynski 24 Jun '15

24 Jun '15

This patch set provides support for the new watchdog model "diag288" including the new watchdog action "inject-nmi". v2: Added tests for action and model. Boris Fiuczynski (4): Support for a new watchdog action inject-nmi Test for the new watchdog action inject-nmi Support for the new watchdog model diag288 Test for the new watchdog model diag288 docs/formatdomain.html.in | 5 +++++ docs/schemas/domaincommon.rng | 2 ++ include/libvirt/libvirt-domain.h | 1 + src/conf/domain_conf.c | 6 +++-- src/conf/domain_conf.h | 2 ++ src/qemu/qemu_command.c | 6 ++--- src/qemu/qemu_monitor_json.c | 2 +- .../qemuxml2argv-watchdog-diag288.args | 8 +++++++ .../qemuxml2argv-watchdog-diag288.xml | 22 ++++++++++++++++++ .../qemuxml2argv-watchdog-injectnmi.args | 5 +++++ .../qemuxml2argv-watchdog-injectnmi.xml | 26 ++++++++++++++++++++++ tests/qemuxml2argvtest.c | 4 ++++ tools/virsh-domain.c | 3 ++- 13 files changed, 85 insertions(+), 7 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-watchdog-diag288.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-watchdog-diag288.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-watchdog-injectnmi.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-watchdog-injectnmi.xml -- 2.3.0

2 5

[libvirt] [PATCH] scsi: Force error for SCSI pools on virStorageBackendSCSIFindLUs failure
by John Ferlan 24 Jun '15

24 Jun '15

Related to : https://bugzilla.redhat.com/show_bug.cgi?id=1171933 Rather than ignore the return status from virStorageBackendSCSIFindLUs, cause a failure to start the pool if a -1 is returned. Issue was noted during testing of the bz for iscsi that 'scsi' and 'fc' pools don't fail. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- src/storage/storage_backend_scsi.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/storage/storage_backend_scsi.c b/src/storage/storage_backend_scsi.c index b426145..a593a2b 100644 --- a/src/storage/storage_backend_scsi.c +++ b/src/storage/storage_backend_scsi.c @@ -935,7 +935,8 @@ virStorageBackendSCSIRefreshPool(virConnectPtr conn ATTRIBUTE_UNUSED, if (virStorageBackendSCSITriggerRescan(host) < 0) goto out; - ignore_value(virStorageBackendSCSIFindLUs(pool, host)); + if (virStorageBackendSCSIFindLUs(pool, host) < 0) + goto out; ret = 0; out: -- 2.1.0

2 1

[libvirt] [PATCH] vircapstest: Properly report error for failed tests
by Michal Privoznik 24 Jun '15

24 Jun '15

There are two macros used in the test: CAPSCOMP and CAPS_EXPECT_ERR. Both run a test case and if a failure occurred, they set the @ret variable to a value of -1 to indicate an error. Well, that's what they should do. Due to a typo, they set the variable to a positive one effectively masking any failed test. Then, we have couple of tests failing. Fix them too. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- tests/vircapstest.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tests/vircapstest.c b/tests/vircapstest.c index 0c79af8..3b41654 100644 --- a/tests/vircapstest.c +++ b/tests/vircapstest.c @@ -204,11 +204,11 @@ doCapsCompare(virCapsPtr caps, #define CAPSCOMP(o, a, d, e, m, fo, fa, fd, fe, fm) \ if (!doCapsCompare(caps, o, a, d, e, m, fo, fa, fd, fe, fm)) \ - ret = 1; + ret = -1; #define CAPS_EXPECT_ERR(o, a, d, e, m) \ if (!doCapsExpectFailure(caps, o, a, d, e, m)) \ - ret = 1; + ret = -1; #ifdef WITH_QEMU static int @@ -224,11 +224,11 @@ test_virCapsDomainDataLookupQEMU(const void *data ATTRIBUTE_UNUSED) /* Checking each parameter individually */ CAPSCOMP(-1, VIR_ARCH_NONE, -1, NULL, NULL, - VIR_DOMAIN_OSTYPE_HVM, VIR_ARCH_I686, - VIR_DOMAIN_VIRT_QEMU, "/usr/bin/qemu", "pc"); + VIR_DOMAIN_OSTYPE_HVM, VIR_ARCH_X86_64, + VIR_DOMAIN_VIRT_QEMU, "/usr/bin/qemu-system-x86_64", "pc-0.11"); CAPSCOMP(VIR_DOMAIN_OSTYPE_HVM, VIR_ARCH_NONE, -1, NULL, NULL, - VIR_DOMAIN_OSTYPE_HVM, VIR_ARCH_I686, - VIR_DOMAIN_VIRT_QEMU, "/usr/bin/qemu", "pc"); + VIR_DOMAIN_OSTYPE_HVM, VIR_ARCH_X86_64, + VIR_DOMAIN_VIRT_QEMU, "/usr/bin/qemu-system-x86_64", "pc-0.11"); CAPSCOMP(-1, VIR_ARCH_AARCH64, -1, NULL, NULL, VIR_DOMAIN_OSTYPE_HVM, VIR_ARCH_AARCH64, VIR_DOMAIN_VIRT_QEMU, "/usr/bin/qemu-system-aarch64", "virt"); @@ -306,7 +306,7 @@ test_virCapsDomainDataLookupLXC(const void *data ATTRIBUTE_UNUSED) } CAPSCOMP(-1, VIR_ARCH_NONE, -1, NULL, NULL, - VIR_DOMAIN_OSTYPE_EXE, VIR_ARCH_I686, + VIR_DOMAIN_OSTYPE_EXE, VIR_ARCH_X86_64, VIR_DOMAIN_VIRT_LXC, "/usr/libexec/libvirt_lxc", NULL); CAPSCOMP(-1, VIR_ARCH_X86_64, -1, NULL, NULL, VIR_DOMAIN_OSTYPE_EXE, VIR_ARCH_X86_64, -- 2.3.6

2 1

[libvirt] [PATCH] virt-aa-helper: fix rules for paths with trailing slash
by Cédric Bosdonnat 24 Jun '15

24 Jun '15

Rules generated for a path like '/' were having '//' which isn't correct for apparmor. Make virt-aa-helper smarter to avoid these. --- src/security/virt-aa-helper.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c index 35423b5..9f1c570 100644 --- a/src/security/virt-aa-helper.c +++ b/src/security/virt-aa-helper.c @@ -773,6 +773,7 @@ vah_add_path(virBufferPtr buf, const char *path, const char *perms, bool recursi char *tmp = NULL; int rc = -1; bool readonly = true; + bool trailingSlash; if (path == NULL) return rc; @@ -809,14 +810,18 @@ vah_add_path(virBufferPtr buf, const char *path, const char *perms, bool recursi goto cleanup; } - virBufferAsprintf(buf, " \"%s%s\" %s,\n", tmp, recursive ? "/**" : "", perms); + trailingSlash = (tmp[strlen(tmp) - 1] == '/'); + + virBufferAsprintf(buf, " \"%s%s%s\" %s,\n", tmp, trailingSlash ? "" : "/", + recursive ? "**" : "", perms); if (readonly) { virBufferAddLit(buf, " # don't audit writes to readonly files\n"); - virBufferAsprintf(buf, " deny \"%s%s\" w,\n", tmp, recursive ? "/**" : ""); + virBufferAsprintf(buf, " deny \"%s%s%s\" w,\n", tmp, + trailingSlash ? "" : "/", recursive ? "**" : ""); } if (recursive) { /* allow reading (but not creating) the dir */ - virBufferAsprintf(buf, " \"%s/\" r,\n", tmp); + virBufferAsprintf(buf, " \"%s%s\" r,\n", tmp, trailingSlash ? "" : "/"); } cleanup: -- 2.1.4

3 2

[libvirt] [PATCH v2] qemu: Use heads parameter for QXL driver
by Frediano Ziglio 24 Jun '15

24 Jun '15

Allows to specify maximum number of head to QXL driver. Signed-off-by: Frediano Ziglio <fziglio(a)redhat.com> The patch to support the "max_outputs" in Qemu is still not merged but I got agreement on the name of the argument. Actually can be a compatiblity problem as heads in the XML configuration was set by default to '1'. --- src/qemu/qemu_capabilities.c | 3 +++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 5 +++++ tests/qemucapabilitiesdata/caps_1.2.2-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.2.2-1.replies | 8 ++++++++ tests/qemucapabilitiesdata/caps_1.3.1-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.3.1-1.replies | 8 ++++++++ tests/qemucapabilitiesdata/caps_1.4.2-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.4.2-1.replies | 8 ++++++++ tests/qemucapabilitiesdata/caps_1.5.3-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.5.3-1.replies | 8 ++++++++ tests/qemucapabilitiesdata/caps_1.6.0-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.6.0-1.replies | 8 ++++++++ tests/qemucapabilitiesdata/caps_1.6.50-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.6.50-1.replies | 8 ++++++++ tests/qemucapabilitiesdata/caps_2.1.1-1.caps | 1 + tests/qemucapabilitiesdata/caps_2.1.1-1.replies | 8 ++++++++ 17 files changed, 72 insertions(+) Changes from v1: - fix formatting for capability strings; - remove global parameters, impossible to reach; - removed RFC. diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index ca7a7c2..a676c41 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -285,6 +285,8 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST, "dea-key-wrap", "pci-serial", "aarch64-off", + + "qxl-vga.max_outputs", /* 190 */ ); @@ -1643,6 +1645,7 @@ static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsQxl[] = { static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsQxlVga[] = { { "vgamem_mb", QEMU_CAPS_QXL_VGA_VGAMEM }, + { "max_outputs", QEMU_CAPS_QXL_VGA_MAX_OUTPUTS }, }; struct virQEMUCapsObjectTypeProps { diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index b5a7770..a2ea84b 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -229,6 +229,7 @@ typedef enum { QEMU_CAPS_DEA_KEY_WRAP = 187, /* -machine dea_key_wrap */ QEMU_CAPS_DEVICE_PCI_SERIAL = 188, /* -device pci-serial */ QEMU_CAPS_CPU_AARCH64_OFF = 189, /* -cpu ...,aarch64=off */ + QEMU_CAPS_QXL_VGA_MAX_OUTPUTS = 190, /* qxl-vga.max_outputs */ QEMU_CAPS_LAST, /* this must always be the last item */ } virQEMUCapsFlags; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 0a6d92f..a9d9169 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -5610,6 +5610,11 @@ qemuBuildDeviceVideoStr(virDomainDefPtr def, /* QEMU accepts mebibytes for vgamem_mb. */ virBufferAsprintf(&buf, ",vgamem_mb=%u", video->vgamem / 1024); } + + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_QXL_VGA_MAX_OUTPUTS) && + video->heads > 0) { + virBufferAsprintf(&buf, ",max_outputs=%u", video->heads); + } } else if (video->vram && ((video->type == VIR_DOMAIN_VIDEO_TYPE_VGA && virQEMUCapsGet(qemuCaps, QEMU_CAPS_VGA_VGAMEM)) || diff --git a/tests/qemucapabilitiesdata/caps_1.2.2-1.caps b/tests/qemucapabilitiesdata/caps_1.2.2-1.caps index 30239df..7791e42 100644 --- a/tests/qemucapabilitiesdata/caps_1.2.2-1.caps +++ b/tests/qemucapabilitiesdata/caps_1.2.2-1.caps @@ -120,4 +120,5 @@ <flag name='vmware-svga.vgamem_mb'/> <flag name='qxl.vgamem_mb'/> <flag name='qxl-vga.vgamem_mb'/> + <flag name='qxl-vga.max_outputs'/> </qemuCaps> diff --git a/tests/qemucapabilitiesdata/caps_1.2.2-1.replies b/tests/qemucapabilitiesdata/caps_1.2.2-1.replies index f501218..aa1d3f9 100644 --- a/tests/qemucapabilitiesdata/caps_1.2.2-1.replies +++ b/tests/qemucapabilitiesdata/caps_1.2.2-1.replies @@ -1488,6 +1488,10 @@ "type": "pci-devfn" }, { + "name": "max_outputs", + "type": "uint16" + }, + { "name": "vgamem_mb", "type": "uint32" }, @@ -1554,6 +1558,10 @@ "type": "pci-devfn" }, { + "name": "max_outputs", + "type": "uint16" + }, + { "name": "vgamem_mb", "type": "uint32" }, diff --git a/tests/qemucapabilitiesdata/caps_1.3.1-1.caps b/tests/qemucapabilitiesdata/caps_1.3.1-1.caps index ea3d850..bf4c731 100644 --- a/tests/qemucapabilitiesdata/caps_1.3.1-1.caps +++ b/tests/qemucapabilitiesdata/caps_1.3.1-1.caps @@ -135,4 +135,5 @@ <flag name='qxl.vgamem_mb'/> <flag name='qxl-vga.vgamem_mb'/> <flag name='pci-serial'/> + <flag name='qxl-vga.max_outputs'/> </qemuCaps> diff --git a/tests/qemucapabilitiesdata/caps_1.3.1-1.replies b/tests/qemucapabilitiesdata/caps_1.3.1-1.replies index e1f9704..6e210fe 100644 --- a/tests/qemucapabilitiesdata/caps_1.3.1-1.replies +++ b/tests/qemucapabilitiesdata/caps_1.3.1-1.replies @@ -1659,6 +1659,10 @@ "type": "pci-devfn" }, { + "name": "max_outputs", + "type": "uint16" + }, + { "name": "surfaces", "type": "int32" }, @@ -1729,6 +1733,10 @@ "type": "pci-devfn" }, { + "name": "max_outputs", + "type": "uint16" + }, + { "name": "surfaces", "type": "int32" }, diff --git a/tests/qemucapabilitiesdata/caps_1.4.2-1.caps b/tests/qemucapabilitiesdata/caps_1.4.2-1.caps index 2c19ddc..a371b57 100644 --- a/tests/qemucapabilitiesdata/caps_1.4.2-1.caps +++ b/tests/qemucapabilitiesdata/caps_1.4.2-1.caps @@ -136,4 +136,5 @@ <flag name='qxl.vgamem_mb'/> <flag name='qxl-vga.vgamem_mb'/> <flag name='pci-serial'/> + <flag name='qxl-vga.max_outputs'/> </qemuCaps> diff --git a/tests/qemucapabilitiesdata/caps_1.4.2-1.replies b/tests/qemucapabilitiesdata/caps_1.4.2-1.replies index 3d797b2..2b97937 100644 --- a/tests/qemucapabilitiesdata/caps_1.4.2-1.replies +++ b/tests/qemucapabilitiesdata/caps_1.4.2-1.replies @@ -1706,6 +1706,10 @@ "type": "pci-devfn" }, { + "name": "max_outputs", + "type": "uint16" + }, + { "name": "surfaces", "type": "int32" }, @@ -1776,6 +1780,10 @@ "type": "pci-devfn" }, { + "name": "max_outputs", + "type": "uint16" + }, + { "name": "surfaces", "type": "int32" }, diff --git a/tests/qemucapabilitiesdata/caps_1.5.3-1.caps b/tests/qemucapabilitiesdata/caps_1.5.3-1.caps index aadccd5..bb3d7aa 100644 --- a/tests/qemucapabilitiesdata/caps_1.5.3-1.caps +++ b/tests/qemucapabilitiesdata/caps_1.5.3-1.caps @@ -145,4 +145,5 @@ <flag name='qxl.vgamem_mb'/> <flag name='qxl-vga.vgamem_mb'/> <flag name='pci-serial'/> + <flag name='qxl-vga.max_outputs'/> </qemuCaps> diff --git a/tests/qemucapabilitiesdata/caps_1.5.3-1.replies b/tests/qemucapabilitiesdata/caps_1.5.3-1.replies index 45571a3..1a67ab9 100644 --- a/tests/qemucapabilitiesdata/caps_1.5.3-1.replies +++ b/tests/qemucapabilitiesdata/caps_1.5.3-1.replies @@ -1780,6 +1780,10 @@ "type": "pci-devfn" }, { + "name": "max_outputs", + "type": "uint16" + }, + { "name": "surfaces", "type": "int32" }, @@ -1850,6 +1854,10 @@ "type": "pci-devfn" }, { + "name": "max_outputs", + "type": "uint16" + }, + { "name": "surfaces", "type": "int32" }, diff --git a/tests/qemucapabilitiesdata/caps_1.6.0-1.caps b/tests/qemucapabilitiesdata/caps_1.6.0-1.caps index 3e81cbf..9d98f13 100644 --- a/tests/qemucapabilitiesdata/caps_1.6.0-1.caps +++ b/tests/qemucapabilitiesdata/caps_1.6.0-1.caps @@ -151,4 +151,5 @@ <flag name='qxl.vgamem_mb'/> <flag name='qxl-vga.vgamem_mb'/> <flag name='pci-serial'/> + <flag name='qxl-vga.max_outputs'/> </qemuCaps> diff --git a/tests/qemucapabilitiesdata/caps_1.6.0-1.replies b/tests/qemucapabilitiesdata/caps_1.6.0-1.replies index ae4b3f4..3b187c5 100644 --- a/tests/qemucapabilitiesdata/caps_1.6.0-1.replies +++ b/tests/qemucapabilitiesdata/caps_1.6.0-1.replies @@ -1842,6 +1842,10 @@ "type": "pci-devfn" }, { + "name": "max_outputs", + "type": "uint16" + }, + { "name": "surfaces", "type": "int32" }, @@ -1912,6 +1916,10 @@ "type": "pci-devfn" }, { + "name": "max_outputs", + "type": "uint16" + }, + { "name": "surfaces", "type": "int32" }, diff --git a/tests/qemucapabilitiesdata/caps_1.6.50-1.caps b/tests/qemucapabilitiesdata/caps_1.6.50-1.caps index 84c357f..ac1a3bd 100644 --- a/tests/qemucapabilitiesdata/caps_1.6.50-1.caps +++ b/tests/qemucapabilitiesdata/caps_1.6.50-1.caps @@ -151,4 +151,5 @@ <flag name='qxl.vgamem_mb'/> <flag name='qxl-vga.vgamem_mb'/> <flag name='pci-serial'/> + <flag name='qxl-vga.max_outputs'/> </qemuCaps> diff --git a/tests/qemucapabilitiesdata/caps_1.6.50-1.replies b/tests/qemucapabilitiesdata/caps_1.6.50-1.replies index 90d31f0..52ddebb 100644 --- a/tests/qemucapabilitiesdata/caps_1.6.50-1.replies +++ b/tests/qemucapabilitiesdata/caps_1.6.50-1.replies @@ -1806,6 +1806,10 @@ "type": "pci-devfn" }, { + "name": "max_outputs", + "type": "uint16" + }, + { "name": "surfaces", "type": "int32" }, @@ -1876,6 +1880,10 @@ "type": "pci-devfn" }, { + "name": "max_outputs", + "type": "uint16" + }, + { "name": "surfaces", "type": "int32" }, diff --git a/tests/qemucapabilitiesdata/caps_2.1.1-1.caps b/tests/qemucapabilitiesdata/caps_2.1.1-1.caps index b1ee8df..df23c28 100644 --- a/tests/qemucapabilitiesdata/caps_2.1.1-1.caps +++ b/tests/qemucapabilitiesdata/caps_2.1.1-1.caps @@ -167,4 +167,5 @@ <flag name='qxl-vga.vgamem_mb'/> <flag name='pc-dimm'/> <flag name='pci-serial'/> + <flag name='qxl-vga.max_outputs'/> </qemuCaps> diff --git a/tests/qemucapabilitiesdata/caps_2.1.1-1.replies b/tests/qemucapabilitiesdata/caps_2.1.1-1.replies index 511461a..863003f 100644 --- a/tests/qemucapabilitiesdata/caps_2.1.1-1.replies +++ b/tests/qemucapabilitiesdata/caps_2.1.1-1.replies @@ -2252,6 +2252,10 @@ "type": "pci-devfn" }, { + "name": "max_outputs", + "type": "uint16" + }, + { "name": "surfaces", "type": "int32" }, @@ -2322,6 +2326,10 @@ "type": "pci-devfn" }, { + "name": "max_outputs", + "type": "uint16" + }, + { "name": "surfaces", "type": "int32" }, -- 2.1.0

2 3

[libvirt] [PATCH v2 0/1] vz: Fix error messages in libvirt log caused by unhadled events
by Mikhail Feoktistov 24 Jun '15

24 Jun '15

Changes from v1 Rebase patch Mikhail Feoktistov (1): vz: Fix error messages in libvirt log caused by unhadled events

2 2

[libvirt] [PATCH] qemu: blockcopy: Forbid using persistent bitmap granularity with raw vols
by Peter Krempa 24 Jun '15

24 Jun '15

qemu returns error but only in the event after the block job actually starts. Reject it upfront for a better error message. Instead of: $ virsh blockcopy vm hdc /tmp/raw.img --granularity 4096 --verbose --wait error: Block Copy unexpectedly failed You will now get: $ virsh blockcopy vm hdc /tmp/raw.img --granularity 4096 --verbose --wait error: unsupported configuration: granularity can't be used with target volume format Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1233115 --- src/qemu/qemu_driver.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index c1373de..f570879 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -16671,6 +16671,16 @@ qemuDomainBlockCopyCommon(virDomainObjPtr vm, goto endjob; } + /* blacklist granularity with some known-bad formats */ + if (granularity && + (mirror->format == VIR_STORAGE_FILE_RAW || + (mirror->format <= VIR_STORAGE_FILE_NONE && + disk->src->format == VIR_STORAGE_FILE_RAW))) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("granularity can't be used with target volume format")); + goto endjob; + } + /* Prepare the destination file. */ /* XXX Allow non-file mirror destinations */ if (!virStorageSourceIsLocalStorage(mirror)) { -- 2.4.1

2 3

[libvirt] [PATCH] conf: improve the way we format blkiotune and cputune
by Luyao Huang 24 Jun '15

24 Jun '15

Just refactor existing code to use a child buf instead of check all element before format <blkiotune> and <cputune>. This will avoid the more and more bigger element check during we introduce new elements in <blkiotune> and <cputune> in the future. Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- src/conf/domain_conf.c | 168 +++++++++++++++++++------------------------------ 1 file changed, 65 insertions(+), 103 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index e592adf..466355a 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -20976,24 +20976,6 @@ virDomainHubDefFormat(virBufferPtr buf, return 0; } -/* - * Return true if no <vcpupin> specified in domain XML - * (I.e. all vcpus inherit the cpuset from "cpuset" of - * <vcpu>). Or false otherwise. - */ -static bool -virDomainIsAllVcpupinInherited(virDomainDefPtr def) -{ - size_t i; - - for (i = 0; i < def->cputune.nvcpupin; i++) { - if (!virBitmapEqual(def->cputune.vcpupin[i]->cpumask, def->cpumask)) - return false; - } - - return true; -} - static void virDomainResourceDefFormat(virBufferPtr buf, @@ -21124,8 +21106,8 @@ virDomainDefFormatInternal(virDomainDefPtr def, const char *type = NULL; int n; size_t i; - bool blkio = false; - bool cputune = false; + virBuffer childrenBuf = VIR_BUFFER_INITIALIZER; + int indent; virCheckFlags(VIR_DOMAIN_DEF_FORMAT_COMMON_FLAGS | VIR_DOMAIN_DEF_FORMAT_STATUS | @@ -21201,62 +21183,47 @@ virDomainDefFormatInternal(virDomainDefPtr def, virBufferAsprintf(buf, "<currentMemory unit='KiB'>%llu</currentMemory>\n", def->mem.cur_balloon); - /* add blkiotune only if there are any */ - if (def->blkio.weight) { - blkio = true; - } else { - for (n = 0; n < def->blkio.ndevices; n++) { - if (def->blkio.devices[n].weight || - def->blkio.devices[n].riops || - def->blkio.devices[n].wiops || - def->blkio.devices[n].rbps || - def->blkio.devices[n].wbps) { - blkio = true; - break; - } - } - } - - if (blkio) { - virBufferAddLit(buf, "<blkiotune>\n"); - virBufferAdjustIndent(buf, 2); - - if (def->blkio.weight) - virBufferAsprintf(buf, "<weight>%u</weight>\n", - def->blkio.weight); - - for (n = 0; n < def->blkio.ndevices; n++) { - virBlkioDevicePtr dev = &def->blkio.devices[n]; + /* start format blkiotune */ + indent = virBufferGetIndent(buf, false); + virBufferAdjustIndent(&childrenBuf, indent + 2); + if (def->blkio.weight) + virBufferAsprintf(&childrenBuf, "<weight>%u</weight>\n", + def->blkio.weight); - if (!dev->weight && !dev->riops && !dev->wiops && - !dev->rbps && !dev->wbps) - continue; - virBufferAddLit(buf, "<device>\n"); - virBufferAdjustIndent(buf, 2); - virBufferEscapeString(buf, "<path>%s</path>\n", - dev->path); - if (dev->weight) - virBufferAsprintf(buf, "<weight>%u</weight>\n", - dev->weight); - if (dev->riops) - virBufferAsprintf(buf, "<read_iops_sec>%u</read_iops_sec>\n", - dev->riops); - if (dev->wiops) - virBufferAsprintf(buf, "<write_iops_sec>%u</write_iops_sec>\n", - dev->wiops); - if (dev->rbps) - virBufferAsprintf(buf, "<read_bytes_sec>%llu</read_bytes_sec>\n", - dev->rbps); - if (dev->wbps) - virBufferAsprintf(buf, "<write_bytes_sec>%llu</write_bytes_sec>\n", - dev->wbps); - virBufferAdjustIndent(buf, -2); - virBufferAddLit(buf, "</device>\n"); - } + for (n = 0; n < def->blkio.ndevices; n++) { + virBlkioDevicePtr dev = &def->blkio.devices[n]; - virBufferAdjustIndent(buf, -2); + if (!dev->weight && !dev->riops && !dev->wiops && + !dev->rbps && !dev->wbps) + continue; + virBufferAddLit(&childrenBuf, "<device>\n"); + virBufferAdjustIndent(&childrenBuf, 2); + virBufferEscapeString(&childrenBuf, "<path>%s</path>\n", + dev->path); + if (dev->weight) + virBufferAsprintf(&childrenBuf, "<weight>%u</weight>\n", + dev->weight); + if (dev->riops) + virBufferAsprintf(&childrenBuf, "<read_iops_sec>%u</read_iops_sec>\n", + dev->riops); + if (dev->wiops) + virBufferAsprintf(&childrenBuf, "<write_iops_sec>%u</write_iops_sec>\n", + dev->wiops); + if (dev->rbps) + virBufferAsprintf(&childrenBuf, "<read_bytes_sec>%llu</read_bytes_sec>\n", + dev->rbps); + if (dev->wbps) + virBufferAsprintf(&childrenBuf, "<write_bytes_sec>%llu</write_bytes_sec>\n", + dev->wbps); + virBufferAdjustIndent(&childrenBuf, -2); + virBufferAddLit(&childrenBuf, "</device>\n"); + } + if (virBufferUse(&childrenBuf)) { + virBufferAddLit(buf, "<blkiotune>\n"); + virBufferAddBuffer(buf, &childrenBuf); virBufferAddLit(buf, "</blkiotune>\n"); } + virBufferFreeAndReset(&childrenBuf); /* add memtune only if there are any */ if (virMemoryLimitIsSet(def->mem.hard_limit) || @@ -21335,35 +21302,26 @@ virDomainDefFormatInternal(virDomainDefPtr def, } } - if (def->cputune.sharesSpecified || - (def->cputune.nvcpupin && !virDomainIsAllVcpupinInherited(def)) || - def->cputune.period || def->cputune.quota || - def->cputune.emulatorpin || - def->cputune.emulator_period || def->cputune.emulator_quota || - virDomainIOThreadIDArrayHasPin(def) || - def->cputune.vcpusched || def->cputune.iothreadsched) { - virBufferAddLit(buf, "<cputune>\n"); - cputune = true; - } - - virBufferAdjustIndent(buf, 2); + /* start format cputune */ + indent = virBufferGetIndent(buf, false); + virBufferAdjustIndent(&childrenBuf, indent + 2); if (def->cputune.sharesSpecified) - virBufferAsprintf(buf, "<shares>%lu</shares>\n", + virBufferAsprintf(&childrenBuf, "<shares>%lu</shares>\n", def->cputune.shares); if (def->cputune.period) - virBufferAsprintf(buf, "<period>%llu</period>\n", + virBufferAsprintf(&childrenBuf, "<period>%llu</period>\n", def->cputune.period); if (def->cputune.quota) - virBufferAsprintf(buf, "<quota>%lld</quota>\n", + virBufferAsprintf(&childrenBuf, "<quota>%lld</quota>\n", def->cputune.quota); if (def->cputune.emulator_period) - virBufferAsprintf(buf, "<emulator_period>%llu" + virBufferAsprintf(&childrenBuf, "<emulator_period>%llu" "</emulator_period>\n", def->cputune.emulator_period); if (def->cputune.emulator_quota) - virBufferAsprintf(buf, "<emulator_quota>%lld" + virBufferAsprintf(&childrenBuf, "<emulator_quota>%lld" "</emulator_quota>\n", def->cputune.emulator_quota); @@ -21373,24 +21331,24 @@ virDomainDefFormatInternal(virDomainDefPtr def, if (virBitmapEqual(def->cpumask, def->cputune.vcpupin[i]->cpumask)) continue; - virBufferAsprintf(buf, "<vcpupin vcpu='%u' ", + virBufferAsprintf(&childrenBuf, "<vcpupin vcpu='%u' ", def->cputune.vcpupin[i]->id); if (!(cpumask = virBitmapFormat(def->cputune.vcpupin[i]->cpumask))) goto error; - virBufferAsprintf(buf, "cpuset='%s'/>\n", cpumask); + virBufferAsprintf(&childrenBuf, "cpuset='%s'/>\n", cpumask); VIR_FREE(cpumask); } if (def->cputune.emulatorpin) { char *cpumask; - virBufferAddLit(buf, "<emulatorpin "); + virBufferAddLit(&childrenBuf, "<emulatorpin "); if (!(cpumask = virBitmapFormat(def->cputune.emulatorpin))) goto error; - virBufferAsprintf(buf, "cpuset='%s'/>\n", cpumask); + virBufferAsprintf(&childrenBuf, "cpuset='%s'/>\n", cpumask); VIR_FREE(cpumask); } @@ -21401,13 +21359,13 @@ virDomainDefFormatInternal(virDomainDefPtr def, if (!def->iothreadids[i]->cpumask) continue; - virBufferAsprintf(buf, "<iothreadpin iothread='%u' ", + virBufferAsprintf(&childrenBuf, "<iothreadpin iothread='%u' ", def->iothreadids[i]->iothread_id); if (!(cpumask = virBitmapFormat(def->iothreadids[i]->cpumask))) goto error; - virBufferAsprintf(buf, "cpuset='%s'/>\n", cpumask); + virBufferAsprintf(&childrenBuf, "cpuset='%s'/>\n", cpumask); VIR_FREE(cpumask); } @@ -21417,13 +21375,13 @@ virDomainDefFormatInternal(virDomainDefPtr def, if (!(ids = virBitmapFormat(sp->ids))) goto error; - virBufferAsprintf(buf, "<vcpusched vcpus='%s' scheduler='%s'", + virBufferAsprintf(&childrenBuf, "<vcpusched vcpus='%s' scheduler='%s'", ids, virProcessSchedPolicyTypeToString(sp->policy)); VIR_FREE(ids); if (sp->priority) - virBufferAsprintf(buf, " priority='%d'", sp->priority); - virBufferAddLit(buf, "/>\n"); + virBufferAsprintf(&childrenBuf, " priority='%d'", sp->priority); + virBufferAddLit(&childrenBuf, "/>\n"); } for (i = 0; i < def->cputune.niothreadsched; i++) { @@ -21432,18 +21390,21 @@ virDomainDefFormatInternal(virDomainDefPtr def, if (!(ids = virBitmapFormat(sp->ids))) goto error; - virBufferAsprintf(buf, "<iothreadsched iothreads='%s' scheduler='%s'", + virBufferAsprintf(&childrenBuf, "<iothreadsched iothreads='%s' scheduler='%s'", ids, virProcessSchedPolicyTypeToString(sp->policy)); VIR_FREE(ids); if (sp->priority) - virBufferAsprintf(buf, " priority='%d'", sp->priority); - virBufferAddLit(buf, "/>\n"); + virBufferAsprintf(&childrenBuf, " priority='%d'", sp->priority); + virBufferAddLit(&childrenBuf, "/>\n"); } - virBufferAdjustIndent(buf, -2); - if (cputune) + if (virBufferUse(&childrenBuf)) { + virBufferAddLit(buf, "<cputune>\n"); + virBufferAddBuffer(buf, &childrenBuf); virBufferAddLit(buf, "</cputune>\n"); + } + virBufferFreeAndReset(&childrenBuf); if (virDomainNumatuneFormatXML(buf, def->numa) < 0) goto error; @@ -22017,6 +21978,7 @@ virDomainDefFormatInternal(virDomainDefPtr def, error: virBufferFreeAndReset(buf); + virBufferFreeAndReset(&childrenBuf); return -1; } -- 1.8.3.1

3 2

[libvirt] [PATCH] qemu:lxc:xml:libxl:xen: improve the error in openconsole/channel
by Luyao Huang 24 Jun '15

24 Jun '15

We allow do not pass the dev_name to openconsole() and openchannel() function, but the error message is not good when we do not specified the console/channel name. the error message after this patch: error: internal error: character device serial0 is not using a PTY Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- src/libxl/libxl_driver.c | 4 ++-- src/lxc/lxc_driver.c | 3 ++- src/qemu/qemu_driver.c | 8 ++++---- src/uml/uml_driver.c | 3 ++- src/xen/xen_driver.c | 3 ++- 5 files changed, 12 insertions(+), 9 deletions(-) diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index a7be745..c64d9be 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -4292,14 +4292,14 @@ libxlDomainOpenConsole(virDomainPtr dom, if (!chr) { virReportError(VIR_ERR_INTERNAL_ERROR, _("cannot find character device %s"), - NULLSTR(dev_name)); + dev_name ? dev_name : "to open"); goto cleanup; } if (chr->source.type != VIR_DOMAIN_CHR_TYPE_PTY) { virReportError(VIR_ERR_INTERNAL_ERROR, _("character device %s is not using a PTY"), - NULLSTR(dev_name)); + dev_name ? dev_name : NULLSTR(chr->info.alias)); goto cleanup; } diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 31fb470..cc1277b 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -3484,7 +3484,8 @@ lxcDomainOpenConsole(virDomainPtr dom, if (chr->source.type != VIR_DOMAIN_CHR_TYPE_PTY) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("character device %s is not using a PTY"), dev_name); + _("character device %s is not using a PTY"), + dev_name ? dev_name : NULLSTR(chr->info.alias)); goto cleanup; } diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 6bb8549..282b32f 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -16041,14 +16041,14 @@ qemuDomainOpenConsole(virDomainPtr dom, if (!chr) { virReportError(VIR_ERR_INTERNAL_ERROR, _("cannot find character device %s"), - NULLSTR(dev_name)); + dev_name ? dev_name : "to open"); goto cleanup; } if (chr->source.type != VIR_DOMAIN_CHR_TYPE_PTY) { virReportError(VIR_ERR_INTERNAL_ERROR, _("character device %s is not using a PTY"), - NULLSTR(dev_name)); + dev_name ? dev_name : NULLSTR(chr->info.alias)); goto cleanup; } @@ -16115,14 +16115,14 @@ qemuDomainOpenChannel(virDomainPtr dom, if (!chr) { virReportError(VIR_ERR_INTERNAL_ERROR, _("cannot find channel %s"), - NULLSTR(name)); + name ? name : "to open"); goto cleanup; } if (chr->source.type != VIR_DOMAIN_CHR_TYPE_UNIX) { virReportError(VIR_ERR_INTERNAL_ERROR, _("channel %s is not using a UNIX socket"), - NULLSTR(name)); + name ? name : NULLSTR(chr->info.alias)); goto cleanup; } diff --git a/src/uml/uml_driver.c b/src/uml/uml_driver.c index f09e79b..7a95458 100644 --- a/src/uml/uml_driver.c +++ b/src/uml/uml_driver.c @@ -2640,7 +2640,8 @@ umlDomainOpenConsole(virDomainPtr dom, if (chr->source.type != VIR_DOMAIN_CHR_TYPE_PTY) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("character device %s is not using a PTY"), dev_name); + _("character device %s is not using a PTY"), + dev_name ? dev_name : NULLSTR(chr->info.alias)); goto cleanup; } diff --git a/src/xen/xen_driver.c b/src/xen/xen_driver.c index da9e6f4..ce31f0f 100644 --- a/src/xen/xen_driver.c +++ b/src/xen/xen_driver.c @@ -2705,7 +2705,8 @@ xenUnifiedDomainOpenConsole(virDomainPtr dom, if (chr->source.type != VIR_DOMAIN_CHR_TYPE_PTY) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("character device %s is not using a PTY"), dev_name); + _("character device %s is not using a PTY"), + dev_name ? dev_name : NULLSTR(chr->info.alias)); goto cleanup; } -- 1.8.3.1

3 2

[libvirt] [PATCH] conf: Adjust invalid secrettype setting during parse
by John Ferlan 24 Jun '15

24 Jun '15

Commit id '1feaccf0' attempted to handle an empty secrettype value; however, it made a mistake by processing the secretType as if it was the original secrettype string. The 'secretType' is actually whether 'usage' or 'uuid' was used. Thus adjust part of the change to make the same check for def->src->type != VIR_STORAGE_TYPE_VOLUME before setting auth_secret_usage from the secrettype field. Luckily the aforementioned commits misdeed would be overwritten by the call to virStorageTranslateDiskSourcePool Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- Follow up to my recent change and response, see: http://www.redhat.com/archives/libvir-list/2015-June/msg00666.html src/conf/domain_conf.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index ca55981..c31edf5 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -6571,17 +6571,11 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt, xmlStrEqual(cur->name, BAD_CAST "auth")) { if (!(authdef = virStorageAuthDefParse(node->doc, cur))) goto error; - /* Shared processing code with storage pools can leave - * this empty, but disk formatting uses it as does command - * creation - so use the secretType to attempt to fill it in. + /* Disk volume types won't have the secrettype filled in until + * after virStorageTranslateDiskSourcePool is run */ - if (!authdef->secrettype) { - const char *secrettype = - virSecretUsageTypeToString(authdef->secretType); - if (VIR_STRDUP(authdef->secrettype, secrettype) < 0) - goto error; - } - if ((auth_secret_usage = + if (def->src->type != VIR_STORAGE_TYPE_VOLUME && + (auth_secret_usage = virSecretUsageTypeFromString(authdef->secrettype)) < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("invalid secret type %s"), -- 2.1.0

2 2

[libvirt] [PATCH] docs: Fix trivial copy-paste error
by Martin Kletzander 24 Jun '15

24 Jun '15

Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- Pushed as trivial (in a while). docs/formatdomain.html.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 95d8c45487aa..f7b9f519a377 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -726,8 +726,7 @@ If no <code>iothreadids</code> are defined, then libvirt numbers IOThreads from 1 to the number of <code>iothreads</code> available for the domain. For real-time schedulers (<code>fifo</code>, - <code>rr</code>), priority must real-time schedulers - (<code>fifo</code>, <code>rr</code>), priority must be specified as + <code>rr</code>), priority must be specified as well (and is ignored for non-real-time ones). The value range for the priority depends on the host kernel (usually 1-99). <span class="since">Since 1.2.13</span> -- 2.4.4

1 0

[libvirt] [[libvirt-php][PATCH v2] qemu-agent-command] fixes for installation and add another libvirt function
by Vasiliy Tolstov 24 Jun '15

24 Jun '15

* add libvirt_domain_qemu_agent_command * fix install target, because before this all stuff goes to /usr/usr dir Signed-off-by: Vasiliy Tolstov <v.tolstov(a)selfip.ru> --- configure.ac | 3 +++ src/Makefile.am | 19 ++++++++++--------- src/libvirt-php.c | 28 ++++++++++++++++++++++++++++ src/libvirt-php.h | 2 ++ 4 files changed, 43 insertions(+), 9 deletions(-) diff --git a/configure.ac b/configure.ac index 9e9fee0..0afa2e2 100644 --- a/configure.ac +++ b/configure.ac @@ -23,6 +23,9 @@ PKG_PROG_PKG_CONFIG LIBVIRT_REQUIRED=0.6.2 PKG_CHECK_MODULES(LIBVIRT, libvirt >= $LIBVIRT_REQUIRED) +PKG_CHECK_MODULES(QEMU, libvirt-qemu) +AC_SUBST([QEMU_CFLAGS]) +AC_SUBST([QEMU_LIBS]) dnl ========================================================================== dnl required minimum version of libxml2 diff --git a/src/Makefile.am b/src/Makefile.am index cab0456..f270ec2 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -6,10 +6,10 @@ WL=@WL@ SHLIB_FLAGS=@SHLIB_FLAGS@ install-exec-local: - $(MKDIR_P) $(DESTDIR)$(prefix)$(PHPEDIR) - $(MKDIR_P) $(DESTDIR)$(prefix)$(PHPCDIR) - $(INSTALL) -m 644 -D .libs/$(PACKAGE).so $(DESTDIR)$(prefix)$(PHPEDIR)/$(PACKAGE).so - $(INSTALL) -m 755 -d $(DESTDIR)$(prefix)$(PHPCDIR) + $(MKDIR_P) $(DESTDIR)$(PHPEDIR) + $(MKDIR_P) $(DESTDIR)$(PHPCDIR) + $(INSTALL) -m 644 -D .libs/$(PACKAGE).so $(DESTDIR)$(PHPEDIR)/$(PACKAGE).so + $(INSTALL) -m 755 -d $(DESTDIR)$(PHPCDIR) $(ECHO) "extension=$(PACKAGE).so" > libvirt-php.ini $(ECHO) >> libvirt-php.ini $(ECHO) "[libvirt]" >> libvirt-php.ini @@ -19,21 +19,22 @@ install-exec-local: $(ECHO) "libvirt.image_path=/var/lib/libvirt/images" >> libvirt-php.ini $(ECHO) "; Limit maximum number of libvirt connections" >> libvirt-php.ini $(ECHO) "libvirt.max_connections=5" >> libvirt-php.ini - $(INSTALL) -m 644 -D libvirt-php.ini $(DESTDIR)$(prefix)$(PHPCDIR)/$(PACKAGE).ini + $(INSTALL) -m 644 -D libvirt-php.ini $(DESTDIR)$(PHPCDIR)/$(PACKAGE).ini uninstall-local: - $(RM) -f $(DESTDIR)$(prefix)$(PHPCDIR)/$(PACKAGE).ini - $(RM) -f $(DESTDIR)$(prefix)$(PHPEDIR)/$(PACKAGE).so + $(RM) -f $(DESTDIR)$(PHPCDIR)/$(PACKAGE).ini + $(RM) -f $(DESTDIR)$(PHPEDIR)/$(PACKAGE).so AM_CFLAGS = \ $(PHPINC) $(LIBXML_CFLAGS) \ - $(LIBVIRT_CFLAGS) $(DEFINES) \ + $(LIBVIRT_CFLAGS) $(QEMU_CFLAGS) $(DEFINES) \ -I$(top_srcdir)/winsrc AM_LDFLAGS = \ $(SHLIB_LDFLAGS) \ $(LIBXML_LIBS) \ - $(LIBVIRT_LIBS) + $(LIBVIRT_LIBS) \ + $(QEMU_LIBS) lib_LTLIBRARIES = libvirt-php.la diff --git a/src/libvirt-php.c b/src/libvirt-php.c index d46fbb9..f9d5557 100644 --- a/src/libvirt-php.c +++ b/src/libvirt-php.c @@ -161,6 +161,7 @@ static zend_function_entry libvirt_functions[] = { PHP_FE(libvirt_domain_send_keys, NULL) PHP_FE(libvirt_domain_send_pointer_event, NULL) PHP_FE(libvirt_domain_update_device, NULL) + PHP_FE(libvirt_domain_qemu_agent_command, NULL) /* Domain snapshot functions */ PHP_FE(libvirt_domain_has_current_snapshot, NULL) PHP_FE(libvirt_domain_snapshot_create, NULL) @@ -3943,6 +3944,33 @@ PHP_FUNCTION(libvirt_domain_get_name) } /* + Function name: libvirt_domain_qemu_agent_command + Since version: 0.5.2(-1) + Description: Function is used to send qemu-ga command + Arguments: @res [resource]: libvirt domain resource, e.g. from libvirt_domain_lookup_by_*() + @timeout [int]: timeout for waiting (-2 block, -1 default, 0 no wait, >0 wait specific time + @flags [int]: ?? + Returns: String on success and FALSE on error +*/ +PHP_FUNCTION(libvirt_domain_qemu_agent_command) +{ + php_libvirt_domain *domain=NULL; + zval *zdomain; + const char *cmd; + int cmd_len; + char *ret; + long timeout = -1; + long flags = 0; + + GET_DOMAIN_FROM_ARGS("rs|l|l", &zdomain, &cmd, &cmd_len, &timeout, &flags); + + ret = virDomainQemuAgentCommand(domain->domain, cmd, timeout, flags); + if (ret == NULL) RETURN_FALSE; + + RETURN_STRING(ret,1); +} + +/* Function name: libvirt_domain_get_uuid_string Since version: 0.4.1(-1) Description: Function is used to get the domain's UUID in string format diff --git a/src/libvirt-php.h b/src/libvirt-php.h index 7c9a229..1d9c6ab 100644 --- a/src/libvirt-php.h +++ b/src/libvirt-php.h @@ -80,6 +80,7 @@ #include <libvirt/libvirt.h> #include <libvirt/virterror.h> +#include <libvirt/libvirt-qemu.h> #include <libxml/parser.h> #include <libxml/xpath.h> #include <fcntl.h> @@ -427,6 +428,7 @@ PHP_FUNCTION(libvirt_domain_send_keys); PHP_FUNCTION(libvirt_domain_send_pointer_event); PHP_FUNCTION(libvirt_domain_get_metadata); PHP_FUNCTION(libvirt_domain_set_metadata); +PHP_FUNCTION(libvirt_domain_qemu_agent_command); /* Domain snapshot functions */ PHP_FUNCTION(libvirt_domain_has_current_snapshot); PHP_FUNCTION(libvirt_domain_snapshot_create); -- 2.3.3

2 3

[libvirt] [PATCH] conf: Enforce scheduler name when parsing XML
by Peter Krempa 23 Jun '15

23 Jun '15

We require the scheduler name attribute in the schemas but the code would actually be fine when it was omitted. Make it mandatory. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1234729 --- src/conf/domain_conf.c | 49 ++++++++++++++++++++++++++----------------------- 1 file changed, 26 insertions(+), 23 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index e592adf..183e66c 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -14153,32 +14153,35 @@ virDomainThreadSchedParse(xmlNodePtr node, } VIR_FREE(tmp); - tmp = virXMLPropString(node, "scheduler"); - if (tmp) { - if ((pol = virProcessSchedPolicyTypeFromString(tmp)) <= 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Invalid scheduler attribute: '%s'"), - tmp); + if (!(tmp = virXMLPropString(node, "scheduler"))) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Missing scheduler attribute")); + goto error; + } + + if ((pol = virProcessSchedPolicyTypeFromString(tmp)) <= 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Invalid scheduler attribute: '%s'"), + tmp); + goto error; + } + sp->policy = pol; + + VIR_FREE(tmp); + if (sp->policy == VIR_PROC_POLICY_FIFO || + sp->policy == VIR_PROC_POLICY_RR) { + tmp = virXMLPropString(node, "priority"); + if (!tmp) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("Missing scheduler priority")); goto error; } - sp->policy = pol; - - VIR_FREE(tmp); - if (sp->policy == VIR_PROC_POLICY_FIFO || - sp->policy == VIR_PROC_POLICY_RR) { - tmp = virXMLPropString(node, "priority"); - if (!tmp) { - virReportError(VIR_ERR_XML_ERROR, "%s", - _("Missing scheduler priority")); - goto error; - } - if (virStrToLong_i(tmp, NULL, 10, &sp->priority) < 0) { - virReportError(VIR_ERR_XML_ERROR, "%s", - _("Invalid value for element priority")); - goto error; - } - VIR_FREE(tmp); + if (virStrToLong_i(tmp, NULL, 10, &sp->priority) < 0) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("Invalid value for element priority")); + goto error; } + VIR_FREE(tmp); } return 0; -- 2.4.1

2 2

[libvirt] [PATCHv3 00/10] new API virDomainBlockSetWriteThreshold
by Eric Blake 23 Jun '15

23 Jun '15

v2 was here: https://www.redhat.com/archives/libvir-list/2015-June/msg00591.html This series depends on my yajl/json cleanups: https://www.redhat.com/archives/libvir-list/2015-June/msg01098.html and can also be found here: git clone git://repo.or.cz/libvirt/ericb.git threshold http://repo.or.cz/w/libvirt/ericb.git/shortlog/refs/heads/threshold Since then, I've rebased to master, addressed Peter's findings on v2, and tested that things actually work when combined with a single pending patch on qemu (I'll reply to this mail with the list id of that patch, where that patch in turn points to this series as justification). Here's a transcript of how I tested: I modified my 'f20' domain to include: <devices> <emulator>/home/eblake/qemu/x86_64-softmmu/qemu-system-x86_64</emulator> <disk type='block' device='disk'> <driver name='qemu' type='qcow2'/> <source dev='/dev/sda6'/> <target dev='vda' bus='virtio'/> </disk> then created a raw partition wrapper around the usual disk image: # qemu-img create -f qcow2 -o backing_file=/var/lib/libvirt/images/f20.img,backing_fmt=qcow2 /dev/sda6 Formatting '/dev/sda6', fmt=qcow2 size=12884901888 backing_file='/var/lib/libvirt/images/f20.img' backing_fmt='qcow2' encryption=off cluster_size=65536 lazy_refcounts=off refcount_bits=16 I then started the domain paused (as long as no guest I/O happens, the threshold cannot be exceeded, which gives me time to register a threshold and set up an event handler): # virsh start --paused f20 Domain f20 started # ./run tools/virsh -k0 domblkthreshold f20 vda 10000 threshold of vda set to 10000 bytes I was then able to play with domstats to see different thresholds as I registered them (such as playing with the parts-per-million or even with virsh 'percentage sugar'): # virsh -k0 domstats f20 --block | grep -C1 allo block.0.write-threshold=10000 block.0.allocation=0 block.0.capacity=12884901888 In another window, I set up my event loop: $ ./run tools/virsh -k0 event f20 --loop --all then in the first window, I resumed things: # virsh resume f20 and got this message in the second window, after several seconds had elapsed (the first few seconds in the guest is under control of Grub, which doesn't write to disk; when it transitioned over to the Linux boot, disk activity started happening and easily causes the qcow2 wrapper to exceed the threshold I set earlier): $ ./run tools/virsh -k0 -c qemu:///system event --loop --all event 'lifecycle' for domain f20: Resumed Unpaused event 'lifecycle' for domain f20: Resumed Unpaused event 'write-threshold' for domain f20 disk vda (/dev/sda6): threshold 10000 exceeded by 186608 bytes Sure enough, the registration had cleared, and the qcow2 wrapper had grown (it grew more than once in the process of booting, so by the time I re-queried, allocation had grown even further). # virsh -k0 domstats f20 --block | grep -C1 allo block.0.write-threshold=0 block.0.allocation=13434368 block.0.capacity=12884901888 I'd really like to see this series in 1.3.0 to commit to the API; there are still some further improvements we can make (in particular 'vda[1]' support, and also improving qemu event handling to re-grab a job lock if the cache of node names is not populated after a libvirtd restart), but as those improvements won't affect ABI, they can be deferred if they don't make it into 1.3.0. [I'm headed on vacation, so I will be really slow to respond in the next 3 weeks; someone else may need to push this if it is approved for 1.3.0] Eric Blake (10): threshold: new API virDomainBlockSetWriteThreshold threshold: expose new API in virsh threshold: new event object for tracking write threshold threshold: wire up threshold event in RPC threshold: add qemu capability bits threshold: learn a node name for a given qcow2 disk threshold: track an allocation node name for a storage source threshold: scrape threshold data from QMP threshold: add threshold event handling in qemu threshold: add write threshold setting in qemu daemon/remote.c | 51 +++ include/libvirt/libvirt-domain.h | 53 +++ src/conf/domain_event.c | 101 ++++- src/conf/domain_event.h | 16 +- src/driver-hypervisor.h | 7 + src/libvirt-domain.c | 98 +++++ src/libvirt_private.syms | 2 + src/libvirt_public.syms | 1 + src/qemu/qemu_capabilities.c | 12 +- src/qemu/qemu_capabilities.h | 4 +- src/qemu/qemu_domain.c | 105 ++++++ src/qemu/qemu_domain.h | 10 +- src/qemu/qemu_driver.c | 108 +++++- src/qemu/qemu_migration.c | 2 +- src/qemu/qemu_monitor.c | 79 +++- src/qemu/qemu_monitor.h | 28 ++ src/qemu/qemu_monitor_json.c | 305 ++++++++++++++- src/qemu/qemu_monitor_json.h | 11 + src/qemu/qemu_process.c | 44 +++ src/remote/remote_driver.c | 35 ++ src/remote/remote_protocol.x | 30 +- src/remote_protocol-structs | 16 + src/util/virstoragefile.c | 4 +- src/util/virstoragefile.h | 3 +- tests/qemucapabilitiesdata/caps_2.1.1-1.replies | 470 ++++++++++++------------ tests/qemumonitortest.c | 13 +- tools/virsh-domain-monitor.c | 108 ++++++ tools/virsh-domain.c | 24 ++ tools/virsh.pod | 26 ++ 29 files changed, 1508 insertions(+), 258 deletions(-) -- 2.4.3

2 16

[libvirt] [PATCH 0/2] Fix a couple issues found with disk backend
by John Ferlan 23 Jun '15

23 Jun '15

Validation of https://bugzilla.redhat.com/show_bug.cgi?id=1181062 raised a couple of questions about XML format and the defaults - these patches address those questions. John Ferlan (2): docs: Adjust Disk storage rng storage: Force setting of disk format type docs/schemas/storagepool.rng | 2 +- src/storage/storage_backend_disk.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) -- 2.1.0

2 7

[libvirt] [PATCH 0/2] Support for new watchdog model diag288 and action inject-nmi
by Boris Fiuczynski 23 Jun '15

23 Jun '15

This patche set provides support for the new watchdog model "diag288" including the new watchdog action "inject-nmi". Boris Fiuczynski (2): Support for the new watchdog action inject-nmi Support for the new watchdog model diag288 docs/formatdomain.html.in | 5 +++++ docs/schemas/domaincommon.rng | 2 ++ include/libvirt/libvirt-domain.h | 1 + src/conf/domain_conf.c | 6 ++++-- src/conf/domain_conf.h | 2 ++ src/qemu/qemu_command.c | 6 +++--- src/qemu/qemu_monitor_json.c | 2 +- tools/virsh-domain.c | 3 ++- 8 files changed, 20 insertions(+), 7 deletions(-) -- 2.3.0

2 3

[libvirt] lxc: setsid() usage
by Richard Weinberger 23 Jun '15

23 Jun '15

Hi! Why is libvirt-lxc issuing a setsid() in lxcContainerSetupFDs()? To me it seems like a hack to have a controlling TTY if PID 1 is /bin/bash. If one runs a sysv init style distro (like Debian) in libvirt-lxc the setsid() has a major downside, when getty spawns a login shell on /dev/tty1 it cannot become the controlling tty. Hence, if one presses ctrl-c in such a session, the container will reboot. Interestingly it does not happen when a systemd distro is used. Maybe because systemd completely closes and reopens the TTY? Thanks, //richard

2 5

[libvirt] [PATCH v2] nodeinfo: fix to parse present cpus rather than possible cpus
by Kothapally Madhu Pavan 23 Jun '15

23 Jun '15

Currently we are parsing all the possible cpus to get the nodeinfo. This fix will perform a check for present cpus before parsing. Signed-off-by: Kothapally Madhu Pavan <kmp(a)linux.vnet.ibm.com> --- src/nodeinfo.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/nodeinfo.c b/src/nodeinfo.c index 2fafe2d..0134aba 100644 --- a/src/nodeinfo.c +++ b/src/nodeinfo.c @@ -57,6 +57,7 @@ #define VIR_FROM_THIS VIR_FROM_NONE VIR_LOG_INIT("nodeinfo"); +virBitmapPtr nodeGetPresentCPUBitmap(void); #if defined(__FreeBSD__) || defined(__APPLE__) static int @@ -418,6 +419,7 @@ virNodeParseNode(const char *node, int processors = 0; DIR *cpudir = NULL; struct dirent *cpudirent = NULL; + virBitmapPtr present_cpumap = NULL; int sock_max = 0; cpu_set_t sock_map; int sock; @@ -438,12 +440,18 @@ virNodeParseNode(const char *node, goto cleanup; } + present_cpumap = nodeGetPresentCPUBitmap(); + /* enumerate sockets in the node */ CPU_ZERO(&sock_map); while ((direrr = virDirRead(cpudir, &cpudirent, node)) > 0) { if (sscanf(cpudirent->d_name, "cpu%u", &cpu) != 1) continue; + if (present_cpumap) + if (!(virBitmapIsBitSet(present_cpumap, cpu))) + continue; + if ((online = virNodeGetCpuValue(node, cpu, "online", 1)) < 0) goto cleanup; @@ -477,6 +485,10 @@ virNodeParseNode(const char *node, if (sscanf(cpudirent->d_name, "cpu%u", &cpu) != 1) continue; + if (present_cpumap) + if (!(virBitmapIsBitSet(present_cpumap, cpu))) + continue; + if ((online = virNodeGetCpuValue(node, cpu, "online", 1)) < 0) goto cleanup; @@ -537,6 +549,7 @@ virNodeParseNode(const char *node, ret = -1; } VIR_FREE(core_maps); + virBitmapFree(present_cpumap); return ret; }

2 1

[libvirt] [PATCH 0/3] yajl cleanups
by Eric Blake 23 Jun '15

23 Jun '15

Fixes 'make check' on RHEL 6, which I recently broke, then adds further improvements to the JSON parser. I'm tempted to push patch 1/3 as a build-breaker, but since the other two need review, I'll hold off and we can do all three as a series. Eric Blake (3): json: cope with older yajl semantics json: reject javascript comments json: reject trailing garbage src/util/virjson.c | 45 ++++++++++++++++++++++++++++++++++++++------- tests/jsontest.c | 5 ++++- 2 files changed, 42 insertions(+), 8 deletions(-) -- 2.4.3

3 7

[libvirt] bisected: Unable to get index for interface...
by Thomas Voegtle 23 Jun '15

23 Jun '15

Hi, On my own build linux system without systemd, I have following problem, when I try to start a qemu VM, libvirtd.log says: 2015-06-23 08:29:25.498+0000: 889: error : virNetDevGetIndex:842 : Unable to get index for interface vm0.0: No such device 2015-06-23 08:29:25.551+0000: 886: error : virNetDevGetIndex:842 : Unable to get index for interface vm0.0: No such device 2015-06-23 08:29:25.611+0000: 888: error : virNetDevGetIndex:842 : Unable to get index for interface vm0.0: No such device ... virsh dumpxml vm: ... <interface type='ethernet'> <mac address='52:54:00:cd:15:51'/> <target dev='vm0.0'/> <model type='virtio'/> <boot order='3'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x0f' function='0x0'/> </interface> ... I had no problems with 1.2.12, so I started a git bisect and I came down to this: # first bad commit: [4bbe1029f2fb6cd1c102794951a944c62fdbd0e6] qemu: fix ifindex array reported to systemd When I revert that commit on top of 1.2.13.1, problem is gone. I tried today's version (d10a5f58c75), problem is still in there. Hope this is useful to you? Thomas

1 0

[libvirt] [PATCH] admin: Fix mingw build by reordering includes
by Martin Kletzander 23 Jun '15

23 Jun '15

By trying to lead the way of clean includes, I sorted the lines alphabetically and that is a problem for mingw builds with gnulib. As 'configmake.h' defines DATADIR and 'datatypes.h' transitively includes 'winsock.h' that uses 'DATADIR' as a name for a struct, it's enough to reorder those. Even though this might be worked around in gnulib later on, this fixes the build for now. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/libvirt-admin.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/libvirt-admin.c b/src/libvirt-admin.c index 11b6fe3238b8..b3fd0b3a8cf2 100644 --- a/src/libvirt-admin.c +++ b/src/libvirt-admin.c @@ -25,8 +25,9 @@ #include <rpc/rpc.h> #include "internal.h" -#include "configmake.h" #include "datatypes.h" +#include "configmake.h" + #include "viralloc.h" #include "virlog.h" #include "virnetclient.h" -- 2.4.4

2 1

[libvirt] [PATCH] docs: Properly mark acl.html dependencies
by Michal Privoznik 23 Jun '15

23 Jun '15

The acl.html file includes aclperms.htmlinc which is generated. However, there's a typo in the Makefile which makes make fail to see the dependencies correctly. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- docs/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/Makefile.am b/docs/Makefile.am index b7b49cb..b807a0b 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -163,7 +163,7 @@ EXTRA_DIST= \ sitemap.html.in aclperms.htmlinc \ todo.pl hvsupport.pl todo.cfg-example -acl.html:: $(srcdir)/aclperms.htmlinc +acl.html: $(srcdir)/aclperms.htmlinc $(srcdir)/aclperms.htmlinc: $(top_srcdir)/src/access/viraccessperm.h \ $(srcdir)/genaclperms.pl Makefile.am -- 2.3.6

2 1

[libvirt] [PATCHv1.5 1/2] cpu:x86: fix specified features will disappear after migrate/restore
by Luyao Huang 23 Jun '15

23 Jun '15

https://bugzilla.redhat.com/show_bug.cgi?id=1207095 We allow set the feature with the host-passthrough cpu, but won't save them in the migration xml, the features we specified will disappear after migrate/restore. This is because we skip the virCPUDefUpdateFeature if cpu mode is host-passthrough. Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- v1.5: just update the description. src/cpu/cpu_x86.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c index 2a14705..26601b6 100644 --- a/src/cpu/cpu_x86.c +++ b/src/cpu/cpu_x86.c @@ -2087,8 +2087,7 @@ x86UpdateCustom(virCPUDefPtr guest, static int x86UpdateHostModel(virCPUDefPtr guest, - const virCPUDef *host, - bool passthrough) + const virCPUDef *host) { virCPUDefPtr oldguest = NULL; const struct x86_map *map; @@ -2124,7 +2123,7 @@ x86UpdateHostModel(virCPUDefPtr guest, } } } - for (i = 0; !passthrough && i < oldguest->nfeatures; i++) { + for (i = 0; i < oldguest->nfeatures; i++) { if (virCPUDefUpdateFeature(guest, oldguest->features[i].name, oldguest->features[i].policy) < 0) @@ -2149,11 +2148,11 @@ x86Update(virCPUDefPtr guest, case VIR_CPU_MODE_HOST_MODEL: guest->match = VIR_CPU_MATCH_EXACT; - return x86UpdateHostModel(guest, host, false); + return x86UpdateHostModel(guest, host); case VIR_CPU_MODE_HOST_PASSTHROUGH: guest->match = VIR_CPU_MATCH_MINIMUM; - return x86UpdateHostModel(guest, host, true); + return x86UpdateHostModel(guest, host); case VIR_CPU_MODE_LAST: break; -- 1.8.3.1

3 5

[libvirt] [PATCHv3] qemu: add a check for slot and base when build dimm address
by Luyao Huang 23 Jun '15

23 Jun '15

When hot-plug a memory device, we don't check if there is a memory device have the same address with the memory device we want hot-pluged. Qemu forbid use/hot-plug 2 memory device with same slot or the same base(qemu side this elemnt named addr). Introduce a address check when build memory device qemu command line. Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- v3: rename qemuBuildMemoryDeviceAddr to qemuCheckMemoryDimmConflict and remove the refactor. src/qemu/qemu_command.c | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 0a6d92f..d3f0a23 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -4952,6 +4952,40 @@ qemuBuildMemoryDimmBackendStr(virDomainMemoryDefPtr mem, } +static bool +qemuCheckMemoryDimmConflict(virDomainDefPtr def, + virDomainMemoryDefPtr mem) +{ + size_t i; + + for (i = 0; i < def->nmems; i++) { + virDomainMemoryDefPtr tmp = def->mems[i]; + + if (tmp == mem || + tmp->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_DIMM) + continue; + + if (mem->info.addr.dimm.slot == tmp->info.addr.dimm.slot) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("memory device slot '%u' is already being" + " used by another memory device"), + mem->info.addr.dimm.slot); + return true; + } + + if (mem->info.addr.dimm.base != 0 && tmp->info.addr.dimm.base != 0 && + mem->info.addr.dimm.base == tmp->info.addr.dimm.base) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("memory device base '0x%llx' is already being" + " used by another memory device"), + mem->info.addr.dimm.base); + return true; + } + } + + return false; +} + char * qemuBuildMemoryDeviceStr(virDomainMemoryDefPtr mem, virDomainDefPtr def, @@ -4993,6 +5027,9 @@ qemuBuildMemoryDeviceStr(virDomainMemoryDefPtr mem, mem->targetNode, mem->info.alias, mem->info.alias); if (mem->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_DIMM) { + if (qemuCheckMemoryDimmConflict(def, mem)) + return NULL; + virBufferAsprintf(&buf, ",slot=%d", mem->info.addr.dimm.slot); virBufferAsprintf(&buf, ",addr=%llu", mem->info.addr.dimm.base); } -- 1.8.3.1

4 4

[libvirt] [PATCH 0/5 v2] Corrections to SCSI logical unit handling
by Eric Farman 22 Jun '15

22 Jun '15

While working with the hostdev tag and SCSI LUNs, a problem was discovered with the XML schema (see commit message in patch 4). This spawned some further corrections to the handling of the logical unit field throughout libvirt. This series was split from a single patch, from this feedback: http://www.redhat.com/archives/libvir-list/2015-June/msg00489.html Eric Farman (5): Print SCSI logical unit as a positive integer Print SCSI logical unit as unsigned integer Convert SCSI logical unit from int to long long docs: Fix XML schema handling of LUN address in hostdev tag docs: Correct typos in scsi hostdev and address elements docs/formatdomain.html.in | 10 +++++++--- docs/schemas/domaincommon.rng | 14 ++++++++++++-- src/conf/domain_audit.c | 2 +- src/conf/domain_conf.c | 4 ++-- src/conf/domain_conf.h | 2 +- src/qemu/qemu_command.h | 2 +- src/qemu/qemu_hotplug.c | 4 ++-- src/util/virhostdev.c | 6 +++--- src/util/virscsi.c | 16 ++++++++-------- src/util/virscsi.h | 8 ++++---- tests/testutilsqemu.c | 2 +- tools/virsh-domain.c | 6 +++--- 12 files changed, 45 insertions(+), 31 deletions(-) -- 1.9.1

5 17