- Devel - libvirt List Archives

[libvirt] [PATCH v2] tpm: adapt sysfs cancel path for new TPM driver
by Stefan Berger 18 Nov '15

18 Nov '15

Adapt the sysfs TPM command cancel path for the TPM driver that does not use a miscdevice anymore since Linux 4.0. Support old and new paths and check their availability. Add a mockup for the test cases to avoid the testing for availability of the cancel path. Signed-off-by: Stefan Berger <stefanb(a)linux.vnet.ibm.com> --- src/util/virtpm.c | 22 ++++++++++++++++++++-- tests/qemuxml2argvmock.c | 15 +++++++++++++++ 2 files changed, 35 insertions(+), 2 deletions(-) diff --git a/src/util/virtpm.c b/src/util/virtpm.c index 88f8361..3872a31 100644 --- a/src/util/virtpm.c +++ b/src/util/virtpm.c @@ -23,9 +23,12 @@ #include <config.h> #include <sys/stat.h> +#include <fcntl.h> #include "virstring.h" #include "virerror.h" +#include "viralloc.h" +#include "virfile.h" #include "virtpm.h" #define VIR_FROM_THIS VIR_FROM_NONE @@ -41,13 +44,28 @@ virTPMCreateCancelPath(const char *devpath) { char *path = NULL; const char *dev; + const char *prefix[] = {"misc/", "tpm/"}; + size_t i; + int fd; if (devpath) { dev = strrchr(devpath, '/'); if (dev) { dev++; - if (virAsprintf(&path, "/sys/class/misc/%s/device/cancel", - dev) < 0) + for (i = 0; i < ARRAY_CARDINALITY(prefix); i++) { + if (virAsprintf(&path, "/sys/class/%s%s/device/cancel", + prefix[i], dev) < 0) + goto cleanup; + + fd = open(path, O_WRONLY); + if (fd >= 0) { + VIR_FORCE_CLOSE(fd); + break; + } + VIR_FREE(path); + } + /* /dev/null does not allow to cancel cmds but it can be used */ + if (!path && virAsprintf(&path, "/dev/null") < 0) goto cleanup; } else { virReportError(VIR_ERR_INTERNAL_ERROR, diff --git a/tests/qemuxml2argvmock.c b/tests/qemuxml2argvmock.c index d24725e..e58b8ce 100644 --- a/tests/qemuxml2argvmock.c +++ b/tests/qemuxml2argvmock.c @@ -24,9 +24,13 @@ #include "virnuma.h" #include "virmock.h" #include "virutil.h" +#include "virstring.h" +#include "virtpm.h" #include <time.h> #include <unistd.h> +#define VIR_FROM_THIS VIR_FROM_NONE + long virGetSystemPageSize(void) { return 4096; @@ -59,3 +63,14 @@ virNumaNodeIsAvailable(int node) return node >= 0 && node <= virNumaGetMaxNode(); } #endif /* WITH_NUMACTL && HAVE_NUMA_BITMASK_ISBITSET */ + +char * +virTPMCreateCancelPath(const char *devpath) +{ + char *path; + (void)devpath; + + ignore_value(VIR_STRDUP(path, "/sys/class/misc/tpm0/device/cancel")); + + return path; +} -- 2.4.3

3 6

Re: [libvirt] [PATCH v2] tpm: adapt sysfs cancel path for new TPM driver
by Cole Robinson 18 Nov '15

18 Nov '15

On 11/17/2015 04:26 PM, Stefan Berger wrote: > Cole Robinson <crobinso(a)redhat.com> wrote on 11/17/2015 03:55:13 PM: > >> From: Cole Robinson <crobinso(a)redhat.com> >> To: Stefan Berger <stefanb(a)linux.vnet.ibm.com>, Stefan Berger/ >> Watson/IBM@IBMUS, libvir-list(a)redhat.com, berrange(a)redhat.com >> Date: 11/17/2015 03:55 PM >> Subject: Re: [PATCH v2] tpm: adapt sysfs cancel path for new TPM driver >> >> On 11/17/2015 03:49 PM, Stefan Berger wrote: >> > On 11/17/2015 02:12 PM, Cole Robinson wrote: >> >> First, thanks for following up on the fedora bugs so quickly! >> >> >> >> On 11/17/2015 10:46 AM, Stefan Berger wrote: >> >>> Adapt the sysfs TPM command cancel path for the TPM driver that >> >>> does not use a miscdevice anymore since Linux 4.0. Support old >> >>> and new paths and check their availability. >> >>> >> >>> Add a mockup for the test cases to avoid the testing for >> >>> availability of the cancel path. >> >>> >> >> I see you sent a qemu patch for a similar change. What's the benefit of >> >> libvirt setting cancel_path if qemu can (and already attempts to)figure it >> >> out? >> > >> > The only benefit is that libvirt is controlling the parameter. >> > >> >> Then IMO we should let qemu handle it and just drop this path handling >> entirely. If there's ever a need to differentiate from qemu's logic or let the >> user override this value then we can add it back without much trouble >> > > Forgot about that: SELinux labeling of that file requires it afaik. > Ah gotchya. Makes sense - Cole

1 0

[libvirt] [PATCH 1/1] virt-aa-helper: support OVMF
by Serge Hallyn 17 Nov '15

17 Nov '15

As suggested by Jamie Strandboge in https://bugs.launchpad.net/ubuntu/+source/libvirt/+bug/1483071 Signed-off-by: Serge Hallyn <serge.hallyn(a)ubuntu.com> --- src/security/virt-aa-helper.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c index 5de56e5..bddcbdc 100644 --- a/src/security/virt-aa-helper.c +++ b/src/security/virt-aa-helper.c @@ -575,7 +575,8 @@ valid_path(const char *path, const bool readonly) /* override the above with these */ const char * const override[] = { "/sys/devices/pci", /* for hostdev pci devices */ - "/etc/libvirt-sandbox/services/" /* for virt-sandbox service config */ + "/etc/libvirt-sandbox/services/", /* for virt-sandbox service config */ + "/usr/share/ovmf/" /* for OVMF images */ }; const int nropaths = ARRAY_CARDINALITY(restricted); -- 2.5.0

2 2

[libvirt] [PATCH] tpm: adapt sysfs cancel path for new TPM driver
by Stefan Berger 17 Nov '15

17 Nov '15

Adapt the sysfs TPM command cancel path for the TPM driver that does not use a miscdevice anymore since Linux 4.0. Support old and new paths. Signed-off-by: Stefan Berger <stefanb(a)linux.vnet.ibm.com> --- src/util/virtpm.c | 21 +++++++++++++++++++-- .../qemuxml2argv-tpm-passthrough.args | 2 +- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/src/util/virtpm.c b/src/util/virtpm.c index 88f8361..40a758b 100644 --- a/src/util/virtpm.c +++ b/src/util/virtpm.c @@ -23,9 +23,12 @@ #include <config.h> #include <sys/stat.h> +#include <fcntl.h> #include "virstring.h" #include "virerror.h" +#include "viralloc.h" +#include "virfile.h" #include "virtpm.h" #define VIR_FROM_THIS VIR_FROM_NONE @@ -41,13 +44,27 @@ virTPMCreateCancelPath(const char *devpath) { char *path = NULL; const char *dev; + const char *prefix[] = {"misc/", "tpm/"}; + int i, fd; if (devpath) { dev = strrchr(devpath, '/'); if (dev) { dev++; - if (virAsprintf(&path, "/sys/class/misc/%s/device/cancel", - dev) < 0) + for (i = 0; i < ARRAY_CARDINALITY(prefix); i++) { + if (virAsprintf(&path, "/sys/class/%s%s/device/cancel", + prefix[i], dev) < 0) + goto cleanup; + + fd = open(path, O_WRONLY); + if (fd >= 0) { + VIR_FORCE_CLOSE(fd); + break; + } + VIR_FREE(path); + } + /* /dev/null does not allow to cancel cmds but it can be used */ + if (!path && virAsprintf(&path, "/dev/null") < 0) goto cleanup; } else { virReportError(VIR_ERR_INTERNAL_ERROR, diff --git a/tests/qemuxml2argvdata/qemuxml2argv-tpm-passthrough.args b/tests/qemuxml2argvdata/qemuxml2argv-tpm-passthrough.args index f33120f..1e48603 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-tpm-passthrough.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-tpm-passthrough.args @@ -17,6 +17,6 @@ QEMU_AUDIO_DRV=none \ -boot c \ -usb \ -tpmdev passthrough,id=tpm-tpm0,path=/dev/tpm0,\ -cancel-path=/sys/class/misc/tpm0/device/cancel \ +cancel-path=/dev/null \ -device tpm-tis,tpmdev=tpm-tpm0,id=tpm0 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 -- 2.4.3

3 4

[libvirt] [QEMU PATCH] target-i386: Disable rdtscp on Opteron_G* CPU models
by Eduardo Habkost 17 Nov '15

17 Nov '15

KVM can't virtualize rdtscp on AMD CPUs yet, so there's no point in enabling it by default on AMD CPU models, as all we are getting are confused users because of the "host doesn't support requested feature" warnings. Disable rdtscp on Opteron_G* models, but keep compatibility on pc-*-2.4 and older (just in case there are people are doing funny stuff using AMD CPU models on Intel hosts). Signed-off-by: Eduardo Habkost <ehabkost(a)redhat.com> --- include/hw/i386/pc.h | 17 +++++++++++++++++ target-i386/cpu.c | 12 ++++++++---- 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 4bbc0ff..854c330 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -347,8 +347,25 @@ bool e820_get_entry(int, uint32_t, uint64_t *, uint64_t *); .driver = "qemu32" "-" TYPE_X86_CPU,\ .property = "popcnt",\ .value = "on",\ + },{\ + .driver = "Opteron_G2" "-" TYPE_X86_CPU,\ + .property = "rdtscp",\ + .value = "on",\ + },{\ + .driver = "Opteron_G3" "-" TYPE_X86_CPU,\ + .property = "rdtscp",\ + .value = "on",\ + },{\ + .driver = "Opteron_G4" "-" TYPE_X86_CPU,\ + .property = "rdtscp",\ + .value = "on",\ + },{\ + .driver = "Opteron_G5" "-" TYPE_X86_CPU,\ + .property = "rdtscp",\ + .value = "on",\ }, + #define PC_COMPAT_2_3 \ PC_COMPAT_2_4 \ HW_COMPAT_2_3 \ diff --git a/target-i386/cpu.c b/target-i386/cpu.c index e5f1c5b..11e5e39 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -1244,8 +1244,9 @@ static X86CPUDefinition builtin_x86_defs[] = { CPUID_DE | CPUID_FP87, .features[FEAT_1_ECX] = CPUID_EXT_CX16 | CPUID_EXT_SSE3, + /* Missing: CPUID_EXT2_RDTSCP */ .features[FEAT_8000_0001_EDX] = - CPUID_EXT2_LM | CPUID_EXT2_RDTSCP | CPUID_EXT2_FXSR | + CPUID_EXT2_LM | CPUID_EXT2_FXSR | CPUID_EXT2_MMX | CPUID_EXT2_NX | CPUID_EXT2_PSE36 | CPUID_EXT2_PAT | CPUID_EXT2_CMOV | CPUID_EXT2_MCA | CPUID_EXT2_PGE | CPUID_EXT2_MTRR | CPUID_EXT2_SYSCALL | @@ -1273,8 +1274,9 @@ static X86CPUDefinition builtin_x86_defs[] = { .features[FEAT_1_ECX] = CPUID_EXT_POPCNT | CPUID_EXT_CX16 | CPUID_EXT_MONITOR | CPUID_EXT_SSE3, + /* Missing: CPUID_EXT2_RDTSCP */ .features[FEAT_8000_0001_EDX] = - CPUID_EXT2_LM | CPUID_EXT2_RDTSCP | CPUID_EXT2_FXSR | + CPUID_EXT2_LM | CPUID_EXT2_FXSR | CPUID_EXT2_MMX | CPUID_EXT2_NX | CPUID_EXT2_PSE36 | CPUID_EXT2_PAT | CPUID_EXT2_CMOV | CPUID_EXT2_MCA | CPUID_EXT2_PGE | CPUID_EXT2_MTRR | CPUID_EXT2_SYSCALL | @@ -1305,8 +1307,9 @@ static X86CPUDefinition builtin_x86_defs[] = { CPUID_EXT_POPCNT | CPUID_EXT_SSE42 | CPUID_EXT_SSE41 | CPUID_EXT_CX16 | CPUID_EXT_SSSE3 | CPUID_EXT_PCLMULQDQ | CPUID_EXT_SSE3, + /* Missing: CPUID_EXT2_RDTSCP */ .features[FEAT_8000_0001_EDX] = - CPUID_EXT2_LM | CPUID_EXT2_RDTSCP | + CPUID_EXT2_LM | CPUID_EXT2_PDPE1GB | CPUID_EXT2_FXSR | CPUID_EXT2_MMX | CPUID_EXT2_NX | CPUID_EXT2_PSE36 | CPUID_EXT2_PAT | CPUID_EXT2_CMOV | CPUID_EXT2_MCA | CPUID_EXT2_PGE | @@ -1340,8 +1343,9 @@ static X86CPUDefinition builtin_x86_defs[] = { CPUID_EXT_AES | CPUID_EXT_POPCNT | CPUID_EXT_SSE42 | CPUID_EXT_SSE41 | CPUID_EXT_CX16 | CPUID_EXT_FMA | CPUID_EXT_SSSE3 | CPUID_EXT_PCLMULQDQ | CPUID_EXT_SSE3, + /* Missing: CPUID_EXT2_RDTSCP */ .features[FEAT_8000_0001_EDX] = - CPUID_EXT2_LM | CPUID_EXT2_RDTSCP | + CPUID_EXT2_LM | CPUID_EXT2_PDPE1GB | CPUID_EXT2_FXSR | CPUID_EXT2_MMX | CPUID_EXT2_NX | CPUID_EXT2_PSE36 | CPUID_EXT2_PAT | CPUID_EXT2_CMOV | CPUID_EXT2_MCA | CPUID_EXT2_PGE | -- 2.1.0

2 3

[libvirt] storage sheepdog: allow to specify redundancy level
by Vasiliy Tolstov 17 Nov '15

17 Nov '15

Some storage backends allows to specify per volume redundancy options. Sheepdog use x format for specify copies, and x:y format to specify data and parity block count. Signed-off-by: Alexey Tyabin <aleksey.tyabin(a)gmail.com> Signed-off-by: Vasiliy Tolstov <v.tolstov(a)selfip.ru> --- docs/schemas/storagevol.rng | 3 ++ src/conf/storage_conf.c | 2 + src/storage/storage_backend_sheepdog.c | 38 +++++++++-------- src/util/virstoragefile.c | 4 +- src/util/virstoragefile.h | 2 + tests/storagebackendsheepdogtest.c | 68 +++++++++++++++--------------- tests/storagevolxml2xmlin/vol-sheepdog.xml | 1 + 7 files changed, 66 insertions(+), 52 deletions(-) diff --git a/docs/schemas/storagevol.rng b/docs/schemas/storagevol.rng index 7450547..068993f 100644 --- a/docs/schemas/storagevol.rng +++ b/docs/schemas/storagevol.rng @@ -55,6 +55,9 @@ <element name='allocation'> <ref name='scaledInteger'/> </element> + <element name='redundancy'> + <ref name='string'/> + </element> </optional> </interleave> </define> diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index 9b8abea..d37c93a 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -1345,6 +1345,8 @@ virStorageVolDefParseXML(virStoragePoolDefPtr pool, ret->target.allocation = ret->target.capacity; } + ret->target.redundancy = virXPathString("string(./redundancy)", ctxt); + ret->target.path = virXPathString("string(./target/path)", ctxt); if (options->formatFromString) { char *format = virXPathString("string(./target/format/@type)", ctxt); diff --git a/src/storage/storage_backend_sheepdog.c b/src/storage/storage_backend_sheepdog.c index 1200813..565cfd0 100644 --- a/src/storage/storage_backend_sheepdog.c +++ b/src/storage/storage_backend_sheepdog.c @@ -275,6 +275,10 @@ virStorageBackendSheepdogBuildVol(virConnectPtr conn ATTRIBUTE_UNUSED, cmd = virCommandNewArgList(SHEEPDOGCLI, "vdi", "create", vol->name, NULL); virCommandAddArgFormat(cmd, "%llu", vol->target.capacity); + + if(NULL != vol->target.redundancy) + virCommandAddArgFormat(cmd, "-c %s", vol->target.redundancy); + virStorageBackendSheepdogAddHostArg(cmd, pool); if (virCommandRun(cmd, NULL) < 0) goto cleanup; @@ -291,18 +295,19 @@ virStorageBackendSheepdogParseVdiList(virStorageVolDefPtr vol, char *output) { /* fields: - * current/clone/snapshot, name, id, size, used, shared, creation time, vdi id, [tag] + * current/clone/snapshot, name, id, size, used, shared, creation time, vdi id, redundancy, [tag], size shift * * example output: - * s test 1 10 0 0 1336556634 7c2b25 - * s test 2 10 0 0 1336557203 7c2b26 - * = test 3 10 0 0 1336557216 7c2b27 + * s test 1 10 0 0 1336556634 7c2b25 1 tt 22 + * s test 2 10 0 0 1336557203 7c2b26 2 zz 22 + * = test 3 10 0 0 1336557216 7c2b27 3 xx 22 */ - int id; + char **args; const char *p, *next; vol->target.allocation = vol->target.capacity = 0; + vol->target.redundancy = NULL; p = output; do { @@ -327,24 +332,21 @@ virStorageBackendSheepdogParseVdiList(virStorageVolDefPtr vol, ++p; ++p; } + } + args = virStringSplit(p, " ", 9); - if (virStrToLong_i(p, &end, 10, &id) < 0) - return -1; - - p = end + 1; - - if (virStrToLong_ull(p, &end, 10, &vol->target.capacity) < 0) - return -1; + if (virStrToLong_ull(args[1], strlen(args[1]), 10, &vol->target.capacity) < 0) + return -1; - p = end + 1; + if (virStrToLong_ull(args[2], strlen(args[2]), 10, &vol->target.allocation) < 0) + return -1; - if (virStrToLong_ull(p, &end, 10, &vol->target.allocation) < 0) - return -1; + if (VIR_STRNDUP(vol->target.redundancy, args[5], strlen(args[2])) < 0) + return -1; - return 0; - } while ((p = next)); + virStringFreeList(args); - return -1; + return 0; } static int diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index 2aa1d90..9cdc90d 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -1846,7 +1846,8 @@ virStorageSourceCopy(const virStorageSource *src, VIR_STRDUP(ret->backingStoreRaw, src->backingStoreRaw) < 0 || VIR_STRDUP(ret->snapshot, src->snapshot) < 0 || VIR_STRDUP(ret->configFile, src->configFile) < 0 || - VIR_STRDUP(ret->compat, src->compat) < 0) + VIR_STRDUP(ret->compat, src->compat) < 0 || + VIR_STRDUP(ret->redundancy, src->redundancy) < 0) goto error; if (src->nhosts) { @@ -2040,6 +2041,7 @@ virStorageSourceClear(virStorageSourcePtr def) VIR_FREE(def->volume); VIR_FREE(def->snapshot); VIR_FREE(def->configFile); + VIR_FREE(def->redundancy); virStorageSourcePoolDefFree(def->srcpool); VIR_FREE(def->driverName); virBitmapFree(def->features); diff --git a/src/util/virstoragefile.h b/src/util/virstoragefile.h index b98fe25..c37cfc2 100644 --- a/src/util/virstoragefile.h +++ b/src/util/virstoragefile.h @@ -282,6 +282,8 @@ struct _virStorageSource { /* Name of the child backing store recorded in metadata of the * current file. */ char *backingStoreRaw; + /* redundancy level, may be used by sheepdog or ceph */ + char *redundancy; }; diff --git a/tests/storagebackendsheepdogtest.c b/tests/storagebackendsheepdogtest.c index 2b0f4db..c037ebe 100644 --- a/tests/storagebackendsheepdogtest.c +++ b/tests/storagebackendsheepdogtest.c @@ -42,6 +42,7 @@ typedef struct { int expected_return; uint64_t expected_capacity; uint64_t expected_allocation; + const char *expected_redundancy; } collie_test; struct testNodeInfoParserData { @@ -119,7 +120,8 @@ test_vdi_list_parser(const void *opaque) } if (vol->target.capacity == test.expected_capacity && - vol->target.allocation == test.expected_allocation) + vol->target.allocation == test.expected_allocation && + !strcmp(vol->target.redundancy, test.expected_redundancy)) ret = 0; cleanup: @@ -138,41 +140,41 @@ mymain(void) char *volxml = NULL; collie_test node_info_tests[] = { - {"", -1, 0, 0}, - {"Total 15245667872 117571104 0% 20972341\n", 0, 15245667872, 117571104}, - {"To", -1, 0, 0}, - {"asdf\nasdf", -1, 0, 0}, - {"Total ", -1, 0, 0}, - {"Total 1", -1, 0, 0}, - {"Total 1\n", -1, 0, 0}, - {"Total 1 ", -1, 0, 0}, - {"Total 1 2", -1, 0, 0}, - {"Total 1 2 ", -1, 0, 0}, - {"Total 1 2\n", 0, 1, 2}, - {"Total 1 2 \n", 0, 1, 2}, - {"Total a 2 \n", -1, 0, 0}, - {"Total 1 b \n", -1, 0, 0}, - {"Total a b \n", -1, 0, 0}, - {"stuff\nTotal 1 2 \n", 0, 1, 2}, - {"0 1 2 3\nTotal 1 2 \n", 0, 1, 2}, - {NULL, 0, 0, 0} + {"", -1, 0, 0,"0"}, + {"Total 15245667872 117571104 1 0% 20972341\n", 0, 15245667872, 117571104,"1"}, + {"To", -1, 0, 0," "}, + {"asdf\nasdf", -1, 0, 0," "}, + {"Total ", -1, 0, 0, " "}, + {"Total 1", -1, 0, 0, " "}, + {"Total 1\n", -1, 0, 0," "}, + {"Total 1 ", -1, 0, 0, " "}, + {"Total 1 2", -1, 0, 0, " "}, + {"Total 1 2 ", -1, 0, 0," "}, + {"Total 1 2 1:1\n", 0, 1, 2,"1:1"}, + {"Total 1 2 3:4\n", 0, 1, 2,"3:4"}, + {"Total a 2 \n", -1, 0, 0," "}, + {"Total 1 b \n", -1, 0, 0," "}, + {"Total a b \n", -1, 0, 0,"sss"}, + {"stuff\nTotal 1 2 1:2\n", 0, 1, 2,"1:2"}, + {"0 1 2 3\nTotal 1 2 3\n", 0, 1, 2,"3"}, + {NULL, 0, 0, 0, NULL} }; collie_test vdi_list_tests[] = { - {"", -1, 0, 0}, - {"= test 3 10 20 0 1336557216 7c2b27\n", 0, 10, 20}, - {"= test\\ with\\ spaces 3 10 20 0 1336557216 7c2b27\n", 0, 10, 20}, - {"= backslashattheend\\\\ 3 10 20 0 1336557216 7c2b27\n", 0, 10, 20}, - {"s test 1 10 20 0 1336556634 7c2b25\n= test 3 50 60 0 1336557216 7c2b27\n", 0, 50, 60}, - {"=", -1, 0, 0}, - {"= test", -1, 0, 0}, - {"= test ", -1, 0, 0}, - {"= test 1", -1, 0, 0}, - {"= test 1 ", -1, 0, 0}, - {"= test 1 2", -1, 0, 0}, - {"= test 1 2 ", -1, 0, 0}, - {"= test 1 2 3", -1, 0, 0}, - {NULL, 0, 0, 0} + {"", -1, 0, 0,NULL}, + {"= test 3 10 20 1 0 1336557216 7c2b27 1\n", 0, 10, 20, "1"}, + {"= test\\ with\\ spaces 3 10 20 0 1336557216 7c2b27 3:4\n", 0, 10, 20, "3:4"}, + {"= backslashattheend\\\\ 3 10 20 0 1336557216 7c2b27 1\n", 0, 10, 20, "1"}, + {"s test 1 10 20 0 1336556634 7c2b25 2\n= test 3 50 60 0 1336557216 7c2b27 2:3\n", 0, 50, 60, "2:3"}, + {"=", -1, 0, 0," "}, + {"= test", -1, 0, 0," "}, + {"= test ", -1, 0, 0," "}, + {"= test 1", -1, 0, 0," "}, + {"= test 1 ", -1, 0, 0," "}, + {"= test 1 2", -1, 0, 0," "}, + {"= test 1 2 ", -1, 0, 0," "}, + {"= test 1 2 3", -1, 0, 0," "}, + {NULL, 0, 0, 0,NULL} }; collie_test *test = node_info_tests; diff --git a/tests/storagevolxml2xmlin/vol-sheepdog.xml b/tests/storagevolxml2xmlin/vol-sheepdog.xml index d6e920b..f88e6db 100644 --- a/tests/storagevolxml2xmlin/vol-sheepdog.xml +++ b/tests/storagevolxml2xmlin/vol-sheepdog.xml @@ -4,6 +4,7 @@ </source> <capacity unit='bytes'>1024</capacity> <allocation unit='bytes'>0</allocation> + <redundancy unit='string'>3</redundancy> <target> <path>sheepdog:test2</path> </target> -- 2.5.0

1 0

[libvirt] [PATCH] storage sheepdog: allow to specify redundancy level
by Vasiliy Tolstov 17 Nov '15

17 Nov '15

Signed-off-by: Vasiliy Tolstov <v.tolstov(a)selfip.ru> --- docs/schemas/storagevol.rng | 3 ++ src/conf/storage_conf.c | 2 + src/storage/storage_backend_sheepdog.c | 38 +++++++++-------- src/util/virstoragefile.c | 4 +- src/util/virstoragefile.h | 2 + tests/storagebackendsheepdogtest.c | 68 +++++++++++++++--------------- tests/storagevolxml2xmlin/vol-sheepdog.xml | 1 + 7 files changed, 66 insertions(+), 52 deletions(-) diff --git a/docs/schemas/storagevol.rng b/docs/schemas/storagevol.rng index 7450547..068993f 100644 --- a/docs/schemas/storagevol.rng +++ b/docs/schemas/storagevol.rng @@ -55,6 +55,9 @@ <element name='allocation'> <ref name='scaledInteger'/> </element> + <element name='redundancy'> + <ref name='string'/> + </element> </optional> </interleave> </define> diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index 9b8abea..d37c93a 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -1345,6 +1345,8 @@ virStorageVolDefParseXML(virStoragePoolDefPtr pool, ret->target.allocation = ret->target.capacity; } + ret->target.redundancy = virXPathString("string(./redundancy)", ctxt); + ret->target.path = virXPathString("string(./target/path)", ctxt); if (options->formatFromString) { char *format = virXPathString("string(./target/format/@type)", ctxt); diff --git a/src/storage/storage_backend_sheepdog.c b/src/storage/storage_backend_sheepdog.c index 1200813..565cfd0 100644 --- a/src/storage/storage_backend_sheepdog.c +++ b/src/storage/storage_backend_sheepdog.c @@ -275,6 +275,10 @@ virStorageBackendSheepdogBuildVol(virConnectPtr conn ATTRIBUTE_UNUSED, cmd = virCommandNewArgList(SHEEPDOGCLI, "vdi", "create", vol->name, NULL); virCommandAddArgFormat(cmd, "%llu", vol->target.capacity); + + if(NULL != vol->target.redundancy) + virCommandAddArgFormat(cmd, "-c %s", vol->target.redundancy); + virStorageBackendSheepdogAddHostArg(cmd, pool); if (virCommandRun(cmd, NULL) < 0) goto cleanup; @@ -291,18 +295,19 @@ virStorageBackendSheepdogParseVdiList(virStorageVolDefPtr vol, char *output) { /* fields: - * current/clone/snapshot, name, id, size, used, shared, creation time, vdi id, [tag] + * current/clone/snapshot, name, id, size, used, shared, creation time, vdi id, redundancy, [tag], size shift * * example output: - * s test 1 10 0 0 1336556634 7c2b25 - * s test 2 10 0 0 1336557203 7c2b26 - * = test 3 10 0 0 1336557216 7c2b27 + * s test 1 10 0 0 1336556634 7c2b25 1 tt 22 + * s test 2 10 0 0 1336557203 7c2b26 2 zz 22 + * = test 3 10 0 0 1336557216 7c2b27 3 xx 22 */ - int id; + char **args; const char *p, *next; vol->target.allocation = vol->target.capacity = 0; + vol->target.redundancy = NULL; p = output; do { @@ -327,24 +332,21 @@ virStorageBackendSheepdogParseVdiList(virStorageVolDefPtr vol, ++p; ++p; } + } + args = virStringSplit(p, " ", 9); - if (virStrToLong_i(p, &end, 10, &id) < 0) - return -1; - - p = end + 1; - - if (virStrToLong_ull(p, &end, 10, &vol->target.capacity) < 0) - return -1; + if (virStrToLong_ull(args[1], strlen(args[1]), 10, &vol->target.capacity) < 0) + return -1; - p = end + 1; + if (virStrToLong_ull(args[2], strlen(args[2]), 10, &vol->target.allocation) < 0) + return -1; - if (virStrToLong_ull(p, &end, 10, &vol->target.allocation) < 0) - return -1; + if (VIR_STRNDUP(vol->target.redundancy, args[5], strlen(args[2])) < 0) + return -1; - return 0; - } while ((p = next)); + virStringFreeList(args); - return -1; + return 0; } static int diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index 2aa1d90..9cdc90d 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -1846,7 +1846,8 @@ virStorageSourceCopy(const virStorageSource *src, VIR_STRDUP(ret->backingStoreRaw, src->backingStoreRaw) < 0 || VIR_STRDUP(ret->snapshot, src->snapshot) < 0 || VIR_STRDUP(ret->configFile, src->configFile) < 0 || - VIR_STRDUP(ret->compat, src->compat) < 0) + VIR_STRDUP(ret->compat, src->compat) < 0 || + VIR_STRDUP(ret->redundancy, src->redundancy) < 0) goto error; if (src->nhosts) { @@ -2040,6 +2041,7 @@ virStorageSourceClear(virStorageSourcePtr def) VIR_FREE(def->volume); VIR_FREE(def->snapshot); VIR_FREE(def->configFile); + VIR_FREE(def->redundancy); virStorageSourcePoolDefFree(def->srcpool); VIR_FREE(def->driverName); virBitmapFree(def->features); diff --git a/src/util/virstoragefile.h b/src/util/virstoragefile.h index b98fe25..c37cfc2 100644 --- a/src/util/virstoragefile.h +++ b/src/util/virstoragefile.h @@ -282,6 +282,8 @@ struct _virStorageSource { /* Name of the child backing store recorded in metadata of the * current file. */ char *backingStoreRaw; + /* redundancy level, may be used by sheepdog or ceph */ + char *redundancy; }; diff --git a/tests/storagebackendsheepdogtest.c b/tests/storagebackendsheepdogtest.c index 2b0f4db..c037ebe 100644 --- a/tests/storagebackendsheepdogtest.c +++ b/tests/storagebackendsheepdogtest.c @@ -42,6 +42,7 @@ typedef struct { int expected_return; uint64_t expected_capacity; uint64_t expected_allocation; + const char *expected_redundancy; } collie_test; struct testNodeInfoParserData { @@ -119,7 +120,8 @@ test_vdi_list_parser(const void *opaque) } if (vol->target.capacity == test.expected_capacity && - vol->target.allocation == test.expected_allocation) + vol->target.allocation == test.expected_allocation && + !strcmp(vol->target.redundancy, test.expected_redundancy)) ret = 0; cleanup: @@ -138,41 +140,41 @@ mymain(void) char *volxml = NULL; collie_test node_info_tests[] = { - {"", -1, 0, 0}, - {"Total 15245667872 117571104 0% 20972341\n", 0, 15245667872, 117571104}, - {"To", -1, 0, 0}, - {"asdf\nasdf", -1, 0, 0}, - {"Total ", -1, 0, 0}, - {"Total 1", -1, 0, 0}, - {"Total 1\n", -1, 0, 0}, - {"Total 1 ", -1, 0, 0}, - {"Total 1 2", -1, 0, 0}, - {"Total 1 2 ", -1, 0, 0}, - {"Total 1 2\n", 0, 1, 2}, - {"Total 1 2 \n", 0, 1, 2}, - {"Total a 2 \n", -1, 0, 0}, - {"Total 1 b \n", -1, 0, 0}, - {"Total a b \n", -1, 0, 0}, - {"stuff\nTotal 1 2 \n", 0, 1, 2}, - {"0 1 2 3\nTotal 1 2 \n", 0, 1, 2}, - {NULL, 0, 0, 0} + {"", -1, 0, 0,"0"}, + {"Total 15245667872 117571104 1 0% 20972341\n", 0, 15245667872, 117571104,"1"}, + {"To", -1, 0, 0," "}, + {"asdf\nasdf", -1, 0, 0," "}, + {"Total ", -1, 0, 0, " "}, + {"Total 1", -1, 0, 0, " "}, + {"Total 1\n", -1, 0, 0," "}, + {"Total 1 ", -1, 0, 0, " "}, + {"Total 1 2", -1, 0, 0, " "}, + {"Total 1 2 ", -1, 0, 0," "}, + {"Total 1 2 1:1\n", 0, 1, 2,"1:1"}, + {"Total 1 2 3:4\n", 0, 1, 2,"3:4"}, + {"Total a 2 \n", -1, 0, 0," "}, + {"Total 1 b \n", -1, 0, 0," "}, + {"Total a b \n", -1, 0, 0,"sss"}, + {"stuff\nTotal 1 2 1:2\n", 0, 1, 2,"1:2"}, + {"0 1 2 3\nTotal 1 2 3\n", 0, 1, 2,"3"}, + {NULL, 0, 0, 0, NULL} }; collie_test vdi_list_tests[] = { - {"", -1, 0, 0}, - {"= test 3 10 20 0 1336557216 7c2b27\n", 0, 10, 20}, - {"= test\\ with\\ spaces 3 10 20 0 1336557216 7c2b27\n", 0, 10, 20}, - {"= backslashattheend\\\\ 3 10 20 0 1336557216 7c2b27\n", 0, 10, 20}, - {"s test 1 10 20 0 1336556634 7c2b25\n= test 3 50 60 0 1336557216 7c2b27\n", 0, 50, 60}, - {"=", -1, 0, 0}, - {"= test", -1, 0, 0}, - {"= test ", -1, 0, 0}, - {"= test 1", -1, 0, 0}, - {"= test 1 ", -1, 0, 0}, - {"= test 1 2", -1, 0, 0}, - {"= test 1 2 ", -1, 0, 0}, - {"= test 1 2 3", -1, 0, 0}, - {NULL, 0, 0, 0} + {"", -1, 0, 0,NULL}, + {"= test 3 10 20 1 0 1336557216 7c2b27 1\n", 0, 10, 20, "1"}, + {"= test\\ with\\ spaces 3 10 20 0 1336557216 7c2b27 3:4\n", 0, 10, 20, "3:4"}, + {"= backslashattheend\\\\ 3 10 20 0 1336557216 7c2b27 1\n", 0, 10, 20, "1"}, + {"s test 1 10 20 0 1336556634 7c2b25 2\n= test 3 50 60 0 1336557216 7c2b27 2:3\n", 0, 50, 60, "2:3"}, + {"=", -1, 0, 0," "}, + {"= test", -1, 0, 0," "}, + {"= test ", -1, 0, 0," "}, + {"= test 1", -1, 0, 0," "}, + {"= test 1 ", -1, 0, 0," "}, + {"= test 1 2", -1, 0, 0," "}, + {"= test 1 2 ", -1, 0, 0," "}, + {"= test 1 2 3", -1, 0, 0," "}, + {NULL, 0, 0, 0,NULL} }; collie_test *test = node_info_tests; diff --git a/tests/storagevolxml2xmlin/vol-sheepdog.xml b/tests/storagevolxml2xmlin/vol-sheepdog.xml index d6e920b..f88e6db 100644 --- a/tests/storagevolxml2xmlin/vol-sheepdog.xml +++ b/tests/storagevolxml2xmlin/vol-sheepdog.xml @@ -4,6 +4,7 @@ </source> <capacity unit='bytes'>1024</capacity> <allocation unit='bytes'>0</allocation> + <redundancy unit='string'>3</redundancy> <target> <path>sheepdog:test2</path> </target> -- 2.5.0

1 0

[libvirt] [PATCH] bhyve: monitor: do not override domain's privateData
by Roman Bogorodskiy 17 Nov '15

17 Nov '15

Current monitor code overrides domain object's privateData, e.g. in virBhyveProcessStart(): vm->privateData = bhyveMonitorOpen(vm, driver); where bhyveMonitorPtr() returns bhyveMonitorPtr. This is not right thing to do, so make bhyveMonitorPtr a part of the bhyveDomainObjPrivate struct and change related code accordingly. --- src/bhyve/bhyve_domain.h | 4 ++++ src/bhyve/bhyve_monitor.c | 36 +++++++++++++++++++----------------- src/bhyve/bhyve_process.c | 11 +++++++---- 3 files changed, 30 insertions(+), 21 deletions(-) diff --git a/src/bhyve/bhyve_domain.h b/src/bhyve/bhyve_domain.h index b8ef22a..0a60392 100644 --- a/src/bhyve/bhyve_domain.h +++ b/src/bhyve/bhyve_domain.h @@ -26,11 +26,15 @@ # include "domain_addr.h" # include "domain_conf.h" +# include "bhyve_monitor.h" + typedef struct _bhyveDomainObjPrivate bhyveDomainObjPrivate; typedef bhyveDomainObjPrivate *bhyveDomainObjPrivatePtr; struct _bhyveDomainObjPrivate { virDomainPCIAddressSetPtr pciaddrs; bool persistentAddrs; + + bhyveMonitorPtr mon; }; extern virDomainXMLPrivateDataCallbacks virBhyveDriverPrivateDataCallbacks; diff --git a/src/bhyve/bhyve_monitor.c b/src/bhyve/bhyve_monitor.c index 1316720..37c9e79 100644 --- a/src/bhyve/bhyve_monitor.c +++ b/src/bhyve/bhyve_monitor.c @@ -27,6 +27,7 @@ #include <sys/time.h> #include <sys/wait.h> +#include "bhyve_domain.h" #include "bhyve_monitor.h" #include "bhyve_process.h" #include "viralloc.h" @@ -41,7 +42,6 @@ VIR_LOG_INIT("bhyve.bhyve_monitor"); struct _bhyveMonitor { int kq; int watch; - virDomainObjPtr vm; bhyveConnPtr driver; }; @@ -49,7 +49,9 @@ static void bhyveMonitorIO(int watch, int kq, int events ATTRIBUTE_UNUSED, void *opaque) { const struct timespec zerowait = { 0, 0 }; - bhyveMonitorPtr mon = opaque; + virDomainObjPtr vm = opaque; + bhyveDomainObjPrivatePtr priv = vm->privateData; + bhyveMonitorPtr mon = priv->mon; struct kevent kev; int rc, status; @@ -75,10 +77,10 @@ bhyveMonitorIO(int watch, int kq, int events ATTRIBUTE_UNUSED, void *opaque) } if (kev.filter == EVFILT_PROC && (kev.fflags & NOTE_EXIT) != 0) { - if ((pid_t)kev.ident != mon->vm->pid) { + if ((pid_t)kev.ident != vm->pid) { virReportError(VIR_ERR_INTERNAL_ERROR, _("event from unexpected proc %ju!=%ju"), - (uintmax_t)mon->vm->pid, (uintmax_t)kev.ident); + (uintmax_t)vm->pid, (uintmax_t)kev.ident); return; } @@ -86,28 +88,28 @@ bhyveMonitorIO(int watch, int kq, int events ATTRIBUTE_UNUSED, void *opaque) if (WIFSIGNALED(status) && WCOREDUMP(status)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Guest %s got signal %d and crashed"), - mon->vm->def->name, + vm->def->name, WTERMSIG(status)); - virBhyveProcessStop(mon->driver, mon->vm, + virBhyveProcessStop(mon->driver, vm, VIR_DOMAIN_SHUTOFF_CRASHED); } else if (WIFEXITED(status)) { if (WEXITSTATUS(status) == 0) { /* 0 - reboot */ /* TODO: Implementing reboot is a little more complicated. */ VIR_INFO("Guest %s rebooted; destroying domain.", - mon->vm->def->name); - virBhyveProcessStop(mon->driver, mon->vm, + vm->def->name); + virBhyveProcessStop(mon->driver, vm, VIR_DOMAIN_SHUTOFF_SHUTDOWN); } else if (WEXITSTATUS(status) < 3) { /* 1 - shutdown, 2 - halt, 3 - triple fault. others - error */ VIR_INFO("Guest %s shut itself down; destroying domain.", - mon->vm->def->name); - virBhyveProcessStop(mon->driver, mon->vm, + vm->def->name); + virBhyveProcessStop(mon->driver, vm, VIR_DOMAIN_SHUTOFF_SHUTDOWN); } else { VIR_INFO("Guest %s had an error and exited with status %d; destroying domain.", - mon->vm->def->name, WEXITSTATUS(status)); - virBhyveProcessStop(mon->driver, mon->vm, + vm->def->name, WEXITSTATUS(status)); + virBhyveProcessStop(mon->driver, vm, VIR_DOMAIN_SHUTOFF_UNKNOWN); } } @@ -117,24 +119,24 @@ bhyveMonitorIO(int watch, int kq, int events ATTRIBUTE_UNUSED, void *opaque) static void bhyveMonitorRelease(void *opaque) { - bhyveMonitorPtr mon = opaque; + virDomainObjPtr vm = opaque; + bhyveDomainObjPrivatePtr priv = vm->privateData; + bhyveMonitorPtr mon = priv->mon; VIR_FORCE_CLOSE(mon->kq); - virObjectUnref(mon->vm); VIR_FREE(mon); } bhyveMonitorPtr bhyveMonitorOpen(virDomainObjPtr vm, bhyveConnPtr driver) { - bhyveMonitorPtr mon; + bhyveMonitorPtr mon = NULL; struct kevent kev; int rc; if (VIR_ALLOC(mon) < 0) return NULL; - mon->vm = virObjectRef(vm); mon->driver = driver; mon->kq = kqueue(); @@ -157,7 +159,7 @@ bhyveMonitorOpen(virDomainObjPtr vm, bhyveConnPtr driver) VIR_EVENT_HANDLE_ERROR | VIR_EVENT_HANDLE_HANGUP, bhyveMonitorIO, - mon, + vm, bhyveMonitorRelease); if (mon->watch < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", diff --git a/src/bhyve/bhyve_process.c b/src/bhyve/bhyve_process.c index 284641a..42255d2 100644 --- a/src/bhyve/bhyve_process.c +++ b/src/bhyve/bhyve_process.c @@ -113,6 +113,7 @@ virBhyveProcessStart(virConnectPtr conn, virCommandPtr cmd = NULL; virCommandPtr load_cmd = NULL; bhyveConnPtr privconn = conn->privateData; + bhyveDomainObjPrivatePtr priv = vm->privateData; int ret = -1, rc; if (virAsprintf(&logfile, "%s/%s.log", @@ -210,7 +211,7 @@ virBhyveProcessStart(virConnectPtr conn, vm->def->id = vm->pid; virDomainObjSetState(vm, VIR_DOMAIN_RUNNING, reason); - vm->privateData = bhyveMonitorOpen(vm, driver); + priv->mon = bhyveMonitorOpen(vm, driver); if (virDomainSaveStatus(driver->xmlopt, BHYVE_STATE_DIR, @@ -257,6 +258,7 @@ virBhyveProcessStop(bhyveConnPtr driver, { int ret = -1; virCommandPtr cmd = NULL; + bhyveDomainObjPrivatePtr priv = vm->privateData; if (!virDomainObjIsActive(vm)) { VIR_DEBUG("VM '%s' not active", vm->def->name); @@ -270,8 +272,8 @@ virBhyveProcessStop(bhyveConnPtr driver, return -1; } - if (vm->privateData != NULL) - bhyveMonitorClose((bhyveMonitorPtr)vm->privateData); + if ((priv != NULL) && (priv->mon != NULL)) + bhyveMonitorClose(priv->mon); /* First, try to kill 'bhyve' process */ if (virProcessKillPainfully(vm->pid, true) != 0) @@ -358,6 +360,7 @@ virBhyveProcessReconnect(virDomainObjPtr vm, int nprocs; char **proc_argv; char *expected_proctitle = NULL; + bhyveDomainObjPrivatePtr priv = vm->privateData; int ret = -1; if (!virDomainObjIsActive(vm)) @@ -379,7 +382,7 @@ virBhyveProcessReconnect(virDomainObjPtr vm, if (proc_argv && proc_argv[0]) { if (STREQ(expected_proctitle, proc_argv[0])) { ret = 0; - vm->privateData = bhyveMonitorOpen(vm, data->driver); + priv->mon = bhyveMonitorOpen(vm, data->driver); } } -- 2.6.1

2 4

[libvirt] split string into tokens via libvirt
by Vasiliy Tolstov 17 Nov '15

17 Nov '15

Hi. I'm need to parse string like "= test\ aaa 3 10 0 0 1336557216 7c2b27 3 22" I can use virStringSplitCount, but second word contains space and splitting not works right. Does this need i need to parse string by hand via strtok ? -- Vasiliy Tolstov, e-mail: v.tolstov(a)selfip.ru

1 1

[libvirt] [PATCH v2] syntax-check: Add prohibit_space_in_label rule
by Andrea Bolognani 17 Nov '15

17 Nov '15

This guards against code such as cleanup : which is happily accepted by the compiler but does not conform to our style guidelines. --- cfg.mk | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/cfg.mk b/cfg.mk index a9bba38..7a5a1de 100644 --- a/cfg.mk +++ b/cfg.mk @@ -919,6 +919,15 @@ sc_require_space_before_label: halt="Top-level labels should be indented by one space" \ $(_sc_search_regexp) +# Allow for up to three spaces before the label: this is to avoid running +# into situations where require_space_before_label is not applied, eg. a +# line matching ^[a-zA-Z0-9]+ :$ +sc_prohibit_space_in_label: + @prohibit='^ ? ? ?[_a-zA-Z0-9]+ +:$$' \ + in_vc_files='\.[ch]$$' \ + halt="There should be no space between label name and colon" \ + $(_sc_search_regexp) + # Doesn't catch all cases of mismatched braces across if-else, but it helps sc_require_if_else_matching_braces: @prohibit='( else( if .*\))? {|} else( if .*\))?$$)' \ -- 2.4.3

2 2

[libvirt] [PATCH] util: remove unnecessary needSize
by Chen Hanxiao 16 Nov '15

16 Nov '15

From: Chen Hanxiao <chenhanxiao(a)gmail.com> Use toadd->use directly. Signed-off-by: Chen Hanxiao <chenhanxiao(a)gmail.com> --- src/util/virbuffer.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/util/virbuffer.c b/src/util/virbuffer.c index 5b338f8..55dad37 100644 --- a/src/util/virbuffer.c +++ b/src/util/virbuffer.c @@ -186,8 +186,6 @@ virBufferAdd(virBufferPtr buf, const char *str, int len) void virBufferAddBuffer(virBufferPtr buf, virBufferPtr toadd) { - unsigned int needSize; - if (!toadd) return; @@ -200,8 +198,7 @@ virBufferAddBuffer(virBufferPtr buf, virBufferPtr toadd) goto done; } - needSize = buf->use + toadd->use; - if (virBufferGrow(buf, needSize - buf->use) < 0) + if (virBufferGrow(buf, toadd->use) < 0) goto done; memcpy(&buf->content[buf->use], toadd->content, toadd->use); -- 1.9.0

2 1

[libvirt] [PATCH v2] gobject: Add wrapper virDomainSetTime()
by Zeeshan Ali (Khattak) 16 Nov '15

16 Nov '15

--- This version: * Replaces the seconds and nseconds arguments by a GDateTime. * Drops the use of flags argument, since caller can specify the only flag currently possible (VIR_DOMAIN_TIME_SYNC) by simply passing a NULL as the GDateTime argument. * Add some needed articles to doc comment. libvirt-gobject/libvirt-gobject-domain.c | 121 +++++++++++++++++++++++++++++++ libvirt-gobject/libvirt-gobject-domain.h | 15 +++- libvirt-gobject/libvirt-gobject.sym | 9 +++ 3 files changed, 144 insertions(+), 1 deletion(-) diff --git a/libvirt-gobject/libvirt-gobject-domain.c b/libvirt-gobject/libvirt-gobject-domain.c index 34eb7ca..debae2d 100644 --- a/libvirt-gobject/libvirt-gobject-domain.c +++ b/libvirt-gobject/libvirt-gobject-domain.c @@ -1886,3 +1886,124 @@ gboolean gvir_domain_get_has_current_snapshot(GVirDomain *dom, return TRUE; } + +/** + * gvir_domain_set_time: + * @dom: the domain + * @date_time: (allow-none)(transfer none): the time to set as #GDateTime. + * @flags: Unused, Pass 0. + * + * This function tries to set guest time to the given value. The passed + * time must in UTC. + * + * If @date_time is %NULL, the time is reset using the domain's RTC. + * + * Please note that some hypervisors may require guest agent to be configured + * and running in order for this function to work. + */ +gboolean gvir_domain_set_time(GVirDomain *dom, + GDateTime *date_time, + guint flags G_GNUC_UNUSED, + GError **err) +{ + GVirDomainPrivate *priv; + int ret; + GTimeVal tv; + gint64 seconds; + guint nseconds; + guint settime_flags; + + g_return_val_if_fail(GVIR_IS_DOMAIN(dom), FALSE); + g_return_val_if_fail(err == NULL || *err == NULL, FALSE); + + if (date_time != NULL) { + if (!g_date_time_to_timeval(date_time, &tv)) { + gvir_set_error_literal(err, GVIR_DOMAIN_ERROR, + 0, + "Failed to parse given time argument"); + return FALSE; + } + + seconds = tv.tv_sec; + nseconds = tv.tv_usec * 1000; + settime_flags = 0; + } else { + seconds = 0; + nseconds = 0; + settime_flags = VIR_DOMAIN_TIME_SYNC; + } + + priv = dom->priv; + ret = virDomainSetTime(priv->handle, seconds, nseconds, settime_flags); + if (ret < 0) { + gvir_set_error_literal(err, GVIR_DOMAIN_ERROR, + 0, + "Unable to set domain time"); + return FALSE; + } + + return TRUE; +} + +static void +gvir_domain_set_time_helper(GTask *task, + gpointer object, + gpointer task_data, + GCancellable *cancellable G_GNUC_UNUSED) +{ + GVirDomain *dom = GVIR_DOMAIN(object); + GDateTime *date_time = (GDateTime *) task_data; + GError *err = NULL; + + if (!gvir_domain_set_time(dom, date_time, 0, &err)) + g_task_return_error(task, err); + else + g_task_return_boolean(task, TRUE); +} + +/** + * gvir_domain_set_time_async: + * @dom: the domain + * @date_time: (allow-none)(transfer none): the time to set as #GDateTime. + * @flags: bitwise-OR of #GVirDomainSetTimeFlags. + * @cancellable: (allow-none)(transfer none): cancellation object + * @callback: (scope async): completion callback + * @user_data: (closure): opaque data for callback + * + * Asynchronous variant of #gvir_domain_set_time. + */ +void gvir_domain_set_time_async(GVirDomain *dom, + GDateTime *date_time, + guint flags G_GNUC_UNUSED, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data) +{ + GTask *task; + + g_return_if_fail(GVIR_IS_DOMAIN(dom)); + g_return_if_fail((cancellable == NULL) || G_IS_CANCELLABLE(cancellable)); + + task = g_task_new(G_OBJECT(dom), + cancellable, + callback, + user_data); + if (date_time != NULL) + g_task_set_task_data(task, + g_date_time_ref(date_time), + (GDestroyNotify)g_date_time_unref); + g_task_run_in_thread(task, gvir_domain_set_time_helper); + + g_object_unref(task); +} + +gboolean gvir_domain_set_time_finish(GVirDomain *dom, + GAsyncResult *result, + GError **err) +{ + g_return_val_if_fail(GVIR_IS_DOMAIN(dom), FALSE); + g_return_val_if_fail(g_task_is_valid(result, G_OBJECT(dom)), FALSE); + g_return_val_if_fail(err == NULL || *err == NULL, FALSE); + + return g_task_propagate_boolean(G_TASK(result), err); +} diff --git a/libvirt-gobject/libvirt-gobject-domain.h b/libvirt-gobject/libvirt-gobject-domain.h index 4fe381e..099cde3 100644 --- a/libvirt-gobject/libvirt-gobject-domain.h +++ b/libvirt-gobject/libvirt-gobject-domain.h @@ -215,7 +215,6 @@ typedef enum { GVIR_DOMAIN_SNAPSHOT_LIST_EXTERNAL = VIR_DOMAIN_SNAPSHOT_LIST_EXTERNAL } GVirDomainSnapshotListFlags; - typedef struct _GVirDomainInfo GVirDomainInfo; struct _GVirDomainInfo { @@ -401,6 +400,20 @@ gboolean gvir_domain_get_has_current_snapshot(GVirDomain *dom, gboolean *has_current_snapshot, GError **error); +gboolean gvir_domain_set_time(GVirDomain *dom, + GDateTime *date_time, + guint flags, + GError **err); +void gvir_domain_set_time_async(GVirDomain *dom, + GDateTime *date_time, + guint flags, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data); +gboolean gvir_domain_set_time_finish(GVirDomain *dom, + GAsyncResult *result, + GError **err); + G_END_DECLS #endif /* __LIBVIRT_GOBJECT_DOMAIN_H__ */ diff --git a/libvirt-gobject/libvirt-gobject.sym b/libvirt-gobject/libvirt-gobject.sym index ca89a45..cbfaa71 100644 --- a/libvirt-gobject/libvirt-gobject.sym +++ b/libvirt-gobject/libvirt-gobject.sym @@ -304,4 +304,13 @@ LIBVIRT_GOBJECT_0.2.2 { gvir_network_get_dhcp_leases; } LIBVIRT_GOBJECT_0.2.1; +LIBVIRT_GOBJECT_0.2.3 { + global: + gvir_domain_set_time_flags_get_type; + + gvir_domain_set_time; + gvir_domain_set_time_async; + gvir_domain_set_time_finish; +} LIBVIRT_GOBJECT_0.2.2; + # .... define new API here using predicted next version number .... -- 2.5.0

2 3

[libvirt] [PATCH] util: remove unnecessary needSize
by Chen Hanxiao 14 Nov '15

14 Nov '15

From: Chen Hanxiao <chenhanxiao(a)gmail.com> Use toadd->use directly. Signed-off-by: Chen Hanxiao <chenhanxiao(a)gmail.com> --- src/util/virbuffer.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/util/virbuffer.c b/src/util/virbuffer.c index 5b338f8..55dad37 100644 --- a/src/util/virbuffer.c +++ b/src/util/virbuffer.c @@ -186,8 +186,6 @@ virBufferAdd(virBufferPtr buf, const char *str, int len) void virBufferAddBuffer(virBufferPtr buf, virBufferPtr toadd) { - unsigned int needSize; - if (!toadd) return; @@ -200,8 +198,7 @@ virBufferAddBuffer(virBufferPtr buf, virBufferPtr toadd) goto done; } - needSize = buf->use + toadd->use; - if (virBufferGrow(buf, needSize - buf->use) < 0) + if (virBufferGrow(buf, toadd->use) < 0) goto done; memcpy(&buf->content[buf->use], toadd->content, toadd->use); -- 1.9.0

1 0

[libvirt] [PATCH 0/4] Fix crash resuling from script doing FC/SCSI pool-create destroy
by John Ferlan 13 Nov '15

13 Nov '15

Details in the patches - essentially testing found an issue creating and destroying an FC/SCSI pool due to the refresh thread created for bz 1152382 running after the destroy. Seen using script which has for i in 1 2 3 ; \ do virsh pool-create /tmp/test.xml; \ sleep 1; \ virsh pool-destroy p1; \ sleep 1; \ done John Ferlan (4): storage: Make active boolean storage: Change cbdata scsi refresh thread field name storage: Introduce virStoragePoolObjFindPoolByUUID storage: Don't assume storage pool exists for scsi refresh thread src/conf/storage_conf.h | 2 +- src/storage/storage_backend_scsi.c | 30 +++++++++++++++++------------- src/storage/storage_driver.c | 31 ++++++++++++++++++++++++++----- src/storage/storage_driver.h | 3 +++ 4 files changed, 47 insertions(+), 19 deletions(-) -- 2.1.0

2 5

[libvirt] [PATCH] vz: add func to set shared drivers after libvirtd init
by Mikhail Feoktistov 13 Nov '15

13 Nov '15

Built-in drivers in libvirt are initialized before libvirtd initialization. Libvirt loads shared drivers on libvirtd initialization step. For built-in drivers we can't set shared drivers, because they are not initialized yet. This patch adds function to set shared drivers after libvirtd init. --- daemon/libvirtd.c | 4 ++++ src/libvirt.c | 41 +++++++++++++++++++++++++++++++++++++++++ src/libvirt_internal.h | 1 + src/libvirt_private.syms | 1 + 4 files changed, 47 insertions(+) diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index 250094b..aac1826 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -431,6 +431,10 @@ static void daemonInitialize(void) bhyveRegister(); # endif #endif +# ifdef WITH_VZ + virAssignSharedDrivers("vz"); + virAssignSharedDrivers("Parallels"); +# endif } diff --git a/src/libvirt.c b/src/libvirt.c index 2602dde..4c4b7bd 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -1433,3 +1433,44 @@ virTypedParameterValidateSet(virConnectPtr conn, } return 0; } + +/** + * virAssignSharedDrivers: + * @name: name of connection driver + * + * This function fills in any empty pointers for shared drivers + * in connect driver structure + * + * Returns 0 in case of success, -1 in case of error +*/ +int +virAssignSharedDrivers(const char *name) +{ + size_t i; + + if (name == NULL) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Driver name must be specified")); + return -1; + } + + for (i = 0; i < virConnectDriverTabCount; i++) { + if (STREQ(virConnectDriverTab[i]->hypervisorDriver->name, name)) { + if (virConnectDriverTab[i]->interfaceDriver == NULL) + virConnectDriverTab[i]->interfaceDriver = virSharedInterfaceDriver; + if (virConnectDriverTab[i]->networkDriver == NULL) + virConnectDriverTab[i]->networkDriver = virSharedNetworkDriver; + if (virConnectDriverTab[i]->nodeDeviceDriver == NULL) + virConnectDriverTab[i]->nodeDeviceDriver = virSharedNodeDeviceDriver; + if (virConnectDriverTab[i]->nwfilterDriver == NULL) + virConnectDriverTab[i]->nwfilterDriver = virSharedNWFilterDriver; + if (virConnectDriverTab[i]->secretDriver == NULL) + virConnectDriverTab[i]->secretDriver = virSharedSecretDriver; + if (virConnectDriverTab[i]->storageDriver == NULL) + virConnectDriverTab[i]->storageDriver = virSharedStorageDriver; + break; + } + } + + return 0; +} diff --git a/src/libvirt_internal.h b/src/libvirt_internal.h index 1313b58..2a7227b 100644 --- a/src/libvirt_internal.h +++ b/src/libvirt_internal.h @@ -289,4 +289,5 @@ virTypedParameterValidateSet(virConnectPtr conn, virTypedParameterPtr params, int nparams); +int virAssignSharedDrivers(const char *name); #endif diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index be6ee19..340555a 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -943,6 +943,7 @@ virFDStreamSetInternalCloseCb; # libvirt_internal.h +virAssignSharedDrivers; virConnectSupportsFeature; virDomainMigrateBegin3; virDomainMigrateBegin3Params; -- 1.8.3.1

3 2

[libvirt] [PATCHv3 0/4] Hyper-v crash feature support
by Dmitry Andreev 13 Nov '15

13 Nov '15

A new Hyper-V cpu feature 'hv_crash' was added to QEMU. The feature will become available in v2.5.0. This patch adds support for this feature. The previous version of this patch is https://www.redhat.com/archives/libvir-list/2015-November/msg00400.html What is changed: * 'model' is an optional attribute and will not be added if it wasn't specified by the user [1/4] * docs text fixed [1/4] [3/4] * schema and code allows multiple panic devices [3/4] * more tests is added and all changes in old tests are removed [4/4] What isn't changed: I didn't add <code> tag around model values in docs because there are many examples of "<ul><li> 'value' —" without a <code> tag. Dmitry Andreev (4): conf: add 'model' attribute for panic device with values isa, pseries, hyperv qemu: add support for hv_crash feature as a panic device schema: allow multiple panic devices tests: add tests for panic models and multiple panic devices docs/formatdomain.html.in | 19 +++- docs/schemas/domaincommon.rng | 13 ++- src/conf/domain_conf.c | 101 ++++++++++++--------- src/conf/domain_conf.h | 15 ++- src/qemu/qemu_command.c | 84 +++++++++++++++-- src/qemu/qemu_domain.c | 21 ++++- tests/qemuargv2xmltest.c | 1 + .../qemuxml2argv-hyperv-panic.args | 21 +++++ .../qemuxml2argvdata/qemuxml2argv-hyperv-panic.xml | 25 +++++ .../qemuxml2argv-panic-double.args | 21 +++++ .../qemuxml2argvdata/qemuxml2argv-panic-double.xml | 28 ++++++ tests/qemuxml2argvdata/qemuxml2argv-panic-isa.xml | 31 +++++++ .../qemuxml2argv-panic-pseries.xml | 30 ++++++ tests/qemuxml2argvtest.c | 3 + tests/qemuxml2xmltest.c | 4 + 15 files changed, 353 insertions(+), 64 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hyperv-panic.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hyperv-panic.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-panic-double.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-panic-double.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-panic-isa.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-panic-pseries.xml -- 1.8.3.1

2 6

[libvirt] [PATCH 0/5] Initial patches to introduce a virtlogd daemon
by Daniel P. Berrange 13 Nov '15

13 Nov '15

Currently we have stdout + stderr of QEMU guests setup to write to a log file (eg /var/log/libvirt/qemu/$GUEST.log). This is nice and simple, but it in fact opens the possibility of a malicious or accidental denial of service, whereby QEMU can write logs of data to stdio and thus fill up the host filesystem holding the log. Although we have logrotate policy in place, this is only processed once a day, so there is still a window where disk usage is not constrained. The only way to solve this is to not let QEMU directly write to the log file, instead connect its stdio to a pipe and copy data from the pipe to the real log file, performing file rollover when it reaches a certain size. If we do this, we need something to keep open the pipe for as long as QEMU is running. This can't be libvirtd since we expect libvirtd to be able to be stopped while QEMU is running. Thus we introduce a new single-purpose daemon virtlogd whose job is exclusively to deal with log file writing. This daemon has support for SIGUSR1 to tell it to re-exec itself while keeping open the pipe to QEMU so it can be safely upgraded while QEMU is running. This series switches QEMU to use virtlogd by default, but in case of problems we can revert back to the old direct file access by setting 'stdio_handler = "file"' in /etc/libvirt/qemu.conf This series is only the first step. The same problem exists when character devices are told to use the file backend. There is a further use case from OpenStack which that they want to allow the use of both a TCP backend and a file backend at the same time. The idea is that the serial port is to be used for an interactive console, so needs the TCP backend support, but we also want to be able to record all output on that serial port to a file for logging purposes. Thus, in a followup I will work on creating a new character device backend "logd" that will use virtlogd to provide this combined tcp+logfile facility for QEMU guests. Daniel P. Berrange (5): util: add API for writing to rotating files Import stripped down virtlockd code as basis of virtlogd logging: introduce log handling protocol logging: add client for virtlogd daemon qemu: add support for sending QEMU stdout/stderr to virtlogd .gitignore | 7 + cfg.mk | 6 +- include/libvirt/virterror.h | 1 + libvirt.spec.in | 24 +- po/POTFILES.in | 5 + src/Makefile.am | 176 +++++- src/libvirt_private.syms | 12 + src/logging/log_daemon.c | 1207 ++++++++++++++++++++++++++++++++++++ src/logging/log_daemon.h | 45 ++ src/logging/log_daemon_config.c | 203 ++++++ src/logging/log_daemon_config.h | 50 ++ src/logging/log_daemon_dispatch.c | 67 ++ src/logging/log_daemon_dispatch.h | 31 + src/logging/log_handler.c | 429 +++++++++++++ src/logging/log_handler.h | 46 ++ src/logging/log_manager.c | 197 ++++++ src/logging/log_manager.h | 42 ++ src/logging/log_protocol.x | 71 +++ src/logging/test_virtlogd.aug.in | 12 + src/logging/virtlogd.aug | 45 ++ src/logging/virtlogd.conf | 67 ++ src/logging/virtlogd.init.in | 94 +++ src/logging/virtlogd.pod.in | 162 +++++ src/logging/virtlogd.service.in | 17 + src/logging/virtlogd.socket.in | 8 + src/logging/virtlogd.sysconf | 3 + src/qemu/libvirtd_qemu.aug | 1 + src/qemu/qemu.conf | 15 + src/qemu/qemu_conf.c | 18 + src/qemu/qemu_conf.h | 1 + src/qemu/qemu_domain.c | 43 +- src/qemu/qemu_process.c | 42 +- src/qemu/test_libvirtd_qemu.aug.in | 1 + src/util/virerror.c | 1 + src/util/virrotatingfile.c | 237 +++++++ src/util/virrotatingfile.h | 44 ++ tests/Makefile.am | 6 + tests/virrotatingfiletest.c | 415 +++++++++++++ 38 files changed, 3802 insertions(+), 49 deletions(-) create mode 100644 src/logging/log_daemon.c create mode 100644 src/logging/log_daemon.h create mode 100644 src/logging/log_daemon_config.c create mode 100644 src/logging/log_daemon_config.h create mode 100644 src/logging/log_daemon_dispatch.c create mode 100644 src/logging/log_daemon_dispatch.h create mode 100644 src/logging/log_handler.c create mode 100644 src/logging/log_handler.h create mode 100644 src/logging/log_manager.c create mode 100644 src/logging/log_manager.h create mode 100644 src/logging/log_protocol.x create mode 100644 src/logging/test_virtlogd.aug.in create mode 100644 src/logging/virtlogd.aug create mode 100644 src/logging/virtlogd.conf create mode 100644 src/logging/virtlogd.init.in create mode 100644 src/logging/virtlogd.pod.in create mode 100644 src/logging/virtlogd.service.in create mode 100644 src/logging/virtlogd.socket.in create mode 100644 src/logging/virtlogd.sysconf create mode 100644 src/util/virrotatingfile.c create mode 100644 src/util/virrotatingfile.h create mode 100644 tests/virrotatingfiletest.c -- 2.5.0

2 11

Re: [libvirt] -cpu check, rdtscp and AMD KVM
by Eduardo Habkost 13 Nov '15

13 Nov '15

(CCing libvir-list) On Thu, Nov 12, 2015 at 05:35:59PM +0100, Paolo Bonzini wrote: > On 12/11/2015 17:27, Eduardo Habkost wrote: > >> > > To simply remove rdtscp from all Opteron_G* models? > > > > > > Not sure this is the right thing to do... Real hardware has it, and > > > going forward KVM will provide it. > > > > Do you see any alternative? > > Live with the warning, and document it in the release notes. That's an option too. But it will cause breakage when upgrading the host kernel, and force users to live with a broken setup because we don't provide CPU models that work. In addition to providing CPU models that work, I believe it's better to make QEMU CPU models match what is already happening in practice with the existing VMs. > > > We need AMD CPU models that can run > > out of the box using today's kernels. As no existing VMs running > > Opteron_G* on AMD CPUs have rdtscp, I believe it makes sense to > > just define Opteron_G* without rdtscp. > > > > When we add SVM rdtscp support to KVM, we can add new > > "Opteron_G[2-5]-rdtscp" CPU models. > > Makes sense too. > > However, I'm a bit afraid of the interaction with libvirt. Right now, > libvirt has rdtscp in the description. If we remove it from libvirt, > libvirt will start adding +rdtscp to the QEMU CPU command line option, > so our change will be moot. And if we do not remove it from libvirt, > libvirt will not be able to start a VM with rdtscp on a fixed kernel. The former is not true (the change won't be moot). The latter seems true. AFAIK, the presence of rdtscp in cpu_map.xml only does two things: * Makes libvirt never use "-cpu Opteron_G2,+rdtscp" even if the user explicitly asked for rdtscp (which is a libvirt bug that should be fixed); * Makes libvirt refuse to run Opteron_G2 in hosts that lack rdtscp (which is also a libvirt bug, because it's checking host CPUID directly instead of GET_SUPPORTED_CPUID; libvirt must let QEMU check if the feature is really available). -- Eduardo

1 0

[libvirt] [RFC] migration encryption
by Nikolay Shirokovskiy 12 Nov '15

12 Nov '15

Hi guys. I have a problem getting migration traffic encrypted for some scenarios. I need to migrate domain with non shared disks and can't use tunelled migration because of RHEL7 qemu. Without tunnel i get both vm state and disk state traffic unencrypted between peer's qemus. AFAIK there is a work in progress in qemu to bring TLS encryption to all channels and eventually I get desired functionality but what are my options now? I thinking of forwarding ports from destination to source and use localhost in hypervisor uri. The only problem is that port for disk migration is auto selected. Can we add a patch to pass this port as a migration parameter?

2 4

[libvirt] [PATCHv2 0/3] Hyper-v crash feature support
by Dmitry Andreev 12 Nov '15

12 Nov '15

A new Hyper-V cpu feature 'hv_crash' was added to QEMU. The feature will become available in v2.5.0. This patch adds support for this feature. Dmitry Andreev (3): conf: add 'model' attribute for panic device with values isa, pseries, hyperv qemu: add support for hv_crash feature as a panic device tests: add tests for panic device with model 'hyperv' docs/formatdomain.html.in | 29 ++++++++++++- docs/schemas/domaincommon.rng | 9 ++++ src/conf/domain_conf.c | 33 ++++++++++++--- src/conf/domain_conf.h | 10 +++++ src/qemu/qemu_command.c | 48 +++++++++++++++++++--- src/qemu/qemu_domain.c | 4 ++ tests/qemuargv2xmltest.c | 1 + .../qemuxml2argv-hyperv-panic.args | 21 ++++++++++ .../qemuxml2argvdata/qemuxml2argv-hyperv-panic.xml | 25 +++++++++++ .../qemuxml2argv-panic-no-address.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-panic.xml | 2 +- .../qemuxml2argvdata/qemuxml2argv-pseries-disk.xml | 2 +- .../qemuxml2argv-pseries-nvram.xml | 2 +- .../qemuxml2argv-pseries-panic-address.xml | 2 +- .../qemuxml2argv-pseries-panic-no-address.xml | 2 +- tests/qemuxml2argvtest.c | 1 + .../qemuxml2xmlout-pseries-panic-missing.xml | 2 +- tests/qemuxml2xmltest.c | 1 + 18 files changed, 176 insertions(+), 20 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hyperv-panic.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hyperv-panic.xml -- 1.8.3.1

2 7

[libvirt] [PATCH 0/3] qemu: Tweak VFIO limit documentation
by Peter Krempa 12 Nov '15

12 Nov '15

Peter Krempa (3): qemu: domain: Restructurate control flow in qemuDomainGetMlockLimitBytes qemu: Explain mlock limit size more in detail qemu: Explain why mlock size is modified when def->mem.locked is enabled src/qemu/qemu_domain.c | 34 ++++++++++++++++++++++++++++------ 1 file changed, 28 insertions(+), 6 deletions(-) -- 2.6.2

2 6

[libvirt] Fwd: xen/libvirt freeze while attching network-device to vm´s
by Eric Blake 12 Nov '15

12 Nov '15

[edited to reduce size to get past moderation] -------- Forwarded Message -------- Date: Wed, 4 Nov 2015 15:57:26 +0100 From: max ustermann <ustermann78(a)web.de> To: libvirt-users(a)redhat.com Subject: xen/libvirt freeze while attching network-device to vm´s Message-ID: <20151104155726.72fd6109@linux-3go9> Hi, first sorry for the cross-posting, but i don Ìt known exactly if my problem belongs to xen or libvirt. I have an VM-Host with Xen 4.6.0 und libvirt 1.2.19. The Job of the Host is to resume in parallel 20 VM Ìs (HVM WinXp) attach a block-device to each VM , wait 60 Seconds, kill the VM and start from beginning. For that, a python script create for each vm a thread and each thread get a connection to the Libvirt-Daemon via "libvirt.open(None)" and do the resume, attach and so on in a loop. This Setup works fine, it do several thousand cycle without any problems. If i complement this setup, so that each vm get , additonal to the blockdevice an network-interface after resume, via "attachDevice" call from the python-script, i observe that libvirtd/xen freeze after 20 to 100 cycle. Their are no error-messages, no crash, noting in "dmesg" or "xl dmesg". When i attached to the libvirtd via gdb and do a "info thread", i get the following: Id Target Id Frame 21 Thread 0x7f792a92c700 (LWP 1312) "libvirtd" __lll_lock_wait () at ../nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S:135 20 Thread 0x7f792a12b700 (LWP 1313) "libvirtd" __lll_lock_wait () at ../nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S:135 19 Thread 0x7f792992a700 (LWP 1314) "libvirtd" __lll_lock_wait () at ../nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S:135 18 Thread 0x7f7929129700 (LWP 1315) "libvirtd" __lll_lock_wait () at ../nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S:135 17 Thread 0x7f7928928700 (LWP 1316) "libvirtd" __lll_lock_wait () at ../nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S:135 16 Thread 0x7f791bfff700 (LWP 1317) "libvirtd" __lll_lock_wait () at ../nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S:135 15 Thread 0x7f791b7fe700 (LWP 1318) "libvirtd" __lll_lock_wait () at ../nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S:135 14 Thread 0x7f791affd700 (LWP 1319) "libvirtd" __lll_lock_wait () at ../nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S:135 13 Thread 0x7f791a7fc700 (LWP 1320) "libvirtd" __lll_lock_wait () at ../nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S:135 12 Thread 0x7f7919ffb700 (LWP 1321) "libvirtd" __lll_lock_wait () at ../nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S:135 11 Thread 0x7f78fd6ff700 (LWP 1334) "libvirtd" pthread_cond_wait@@GLIBC_2.3.2 () at ../nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S:185 10 Thread 0x7f78fcefe700 (LWP 1335) "libvirtd" pthread_cond_wait@@GLIBC_2.3.2 () at ../nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S:185 9 Thread 0x7f78f3fff700 (LWP 1336) "libvirtd" pthread_cond_wait@@GLIBC_2.3.2 () at ../nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S:185 8 Thread 0x7f78ebfff700 (LWP 1337) "libvirtd" pthread_cond_wait@@GLIBC_2.3.2 () at ../nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S:185 7 Thread 0x7f78f37fe700 (LWP 1338) "libvirtd" pthread_cond_wait@@GLIBC_2.3.2 () at ../nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S:185 6 Thread 0x7f793bf94700 (LWP 1494) "libvirtd" 0x00007f79375c87fd in read () at ../sysdeps/unix/syscall-template.S:81 5 Thread 0x7f78f241d700 (LWP 17709) "libvirtd" __lll_lock_wait () at ../nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S:135 4 Thread 0x7f78f1c1c700 (LWP 17717) "libvirtd" __lll_lock_wait () at ../nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S:135 3 Thread 0x7f78f141b700 (LWP 17722) "libvirtd" __lll_lock_wait () at ../nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S:135 2 Thread 0x7f78f0c1a700 (LWP 17751) "libvirtd" __lll_lock_wait () at ../nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S:135 * 1 Thread 0x7f793c0428c0 (LWP 1269) "libvirtd" __lll_lock_wait () at ../nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S:135 i start to examine at thread 1 and get the fowlling bt: #0 __lll_lock_wait () at ../nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S:135 #1 0x00007f79375c411b in _L_lock_812 () from /lib64/libpthread.so.0 #2 0x00007f79375c3fe8 in __GI___pthread_mutex_lock (mutex=0x7f78d80edd30) at ../nptl/pthread_mutex_lock.c:79 #3 0x00007f793b09cd0c in virMutexLock (m=0x7f78d80edd30) at util/virthread.c:89 #4 0x00007f793b07d831 in virObjectLock (anyobj=0x7f78d80edd20) at util/virobject.c:323 #5 0x00007f793b0b71d7 in virDomainObjListFindByID (doms=0x7f78d80edd20, id=1) at conf/domain_conf.c:1237 #6 0x00007f78fe3f7eb3 in libxlDomainEventHandler (data=0x7f78d81ce940, event=0x7f793c30c2e0) at libxl/libxl_domain.c:534 #7 0x00007f793806f7c0 in egc_run_callbacks (egc=egc@entry=0x7ffdb79c7490) at libxl_event.c:1405 #8 0x00007f793806fb9d in libxl__egc_cleanup (egc=0x7ffdb79c7490) at libxl_event.c:1436 #9 libxl_osevent_occurred_fd (ctx=<optimized out>, for_libxl=0x7f78d80ec220, fd=27, events_ign=<optimized out>, revents_ign=<optimized out>) at libxl_event.c:1339 #10 0x00007f78fe3f9ac5 in libxlFDEventCallback (watch=11, fd=27, vir_events=1, fd_info=0x7f78d811c430) at libxl/libxl_driver.c:134 #11 0x00007f793b04a9c4 in virEventPollDispatchHandles (nfds=31, fds=0x7f793c30b510) at util/vireventpoll.c:509 #12 0x00007f793b04b224 in virEventPollRunOnce () at util/vireventpoll.c:658 #13 0x00007f793b0490cd in virEventRunDefaultImpl () at util/virevent.c:308 #14 0x00007f793b1f5ab6 in virNetDaemonRun (dmn=0x7f793c2e1b80) at rpc/virnetdaemon.c:701 #15 0x00007f793be0bc27 in main (argc=1, argv=0x7ffdb79c7d78) at libvirtd.c:1577 i select frame 3 and look who holds the lock: (gdb) frame 3 #3 0x00007f793b09cd0c in virMutexLock (m=0x7f78d80edd30) at util/virthread.c:89 89 pthread_mutex_lock(&m->lock); (gdb) p *m $5 = {lock = {__data = {__lock = 2, __count = 0, __owner = 1312, __nusers = 1, __kind = 512, __spins = 0, __elision = 0, __list = {__prev = 0x0, __next = 0x0}}, __size = "\002\000\000\000\000\000\000\000 \005\000\000\001\000\000\000\000\002", '\000' <repeats 21 times>, __align = 2}} i switch to frame 21 (LWP1312) i taek a look to the bt: (gdb) bt #0 __lll_lock_wait () at ../nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S:135 #1 0x00007f79375c411b in _L_lock_812 () from /lib64/libpthread.so.0 #2 0x00007f79375c3fe8 in __GI___pthread_mutex_lock (mutex=0x7f79140099d0) at ../nptl/pthread_mutex_lock.c:79 #3 0x00007f793b09cd0c in virMutexLock (m=0x7f79140099d0) at util/virthread.c:89 #4 0x00007f793b07d831 in virObjectLock (anyobj=0x7f79140099c0) at util/virobject.c:323 #5 0x00007f793b0b717f in virDomainObjListSearchID (payload=0x7f79140099c0, name=0x7f791400f7c0, data=0x7f792a92b464) at conf/domain_conf.c:1225 #6 0x00007f793b055f1e in virHashSearch (ctable=0x7f78d81ccc40, iter=0x7f793b0b7148 <virDomainObjListSearchID>, data=0x7f792a92b464) at util/virhash.c:724 #7 0x00007f793b0b71f2 in virDomainObjListFindByID (doms=0x7f78d80edd20, id=2) at conf/domain_conf.c:1238 #8 0x00007f78fe3f7eb3 in libxlDomainEventHandler (data=0x7f78d81ce940, event=0x7f791c005610) at libxl/libxl_domain.c:534 #9 0x00007f793806f7c0 in egc_run_callbacks (egc=egc@entry=0x7f792a92b580) at libxl_event.c:1405 #10 0x00007f7938070f8b in libxl__egc_cleanup (egc=0x7f792a92b580) at libxl_event.c:1436 #11 libxl__ao_inprogress (ao=ao@entry=0x7f791c00c6e0, file=file@entry=0x7f793808d512 "libxl.c", line=line@entry=4226, func=func@entry=0x7f7938090150 <__func__.20288> "libxl_device_nic_add") at libxl_event.c:2014 #12 0x00007f7938048fa6 in libxl_device_nic_add (ctx=0x7f78d8112830, domid=19, nic=0x7f792a92b6b0, ao_how=<optimized out>) at libxl.c:4226 #13 0x00007f78fe402baa in libxlDomainAttachNetDevice (driver=0x7f78d81ce940, vm=0x7f79140099c0, net=0x7f791c003610) at libxl/libxl_driver.c:3199 #14 0x00007f78fe402d12 in libxlDomainAttachDeviceLive (driver=0x7f78d81ce940, vm=0x7f79140099c0, dev=0x7f791c001350) at libxl/libxl_driver.c:3231 #15 0x00007f78fe404135 in libxlDomainAttachDeviceFlags (dom=0x7f791c009150, xml=0x7f791c009230 "<interface type=\"bridge\">\n <source bridge=\"xenbr0\" />\n <model type=\"rtl8139\" />\n <mac address=\"00:27:0e:0c:01:09\" />\n </interface>", flags=1) at libxl/libxl_driver.c:3707 #16 0x00007f78fe404239 in libxlDomainAttachDevice (dom=0x7f791c009150, xml=0x7f791c009230 "<interface type=\"bridge\">\n <source bridge=\"xenbr0\" />\n <model type=\"rtl8139\" />\n <mac address=\"00:27:0e:0c:01:09\" />\n </interface>") at libxl/libxl_driver.c:3745 #17 0x00007f793b18422c in virDomainAttachDevice (domain=0x7f791c009150, xml=0x7f791c009230 "<interface type=\"bridge\">\n <source bridge=\"xenbr0\" />\n <model type=\"rtl8139\" />\n <mac address=\"00:27:0e:0c:01:09\" />\n </interface>") at libvirt-domain.c:8351 #18 0x00007f793be11a1f in remoteDispatchDomainAttachDevice (server=0x7f793c2e0a90, client=0x7f793c2f34c0, msg=0x7f793c2feca0, rerr=0x7f792a92bab0, args=0x7f791c009190) at remote_dispatch.h:2850 #19 0x00007f793be11923 in remoteDispatchDomainAttachDeviceHelper (server=0x7f793c2e0a90, client=0x7f793c2f34c0, msg=0x7f793c2feca0, rerr=0x7f792a92bab0, args=0x7f791c009190, ret=0x7f791c009130) at remote_dispatch.h:2826 #20 0x00007f793b1fccfc in virNetServerProgramDispatchCall (prog=0x7f793c2eefd0, server=0x7f793c2e0a90, client=0x7f793c2f34c0, msg=0x7f793c2feca0) at rpc/virnetserverprogram.c:437 #21 0x00007f793b1fc863 in virNetServerProgramDispatch (prog=0x7f793c2eefd0, server=0x7f793c2e0a90, client=0x7f793c2f34c0, msg=0x7f793c2feca0) at rpc/virnetserverprogram.c:307 #22 0x00007f793b1f5e6d in virNetServerProcessMsg (srv=0x7f793c2e0a90, client=0x7f793c2f34c0, prog=0x7f793c2eefd0, msg=0x7f793c2feca0) at rpc/virnetserver.c:135 #23 0x00007f793b1f5f3a in virNetServerHandleJob (jobOpaque=0x7f793c302c60, opaque=0x7f793c2e0a90) at rpc/virnetserver.c:156 #24 0x00007f793b09d9f7 in virThreadPoolWorker (opaque=0x7f793c2e0750) at util/virthreadpool.c:145 #25 0x00007f793b09d00a in virThreadHelper (data=0x7f793c2eced0) at util/virthread.c:206 #26 0x00007f79375c1ee5 in start_thread (arg=0x7f792a92c700) at pthread_create.c:309 #27 0x00007f79372f0d1d in clone () at ../sysdeps/unix/sysv/linux/x86_64/clone.S:111 here i select frame 3 and look who holds the lock: (gdb) frame 3 #3 0x00007f793b09cd0c in virMutexLock (m=0x7f79140099d0) at util/virthread.c:89 89 pthread_mutex_lock(&m->lock); $6 = {lock = {__data = {__lock = 2, __count = 0, __owner = 1312, __nusers = 1, __kind = 512, __spins = 0, __elision = 0, __list = {__prev = 0x0, __next = 0x0}}, __size = "\002\000\000\000\000\000\000\000 \005\000\000\001\000\000\000\000\002", '\000' <repeats 21 times>, __align = 2}} so i see that thread 21 waits for a lock that holds by thread 21 from frame 4 i see, that the process want a lock for vm object: #4 0x00007f793b07d831 in virObjectLock (anyobj=0x7f79140099c0) at util/virobject.c:323 further down in the bt i see in frame 14: #14 0x00007f78fe402d12 in libxlDomainAttachDeviceLive (driver=0x7f78d81ce940, vm=0x7f79140099c0, dev=0x7f791c001350) at libxl/libxl_driver.c:3231 that vm-object 0x7f79140099c0 is the object for that also a network-device should be attached. And from that i know that there is a lock on the vm-object. so i go up in the bt an see that libxlDomainAttachDeviceLive(libvirtd) (frame14) calls libxlDomainAttachNetDevice(libvirtd) (frame13), that calls libxl_device_nic_add(libxl/xen) (frame12) from info frame for frame12 i see that he calls frame 0x7f792a92b5f0: (gdb) info f Stack level 12, frame at 0x7f792a92b670: rip = 0x7f7938048fa6 in libxl_device_nic_add (libxl.c:4226); saved rip = 0x7f78fe402baa called by frame at 0x7f792a92b760, caller of frame at 0x7f792a92b5f0 source language c. Arglist at 0x7f792a92b5e8, args: ctx=0x7f78d8112830, domid=19, nic=0x7f792a92b6b0, ao_how=<optimized out> Locals at 0x7f792a92b5e8, Previous frame's sp is 0x7f792a92b670 Saved registers: rbx at 0x7f792a92b640, rbp at 0x7f792a92b648, r12 at 0x7f792a92b650, r13 at 0x7f792a92b658, r14 at 0x7f792a92b660, rip at 0x7f792a92b668 and this is frame 11 libxl__ao_inprogress (ao=ao@entry=0x7f791c00c6e0, file=file@entry=0x7f793808d512 "libxl.c", line=line@entry=4226, func=func@entry=0x7f7938090150 <__func__.20288> "libxl_device_nic_add") at libxl_event.c:2014 so further i see that libxl__ao_inprogress calls libxl__egc_cleanup and that calls egc_run_callbacks, frame 9 info frame for frame 9 gives: (gdb) info f Stack level 9, frame at 0x7f792a92b540: rip = 0x7f793806f7c0 in egc_run_callbacks (libxl_event.c:1405); saved rip = 0x7f7938070f8b called by frame at 0x7f792a92b5f0, caller of frame at 0x7f792a92b500 source language c. Arglist at 0x7f792a92b4f8, args: egc=egc@entry=0x7f792a92b580 Locals at 0x7f792a92b4f8, Previous frame's sp is 0x7f792a92b540 Saved registers: rbx at 0x7f792a92b520, rbp at 0x7f792a92b528, r12 at 0x7f792a92b530, rip at 0x7f792a92b538 and list gives: (gdb) list 1400 1401 LIBXL_TAILQ_FOREACH_SAFE(ev, &egc->occurred_for_callback, link, ev_tmp) { 1402 LIBXL_TAILQ_REMOVE(&egc->occurred_for_callback, ev, link); 1403 LOG(DEBUG,"event %p callback type=%s", 1404 ev, libxl_event_type_to_string(ev->type)); 1405 CTX->event_hooks->event_occurs(CTX->event_hooks_user, ev); 1406 } 1407 1408 LIBXL_TAILQ_FOREACH_SAFE(aop, &egc->aops_for_callback, entry, aop_tmp) { 1409 LIBXL_TAILQ_REMOVE(&egc->aops_for_callback, aop, entry); from here i see that egc_run_callbacks is at line 1405 " CTX->event_hooks->event_occurs(CTX->event_hooks_user, ev);" , but i have no idea what he is doing there and while it "hangs" here!?! if i see it correctly, the systems freeze/hangs because it waits of the release of the lock for the vm which actuall attach a network-device, and the process of attaching the network-device didn Ìt finished and hold the lock. as i say at the geginning of my mail, if i only attach a block-device to the vm`s every thing runs, and with additional attaching a network-device after 20 to 100 resume , it freezeÂ´s. i am gratefull for any help,hints and tips for further debugging. all the best max for completness , here are the output of "(gdb) thread apply all bt full": [trimmed by moderator]

2 1

[libvirt] libvirt-snmp development
by Maxim Nestratov 12 Nov '15

12 Nov '15

Hi all, There were no active develoment in libvirt-snmp subproject for a while. Taking this into account I want to ask the following. If we are, here in Virtuozzo, interested in extending this subproject, will there be support from project maintainers in doing this or not? Maxim Nestratov

5 8

[libvirt] [PATCH] libxl: open libxl log stream with libvirtd log_level
by Jim Fehlig 12 Nov '15

12 Nov '15

Instead of a hardcoded DEBUG log level, use the overall daemon log level specified in libvirtd.conf when opening a log stream with libxl. libxl is very verbose when DEBUG log level is set, resulting in huge log files that can potentially fill a disk. Control of libxl verbosity should be placed in the administrator's hands. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- src/libxl/libxl_conf.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index a76ad5a..40fa4b5 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -1496,6 +1496,7 @@ libxlDriverConfigNew(void) { libxlDriverConfigPtr cfg; char *log_file = NULL; + xentoollog_level log_level; char ebuf[1024]; unsigned int free_mem; @@ -1540,9 +1541,24 @@ libxlDriverConfigNew(void) } VIR_FREE(log_file); + switch (virLogGetDefaultPriority()) { + case VIR_LOG_DEBUG: + log_level = XTL_DEBUG; + break; + case VIR_LOG_INFO: + log_level = XTL_INFO; + break; + case VIR_LOG_WARN: + log_level = XTL_WARN; + break; + case VIR_LOG_ERROR: + log_level = XTL_ERROR; + break; + } + cfg->logger = (xentoollog_logger *)xtl_createlogger_stdiostream(cfg->logger_file, - XTL_DEBUG, XTL_STDIOSTREAM_SHOW_DATE); + log_level, XTL_STDIOSTREAM_SHOW_DATE); if (!cfg->logger) { VIR_ERROR(_("cannot create logger for libxenlight, disabling driver")); goto error; -- 2.5.0

5 11

[libvirt] [PATCH v2 00/17] Drop support for QEMU < 0.12.0
by Daniel P. Berrange 11 Nov '15

11 Nov '15

A v2 of this series: https://www.redhat.com/archives/libvir-list/2015-November/msg00165.html The patches for introducing virtlogd will be significantly simplified if we don't need to worry about parsing stderr during startup. This is required prior to QEMU 0.11 so that we can get the dyanamically allocated /dev/pty/NNN paths. The QEMU 0.12.1 release was shipped in RHEL-6 vintage distros and is already quite old, so seems like a fair target version to aim for as the minimum required. By dropping support for anything older than QEMU 0.12.0 we can remove the code for parsing stderr. The QEMU 0.12.0 release was quite special because it was the release where QEMU switched what I call its "modern" approach to configuration via -device. A major part of the complexity of the QEMU command line generator is due to need to support non-device syntax, so by mandating QEMU 0.12.0 we'll be able to kill off alot of conditional code. This series makes a start by assuming existance of 5 features, -vnc, 'info chardev', -no-reboot, -drive and -name, but there are a tonne more we can assume. This series drops 20 QEMU_CAPS_* flags, but there are still another ~15-20 that can be dropped, now we assume 0.12.0 or better. Changed in v2: - Fixed misc coverity reports from John - Rebased to use test .args files with new line wrapping for clarity - Split out some fixes into separate patches - Dropped a bunch more capabilities Daniel P. Berrange (17): qemu: mandate QEMU version 0.12.0 or newer qemu: remove all support for kQEMU qemu: assume -vnc arg always takes a ':' qemu: assume 'info chardev' is always available qemu: assume -no-reboot is always available qemu: handle USB bus in qemuAssignDeviceDiskAliasFixed() qemu: handle floppy disk bus when parsing command line argv qemu: assume -drive argument is always available qemu: assume -name is always available qemu: assume -uuid is always available qemu: really remove last traces of Xenner support qemu: assume vnet-hdr feature is always available qemu: assume support for all migration protocols except rdma qemu: assume -drive cache always uses v2 option names qemu: assume -drive format is always available qemu: assume -vga is always available qemu: assume various QEMU 0.10 features are always available src/qemu/qemu_capabilities.c | 145 +--- src/qemu/qemu_capabilities.h | 57 +- src/qemu/qemu_command.c | 748 +++++++-------------- src/qemu/qemu_command.h | 2 - src/qemu/qemu_hotplug.c | 15 +- src/qemu/qemu_migration.c | 77 +-- src/qemu/qemu_process.c | 204 +----- tests/qemuargv2xmltest.c | 7 - tests/qemucapabilitiesdata/caps_1.2.2-1.caps | 14 - tests/qemucapabilitiesdata/caps_1.3.1-1.caps | 14 - tests/qemucapabilitiesdata/caps_1.4.2-1.caps | 14 - tests/qemucapabilitiesdata/caps_1.5.3-1.caps | 14 - tests/qemucapabilitiesdata/caps_1.6.0-1.caps | 14 - tests/qemucapabilitiesdata/caps_1.6.50-1.caps | 14 - tests/qemucapabilitiesdata/caps_2.1.1-1.caps | 14 - tests/qemucaps2xmldata/all_1.6.0-1.caps | 14 - tests/qemucaps2xmldata/nodisksnapshot_1.6.0-1.caps | 14 - tests/qemuhelpdata/kvm-74 | 111 --- tests/qemuhelpdata/kvm-83-rhel56 | 141 ---- tests/qemuhelpdata/kvm-86 | 170 ----- tests/qemuhelpdata/qemu-0.10.5 | 141 ---- tests/qemuhelpdata/qemu-0.9.1 | 102 --- tests/qemuhelpdata/qemu-kvm-0.10.5 | 155 ----- tests/qemuhelpdata/qemu-kvm-0.11.0-rc2 | 177 ----- tests/qemuhelptest.c | 276 -------- tests/qemuhotplugtest.c | 2 - .../qemuxml2argv-aarch64-aavmf-virtio-mmio.args | 4 +- .../qemuxml2argv-aarch64-cpu-passthrough.args | 4 +- .../qemuxml2argvdata/qemuxml2argv-aarch64-gic.args | 2 + .../qemuxml2argv-aarch64-gicv3.args | 2 + .../qemuxml2argv-aarch64-kvm-32-on-64.args | 4 +- .../qemuxml2argv-aarch64-mmio-default-pci.args | 4 +- .../qemuxml2argv-aarch64-virt-default-nic.args | 2 + .../qemuxml2argv-aarch64-virt-virtio.args | 4 +- .../qemuxml2argv-aarch64-virtio-pci.args | 4 +- .../qemuxml2argv-arm-vexpressa9-basic.args | 4 +- .../qemuxml2argv-arm-vexpressa9-nodevs.args | 2 + .../qemuxml2argv-arm-vexpressa9-virtio.args | 4 +- .../qemuxml2argv-arm-virt-virtio.args | 4 +- .../qemuxml2argv-balloon-device-auto.args | 5 +- .../qemuxml2argv-balloon-device-period.args | 5 +- .../qemuxml2argv-balloon-device.args | 5 +- .../qemuxml2argvdata/qemuxml2argv-bios-nvram.args | 2 + tests/qemuxml2argvdata/qemuxml2argv-bios.args | 5 +- .../qemuxml2argv-blkdeviotune-max.args | 9 +- .../qemuxml2argv-blkdeviotune.args | 9 +- .../qemuxml2argv-blkiotune-device.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-blkiotune.args | 3 +- .../qemuxml2argvdata/qemuxml2argv-boot-cdrom.args | 4 +- .../qemuxml2argv-boot-complex-bootindex.args | 16 +- .../qemuxml2argv-boot-complex.args | 16 +- .../qemuxml2argv-boot-floppy-q35.args | 4 +- .../qemuxml2argvdata/qemuxml2argv-boot-floppy.args | 6 +- ...xml2argv-boot-menu-disable-drive-bootindex.args | 4 +- .../qemuxml2argv-boot-menu-disable-drive.args | 4 +- .../qemuxml2argv-boot-menu-disable.args | 4 +- ...qemuxml2argv-boot-menu-enable-with-timeout.args | 4 +- .../qemuxml2argv-boot-menu-enable.args | 4 +- .../qemuxml2argvdata/qemuxml2argv-boot-multi.args | 4 +- .../qemuxml2argv-boot-network.args | 4 +- .../qemuxml2argvdata/qemuxml2argv-boot-order.args | 11 +- .../qemuxml2argvdata/qemuxml2argv-boot-strict.args | 16 +- .../qemuxml2argv-bootindex-floppy-q35.args | 4 +- .../qemuxml2argv-channel-guestfwd.args | 5 +- .../qemuxml2argv-channel-spicevmc-old.args | 6 +- .../qemuxml2argv-channel-spicevmc.args | 6 +- .../qemuxml2argv-channel-virtio-auto.args | 5 +- .../qemuxml2argv-channel-virtio-autoadd.args | 5 +- .../qemuxml2argv-channel-virtio-autoassign.args | 5 +- .../qemuxml2argv-channel-virtio-default.args | 5 +- .../qemuxml2argv-channel-virtio-state.args | 5 +- .../qemuxml2argv-channel-virtio-unix.args | 5 +- .../qemuxml2argv-channel-virtio.args | 5 +- .../qemuxml2argv-clock-catchup.args | 4 +- .../qemuxml2argv-clock-france.args | 4 +- .../qemuxml2argv-clock-hpet-off.args | 4 +- ...muxml2argv-clock-localtime-basis-localtime.args | 4 +- .../qemuxml2argv-clock-localtime.args | 4 +- .../qemuxml2argv-clock-timer-hyperv-rtc.args | 2 + tests/qemuxml2argvdata/qemuxml2argv-clock-utc.args | 10 +- tests/qemuxml2argvdata/qemuxml2argv-clock-utc.xml | 2 +- .../qemuxml2argv-clock-variable.args | 4 +- .../qemuxml2argv-console-compat-auto.args | 4 +- .../qemuxml2argv-console-compat-chardev.args | 5 +- .../qemuxml2argv-console-compat.args | 4 +- .../qemuxml2argv-console-sclp.args | 4 +- .../qemuxml2argv-console-virtio-ccw.args | 4 +- .../qemuxml2argv-console-virtio-many.args | 5 +- .../qemuxml2argv-console-virtio-s390.args | 4 +- .../qemuxml2argv-console-virtio.args | 5 +- .../qemuxml2argv-controller-order.args | 8 +- .../qemuxml2argv-cpu-Haswell-noTSX.args | 2 + .../qemuxml2argvdata/qemuxml2argv-cpu-Haswell.args | 2 + .../qemuxml2argv-cpu-Haswell2.args | 2 + .../qemuxml2argv-cpu-Haswell3.args | 2 + .../qemuxml2argv-cpu-eoi-disabled.args | 2 + .../qemuxml2argv-cpu-eoi-enabled.args | 2 + .../qemuxml2argvdata/qemuxml2argv-cpu-exact1.args | 2 + .../qemuxml2argv-cpu-exact2-nofallback.args | 2 + .../qemuxml2argvdata/qemuxml2argv-cpu-exact2.args | 2 + .../qemuxml2argv-cpu-fallback.args | 2 + .../qemuxml2argv-cpu-host-kvmclock.args | 2 + .../qemuxml2argv-cpu-host-model-fallback.args | 2 + .../qemuxml2argv-cpu-host-model-vendor.args | 2 + .../qemuxml2argv-cpu-host-model.args | 2 + ...qemuxml2argv-cpu-host-passthrough-features.args | 4 +- .../qemuxml2argv-cpu-host-passthrough.args | 2 + .../qemuxml2argv-cpu-kvmclock.args | 2 + .../qemuxml2argv-cpu-minimum1.args | 2 + .../qemuxml2argv-cpu-minimum2.args | 2 + .../qemuxml2argv-cpu-numa-disjoint.args | 2 + .../qemuxml2argv-cpu-numa-no-memory-element.args | 2 + tests/qemuxml2argvdata/qemuxml2argv-cpu-numa1.args | 2 + tests/qemuxml2argvdata/qemuxml2argv-cpu-numa2.args | 2 + .../qemuxml2argvdata/qemuxml2argv-cpu-strict1.args | 2 + .../qemuxml2argv-cpu-topology1.args | 2 + .../qemuxml2argv-cpu-topology2.args | 2 + .../qemuxml2argv-cpu-topology3.args | 2 + .../qemuxml2argv-cputune-numatune.args | 2 + .../qemuxml2argv-cputune-zero-shares.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-cputune.args | 3 +- .../qemuxml2argv-default-kvm-host-arch.args | 2 + .../qemuxml2argv-default-qemu-host-arch.args | 2 + tests/qemuxml2argvdata/qemuxml2argv-disk-aio.args | 2 + .../qemuxml2argv-disk-blockio.args | 6 +- .../qemuxml2argv-disk-cdrom-empty.args | 6 +- .../qemuxml2argv-disk-cdrom-network-ftp.args | 4 +- .../qemuxml2argv-disk-cdrom-network-ftps.args | 4 +- .../qemuxml2argv-disk-cdrom-network-http.args | 4 +- .../qemuxml2argv-disk-cdrom-network-https.args | 4 +- .../qemuxml2argv-disk-cdrom-network-tftp.args | 4 +- ...qemuxml2argv-disk-cdrom-tray-no-device-cap.args | 5 +- .../qemuxml2argv-disk-cdrom-tray.args | 9 +- .../qemuxml2argvdata/qemuxml2argv-disk-cdrom.args | 6 +- .../qemuxml2argv-disk-copy_on_read.args | 6 +- .../qemuxml2argv-disk-drive-boot-cdrom.args | 6 +- .../qemuxml2argv-disk-drive-boot-disk.args | 6 +- .../qemuxml2argv-disk-drive-cache-directsync.args | 2 + .../qemuxml2argv-disk-drive-cache-unsafe.args | 2 + .../qemuxml2argv-disk-drive-cache-v1-none.args | 21 - .../qemuxml2argv-disk-drive-cache-v1-none.xml | 35 - .../qemuxml2argv-disk-drive-cache-v1-wb.args | 21 - .../qemuxml2argv-disk-drive-cache-v1-wb.xml | 35 - .../qemuxml2argv-disk-drive-cache-v1-wt.args | 21 - .../qemuxml2argv-disk-drive-cache-v1-wt.xml | 35 - .../qemuxml2argv-disk-drive-cache-v2-none.args | 2 + .../qemuxml2argv-disk-drive-cache-v2-wb.args | 2 + .../qemuxml2argv-disk-drive-cache-v2-wt.args | 2 + .../qemuxml2argv-disk-drive-copy-on-read.args | 2 + .../qemuxml2argv-disk-drive-discard.args | 6 +- ...uxml2argv-disk-drive-error-policy-enospace.args | 4 +- .../qemuxml2argv-disk-drive-error-policy-stop.args | 4 +- ...gv-disk-drive-error-policy-wreport-rignore.args | 4 +- .../qemuxml2argv-disk-drive-fat.args | 2 + .../qemuxml2argv-disk-drive-fmt-qcow.args | 2 + .../qemuxml2argv-disk-drive-network-gluster.args | 2 + ...qemuxml2argv-disk-drive-network-iscsi-auth.args | 2 + .../qemuxml2argv-disk-drive-network-iscsi-lun.args | 2 + .../qemuxml2argv-disk-drive-network-iscsi.args | 2 + ...qemuxml2argv-disk-drive-network-nbd-export.args | 2 + ...ml2argv-disk-drive-network-nbd-ipv6-export.args | 2 + .../qemuxml2argv-disk-drive-network-nbd-ipv6.args | 2 + .../qemuxml2argv-disk-drive-network-nbd-unix.args | 2 + .../qemuxml2argv-disk-drive-network-nbd.args | 2 + .../qemuxml2argv-disk-drive-network-rbd-auth.args | 2 + ...muxml2argv-disk-drive-network-rbd-ceph-env.args | 4 +- .../qemuxml2argv-disk-drive-network-rbd-ipv6.args | 2 + .../qemuxml2argv-disk-drive-network-rbd.args | 2 + .../qemuxml2argv-disk-drive-network-sheepdog.args | 2 + .../qemuxml2argv-disk-drive-no-boot.args | 9 +- .../qemuxml2argv-disk-drive-readonly-disk.args | 7 +- ...qemuxml2argv-disk-drive-readonly-no-device.args | 6 +- .../qemuxml2argv-disk-drive-shared.args | 4 +- .../qemuxml2argv-disk-floppy-pseries.args | 8 +- ...emuxml2argv-disk-floppy-tray-no-device-cap.args | 7 +- .../qemuxml2argv-disk-floppy-tray.args | 8 +- .../qemuxml2argvdata/qemuxml2argv-disk-floppy.args | 8 +- .../qemuxml2argv-disk-geometry.args | 6 +- .../qemuxml2argv-disk-ide-drive-split.args | 6 +- .../qemuxml2argv-disk-ide-wwn.args | 4 +- .../qemuxml2argv-disk-ioeventfd.args | 7 +- .../qemuxml2argv-disk-ioeventfd.xml | 1 + .../qemuxml2argvdata/qemuxml2argv-disk-iscsi.args | 7 +- tests/qemuxml2argvdata/qemuxml2argv-disk-many.args | 10 +- .../qemuxml2argvdata/qemuxml2argv-disk-order.args | 11 +- .../qemuxml2argv-disk-sata-device.args | 4 +- .../qemuxml2argv-disk-scsi-device-auto.args | 6 +- .../qemuxml2argv-disk-scsi-device.args | 6 +- .../qemuxml2argv-disk-scsi-disk-split.args | 10 +- .../qemuxml2argv-disk-scsi-disk-vpd.args | 6 +- .../qemuxml2argv-disk-scsi-disk-wwn.args | 6 +- .../qemuxml2argv-disk-scsi-lun-passthrough.args | 6 +- .../qemuxml2argv-disk-scsi-megasas.args | 6 +- .../qemuxml2argv-disk-scsi-virtio-scsi.args | 6 +- .../qemuxml2argv-disk-scsi-vscsi.args | 6 +- .../qemuxml2argvdata/qemuxml2argv-disk-serial.args | 4 +- .../qemuxml2argv-disk-snapshot.args | 2 + .../qemuxml2argv-disk-source-pool-mode.args | 4 +- .../qemuxml2argv-disk-source-pool.args | 6 +- .../qemuxml2argv-disk-usb-device-removable.args | 6 +- .../qemuxml2argv-disk-usb-device.args | 6 +- tests/qemuxml2argvdata/qemuxml2argv-disk-usb.args | 4 +- .../qemuxml2argv-disk-virtio-ccw-many.args | 10 +- .../qemuxml2argv-disk-virtio-ccw.args | 6 +- .../qemuxml2argv-disk-virtio-s390.args | 4 +- .../qemuxml2argv-disk-virtio-scsi-ccw.args | 6 +- .../qemuxml2argv-disk-virtio-scsi-cmd_per_lun.args | 4 +- .../qemuxml2argv-disk-virtio-scsi-ioeventfd.args | 4 +- .../qemuxml2argv-disk-virtio-scsi-max_sectors.args | 4 +- .../qemuxml2argv-disk-virtio-scsi-num_queues.args | 4 +- .../qemuxml2argvdata/qemuxml2argv-disk-virtio.args | 10 +- .../qemuxml2argvdata/qemuxml2argv-disk-xenvbd.args | 10 +- .../qemuxml2argv-encrypted-disk.args | 3 +- .../qemuxml2argv-eoi-disabled.args | 2 + .../qemuxml2argvdata/qemuxml2argv-eoi-enabled.args | 2 + tests/qemuxml2argvdata/qemuxml2argv-event_idx.args | 7 +- .../qemuxml2argv-fips-enabled.args | 4 +- .../qemuxml2argv-floppy-drive-fat.args | 2 + tests/qemuxml2argvdata/qemuxml2argv-fs9p-ccw.args | 4 +- tests/qemuxml2argvdata/qemuxml2argv-fs9p.args | 5 +- .../qemuxml2argv-graphics-sdl-fullscreen.args | 8 +- .../qemuxml2argv-graphics-sdl.args | 7 +- ...emuxml2argv-graphics-spice-agent-file-xfer.args | 5 +- .../qemuxml2argv-graphics-spice-agentmouse.args | 5 +- .../qemuxml2argv-graphics-spice-compression.args | 5 +- .../qemuxml2argv-graphics-spice-qxl-vga.args | 5 +- .../qemuxml2argv-graphics-spice-sasl.args | 5 +- .../qemuxml2argv-graphics-spice-timeout.args | 7 +- .../qemuxml2argv-graphics-spice-usb-redir.args | 2 + .../qemuxml2argv-graphics-spice.args | 5 +- .../qemuxml2argv-graphics-vnc-policy.args | 7 +- .../qemuxml2argv-graphics-vnc-sasl.args | 4 +- .../qemuxml2argv-graphics-vnc-socket.args | 7 +- .../qemuxml2argv-graphics-vnc-tls.args | 7 +- .../qemuxml2argv-graphics-vnc-websocket.args | 5 +- .../qemuxml2argv-graphics-vnc.args | 7 +- .../qemuxml2argv-hostdev-pci-address-device.args | 5 +- .../qemuxml2argv-hostdev-pci-address.args | 4 +- .../qemuxml2argv-hostdev-scsi-boot.args | 4 +- .../qemuxml2argv-hostdev-scsi-lsi-iscsi-auth.args | 4 +- .../qemuxml2argv-hostdev-scsi-lsi-iscsi.args | 4 +- .../qemuxml2argv-hostdev-scsi-lsi.args | 4 +- .../qemuxml2argv-hostdev-scsi-readonly.args | 4 +- ...emuxml2argv-hostdev-scsi-virtio-iscsi-auth.args | 4 +- .../qemuxml2argv-hostdev-scsi-virtio-iscsi.args | 4 +- .../qemuxml2argv-hostdev-scsi-virtio-scsi.args | 4 +- ...muxml2argv-hostdev-usb-address-device-boot.args | 5 +- .../qemuxml2argv-hostdev-usb-address-device.args | 5 +- .../qemuxml2argv-hostdev-usb-address.args | 4 +- .../qemuxml2argv-hostdev-vfio-multidomain.args | 5 +- .../qemuxml2argv-hostdev-vfio.args | 5 +- .../qemuxml2argv-hotplug-base.args | 2 + .../qemuxml2argv-hugepages-numa.args | 7 +- .../qemuxml2argv-hugepages-pages.args | 4 +- .../qemuxml2argv-hugepages-pages2.args | 4 +- .../qemuxml2argv-hugepages-pages3.args | 4 +- .../qemuxml2argv-hugepages-pages5.args | 4 +- .../qemuxml2argv-hugepages-pages6.args | 4 +- .../qemuxml2argv-hugepages-shared.args | 4 +- tests/qemuxml2argvdata/qemuxml2argv-hugepages.args | 4 +- .../qemuxml2argvdata/qemuxml2argv-hyperv-off.args | 2 + tests/qemuxml2argvdata/qemuxml2argv-hyperv.args | 2 + .../qemuxml2argv-input-usbmouse-addr.args | 5 +- .../qemuxml2argv-input-usbmouse.args | 4 +- .../qemuxml2argv-input-usbtablet.args | 4 +- .../qemuxml2argv-iothreads-disk-virtio-ccw.args | 6 +- .../qemuxml2argv-iothreads-disk.args | 10 +- .../qemuxml2argv-iothreads-ids-partial.args | 4 +- .../qemuxml2argv-iothreads-ids.args | 4 +- tests/qemuxml2argvdata/qemuxml2argv-iothreads.args | 4 +- .../qemuxml2argv-kvm-features-off.args | 2 + .../qemuxml2argv-kvm-features.args | 2 + .../qemuxml2argv-kvm-pit-delay.args | 4 +- .../qemuxml2argv-kvm-pit-device.args | 4 +- tests/qemuxml2argvdata/qemuxml2argv-kvm.args | 2 + .../qemuxml2argv-kvmclock+eoi-disabled.args | 2 + tests/qemuxml2argvdata/qemuxml2argv-kvmclock.args | 2 + tests/qemuxml2argvdata/qemuxml2argv-lease.args | 4 +- .../qemuxml2argv-machine-aeskeywrap-off-argv.args | 5 +- .../qemuxml2argv-machine-aeskeywrap-off-cap.args | 4 +- .../qemuxml2argv-machine-aeskeywrap-off-caps.args | 4 +- .../qemuxml2argv-machine-aeskeywrap-on-argv.args | 5 +- .../qemuxml2argv-machine-aeskeywrap-on-cap.args | 4 +- .../qemuxml2argv-machine-aeskeywrap-on-caps.args | 4 +- .../qemuxml2argv-machine-aliases1.args | 4 +- .../qemuxml2argv-machine-aliases2.args | 4 +- .../qemuxml2argv-machine-core-off.args | 4 +- .../qemuxml2argv-machine-core-on.args | 4 +- .../qemuxml2argv-machine-deakeywrap-off-argv.args | 5 +- .../qemuxml2argv-machine-deakeywrap-off-cap.args | 4 +- .../qemuxml2argv-machine-deakeywrap-off-caps.args | 4 +- .../qemuxml2argv-machine-deakeywrap-on-argv.args | 5 +- .../qemuxml2argv-machine-deakeywrap-on-cap.args | 4 +- .../qemuxml2argv-machine-deakeywrap-on-caps.args | 4 +- .../qemuxml2argv-machine-keywrap-none-argv.args | 5 +- .../qemuxml2argv-machine-keywrap-none-caps.args | 4 +- .../qemuxml2argv-machine-keywrap-none.args | 4 +- .../qemuxml2argv-machine-usb-opt.args | 4 +- .../qemuxml2argv-machine-vmport-opt.args | 4 +- .../qemuxml2argv-memory-hotplug-dimm-addr.args | 5 +- .../qemuxml2argv-memory-hotplug-dimm.args | 5 +- .../qemuxml2argv-memory-hotplug.args | 4 +- .../qemuxml2argv-memtune-unlimited.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-memtune.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-metadata.args | 3 +- .../qemuxml2argv-migrate-numa-unaligned.args | 4 +- tests/qemuxml2argvdata/qemuxml2argv-migrate.args | 4 +- .../qemuxml2argv-minimal-msg-timestamp.args | 3 +- .../qemuxml2argv-minimal-s390.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-minimal.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-misc-acpi.args | 4 +- .../qemuxml2argv-misc-disable-s3.args | 4 +- .../qemuxml2argv-misc-disable-suspends.args | 4 +- .../qemuxml2argv-misc-enable-s4.args | 4 +- .../qemuxml2argv-misc-no-reboot.args | 4 +- tests/qemuxml2argvdata/qemuxml2argv-misc-uuid.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-mlock-off.args | 2 + tests/qemuxml2argvdata/qemuxml2argv-mlock-on.args | 2 + .../qemuxml2argv-mlock-unsupported.args | 2 + .../qemuxml2argv-monitor-json.args | 5 +- .../qemuxml2argv-multifunction-pci-device.args | 4 +- .../qemuxml2argvdata/qemuxml2argv-net-client.args | 8 +- .../qemuxml2argv-net-eth-ifname.args | 8 +- .../qemuxml2argv-net-eth-names.args | 4 +- tests/qemuxml2argvdata/qemuxml2argv-net-eth.args | 8 +- .../qemuxml2argv-net-hostdev-multidomain.args | 5 +- .../qemuxml2argv-net-hostdev-vfio-multidomain.args | 5 +- .../qemuxml2argv-net-hostdev-vfio.args | 5 +- .../qemuxml2argvdata/qemuxml2argv-net-hostdev.args | 5 +- tests/qemuxml2argvdata/qemuxml2argv-net-mcast.args | 8 +- .../qemuxml2argvdata/qemuxml2argv-net-server.args | 8 +- tests/qemuxml2argvdata/qemuxml2argv-net-udp.args | 9 +- tests/qemuxml2argvdata/qemuxml2argv-net-user.args | 8 +- .../qemuxml2argv-net-vhostuser-multiq.args | 5 +- .../qemuxml2argv-net-vhostuser.args | 5 +- .../qemuxml2argv-net-virtio-ccw.args | 2 + .../qemuxml2argv-net-virtio-device.args | 5 +- .../qemuxml2argv-net-virtio-disable-offloads.args | 5 +- .../qemuxml2argv-net-virtio-netdev.args | 5 +- .../qemuxml2argv-net-virtio-s390.args | 2 + .../qemuxml2argvdata/qemuxml2argv-net-virtio.args | 8 +- .../qemuxml2argvdata/qemuxml2argv-no-shutdown.args | 5 +- .../qemuxml2argv-nographics-vga.args | 4 +- .../qemuxml2argvdata/qemuxml2argv-nographics.args | 4 +- .../qemuxml2argv-nosharepages.args | 4 +- ...qemuxml2argv-numad-auto-memory-vcpu-cpuset.args | 4 +- ...d-auto-memory-vcpu-no-cpuset-and-placement.args | 4 +- ...muxml2argv-numad-auto-vcpu-static-numatune.args | 4 +- ...qemuxml2argv-numad-static-memory-auto-vcpu.args | 4 +- tests/qemuxml2argvdata/qemuxml2argv-numad.args | 4 +- ...qemuxml2argv-numatune-auto-nodeset-invalid.args | 4 +- .../qemuxml2argv-numatune-auto-prefer.args | 2 + .../qemuxml2argv-numatune-memnode-no-memory.args | 2 + .../qemuxml2argv-numatune-memnode.args | 2 + .../qemuxml2argv-numatune-memory.args | 4 +- .../qemuxml2argv-panic-no-address.args | 5 +- tests/qemuxml2argvdata/qemuxml2argv-panic.args | 5 +- .../qemuxml2argv-parallel-parport-chardev.args | 5 +- .../qemuxml2argv-parallel-tcp-chardev.args | 5 +- .../qemuxml2argv-parallel-tcp.args | 4 +- .../qemuxml2argv-pci-autoadd-addr.args | 6 +- .../qemuxml2argv-pci-autoadd-idx.args | 6 +- .../qemuxml2argv-pci-bridge-many-disks.args | 317 ++++++--- tests/qemuxml2argvdata/qemuxml2argv-pci-many.args | 89 ++- tests/qemuxml2argvdata/qemuxml2argv-pci-rom.args | 5 +- .../qemuxml2argv-pci-serial-dev-chardev.args | 5 +- .../qemuxml2argv-pcie-root-port.args | 4 +- tests/qemuxml2argvdata/qemuxml2argv-pcie-root.args | 2 + .../qemuxml2argv-pcie-switch-downstream-port.args | 4 +- .../qemuxml2argv-pcie-switch-upstream-port.args | 4 +- .../qemuxml2argv-pcihole64-none.args | 2 + .../qemuxml2argv-pcihole64-q35.args | 4 +- tests/qemuxml2argvdata/qemuxml2argv-pcihole64.args | 2 + .../qemuxml2argv-pmu-feature-off.args | 2 + .../qemuxml2argvdata/qemuxml2argv-pmu-feature.args | 2 + tests/qemuxml2argvdata/qemuxml2argv-ppc-dtb.args | 2 + .../qemuxml2argv-ppce500-serial.args | 2 + .../qemuxml2argv-ppce500-serial.xml | 1 + .../qemuxml2argv-pseries-basic.args | 2 + .../qemuxml2argv-pseries-cpu-compat.args | 2 + .../qemuxml2argv-pseries-cpu-compat.xml | 1 + .../qemuxml2argv-pseries-cpu-exact.args | 2 + .../qemuxml2argv-pseries-cpu-le.args | 2 + .../qemuxml2argv-pseries-disk.args | 1 + .../qemuxml2argv-pseries-nvram.args | 2 + .../qemuxml2argv-pseries-panic-missing.args | 2 + .../qemuxml2argv-pseries-panic-no-address.args | 2 + .../qemuxml2argv-pseries-usb-default.args | 2 + .../qemuxml2argv-pseries-usb-kbd.args | 2 + .../qemuxml2argv-pseries-usb-multi.args | 2 + .../qemuxml2argv-pseries-vio-user-assigned.args | 4 +- .../qemuxml2argvdata/qemuxml2argv-pseries-vio.args | 4 +- .../qemuxml2argv-pv-spinlock-disabled.args | 2 + .../qemuxml2argv-pv-spinlock-enabled.args | 2 + tests/qemuxml2argvdata/qemuxml2argv-q35.args | 4 +- .../qemuxml2argv-qemu-ns-no-env.args | 4 +- tests/qemuxml2argvdata/qemuxml2argv-qemu-ns.args | 4 +- .../qemuxml2argv-reboot-timeout-disabled.args | 2 + .../qemuxml2argv-reboot-timeout-enabled.args | 2 + .../qemuxml2argvdata/qemuxml2argv-restore-v1.args | 21 - tests/qemuxml2argvdata/qemuxml2argv-restore-v1.xml | 28 - .../qemuxml2argv-restore-v2-fd.args | 4 +- .../qemuxml2argvdata/qemuxml2argv-restore-v2.args | 4 +- ...muxml2argv-s390-allow-bogus-usb-controller.args | 4 +- ...emuxml2argv-s390-allow-bogus-usb-controller.xml | 1 + .../qemuxml2argv-s390-allow-bogus-usb-none.args | 4 +- .../qemuxml2argv-s390-allow-bogus-usb-none.xml | 1 + .../qemuxml2argv-seclabel-dac-none.args | 3 +- .../qemuxml2argv-seclabel-dynamic-baselabel.args | 3 +- .../qemuxml2argv-seclabel-dynamic-labelskip.args | 3 +- .../qemuxml2argv-seclabel-dynamic-override.args | 5 +- .../qemuxml2argv-seclabel-dynamic-relabel.args | 3 +- .../qemuxml2argv-seclabel-dynamic.args | 3 +- .../qemuxml2argv-seclabel-none.args | 3 +- .../qemuxml2argv-seclabel-static-labelskip.args | 3 +- .../qemuxml2argv-seclabel-static-relabel.args | 3 +- .../qemuxml2argv-seclabel-static.args | 3 +- .../qemuxml2argv-serial-dev-chardev-iobase.args | 5 +- .../qemuxml2argv-serial-dev-chardev.args | 5 +- .../qemuxml2argvdata/qemuxml2argv-serial-dev.args | 4 +- .../qemuxml2argv-serial-file-chardev.args | 5 +- .../qemuxml2argvdata/qemuxml2argv-serial-file.args | 4 +- .../qemuxml2argv-serial-many-chardev.args | 5 +- .../qemuxml2argvdata/qemuxml2argv-serial-many.args | 4 +- .../qemuxml2argv-serial-pty-chardev.args | 5 +- .../qemuxml2argvdata/qemuxml2argv-serial-pty.args | 4 +- .../qemuxml2argv-serial-spiceport-nospice.args | 3 +- .../qemuxml2argv-serial-spiceport.args | 5 +- .../qemuxml2argv-serial-tcp-chardev.args | 5 +- .../qemuxml2argv-serial-tcp-telnet-chardev.args | 5 +- .../qemuxml2argv-serial-tcp-telnet.args | 4 +- .../qemuxml2argvdata/qemuxml2argv-serial-tcp.args | 4 +- .../qemuxml2argv-serial-udp-chardev.args | 5 +- .../qemuxml2argvdata/qemuxml2argv-serial-udp.args | 4 +- .../qemuxml2argv-serial-unix-chardev.args | 5 +- .../qemuxml2argvdata/qemuxml2argv-serial-unix.args | 4 +- .../qemuxml2argv-serial-vc-chardev.args | 5 +- tests/qemuxml2argvdata/qemuxml2argv-serial-vc.args | 4 +- tests/qemuxml2argvdata/qemuxml2argv-shmem.args | 2 + .../qemuxml2argv-smartcard-controller.args | 2 + .../qemuxml2argv-smartcard-host-certificates.args | 2 + .../qemuxml2argv-smartcard-host.args | 2 + ...emuxml2argv-smartcard-passthrough-spicevmc.args | 2 + .../qemuxml2argv-smartcard-passthrough-tcp.args | 2 + tests/qemuxml2argvdata/qemuxml2argv-smbios.args | 4 +- tests/qemuxml2argvdata/qemuxml2argv-smp.args | 4 +- .../qemuxml2argv-sound-device.args | 5 +- tests/qemuxml2argvdata/qemuxml2argv-sound.args | 4 +- .../qemuxml2argv-tpm-passthrough.args | 2 + .../qemuxml2argv-usb-controller.args | 2 + tests/qemuxml2argvdata/qemuxml2argv-usb-hub.args | 2 + .../qemuxml2argv-usb-ich9-companion.args | 2 + .../qemuxml2argv-usb-ich9-ehci-addr.args | 2 + tests/qemuxml2argvdata/qemuxml2argv-usb-none.args | 2 + .../qemuxml2argv-usb-piix3-controller.args | 2 + tests/qemuxml2argvdata/qemuxml2argv-usb-ports.args | 2 + .../qemuxml2argv-usb-redir-boot.args | 2 + .../qemuxml2argv-usb-redir-filter-version.args | 2 + .../qemuxml2argv-usb-redir-filter.args | 2 + tests/qemuxml2argvdata/qemuxml2argv-usb-redir.args | 2 + tests/qemuxml2argvdata/qemuxml2argv-usb1-usb2.args | 2 + .../qemuxml2argv-video-device-pciaddr-default.args | 6 +- .../qemuxml2argv-video-qxl-device-vgamem.args | 6 +- .../qemuxml2argv-video-qxl-device.args | 6 +- .../qemuxml2argv-video-qxl-nodevice.args | 5 +- .../qemuxml2argv-video-qxl-sec-device-vgamem.args | 6 +- .../qemuxml2argv-video-qxl-sec-device.args | 6 +- .../qemuxml2argv-video-vga-device-vgamem.args | 6 +- .../qemuxml2argv-video-vga-device.args | 6 +- .../qemuxml2argv-video-vga-nodevice.args | 5 +- .../qemuxml2argvdata/qemuxml2argv-virtio-lun.args | 6 +- .../qemuxml2argv-virtio-rng-ccw.args | 4 +- .../qemuxml2argv-virtio-rng-default.args | 2 + .../qemuxml2argv-virtio-rng-egd.args | 2 + .../qemuxml2argv-virtio-rng-multiple.args | 2 + .../qemuxml2argv-virtio-rng-random.args | 2 + .../qemuxml2argv-watchdog-device.args | 5 +- .../qemuxml2argv-watchdog-diag288.args | 4 +- .../qemuxml2argv-watchdog-dump.args | 4 +- .../qemuxml2argv-watchdog-injectnmi.args | 4 +- tests/qemuxml2argvdata/qemuxml2argv-watchdog.args | 4 +- tests/qemuxml2argvtest.c | 498 ++++++-------- tests/qemuxml2xmltest.c | 8 - .../qemuxmlns-qemu-ns-commandline-ns0.args | 4 +- .../qemuxmlns-qemu-ns-commandline-ns1.args | 4 +- .../qemuxmlns-qemu-ns-commandline.args | 4 +- .../qemuxmlns-qemu-ns-domain-commandline-ns0.args | 4 +- .../qemuxmlns-qemu-ns-domain-commandline.args | 4 +- .../qemuxmlns-qemu-ns-domain-ns0.args | 4 +- tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain.args | 4 +- tests/qemuxmlnstest.c | 2 - 491 files changed, 2258 insertions(+), 3395 deletions(-) delete mode 100644 tests/qemuhelpdata/kvm-74 delete mode 100644 tests/qemuhelpdata/kvm-83-rhel56 delete mode 100644 tests/qemuhelpdata/kvm-86 delete mode 100644 tests/qemuhelpdata/qemu-0.10.5 delete mode 100644 tests/qemuhelpdata/qemu-0.9.1 delete mode 100644 tests/qemuhelpdata/qemu-kvm-0.10.5 delete mode 100644 tests/qemuhelpdata/qemu-kvm-0.11.0-rc2 delete mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-none.args delete mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-none.xml delete mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-wb.args delete mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-wb.xml delete mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-wt.args delete mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-wt.xml delete mode 100644 tests/qemuxml2argvdata/qemuxml2argv-restore-v1.args delete mode 100644 tests/qemuxml2argvdata/qemuxml2argv-restore-v1.xml -- 2.5.0

5 35

[libvirt] [PATCH] tests: Remove qemuxmlnstest
by Jiri Denemark 11 Nov '15

11 Nov '15

It's just a copy&paste of qemuxml2argv test anyway. We can test most of them (except for qemuxmlns-qemu-ns-domain.xml which fails to validate against our schema) by qemuxml2argv test. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- tests/Makefile.am | 10 +- .../qemuxml2argv-qemu-ns-commandline-ns0.args} | 2 +- .../qemuxml2argv-qemu-ns-commandline-ns0.xml} | 0 .../qemuxml2argv-qemu-ns-commandline-ns1.args} | 2 +- .../qemuxml2argv-qemu-ns-commandline-ns1.xml} | 0 .../qemuxml2argv-qemu-ns-commandline.args} | 2 +- .../qemuxml2argv-qemu-ns-commandline.xml} | 0 ...muxml2argv-qemu-ns-domain-commandline-ns0.args} | 2 +- ...emuxml2argv-qemu-ns-domain-commandline-ns0.xml} | 0 .../qemuxml2argv-qemu-ns-domain-commandline.args | 22 ++ .../qemuxml2argv-qemu-ns-domain-commandline.xml} | 0 .../qemuxml2argv-qemu-ns-domain-ns0.args | 22 ++ .../qemuxml2argv-qemu-ns-domain-ns0.xml} | 0 tests/qemuxml2argvtest.c | 7 + .../qemuxmlns-qemu-ns-domain-commandline.args | 22 -- .../qemuxmlns-qemu-ns-domain-ns0.args | 22 -- tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain.args | 22 -- tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain.xml | 27 --- tests/qemuxmlnstest.c | 269 --------------------- 19 files changed, 57 insertions(+), 374 deletions(-) rename tests/{qemuxmlnsdata/qemuxmlns-qemu-ns-commandline-ns0.args => qemuxml2argvdata/qemuxml2argv-qemu-ns-commandline-ns0.args} (84%) rename tests/{qemuxmlnsdata/qemuxmlns-qemu-ns-commandline-ns0.xml => qemuxml2argvdata/qemuxml2argv-qemu-ns-commandline-ns0.xml} (100%) rename tests/{qemuxmlnsdata/qemuxmlns-qemu-ns-commandline.args => qemuxml2argvdata/qemuxml2argv-qemu-ns-commandline-ns1.args} (84%) rename tests/{qemuxmlnsdata/qemuxmlns-qemu-ns-commandline-ns1.xml => qemuxml2argvdata/qemuxml2argv-qemu-ns-commandline-ns1.xml} (100%) rename tests/{qemuxmlnsdata/qemuxmlns-qemu-ns-commandline-ns1.args => qemuxml2argvdata/qemuxml2argv-qemu-ns-commandline.args} (84%) rename tests/{qemuxmlnsdata/qemuxmlns-qemu-ns-commandline.xml => qemuxml2argvdata/qemuxml2argv-qemu-ns-commandline.xml} (100%) rename tests/{qemuxmlnsdata/qemuxmlns-qemu-ns-domain-commandline-ns0.args => qemuxml2argvdata/qemuxml2argv-qemu-ns-domain-commandline-ns0.args} (84%) rename tests/{qemuxmlnsdata/qemuxmlns-qemu-ns-domain-commandline-ns0.xml => qemuxml2argvdata/qemuxml2argv-qemu-ns-domain-commandline-ns0.xml} (100%) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-domain-commandline.args rename tests/{qemuxmlnsdata/qemuxmlns-qemu-ns-domain-commandline.xml => qemuxml2argvdata/qemuxml2argv-qemu-ns-domain-commandline.xml} (100%) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-domain-ns0.args rename tests/{qemuxmlnsdata/qemuxmlns-qemu-ns-domain-ns0.xml => qemuxml2argvdata/qemuxml2argv-qemu-ns-domain-ns0.xml} (100%) delete mode 100644 tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain-commandline.args delete mode 100644 tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain-ns0.args delete mode 100644 tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain.args delete mode 100644 tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain.xml delete mode 100644 tests/qemuxmlnstest.c diff --git a/tests/Makefile.am b/tests/Makefile.am index 4af38fe..c564038 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -116,7 +116,6 @@ EXTRA_DIST = \ qemumonitorjsondata \ qemuxml2argvdata \ qemuxml2xmloutdata \ - qemuxmlnsdata \ schematestutils.sh \ secretxml2xmlin \ securityselinuxhelperdata \ @@ -244,7 +243,7 @@ test_programs += xlconfigtest endif WITH_LIBXL if WITH_QEMU -test_programs += qemuxml2argvtest qemuxml2xmltest qemuxmlnstest \ +test_programs += qemuxml2argvtest qemuxml2xmltest \ qemuargv2xmltest qemuhelptest domainsnapshotxml2xmltest \ qemumonitortest qemumonitorjsontest qemuhotplugtest \ qemuagenttest qemucapabilitiestest qemucaps2xmltest \ @@ -567,11 +566,6 @@ qemuxml2xmltest_SOURCES = \ testutils.c testutils.h qemuxml2xmltest_LDADD = $(qemu_LDADDS) $(LDADDS) -qemuxmlnstest_SOURCES = \ - qemuxmlnstest.c testutilsqemu.c testutilsqemu.h \ - testutils.c testutils.h -qemuxmlnstest_LDADD = $(qemu_LDADDS) $(LDADDS) - qemuargv2xmltest_SOURCES = \ qemuargv2xmltest.c testutilsqemu.c testutilsqemu.h \ testutils.c testutils.h @@ -642,7 +636,7 @@ domainsnapshotxml2xmltest_SOURCES = \ domainsnapshotxml2xmltest_LDADD = $(qemu_LDADDS) $(LDADDS) else ! WITH_QEMU EXTRA_DIST += qemuxml2argvtest.c qemuxml2xmltest.c qemuargv2xmltest.c \ - qemuxmlnstest.c qemuhelptest.c domainsnapshotxml2xmltest.c \ + qemuhelptest.c domainsnapshotxml2xmltest.c \ qemumonitortest.c testutilsqemu.c testutilsqemu.h \ qemumonitorjsontest.c qemuhotplugtest.c \ qemuagenttest.c qemucapabilitiestest.c \ diff --git a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-commandline-ns0.args b/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-commandline-ns0.args similarity index 84% rename from tests/qemuxmlnsdata/qemuxmlns-qemu-ns-commandline-ns0.args rename to tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-commandline-ns0.args index c25a069..ba786b9 100644 --- a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-commandline-ns0.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-commandline-ns0.args @@ -12,7 +12,7 @@ QEMU_AUDIO_DRV=none \ -smp 1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ --monitor unix:/tmp/domain-QEMUGuest1/monitor.sock,server,nowait \ +-monitor unix:/tmp/test-monitor,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-commandline-ns0.xml b/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-commandline-ns0.xml similarity index 100% rename from tests/qemuxmlnsdata/qemuxmlns-qemu-ns-commandline-ns0.xml rename to tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-commandline-ns0.xml diff --git a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-commandline.args b/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-commandline-ns1.args similarity index 84% rename from tests/qemuxmlnsdata/qemuxmlns-qemu-ns-commandline.args rename to tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-commandline-ns1.args index c25a069..ba786b9 100644 --- a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-commandline.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-commandline-ns1.args @@ -12,7 +12,7 @@ QEMU_AUDIO_DRV=none \ -smp 1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ --monitor unix:/tmp/domain-QEMUGuest1/monitor.sock,server,nowait \ +-monitor unix:/tmp/test-monitor,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-commandline-ns1.xml b/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-commandline-ns1.xml similarity index 100% rename from tests/qemuxmlnsdata/qemuxmlns-qemu-ns-commandline-ns1.xml rename to tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-commandline-ns1.xml diff --git a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-commandline-ns1.args b/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-commandline.args similarity index 84% rename from tests/qemuxmlnsdata/qemuxmlns-qemu-ns-commandline-ns1.args rename to tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-commandline.args index c25a069..ba786b9 100644 --- a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-commandline-ns1.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-commandline.args @@ -12,7 +12,7 @@ QEMU_AUDIO_DRV=none \ -smp 1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ --monitor unix:/tmp/domain-QEMUGuest1/monitor.sock,server,nowait \ +-monitor unix:/tmp/test-monitor,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-commandline.xml b/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-commandline.xml similarity index 100% rename from tests/qemuxmlnsdata/qemuxmlns-qemu-ns-commandline.xml rename to tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-commandline.xml diff --git a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain-commandline-ns0.args b/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-domain-commandline-ns0.args similarity index 84% rename from tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain-commandline-ns0.args rename to tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-domain-commandline-ns0.args index c25a069..ba786b9 100644 --- a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain-commandline-ns0.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-domain-commandline-ns0.args @@ -12,7 +12,7 @@ QEMU_AUDIO_DRV=none \ -smp 1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ --monitor unix:/tmp/domain-QEMUGuest1/monitor.sock,server,nowait \ +-monitor unix:/tmp/test-monitor,server,nowait \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain-commandline-ns0.xml b/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-domain-commandline-ns0.xml similarity index 100% rename from tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain-commandline-ns0.xml rename to tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-domain-commandline-ns0.xml diff --git a/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-domain-commandline.args b/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-domain-commandline.args new file mode 100644 index 0000000..ba786b9 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-domain-commandline.args @@ -0,0 +1,22 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-name QEMUGuest1 \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ +-net none \ +-serial none \ +-parallel none ARGUMENT diff --git a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain-commandline.xml b/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-domain-commandline.xml similarity index 100% rename from tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain-commandline.xml rename to tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-domain-commandline.xml diff --git a/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-domain-ns0.args b/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-domain-ns0.args new file mode 100644 index 0000000..ba786b9 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-domain-ns0.args @@ -0,0 +1,22 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-name QEMUGuest1 \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ +-net none \ +-serial none \ +-parallel none ARGUMENT diff --git a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain-ns0.xml b/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-domain-ns0.xml similarity index 100% rename from tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain-ns0.xml rename to tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-domain-ns0.xml diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 256027e..1c52828 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1733,6 +1733,13 @@ mymain(void) QEMU_CAPS_MACHINE_OPT, QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_DEVICE, QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390); + DO_TEST("qemu-ns-domain-ns0", NONE); + DO_TEST("qemu-ns-domain-commandline", NONE); + DO_TEST("qemu-ns-domain-commandline-ns0", NONE); + DO_TEST("qemu-ns-commandline", NONE); + DO_TEST("qemu-ns-commandline-ns0", NONE); + DO_TEST("qemu-ns-commandline-ns1", NONE); + qemuTestDriverFree(&driver); return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; diff --git a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain-commandline.args b/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain-commandline.args deleted file mode 100644 index c25a069..0000000 --- a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain-commandline.args +++ /dev/null @@ -1,22 +0,0 @@ -LC_ALL=C \ -PATH=/bin \ -HOME=/home/test \ -USER=test \ -LOGNAME=test \ -QEMU_AUDIO_DRV=none \ -/usr/bin/qemu \ --name QEMUGuest1 \ --S \ --M pc \ --m 214 \ --smp 1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --nographic \ --monitor unix:/tmp/domain-QEMUGuest1/monitor.sock,server,nowait \ --no-acpi \ --boot c \ --usb \ --drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ --net none \ --serial none \ --parallel none ARGUMENT diff --git a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain-ns0.args b/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain-ns0.args deleted file mode 100644 index c25a069..0000000 --- a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain-ns0.args +++ /dev/null @@ -1,22 +0,0 @@ -LC_ALL=C \ -PATH=/bin \ -HOME=/home/test \ -USER=test \ -LOGNAME=test \ -QEMU_AUDIO_DRV=none \ -/usr/bin/qemu \ --name QEMUGuest1 \ --S \ --M pc \ --m 214 \ --smp 1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --nographic \ --monitor unix:/tmp/domain-QEMUGuest1/monitor.sock,server,nowait \ --no-acpi \ --boot c \ --usb \ --drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ --net none \ --serial none \ --parallel none ARGUMENT diff --git a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain.args b/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain.args deleted file mode 100644 index fc42040..0000000 --- a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain.args +++ /dev/null @@ -1,22 +0,0 @@ -LC_ALL=C \ -PATH=/bin \ -HOME=/home/test \ -USER=test \ -LOGNAME=test \ -QEMU_AUDIO_DRV=none \ -/usr/bin/qemu \ --name QEMUGuest1 \ --S \ --M pc \ --m 214 \ --smp 1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --nographic \ --monitor unix:/tmp/domain-QEMUGuest1/monitor.sock,server,nowait \ --no-acpi \ --boot c \ --usb \ --drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ --net none \ --serial none \ --parallel none diff --git a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain.xml b/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain.xml deleted file mode 100644 index 5d697fc..0000000 --- a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain.xml +++ /dev/null @@ -1,27 +0,0 @@ -<domain type='qemu' xmlns:qemu='urn:dummy'> - <name>QEMUGuest1</name> - <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>219136</memory> - <currentMemory unit='KiB'>219136</currentMemory> - <vcpu>1</vcpu> - <os> - <type arch='i686' machine='pc'>hvm</type> - <boot dev='hd'/> - </os> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>destroy</on_crash> - <devices> - <emulator>/usr/bin/qemu</emulator> - <disk type='block' device='disk'> - <source dev='/dev/HostVG/QEMUGuest1'/> - <target dev='hda' bus='ide'/> - <address type='drive' controller='0' bus='0' unit='0'/> - </disk> - <controller type='ide' index='0'/> - </devices> - <qemu:commandline> - <qemu:arg value='ARGUMENT'/> - </qemu:commandline> -</domain> diff --git a/tests/qemuxmlnstest.c b/tests/qemuxmlnstest.c deleted file mode 100644 index 4d83f7a..0000000 --- a/tests/qemuxmlnstest.c +++ /dev/null @@ -1,269 +0,0 @@ -#include <config.h> - -#include <stdio.h> -#include <stdlib.h> -#include <unistd.h> -#include <string.h> - -#include <sys/types.h> -#include <fcntl.h> - -#include "testutils.h" - -#ifdef WITH_QEMU - -# include "internal.h" -# include "qemu/qemu_capabilities.h" -# include "qemu/qemu_command.h" -# include "qemu/qemu_domain.h" -# include "qemu/qemu_process.h" -# include "datatypes.h" -# include "cpu/cpu_map.h" -# include "testutilsqemu.h" -# include "virstring.h" - -# define VIR_FROM_THIS VIR_FROM_QEMU - -static const char *abs_top_srcdir; -static virQEMUDriver driver; - -static int testCompareXMLToArgvFiles(const char *xml, - const char *cmdline, - virQEMUCapsPtr extraFlags, - const char *migrateFrom, - int migrateFd, - bool json, - bool expectError) -{ - char *actualargv = NULL; - int ret = -1; - virDomainDefPtr vmdef = NULL; - virDomainChrSourceDefPtr monitor_chr = NULL; - virConnectPtr conn; - char *log = NULL; - char *emulator = NULL; - virCommandPtr cmd = NULL; - - if (!(conn = virGetConnect())) - goto fail; - - if (!(vmdef = virDomainDefParseFile(xml, driver.caps, driver.xmlopt, - VIR_DOMAIN_DEF_PARSE_INACTIVE))) - goto fail; - - if (!virDomainDefCheckABIStability(vmdef, vmdef)) { - VIR_TEST_DEBUG("ABI stability check failed on %s", xml); - goto fail; - } - - /* - * For test purposes, we may want to fake emulator's output by providing - * our own script instead of a real emulator. For this to work we need to - * specify a relative path in <emulator/> element, which, however, is not - * allowed by RelaxNG schema for domain XML. To work around it we add an - * extra '/' at the beginning of relative emulator path so that it looks - * like, e.g., "/./qemu.sh" or "/../emulator/qemu.sh" instead of - * "./qemu.sh" or "../emulator/qemu.sh" respectively. The following code - * detects such paths, strips the extra '/' and makes the path absolute. - */ - if (vmdef->emulator && STRPREFIX(vmdef->emulator, "/.")) { - if (VIR_STRDUP(emulator, vmdef->emulator + 1) < 0) - goto fail; - VIR_FREE(vmdef->emulator); - vmdef->emulator = NULL; - if (virAsprintf(&vmdef->emulator, "%s/qemuxml2argvdata/%s", - abs_srcdir, emulator) < 0) - goto fail; - } - - vmdef->id = -1; - - if (VIR_ALLOC(monitor_chr) < 0) - goto fail; - if (qemuProcessPrepareMonitorChr(driver.config, - monitor_chr, - vmdef->name) < 0) - goto fail; - - virQEMUCapsSetList(extraFlags, - QEMU_CAPS_NO_ACPI, - QEMU_CAPS_LAST); - - if (virQEMUCapsGet(extraFlags, QEMU_CAPS_DEVICE)) - qemuDomainAssignAddresses(vmdef, extraFlags, NULL); - - log = virtTestLogContentAndReset(); - VIR_FREE(log); - virResetLastError(); - - if (vmdef->os.arch == VIR_ARCH_X86_64 || - vmdef->os.arch == VIR_ARCH_I686) { - virQEMUCapsSet(extraFlags, QEMU_CAPS_PCI_MULTIBUS); - } - - if (qemuAssignDeviceAliases(vmdef, extraFlags) < 0) - goto fail; - - if (!(cmd = qemuBuildCommandLine(conn, &driver, - vmdef, monitor_chr, json, extraFlags, - migrateFrom, migrateFd, NULL, - VIR_NETDEV_VPORT_PROFILE_OP_NO_OP, - &testCallbacks, false, false, NULL, - NULL, NULL))) - goto fail; - - if (!virtTestOOMActive()) { - if (!!virGetLastError() != expectError) { - if ((log = virtTestLogContentAndReset())) - VIR_TEST_DEBUG("\n%s", log); - goto fail; - } - - if (expectError) { - /* need to suppress the errors */ - virResetLastError(); - } - } - - if (!(actualargv = virCommandToString(cmd))) - goto fail; - - if (emulator) { - /* Skip the abs_srcdir portion of replacement emulator. */ - char *start_skip = strstr(actualargv, abs_srcdir); - char *end_skip = strstr(actualargv, emulator); - if (!start_skip || !end_skip) - goto fail; - memmove(start_skip, end_skip, strlen(end_skip) + 1); - } - - if (virtTestCompareToFile(actualargv, cmdline) < 0) - goto fail; - - ret = 0; - - fail: - virDomainChrSourceDefFree(monitor_chr); - VIR_FREE(log); - VIR_FREE(emulator); - VIR_FREE(actualargv); - virCommandFree(cmd); - virDomainDefFree(vmdef); - virObjectUnref(conn); - return ret; -} - - -struct testInfo { - const char *name; - virQEMUCapsPtr extraFlags; - const char *migrateFrom; - int migrateFd; - bool json; - bool expectError; -}; - -static int -testCompareXMLToArgvHelper(const void *data) -{ - int result = -1; - const struct testInfo *info = data; - char *xml = NULL; - char *args = NULL; - - if (virAsprintf(&xml, "%s/qemuxmlnsdata/qemuxmlns-%s.xml", - abs_srcdir, info->name) < 0 || - virAsprintf(&args, "%s/qemuxmlnsdata/qemuxmlns-%s.args", - abs_srcdir, info->name) < 0) - goto cleanup; - - qemuTestCapsName = info->name; - result = qemuTestCapsCacheInsert(driver.qemuCapsCache, info->name, - info->extraFlags); - if (result < 0) - goto cleanup; - - result = testCompareXMLToArgvFiles(xml, args, info->extraFlags, - info->migrateFrom, info->migrateFd, - info->json, info->expectError); - - cleanup: - VIR_FREE(xml); - VIR_FREE(args); - return result; -} - - - -static int -mymain(void) -{ - int ret = 0; - bool json = false; - - abs_top_srcdir = getenv("abs_top_srcdir"); - if (!abs_top_srcdir) - abs_top_srcdir = abs_srcdir "/.."; - - if (qemuTestDriverInit(&driver) < 0) - return EXIT_FAILURE; - - VIR_FREE(driver.config->libDir); - if (VIR_STRDUP_QUIET(driver.config->libDir, "/tmp") < 0) - return EXIT_FAILURE; - -# define DO_TEST_FULL(name, migrateFrom, migrateFd, expectError, ...) \ - do { \ - struct testInfo info = { \ - name, NULL, migrateFrom, migrateFd, json, expectError \ - }; \ - if (!(info.extraFlags = virQEMUCapsNew())) \ - return EXIT_FAILURE; \ - virQEMUCapsSetList(info.extraFlags, __VA_ARGS__, QEMU_CAPS_LAST);\ - if (virtTestRun("QEMU XML-2-ARGV " name, \ - testCompareXMLToArgvHelper, &info) < 0) \ - ret = -1; \ - virObjectUnref(info.extraFlags); \ - } while (0) - -# define DO_TEST(name, expectError, ...) \ - DO_TEST_FULL(name, NULL, -1, expectError, __VA_ARGS__) - -# define NONE QEMU_CAPS_LAST - - /* Unset or set all envvars here that are copied in qemudBuildCommandLine - * using ADD_ENV_COPY, otherwise these tests may fail due to unexpected - * values for these envvars */ - setenv("PATH", "/bin", 1); - setenv("USER", "test", 1); - setenv("LOGNAME", "test", 1); - setenv("HOME", "/home/test", 1); - unsetenv("TMPDIR"); - unsetenv("LD_PRELOAD"); - unsetenv("LD_LIBRARY_PATH"); - unsetenv("QEMU_AUDIO_DRV"); - unsetenv("SDL_AUDIODRIVER"); - - DO_TEST("qemu-ns-domain", false, NONE); - DO_TEST("qemu-ns-domain-ns0", false, NONE); - DO_TEST("qemu-ns-domain-commandline", false, NONE); - DO_TEST("qemu-ns-domain-commandline-ns0", false, NONE); - DO_TEST("qemu-ns-commandline", false, NONE); - DO_TEST("qemu-ns-commandline-ns0", false, NONE); - DO_TEST("qemu-ns-commandline-ns1", false, NONE); - - qemuTestDriverFree(&driver); - - return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; -} - -VIRT_TEST_MAIN(mymain) - -#else - -int main(void) -{ - return EXIT_AM_SKIP; -} - -#endif /* WITH_QEMU */ -- 2.6.3

2 1

[libvirt] [PATCH] security: Cleanup DAC driver
by Jiri Denemark 11 Nov '15

11 Nov '15

Fixes several style issues and removes "DEF" (what is it supposed to mean anyway?) from debug messages. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/security/security_dac.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/src/security/security_dac.c b/src/security/security_dac.c index 7200a1a..dfdeffd 100644 --- a/src/security/security_dac.c +++ b/src/security/security_dac.c @@ -856,14 +856,13 @@ virSecurityDACSetChardevLabel(virSecurityManagerPtr mgr, break; case VIR_DOMAIN_CHR_TYPE_PIPE: - if ((virAsprintf(&in, "%s.in", dev_source->data.file.path) < 0) || - (virAsprintf(&out, "%s.out", dev_source->data.file.path) < 0)) + if (virAsprintf(&in, "%s.in", dev_source->data.file.path) < 0 || + virAsprintf(&out, "%s.out", dev_source->data.file.path) < 0) goto done; if (virFileExists(in) && virFileExists(out)) { - if ((virSecurityDACSetOwnership(priv, NULL, in, user, group) < 0) || - (virSecurityDACSetOwnership(priv, NULL, out, user, group) < 0)) { + if (virSecurityDACSetOwnership(priv, NULL, in, user, group) < 0 || + virSecurityDACSetOwnership(priv, NULL, out, user, group) < 0) goto done; - } } else if (virSecurityDACSetOwnership(priv, NULL, dev_source->data.file.path, user, group) < 0) { @@ -927,14 +926,13 @@ virSecurityDACRestoreChardevLabel(virSecurityManagerPtr mgr, break; case VIR_DOMAIN_CHR_TYPE_PIPE: - if ((virAsprintf(&out, "%s.out", dev_source->data.file.path) < 0) || - (virAsprintf(&in, "%s.in", dev_source->data.file.path) < 0)) + if (virAsprintf(&out, "%s.out", dev_source->data.file.path) < 0 || + virAsprintf(&in, "%s.in", dev_source->data.file.path) < 0) goto done; if (virFileExists(in) && virFileExists(out)) { - if ((virSecurityDACRestoreSecurityFileLabel(priv, out) < 0) || - (virSecurityDACRestoreSecurityFileLabel(priv, in) < 0)) { + if (virSecurityDACRestoreSecurityFileLabel(priv, out) < 0 || + virSecurityDACRestoreSecurityFileLabel(priv, in) < 0) goto done; - } } else if (virSecurityDACRestoreSecurityFileLabel(priv, dev_source->data.file.path) < 0) { goto done; } @@ -1213,7 +1211,7 @@ virSecurityDACSetProcessLabel(virSecurityManagerPtr mgr, if (virSecurityDACGetIds(secdef, priv, &user, &group, &groups, &ngroups) < 0) return -1; - VIR_DEBUG("Dropping privileges of DEF to %u:%u, %d supplemental groups", + VIR_DEBUG("Dropping privileges to %u:%u, %d supplemental groups", (unsigned int) user, (unsigned int) group, ngroups); if (virSetUIDGID(user, group, groups, ngroups) < 0) @@ -1238,7 +1236,7 @@ virSecurityDACSetChildProcessLabel(virSecurityManagerPtr mgr, if (virSecurityDACGetIds(secdef, priv, &user, &group, NULL, NULL)) return -1; - VIR_DEBUG("Setting child to drop privileges of DEF to %u:%u", + VIR_DEBUG("Setting child to drop privileges to %u:%u", (unsigned int) user, (unsigned int) group); virCommandSetUID(cmd, user); -- 2.6.3

2 1

[libvirt] [PATCH] tests: Add QEMU 2.4.0 capabilities
by Jiri Denemark 11 Nov '15

11 Nov '15

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- tests/qemucapabilitiesdata/caps_2.4.0-1.caps | 164 + tests/qemucapabilitiesdata/caps_2.4.0-1.replies | 3953 +++++++++++++++++++++++ tests/qemucapabilitiestest.c | 1 + 3 files changed, 4118 insertions(+) create mode 100644 tests/qemucapabilitiesdata/caps_2.4.0-1.caps create mode 100644 tests/qemucapabilitiesdata/caps_2.4.0-1.replies diff --git a/tests/qemucapabilitiesdata/caps_2.4.0-1.caps b/tests/qemucapabilitiesdata/caps_2.4.0-1.caps new file mode 100644 index 0000000..0d1b1c0 --- /dev/null +++ b/tests/qemucapabilitiesdata/caps_2.4.0-1.caps @@ -0,0 +1,164 @@ + <qemuCaps> + <flag name='mem-path'/> + <flag name='drive-serial'/> + <flag name='chardev'/> + <flag name='enable-kvm'/> + <flag name='monitor-json'/> + <flag name='balloon'/> + <flag name='device'/> + <flag name='sdl'/> + <flag name='smp-topology'/> + <flag name='netdev'/> + <flag name='rtc'/> + <flag name='vhost-net'/> + <flag name='no-hpet'/> + <flag name='no-kvm-pit'/> + <flag name='pci-configfd'/> + <flag name='nodefconfig'/> + <flag name='boot-menu'/> + <flag name='fsdev'/> + <flag name='name-process'/> + <flag name='drive-readonly'/> + <flag name='smbios-type'/> + <flag name='vga-qxl'/> + <flag name='spice'/> + <flag name='vga-none'/> + <flag name='boot-index'/> + <flag name='hda-duplex'/> + <flag name='drive-aio'/> + <flag name='pci-multibus'/> + <flag name='pci-bootindex'/> + <flag name='ccid-passthru'/> + <flag name='chardev-spicevmc'/> + <flag name='virtio-tx-alg'/> + <flag name='device-qxl-vga'/> + <flag name='pci-multifunction'/> + <flag name='virtio-blk-pci.ioeventfd'/> + <flag name='sga'/> + <flag name='virtio-blk-pci.event_idx'/> + <flag name='virtio-net-pci.event_idx'/> + <flag name='cache-directsync'/> + <flag name='piix3-usb-uhci'/> + <flag name='piix4-usb-uhci'/> + <flag name='usb-ehci'/> + <flag name='ich9-usb-ehci1'/> + <flag name='vt82c686b-usb-uhci'/> + <flag name='pci-ohci'/> + <flag name='usb-redir'/> + <flag name='usb-hub'/> + <flag name='no-shutdown'/> + <flag name='cache-unsafe'/> + <flag name='rombar'/> + <flag name='ich9-ahci'/> + <flag name='no-acpi'/> + <flag name='fsdev-readonly'/> + <flag name='virtio-blk-pci.scsi'/> + <flag name='blk-sg-io'/> + <flag name='drive-copy-on-read'/> + <flag name='cpu-host'/> + <flag name='fsdev-writeout'/> + <flag name='drive-iotune'/> + <flag name='system_wakeup'/> + <flag name='scsi-disk.channel'/> + <flag name='scsi-block'/> + <flag name='transaction'/> + <flag name='block-job-async'/> + <flag name='scsi-cd'/> + <flag name='ide-cd'/> + <flag name='no-user-config'/> + <flag name='hda-micro'/> + <flag name='dump-guest-memory'/> + <flag name='nec-usb-xhci'/> + <flag name='balloon-event'/> + <flag name='bridge'/> + <flag name='lsi'/> + <flag name='virtio-scsi-pci'/> + <flag name='blockio'/> + <flag name='disable-s3'/> + <flag name='disable-s4'/> + <flag name='usb-redir.filter'/> + <flag name='ide-drive.wwn'/> + <flag name='scsi-disk.wwn'/> + <flag name='seccomp-sandbox'/> + <flag name='dump-guest-core'/> + <flag name='seamless-migration'/> + <flag name='block-commit'/> + <flag name='vnc'/> + <flag name='drive-mirror'/> + <flag name='usb-redir.bootindex'/> + <flag name='usb-host.bootindex'/> + <flag name='blockdev-snapshot-sync'/> + <flag name='qxl'/> + <flag name='VGA'/> + <flag name='cirrus-vga'/> + <flag name='vmware-svga'/> + <flag name='device-video-primary'/> + <flag name='usb-serial'/> + <flag name='usb-net'/> + <flag name='add-fd'/> + <flag name='nbd-server'/> + <flag name='virtio-rng'/> + <flag name='rng-random'/> + <flag name='rng-egd'/> + <flag name='dtb'/> + <flag name='megasas'/> + <flag name='ipv6-migration'/> + <flag name='machine-opt'/> + <flag name='machine-usb-opt'/> + <flag name='tpm-passthrough'/> + <flag name='tpm-tis'/> + <flag name='pci-bridge'/> + <flag name='vfio-pci'/> + <flag name='vfio-pci.bootindex'/> + <flag name='scsi-generic'/> + <flag name='scsi-generic.bootindex'/> + <flag name='mem-merge'/> + <flag name='vnc-websocket'/> + <flag name='drive-discard'/> + <flag name='mlock'/> + <flag name='vnc-share-policy'/> + <flag name='device-del-event'/> + <flag name='dmi-to-pci-bridge'/> + <flag name='i440fx-pci-hole64-size'/> + <flag name='q35-pci-hole64-size'/> + <flag name='usb-storage'/> + <flag name='usb-storage.removable'/> + <flag name='virtio-mmio'/> + <flag name='ich9-intel-hda'/> + <flag name='kvm-pit-lost-tick-policy'/> + <flag name='boot-strict'/> + <flag name='pvpanic'/> + <flag name='reboot-timeout'/> + <flag name='spice-file-xfer-disable'/> + <flag name='spiceport'/> + <flag name='usb-kbd'/> + <flag name='host-pci-multidomain'/> + <flag name='msg-timestamp'/> + <flag name='active-commit'/> + <flag name='change-backing-file'/> + <flag name='memory-backend-ram'/> + <flag name='memory-backend-file'/> + <flag name='numa'/> + <flag name='usb-audio'/> + <flag name='rtc-reset-reinjection'/> + <flag name='splash-timeout'/> + <flag name='iothread'/> + <flag name='migrate-rdma'/> + <flag name='ivshmem'/> + <flag name='drive-iotune-max'/> + <flag name='VGA.vgamem_mb'/> + <flag name='vmware-svga.vgamem_mb'/> + <flag name='qxl.vgamem_mb'/> + <flag name='qxl-vga.vgamem_mb'/> + <flag name='pc-dimm'/> + <flag name='machine-vmport-opt'/> + <flag name='pci-serial'/> + <flag name='ioh3420'/> + <flag name='vhost-user-multiqueue'/> + <flag name='migration-event'/> + <flag name='x3130-upstream'/> + <flag name='xio3130-downstream'/> + <flag name='rtl8139'/> + <flag name='e1000'/> + <flag name='virtio-net'/> + </qemuCaps> diff --git a/tests/qemucapabilitiesdata/caps_2.4.0-1.replies b/tests/qemucapabilitiesdata/caps_2.4.0-1.replies new file mode 100644 index 0000000..e8a1047 --- /dev/null +++ b/tests/qemucapabilitiesdata/caps_2.4.0-1.replies @@ -0,0 +1,3953 @@ +{ + "QMP": { + "version": { + "qemu": { + "micro": 0, + "minor": 4, + "major": 2 + }, + "package": "" + }, + "capabilities": [ + ] + } +} + +{ + "return": { + }, + "id": "libvirt-1" +} + +{ + "return": { + "qemu": { + "micro": 0, + "minor": 4, + "major": 2 + }, + "package": "" + }, + "id": "libvirt-2" +} + +{ + "return": { + "arch": "x86_64" + }, + "id": "libvirt-3" +} + +{ + "return": [ + { + "name": "query-rocker-of-dpa-groups" + }, + { + "name": "query-rocker-of-dpa-flows" + }, + { + "name": "query-rocker-ports" + }, + { + "name": "query-rocker" + }, + { + "name": "block-set-write-threshold" + }, + { + "name": "x-input-send-event" + }, + { + "name": "trace-event-set-state" + }, + { + "name": "trace-event-get-state" + }, + { + "name": "rtc-reset-reinjection" + }, + { + "name": "query-acpi-ospm-status" + }, + { + "name": "query-memory-devices" + }, + { + "name": "query-memdev" + }, + { + "name": "query-named-block-nodes" + }, + { + "name": "blockdev-add" + }, + { + "name": "query-rx-filter" + }, + { + "name": "chardev-remove" + }, + { + "name": "chardev-add" + }, + { + "name": "query-tpm-types" + }, + { + "name": "query-tpm-models" + }, + { + "name": "query-tpm" + }, + { + "name": "query-target" + }, + { + "name": "query-cpu-definitions" + }, + { + "name": "query-machines" + }, + { + "name": "device-list-properties" + }, + { + "name": "qom-list-types" + }, + { + "name": "change-vnc-password" + }, + { + "name": "nbd-server-stop" + }, + { + "name": "nbd-server-add" + }, + { + "name": "nbd-server-start" + }, + { + "name": "qom-get" + }, + { + "name": "qom-set" + }, + { + "name": "qom-list" + }, + { + "name": "query-block-jobs" + }, + { + "name": "query-balloon" + }, + { + "name": "query-migrate-parameters" + }, + { + "name": "migrate-set-parameters" + }, + { + "name": "query-migrate-capabilities" + }, + { + "name": "migrate-set-capabilities" + }, + { + "name": "query-migrate" + }, + { + "name": "query-command-line-options" + }, + { + "name": "query-uuid" + }, + { + "name": "query-name" + }, + { + "name": "query-spice" + }, + { + "name": "query-vnc-servers" + }, + { + "name": "query-vnc" + }, + { + "name": "query-mice" + }, + { + "name": "query-status" + }, + { + "name": "query-kvm" + }, + { + "name": "query-pci" + }, + { + "name": "query-iothreads" + }, + { + "name": "query-cpus" + }, + { + "name": "query-blockstats" + }, + { + "name": "query-block" + }, + { + "name": "query-chardev-backends" + }, + { + "name": "query-chardev" + }, + { + "name": "query-events" + }, + { + "name": "query-commands" + }, + { + "name": "query-version" + }, + { + "name": "human-monitor-command" + }, + { + "name": "qmp_capabilities" + }, + { + "name": "add_client" + }, + { + "name": "expire_password" + }, + { + "name": "set_password" + }, + { + "name": "block_set_io_throttle" + }, + { + "name": "block_passwd" + }, + { + "name": "query-fdsets" + }, + { + "name": "remove-fd" + }, + { + "name": "add-fd" + }, + { + "name": "closefd" + }, + { + "name": "getfd" + }, + { + "name": "set_link" + }, + { + "name": "balloon" + }, + { + "name": "change-backing-file" + }, + { + "name": "drive-mirror" + }, + { + "name": "blockdev-snapshot-delete-internal-sync" + }, + { + "name": "blockdev-snapshot-internal-sync" + }, + { + "name": "blockdev-snapshot-sync" + }, + { + "name": "block-dirty-bitmap-clear" + }, + { + "name": "block-dirty-bitmap-remove" + }, + { + "name": "block-dirty-bitmap-add" + }, + { + "name": "transaction" + }, + { + "name": "block-job-complete" + }, + { + "name": "block-job-resume" + }, + { + "name": "block-job-pause" + }, + { + "name": "block-job-cancel" + }, + { + "name": "block-job-set-speed" + }, + { + "name": "blockdev-backup" + }, + { + "name": "drive-backup" + }, + { + "name": "block-commit" + }, + { + "name": "block-stream" + }, + { + "name": "block_resize" + }, + { + "name": "object-del" + }, + { + "name": "object-add" + }, + { + "name": "netdev_del" + }, + { + "name": "netdev_add" + }, + { + "name": "query-dump-guest-memory-capability" + }, + { + "name": "dump-guest-memory" + }, + { + "name": "client_migrate_info" + }, + { + "name": "migrate_set_downtime" + }, + { + "name": "migrate_set_speed" + }, + { + "name": "query-migrate-cache-size" + }, + { + "name": "migrate-set-cache-size" + }, + { + "name": "migrate-incoming" + }, + { + "name": "migrate_cancel" + }, + { + "name": "migrate" + }, + { + "name": "xen-set-global-dirty-log" + }, + { + "name": "xen-save-devices-state" + }, + { + "name": "ringbuf-read" + }, + { + "name": "ringbuf-write" + }, + { + "name": "inject-nmi" + }, + { + "name": "pmemsave" + }, + { + "name": "memsave" + }, + { + "name": "cpu-add" + }, + { + "name": "cpu" + }, + { + "name": "send-key" + }, + { + "name": "device_del" + }, + { + "name": "device_add" + }, + { + "name": "system_powerdown" + }, + { + "name": "system_reset" + }, + { + "name": "system_wakeup" + }, + { + "name": "cont" + }, + { + "name": "stop" + }, + { + "name": "screendump" + }, + { + "name": "change" + }, + { + "name": "eject" + }, + { + "name": "quit" + } + ], + "id": "libvirt-4" +} + +{ + "return": { + "fd": 11, + "fdset-id": 0 + }, + "id": "libvirt-5" +} + +{ + "id": "libvirt-6", + "error": { + "class": "DeviceNotFound", + "desc": "Device 'bogus' not found" + } +} + +{ + "return": [ + { + "name": "MEM_UNPLUG_ERROR" + }, + { + "name": "VSERPORT_CHANGE" + }, + { + "name": "QUORUM_REPORT_BAD" + }, + { + "name": "QUORUM_FAILURE" + }, + { + "name": "GUEST_PANICKED" + }, + { + "name": "BALLOON_CHANGE" + }, + { + "name": "ACPI_DEVICE_OST" + }, + { + "name": "MIGRATION" + }, + { + "name": "SPICE_MIGRATE_COMPLETED" + }, + { + "name": "SPICE_DISCONNECTED" + }, + { + "name": "SPICE_INITIALIZED" + }, + { + "name": "SPICE_CONNECTED" + }, + { + "name": "VNC_DISCONNECTED" + }, + { + "name": "VNC_INITIALIZED" + }, + { + "name": "VNC_CONNECTED" + }, + { + "name": "NIC_RX_FILTER_CHANGED" + }, + { + "name": "DEVICE_DELETED" + }, + { + "name": "WATCHDOG" + }, + { + "name": "RTC_CHANGE" + }, + { + "name": "WAKEUP" + }, + { + "name": "SUSPEND_DISK" + }, + { + "name": "SUSPEND" + }, + { + "name": "RESUME" + }, + { + "name": "STOP" + }, + { + "name": "RESET" + }, + { + "name": "POWERDOWN" + }, + { + "name": "SHUTDOWN" + }, + { + "name": "DEVICE_TRAY_MOVED" + }, + { + "name": "BLOCK_WRITE_THRESHOLD" + }, + { + "name": "BLOCK_JOB_READY" + }, + { + "name": "BLOCK_JOB_ERROR" + }, + { + "name": "BLOCK_JOB_CANCELLED" + }, + { + "name": "BLOCK_JOB_COMPLETED" + }, + { + "name": "BLOCK_IO_ERROR" + }, + { + "name": "BLOCK_IMAGE_CORRUPTED" + } + ], + "id": "libvirt-7" +} + +{ + "return": [ + { + "name": "virtio-tablet-pci" + }, + { + "name": "pc-0.13-machine" + }, + { + "name": "fw_cfg" + }, + { + "name": "generic-sdhci" + }, + { + "name": "i82551" + }, + { + "name": "i82550" + }, + { + "name": "Westmere-x86_64-cpu" + }, + { + "name": "e1000-82540em" + }, + { + "name": "pci-serial-4x" + }, + { + "name": "Penryn-x86_64-cpu" + }, + { + "name": "Haswell-x86_64-cpu" + }, + { + "name": "iothread" + }, + { + "name": "pc-q35-2.3-machine" + }, + { + "name": "icc-bridge" + }, + { + "name": "cfi.pflash01" + }, + { + "name": "virtio-gpu-device" + }, + { + "name": "Opteron_G3-x86_64-cpu" + }, + { + "name": "Broadwell-x86_64-cpu" + }, + { + "name": "piix3-ide" + }, + { + "name": "isa-parallel" + }, + { + "name": "pc-q35-2.4-machine" + }, + { + "name": "i2c-bus" + }, + { + "name": "megasas" + }, + { + "name": "usb-braille" + }, + { + "name": "vmware-svga" + }, + { + "name": "pc-i440fx-2.0-machine" + }, + { + "name": "PIIX3-xen" + }, + { + "name": "ccid-bus" + }, + { + "name": "scsi-cd" + }, + { + "name": "isa-serial" + }, + { + "name": "usb-ehci" + }, + { + "name": "user-creatable" + }, + { + "name": "container" + }, + { + "name": "host-x86_64-cpu" + }, + { + "name": "pci-serial-2x" + }, + { + "name": "piix4-ide" + }, + { + "name": "scsi-generic" + }, + { + "name": "pc-1.0-machine" + }, + { + "name": "virtio-net-pci" + }, + { + "name": "pc-dimm" + }, + { + "name": "pc-q35-1.7-machine" + }, + { + "name": "Haswell-noTSX-x86_64-cpu" + }, + { + "name": "pc-i440fx-2.1-machine" + }, + { + "name": "virtio-mouse-device" + }, + { + "name": "virtio-mouse-pci" + }, + { + "name": "isa-debugcon" + }, + { + "name": "ide-hd" + }, + { + "name": "virtio-vga" + }, + { + "name": "qemu64-x86_64-cpu" + }, + { + "name": "rng-egd" + }, + { + "name": "isa-pcspk" + }, + { + "name": "isa-pit" + }, + { + "name": "pc-1.1-machine" + }, + { + "name": "ich9-usb-ehci1" + }, + { + "name": "ich9-usb-ehci2" + }, + { + "name": "pxb-host" + }, + { + "name": "intel-iommu" + }, + { + "name": "irq" + }, + { + "name": "cirrus-vga" + }, + { + "name": "virtconsole" + }, + { + "name": "virtio-rng-pci" + }, + { + "name": "PCIE" + }, + { + "name": "pentium3-x86_64-cpu" + }, + { + "name": "qxl-vga" + }, + { + "name": "ioapic" + }, + { + "name": "kvm-pit" + }, + { + "name": "pc-0.14-machine" + }, + { + "name": "pc-i440fx-1.4-machine" + }, + { + "name": "pc-q35-2.0-machine" + }, + { + "name": "usb-host" + }, + { + "name": "usb-bus" + }, + { + "name": "vhost-scsi-pci" + }, + { + "name": "usb-kbd" + }, + { + "name": "486-x86_64-cpu" + }, + { + "name": "ES1370" + }, + { + "name": "gus" + }, + { + "name": "PIIX3" + }, + { + "name": "isa-applesmc" + }, + { + "name": "kvm-pci-assign" + }, + { + "name": "i82559er" + }, + { + "name": "q35-pcihost" + }, + { + "name": "e1000-82545em" + }, + { + "name": "pc-i440fx-1.5-machine" + }, + { + "name": "usb-bt-dongle" + }, + { + "name": "AC97" + }, + { + "name": "i6300esb" + }, + { + "name": "mc146818rtc" + }, + { + "name": "e1000-82544gc" + }, + { + "name": "PIIX4_PM" + }, + { + "name": "piix4-usb-uhci" + }, + { + "name": "sysbus-ahci" + }, + { + "name": "virtio-tablet-device" + }, + { + "name": "kvm-ioapic" + }, + { + "name": "pvpanic" + }, + { + "name": "core2duo-x86_64-cpu" + }, + { + "name": "virtio-9p-pci" + }, + { + "name": "scsi-disk" + }, + { + "name": "acpi-device-interface" + }, + { + "name": "sb16" + }, + { + "name": "pc-0.15-machine" + }, + { + "name": "usb-mouse" + }, + { + "name": "piix3-usb-uhci" + }, + { + "name": "vfio-calxeda-xgmac" + }, + { + "name": "virtio-scsi-device" + }, + { + "name": "virtio-blk-pci" + }, + { + "name": "virtio-9p-device" + }, + { + "name": "hda-output" + }, + { + "name": "SUNW,fdtwo" + }, + { + "name": "tpci200" + }, + { + "name": "Opteron_G4-x86_64-cpu" + }, + { + "name": "pc-q35-1.4-machine" + }, + { + "name": "virtio-mmio" + }, + { + "name": "qemu-console" + }, + { + "name": "isa-i8259" + }, + { + "name": "System" + }, + { + "name": "pvscsi" + }, + { + "name": "virtio-net-device" + }, + { + "name": "usb-hub" + }, + { + "name": "IvyBridge-x86_64-cpu" + }, + { + "name": "hda-duplex" + }, + { + "name": "pc-i440fx-2.3-machine" + }, + { + "name": "virtio-keyboard-pci" + }, + { + "name": "pci-ohci" + }, + { + "name": "isapc-machine" + }, + { + "name": "ipoctal232" + }, + { + "name": "pc-1.2-machine" + }, + { + "name": "xio3130-downstream" + }, + { + "name": "ide-cd" + }, + { + "name": "pc-i440fx-2.2-machine" + }, + { + "name": "isabus-bridge" + }, + { + "name": "nec-usb-xhci" + }, + { + "name": "memory-backend-file" + }, + { + "name": "isa-ide" + }, + { + "name": "virtio-keyboard-device" + }, + { + "name": "megasas-gen2" + }, + { + "name": "isa-vga" + }, + { + "name": "qemu:memory-region" + }, + { + "name": "rng-random" + }, + { + "name": "hotplug-handler" + }, + { + "name": "kvm-i8259" + }, + { + "name": "i440FX-pcihost" + }, + { + "name": "qemu32-x86_64-cpu" + }, + { + "name": "tpm-tis" + }, + { + "name": "tpm-passthrough" + }, + { + "name": "apic" + }, + { + "name": "isa-debug-exit" + }, + { + "name": "pc-0.10-machine" + }, + { + "name": "pc-testdev" + }, + { + "name": "rocker" + }, + { + "name": "Opteron_G1-x86_64-cpu" + }, + { + "name": "sga" + }, + { + "name": "pcnet" + }, + { + "name": "ivshmem" + }, + { + "name": "hpet" + }, + { + "name": "adlib" + }, + { + "name": "lsi53c895a" + }, + { + "name": "pxb-bus" + }, + { + "name": "usb-audio" + }, + { + "name": "usb-wacom-tablet" + }, + { + "name": "pc-0.11-machine" + }, + { + "name": "kvm-apic" + }, + { + "name": "phenom-x86_64-cpu" + }, + { + "name": "fw_cfg_io" + }, + { + "name": "ioh3420" + }, + { + "name": "pc-q35-2.1-machine" + }, + { + "name": "cs4231a" + }, + { + "name": "dc390" + }, + { + "name": "nvme" + }, + { + "name": "i82801b11-bridge" + }, + { + "name": "kvmvapic" + }, + { + "name": "fw-path-provider" + }, + { + "name": "usb-net" + }, + { + "name": "pci-bridge-seat" + }, + { + "name": "mch" + }, + { + "name": "usb-tablet" + }, + { + "name": "vhost-scsi" + }, + { + "name": "usb-ccid" + }, + { + "name": "pc-i440fx-1.7-machine" + }, + { + "name": "tcg-accel" + }, + { + "name": "virtio-mmio-bus" + }, + { + "name": "pc-q35-2.2-machine" + }, + { + "name": "usb-bot" + }, + { + "name": "ICH9-LPC" + }, + { + "name": "edu" + }, + { + "name": "accel" + }, + { + "name": "pc-i440fx-1.6-machine" + }, + { + "name": "kvmclock" + }, + { + "name": "lsi53c810" + }, + { + "name": "isa-cirrus-vga" + }, + { + "name": "virtio-serial-bus" + }, + { + "name": "ib700" + }, + { + "name": "SandyBridge-x86_64-cpu" + }, + { + "name": "esp" + }, + { + "name": "virtio-balloon-device" + }, + { + "name": "ccid-card-passthru" + }, + { + "name": "ich9-usb-uhci5" + }, + { + "name": "qxl" + }, + { + "name": "intel-hda" + }, + { + "name": "ich9-usb-uhci6" + }, + { + "name": "pci-bridge" + }, + { + "name": "virtio-serial-device" + }, + { + "name": "ich9-usb-uhci3" + }, + { + "name": "ICH9 SMB" + }, + { + "name": "ich9-usb-uhci4" + }, + { + "name": "piix3-ide-xen" + }, + { + "name": "virtio-input-host-device" + }, + { + "name": "icc-bus" + }, + { + "name": "vmxnet3" + }, + { + "name": "IDE" + }, + { + "name": "VGA" + }, + { + "name": "pci-testdev" + }, + { + "name": "ich9-usb-uhci2" + }, + { + "name": "ich9-usb-uhci1" + }, + { + "name": "x3130-upstream" + }, + { + "name": "none-machine" + }, + { + "name": "sysbus-fdc" + }, + { + "name": "SCSI" + }, + { + "name": "n270-x86_64-cpu" + }, + { + "name": "pci-serial" + }, + { + "name": "pc-q35-1.5-machine" + }, + { + "name": "athlon-x86_64-cpu" + }, + { + "name": "ISA" + }, + { + "name": "i8042" + }, + { + "name": "kvm-accel" + }, + { + "name": "i82559c" + }, + { + "name": "i82559b" + }, + { + "name": "i82559a" + }, + { + "name": "scsi-hd" + }, + { + "name": "qtest-accel" + }, + { + "name": "virtio-balloon-pci" + }, + { + "name": "hda-micro" + }, + { + "name": "scsi-block" + }, + { + "name": "virtio-scsi-pci" + }, + { + "name": "rtl8139" + }, + { + "name": "vmmouse" + }, + { + "name": "ich9-intel-hda" + }, + { + "name": "usb-mtp" + }, + { + "name": "ide-drive" + }, + { + "name": "fw_cfg_mem" + }, + { + "name": "PCI" + }, + { + "name": "Opteron_G5-x86_64-cpu" + }, + { + "name": "vmport" + }, + { + "name": "coreduo-x86_64-cpu" + }, + { + "name": "virtio-serial-pci" + }, + { + "name": "pc-q35-1.6-machine" + }, + { + "name": "virtio-input-host-pci" + }, + { + "name": "virtio-pci-bus" + }, + { + "name": "pentium2-x86_64-cpu" + }, + { + "name": "nmi" + }, + { + "name": "i82558b" + }, + { + "name": "i82558a" + }, + { + "name": "pc-0.12-machine" + }, + { + "name": "am53c974" + }, + { + "name": "sdhci-pci" + }, + { + "name": "port92" + }, + { + "name": "pxb" + }, + { + "name": "kvm64-x86_64-cpu" + }, + { + "name": "e1000" + }, + { + "name": "Conroe-x86_64-cpu" + }, + { + "name": "ne2k_isa" + }, + { + "name": "pc-1.3-machine" + }, + { + "name": "HDA" + }, + { + "name": "usb-storage" + }, + { + "name": "usb-serial" + }, + { + "name": "usb-uas" + }, + { + "name": "pc-i440fx-2.4-machine" + }, + { + "name": "sysbus-ohci" + }, + { + "name": "usb-redir" + }, + { + "name": "i82801" + }, + { + "name": "Broadwell-noTSX-x86_64-cpu" + }, + { + "name": "i82557c" + }, + { + "name": "i82557b" + }, + { + "name": "i82557a" + }, + { + "name": "Nehalem-x86_64-cpu" + }, + { + "name": "memory-backend-ram" + }, + { + "name": "QJSON" + }, + { + "name": "virtserialport" + }, + { + "name": "i440FX" + }, + { + "name": "ne2k_pci" + }, + { + "name": "smbus-eeprom" + }, + { + "name": "i82562" + }, + { + "name": "ich9-ahci" + }, + { + "name": "virtio-rng-device" + }, + { + "name": "isa-fdc" + }, + { + "name": "kvm32-x86_64-cpu" + }, + { + "name": "Opteron_G2-x86_64-cpu" + }, + { + "name": "vfio-pci" + }, + { + "name": "IndustryPack" + }, + { + "name": "virtio-gpu-pci" + }, + { + "name": "vt82c686b-usb-uhci" + }, + { + "name": "secondary-vga" + }, + { + "name": "pentium-x86_64-cpu" + }, + { + "name": "virtio-blk-device" + } + ], + "id": "libvirt-8" +} + +{ + "return": [ + { + "name": "bootindex", + "type": "int32" + }, + { + "name": "iothread", + "type": "link<iothread>" + }, + { + "name": "any_layout", + "description": "on/off", + "type": "bool" + }, + { + "name": "notify_on_empty", + "description": "on/off", + "type": "bool" + }, + { + "name": "event_idx", + "description": "on/off", + "type": "bool" + }, + { + "name": "indirect_desc", + "description": "on/off", + "type": "bool" + }, + { + "name": "x-data-plane", + "description": "on/off", + "type": "bool" + }, + { + "name": "request-merging", + "description": "on/off", + "type": "bool" + }, + { + "name": "scsi", + "description": "on/off", + "type": "bool" + }, + { + "name": "config-wce", + "description": "on/off", + "type": "bool" + }, + { + "name": "serial", + "type": "str" + }, + { + "name": "secs", + "type": "uint32" + }, + { + "name": "heads", + "type": "uint32" + }, + { + "name": "cyls", + "type": "uint32" + }, + { + "name": "discard_granularity", + "type": "uint32" + }, + { + "name": "opt_io_size", + "type": "uint32" + }, + { + "name": "min_io_size", + "type": "uint16" + }, + { + "name": "physical_block_size", + "description": "A power of two between 512 and 32768", + "type": "uint16" + }, + { + "name": "logical_block_size", + "description": "A power of two between 512 and 32768", + "type": "uint16" + }, + { + "name": "drive", + "description": "ID of a drive to use as a backend", + "type": "str" + }, + { + "name": "virtio-backend", + "type": "child<virtio-blk-device>" + }, + { + "name": "command_serr_enable", + "description": "on/off", + "type": "bool" + }, + { + "name": "multifunction", + "description": "on/off", + "type": "bool" + }, + { + "name": "rombar", + "type": "uint32" + }, + { + "name": "romfile", + "type": "str" + }, + { + "name": "addr", + "description": "Slot and optional function number, example: 06.0 or 06", + "type": "int32" + }, + { + "name": "disable-modern", + "description": "on/off", + "type": "bool" + }, + { + "name": "disable-legacy", + "description": "on/off", + "type": "bool" + }, + { + "name": "virtio-pci-bus-master-bug-migration", + "description": "on/off", + "type": "bool" + }, + { + "name": "vectors", + "type": "uint32" + }, + { + "name": "ioeventfd", + "description": "on/off", + "type": "bool" + }, + { + "name": "class", + "type": "uint32" + } + ], + "id": "libvirt-9" +} + +{ + "return": [ + { + "name": "bootindex", + "type": "int32" + }, + { + "name": "any_layout", + "description": "on/off", + "type": "bool" + }, + { + "name": "notify_on_empty", + "description": "on/off", + "type": "bool" + }, + { + "name": "event_idx", + "description": "on/off", + "type": "bool" + }, + { + "name": "indirect_desc", + "description": "on/off", + "type": "bool" + }, + { + "name": "tx", + "type": "str" + }, + { + "name": "x-txburst", + "type": "int32" + }, + { + "name": "x-txtimer", + "type": "uint32" + }, + { + "name": "netdev", + "description": "ID of a netdev to use as a backend", + "type": "str" + }, + { + "name": "vlan", + "description": "Integer VLAN id to connect to", + "type": "int32" + }, + { + "name": "mac", + "description": "Ethernet 6-byte MAC Address, example: 52:54:00:12:34:56", + "type": "str" + }, + { + "name": "mq", + "description": "on/off", + "type": "bool" + }, + { + "name": "ctrl_guest_offloads", + "description": "on/off", + "type": "bool" + }, + { + "name": "ctrl_mac_addr", + "description": "on/off", + "type": "bool" + }, + { + "name": "ctrl_rx_extra", + "description": "on/off", + "type": "bool" + }, + { + "name": "ctrl_vlan", + "description": "on/off", + "type": "bool" + }, + { + "name": "ctrl_rx", + "description": "on/off", + "type": "bool" + }, + { + "name": "ctrl_vq", + "description": "on/off", + "type": "bool" + }, + { + "name": "status", + "description": "on/off", + "type": "bool" + }, + { + "name": "mrg_rxbuf", + "description": "on/off", + "type": "bool" + }, + { + "name": "host_ufo", + "description": "on/off", + "type": "bool" + }, + { + "name": "host_ecn", + "description": "on/off", + "type": "bool" + }, + { + "name": "host_tso6", + "description": "on/off", + "type": "bool" + }, + { + "name": "host_tso4", + "description": "on/off", + "type": "bool" + }, + { + "name": "guest_announce", + "description": "on/off", + "type": "bool" + }, + { + "name": "guest_ufo", + "description": "on/off", + "type": "bool" + }, + { + "name": "guest_ecn", + "description": "on/off", + "type": "bool" + }, + { + "name": "guest_tso6", + "description": "on/off", + "type": "bool" + }, + { + "name": "guest_tso4", + "description": "on/off", + "type": "bool" + }, + { + "name": "gso", + "description": "on/off", + "type": "bool" + }, + { + "name": "guest_csum", + "description": "on/off", + "type": "bool" + }, + { + "name": "csum", + "description": "on/off", + "type": "bool" + }, + { + "name": "virtio-backend", + "type": "child<virtio-net-device>" + }, + { + "name": "command_serr_enable", + "description": "on/off", + "type": "bool" + }, + { + "name": "multifunction", + "description": "on/off", + "type": "bool" + }, + { + "name": "rombar", + "type": "uint32" + }, + { + "name": "romfile", + "type": "str" + }, + { + "name": "addr", + "description": "Slot and optional function number, example: 06.0 or 06", + "type": "int32" + }, + { + "name": "disable-modern", + "description": "on/off", + "type": "bool" + }, + { + "name": "disable-legacy", + "description": "on/off", + "type": "bool" + }, + { + "name": "virtio-pci-bus-master-bug-migration", + "description": "on/off", + "type": "bool" + }, + { + "name": "vectors", + "type": "uint32" + }, + { + "name": "ioeventfd", + "description": "on/off", + "type": "bool" + } + ], + "id": "libvirt-10" +} + +{ + "id": "libvirt-11", + "error": { + "class": "DeviceNotFound", + "desc": "Device 'virtio-blk-ccw' not found" + } +} + +{ + "id": "libvirt-12", + "error": { + "class": "DeviceNotFound", + "desc": "Device 'virtio-net-ccw' not found" + } +} + +{ + "id": "libvirt-13", + "error": { + "class": "DeviceNotFound", + "desc": "Device 'virtio-blk-s390' not found" + } +} + +{ + "id": "libvirt-14", + "error": { + "class": "DeviceNotFound", + "desc": "Device 'virtio-net-s390' not found" + } +} + +{ + "id": "libvirt-15", + "error": { + "class": "DeviceNotFound", + "desc": "Device 'pci-assign' not found" + } +} + +{ + "return": [ + { + "name": "bootindex", + "type": "int32" + }, + { + "name": "command_serr_enable", + "description": "on/off", + "type": "bool" + }, + { + "name": "multifunction", + "description": "on/off", + "type": "bool" + }, + { + "name": "rombar", + "type": "uint32" + }, + { + "name": "romfile", + "type": "str" + }, + { + "name": "addr", + "description": "Slot and optional function number, example: 06.0 or 06", + "type": "int32" + }, + { + "name": "configfd", + "type": "str" + }, + { + "name": "share_intx", + "description": "on/off", + "type": "bool" + }, + { + "name": "prefer_msi", + "description": "on/off", + "type": "bool" + }, + { + "name": "host", + "description": "Address (bus/device/function) of the host device, example: 04:10.0", + "type": "str" + } + ], + "id": "libvirt-16" +} + +{ + "return": [ + { + "name": "bootindex", + "type": "int32" + }, + { + "name": "command_serr_enable", + "description": "on/off", + "type": "bool" + }, + { + "name": "multifunction", + "description": "on/off", + "type": "bool" + }, + { + "name": "rombar", + "type": "uint32" + }, + { + "name": "romfile", + "type": "str" + }, + { + "name": "addr", + "description": "Slot and optional function number, example: 06.0 or 06", + "type": "int32" + }, + { + "name": "x-mmap", + "type": "bool" + }, + { + "name": "x-req", + "description": "on/off", + "type": "bool" + }, + { + "name": "x-vga", + "description": "on/off", + "type": "bool" + }, + { + "name": "x-intx-mmap-timeout-ms", + "type": "uint32" + }, + { + "name": "host", + "description": "Address (bus/device/function) of the host device, example: 04:10.0", + "type": "str" + } + ], + "id": "libvirt-17" +} + +{ + "return": [ + { + "name": "bootindex", + "type": "int32" + }, + { + "name": "lun", + "type": "uint32" + }, + { + "name": "scsi-id", + "type": "uint32" + }, + { + "name": "channel", + "type": "uint32" + }, + { + "name": "max_io_size", + "type": "uint64" + }, + { + "name": "max_unmap_size", + "type": "uint64" + }, + { + "name": "port_index", + "type": "uint16" + }, + { + "name": "port_wwn", + "type": "uint64" + }, + { + "name": "wwn", + "type": "uint64" + }, + { + "name": "dpofua", + "description": "on/off", + "type": "bool" + }, + { + "name": "removable", + "description": "on/off", + "type": "bool" + }, + { + "name": "product", + "type": "str" + }, + { + "name": "vendor", + "type": "str" + }, + { + "name": "serial", + "type": "str" + }, + { + "name": "ver", + "type": "str" + }, + { + "name": "discard_granularity", + "type": "uint32" + }, + { + "name": "opt_io_size", + "type": "uint32" + }, + { + "name": "min_io_size", + "type": "uint16" + }, + { + "name": "physical_block_size", + "description": "A power of two between 512 and 32768", + "type": "uint16" + }, + { + "name": "logical_block_size", + "description": "A power of two between 512 and 32768", + "type": "uint16" + }, + { + "name": "drive", + "description": "ID of a drive to use as a backend", + "type": "str" + } + ], + "id": "libvirt-18" +} + +{ + "return": [ + { + "name": "bootindex", + "type": "int32" + }, + { + "name": "unit", + "type": "uint32" + }, + { + "name": "model", + "type": "str" + }, + { + "name": "serial", + "type": "str" + }, + { + "name": "wwn", + "type": "uint64" + }, + { + "name": "ver", + "type": "str" + }, + { + "name": "discard_granularity", + "type": "uint32" + }, + { + "name": "opt_io_size", + "type": "uint32" + }, + { + "name": "min_io_size", + "type": "uint16" + }, + { + "name": "physical_block_size", + "description": "A power of two between 512 and 32768", + "type": "uint16" + }, + { + "name": "logical_block_size", + "description": "A power of two between 512 and 32768", + "type": "uint16" + }, + { + "name": "drive", + "description": "ID of a drive to use as a backend", + "type": "str" + } + ], + "id": "libvirt-19" +} + +{ + "return": [ + { + "name": "command_serr_enable", + "description": "on/off", + "type": "bool" + }, + { + "name": "multifunction", + "description": "on/off", + "type": "bool" + }, + { + "name": "rombar", + "type": "uint32" + }, + { + "name": "romfile", + "type": "str" + }, + { + "name": "addr", + "description": "Slot and optional function number, example: 06.0 or 06", + "type": "int32" + }, + { + "name": "memory-hotplug-support", + "type": "bool" + }, + { + "name": "acpi-pci-hotplug-with-bridge-support", + "type": "bool" + }, + { + "name": "s4_val", + "type": "uint8" + }, + { + "name": "disable_s4", + "type": "uint8" + }, + { + "name": "disable_s3", + "type": "uint8" + }, + { + "name": "smb_io_base", + "type": "uint32" + } + ], + "id": "libvirt-20" +} + +{ + "return": [ + { + "name": "bootindex", + "type": "int32" + }, + { + "name": "msos-desc", + "description": "on/off", + "type": "bool" + }, + { + "name": "full-path", + "description": "on/off", + "type": "bool" + }, + { + "name": "serial", + "type": "str" + }, + { + "name": "port", + "type": "str" + }, + { + "name": "filter", + "type": "str" + }, + { + "name": "debug", + "type": "uint8" + }, + { + "name": "chardev", + "description": "ID of a chardev to use as a backend", + "type": "str" + } + ], + "id": "libvirt-21" +} + +{ + "return": [ + { + "name": "bootindex", + "type": "int32" + }, + { + "name": "msos-desc", + "description": "on/off", + "type": "bool" + }, + { + "name": "full-path", + "description": "on/off", + "type": "bool" + }, + { + "name": "serial", + "type": "str" + }, + { + "name": "port", + "type": "str" + }, + { + "name": "pipeline", + "description": "on/off", + "type": "bool" + }, + { + "name": "loglevel", + "type": "uint32" + }, + { + "name": "isobsize", + "type": "uint32" + }, + { + "name": "isobufs", + "type": "uint32" + }, + { + "name": "productid", + "type": "uint32" + }, + { + "name": "vendorid", + "type": "uint32" + }, + { + "name": "hostport", + "type": "str" + }, + { + "name": "hostaddr", + "type": "uint32" + }, + { + "name": "hostbus", + "type": "uint32" + } + ], + "id": "libvirt-22" +} + +{ + "return": [ + { + "name": "bootindex", + "type": "int32" + }, + { + "name": "lun", + "type": "uint32" + }, + { + "name": "scsi-id", + "type": "uint32" + }, + { + "name": "channel", + "type": "uint32" + }, + { + "name": "drive", + "description": "ID of a drive to use as a backend", + "type": "str" + } + ], + "id": "libvirt-23" +} + +{ + "return": [ + { + "name": "pci-hole64-end", + "type": "int" + }, + { + "name": "pci-hole64-start", + "type": "int" + }, + { + "name": "pci-hole-end", + "type": "int" + }, + { + "name": "pci-hole-start", + "type": "int" + }, + { + "name": "pci-conf-data[0]", + "type": "child<qemu:memory-region>" + }, + { + "name": "pci-conf-idx[0]", + "type": "child<qemu:memory-region>" + }, + { + "name": "short_root_bus", + "type": "uint32" + }, + { + "name": "pci-hole64-size", + "type": "size" + } + ], + "id": "libvirt-24" +} + +{ + "return": [ + { + "name": "mcfg_size", + "type": "int" + }, + { + "name": "pci-hole64-end", + "type": "int" + }, + { + "name": "pci-hole64-start", + "type": "int" + }, + { + "name": "pci-hole-end", + "type": "int" + }, + { + "name": "pci-hole-start", + "type": "int" + }, + { + "name": "mch", + "type": "child<mch>" + }, + { + "name": "pci-conf-data[0]", + "type": "child<qemu:memory-region>" + }, + { + "name": "pci-conf-idx[0]", + "type": "child<qemu:memory-region>" + }, + { + "name": "pcie-mmcfg-mmio[0]", + "type": "child<qemu:memory-region>" + }, + { + "name": "short_root_bus", + "type": "uint32" + }, + { + "name": "pci-hole64-size", + "type": "size" + }, + { + "name": "MCFG", + "type": "uint64" + } + ], + "id": "libvirt-25" +} + +{ + "return": [ + { + "name": "bootindex", + "type": "int32" + }, + { + "name": "msos-desc", + "description": "on/off", + "type": "bool" + }, + { + "name": "full-path", + "description": "on/off", + "type": "bool" + }, + { + "name": "serial", + "type": "str" + }, + { + "name": "port", + "type": "str" + }, + { + "name": "removable", + "description": "on/off", + "type": "bool" + }, + { + "name": "discard_granularity", + "type": "uint32" + }, + { + "name": "opt_io_size", + "type": "uint32" + }, + { + "name": "min_io_size", + "type": "uint16" + }, + { + "name": "physical_block_size", + "description": "A power of two between 512 and 32768", + "type": "uint16" + }, + { + "name": "logical_block_size", + "description": "A power of two between 512 and 32768", + "type": "uint16" + }, + { + "name": "drive", + "description": "ID of a drive to use as a backend", + "type": "str" + } + ], + "id": "libvirt-26" +} + +{ + "return": [ + { + "name": "lost_tick_policy", + "type": "LostTickPolicy" + }, + { + "name": "iobase", + "type": "uint32" + } + ], + "id": "libvirt-27" +} + +{ + "return": [ + { + "name": "big-endian-framebuffer", + "type": "bool" + }, + { + "name": "command_serr_enable", + "description": "on/off", + "type": "bool" + }, + { + "name": "multifunction", + "description": "on/off", + "type": "bool" + }, + { + "name": "rombar", + "type": "uint32" + }, + { + "name": "romfile", + "type": "str" + }, + { + "name": "addr", + "description": "Slot and optional function number, example: 06.0 or 06", + "type": "int32" + }, + { + "name": "qemu-extended-regs", + "description": "on/off", + "type": "bool" + }, + { + "name": "mmio", + "description": "on/off", + "type": "bool" + }, + { + "name": "vgamem_mb", + "type": "uint32" + } + ], + "id": "libvirt-28" +} + +{ + "return": [ + { + "name": "command_serr_enable", + "description": "on/off", + "type": "bool" + }, + { + "name": "multifunction", + "description": "on/off", + "type": "bool" + }, + { + "name": "rombar", + "type": "uint32" + }, + { + "name": "romfile", + "type": "str" + }, + { + "name": "addr", + "description": "Slot and optional function number, example: 06.0 or 06", + "type": "int32" + }, + { + "name": "vgamem_mb", + "type": "uint32" + } + ], + "id": "libvirt-29" +} + +{ + "return": [ + { + "name": "command_serr_enable", + "description": "on/off", + "type": "bool" + }, + { + "name": "multifunction", + "description": "on/off", + "type": "bool" + }, + { + "name": "rombar", + "type": "uint32" + }, + { + "name": "romfile", + "type": "str" + }, + { + "name": "addr", + "description": "Slot and optional function number, example: 06.0 or 06", + "type": "int32" + }, + { + "name": "surfaces", + "type": "int32" + }, + { + "name": "vgamem_mb", + "type": "uint32" + }, + { + "name": "vram64_size_mb", + "type": "uint32" + }, + { + "name": "vram_size_mb", + "type": "uint32" + }, + { + "name": "ram_size_mb", + "type": "uint32" + }, + { + "name": "cmdlog", + "type": "uint32" + }, + { + "name": "guestdebug", + "type": "uint32" + }, + { + "name": "debug", + "type": "uint32" + }, + { + "name": "revision", + "type": "uint32" + }, + { + "name": "vram_size", + "type": "uint32" + }, + { + "name": "ram_size", + "type": "uint32" + } + ], + "id": "libvirt-30" +} + +{ + "return": [ + { + "name": "command_serr_enable", + "description": "on/off", + "type": "bool" + }, + { + "name": "multifunction", + "description": "on/off", + "type": "bool" + }, + { + "name": "rombar", + "type": "uint32" + }, + { + "name": "romfile", + "type": "str" + }, + { + "name": "addr", + "description": "Slot and optional function number, example: 06.0 or 06", + "type": "int32" + }, + { + "name": "surfaces", + "type": "int32" + }, + { + "name": "vgamem_mb", + "type": "uint32" + }, + { + "name": "vram64_size_mb", + "type": "uint32" + }, + { + "name": "vram_size_mb", + "type": "uint32" + }, + { + "name": "ram_size_mb", + "type": "uint32" + }, + { + "name": "cmdlog", + "type": "uint32" + }, + { + "name": "guestdebug", + "type": "uint32" + }, + { + "name": "debug", + "type": "uint32" + }, + { + "name": "revision", + "type": "uint32" + }, + { + "name": "vram_size", + "type": "uint32" + }, + { + "name": "ram_size", + "type": "uint32" + } + ], + "id": "libvirt-31" +} + +{ + "return": [ + { + "name": "pc-i440fx-2.4", + "is-default": true, + "cpu-max": 255, + "alias": "pc" + }, + { + "name": "pc-1.3", + "cpu-max": 255 + }, + { + "name": "pc-0.12", + "cpu-max": 255 + }, + { + "name": "pc-q35-1.6", + "cpu-max": 255 + }, + { + "name": "pc-q35-1.5", + "cpu-max": 255 + }, + { + "name": "none", + "cpu-max": 1 + }, + { + "name": "pc-i440fx-1.6", + "cpu-max": 255 + }, + { + "name": "pc-q35-2.2", + "cpu-max": 255 + }, + { + "name": "pc-i440fx-1.7", + "cpu-max": 255 + }, + { + "name": "pc-q35-2.1", + "cpu-max": 255 + }, + { + "name": "pc-0.11", + "cpu-max": 255 + }, + { + "name": "pc-0.10", + "cpu-max": 255 + }, + { + "name": "pc-i440fx-2.2", + "cpu-max": 255 + }, + { + "name": "pc-1.2", + "cpu-max": 255 + }, + { + "name": "isapc", + "cpu-max": 1 + }, + { + "name": "pc-i440fx-2.3", + "cpu-max": 255 + }, + { + "name": "pc-q35-1.4", + "cpu-max": 255 + }, + { + "name": "pc-0.15", + "cpu-max": 255 + }, + { + "name": "pc-i440fx-1.5", + "cpu-max": 255 + }, + { + "name": "pc-q35-2.0", + "cpu-max": 255 + }, + { + "name": "pc-i440fx-1.4", + "cpu-max": 255 + }, + { + "name": "pc-0.14", + "cpu-max": 255 + }, + { + "name": "pc-1.1", + "cpu-max": 255 + }, + { + "name": "pc-i440fx-2.1", + "cpu-max": 255 + }, + { + "name": "pc-q35-1.7", + "cpu-max": 255 + }, + { + "name": "pc-1.0", + "cpu-max": 255 + }, + { + "name": "pc-i440fx-2.0", + "cpu-max": 255 + }, + { + "name": "pc-q35-2.4", + "cpu-max": 255, + "alias": "q35" + }, + { + "name": "pc-q35-2.3", + "cpu-max": 255 + }, + { + "name": "pc-0.13", + "cpu-max": 255 + } + ], + "id": "libvirt-32" +} + +{ + "return": [ + { + "name": "Opteron_G5" + }, + { + "name": "Opteron_G4" + }, + { + "name": "Opteron_G3" + }, + { + "name": "Opteron_G2" + }, + { + "name": "Opteron_G1" + }, + { + "name": "Broadwell" + }, + { + "name": "Broadwell-noTSX" + }, + { + "name": "Haswell" + }, + { + "name": "Haswell-noTSX" + }, + { + "name": "IvyBridge" + }, + { + "name": "SandyBridge" + }, + { + "name": "Westmere" + }, + { + "name": "Nehalem" + }, + { + "name": "Penryn" + }, + { + "name": "Conroe" + }, + { + "name": "n270" + }, + { + "name": "athlon" + }, + { + "name": "pentium3" + }, + { + "name": "pentium2" + }, + { + "name": "pentium" + }, + { + "name": "486" + }, + { + "name": "coreduo" + }, + { + "name": "kvm32" + }, + { + "name": "qemu32" + }, + { + "name": "kvm64" + }, + { + "name": "core2duo" + }, + { + "name": "phenom" + }, + { + "name": "qemu64" + } + ], + "id": "libvirt-33" +} + +{ + "return": { + "enabled": false, + "present": true + }, + "id": "libvirt-34" +} + +{ + "return": [ + "tpm-tis" + ], + "id": "libvirt-35" +} + +{ + "return": [ + "passthrough" + ], + "id": "libvirt-36" +} + +{ + "return": [ + { + "parameters": [ + { + "name": "timeout", + "help": "Request timeout in seconds (default 0 = no timeout)", + "type": "number" + }, + { + "name": "initiator-name", + "help": "Initiator iqn name to use when connecting", + "type": "string" + }, + { + "name": "header-digest", + "help": "HeaderDigest setting. {CRC32C|CRC32C-NONE|NONE-CRC32C|NONE}", + "type": "string" + }, + { + "name": "password", + "help": "password for CHAP authentication to target", + "type": "string" + }, + { + "name": "user", + "help": "username for CHAP authentication to target", + "type": "string" + } + ], + "option": "iscsi" + }, + { + "parameters": [ + { + "name": "non-adaptive", + "type": "boolean" + }, + { + "name": "lossy", + "type": "boolean" + }, + { + "name": "acl", + "type": "boolean" + }, + { + "name": "x509verify", + "type": "string" + }, + { + "name": "tls", + "type": "boolean" + }, + { + "name": "sasl", + "type": "boolean" + }, + { + "name": "lock-key-sync", + "type": "boolean" + }, + { + "name": "reverse", + "type": "boolean" + }, + { + "name": "password", + "type": "boolean" + }, + { + "name": "ipv6", + "type": "boolean" + }, + { + "name": "ipv4", + "type": "boolean" + }, + { + "name": "to", + "type": "number" + }, + { + "name": "connections", + "type": "number" + }, + { + "name": "head", + "type": "number" + }, + { + "name": "display", + "type": "string" + }, + { + "name": "share", + "type": "string" + }, + { + "name": "x509", + "type": "string" + }, + { + "name": "websocket", + "type": "string" + }, + { + "name": "vnc", + "type": "string" + } + ], + "option": "vnc" + }, + { + "parameters": [ + { + "name": "seamless-migration", + "type": "boolean" + }, + { + "name": "playback-compression", + "type": "boolean" + }, + { + "name": "agent-mouse", + "type": "boolean" + }, + { + "name": "streaming-video", + "type": "string" + }, + { + "name": "zlib-glz-wan-compression", + "type": "string" + }, + { + "name": "jpeg-wan-compression", + "type": "string" + }, + { + "name": "image-compression", + "type": "string" + }, + { + "name": "plaintext-channel", + "type": "string" + }, + { + "name": "tls-channel", + "type": "string" + }, + { + "name": "tls-ciphers", + "type": "string" + }, + { + "name": "x509-dh-key-file", + "type": "string" + }, + { + "name": "x509-cacert-file", + "type": "string" + }, + { + "name": "x509-cert-file", + "type": "string" + }, + { + "name": "x509-key-password", + "type": "string" + }, + { + "name": "x509-key-file", + "type": "string" + }, + { + "name": "x509-dir", + "type": "string" + }, + { + "name": "sasl", + "type": "boolean" + }, + { + "name": "disable-agent-file-xfer", + "type": "boolean" + }, + { + "name": "disable-copy-paste", + "type": "boolean" + }, + { + "name": "disable-ticketing", + "type": "boolean" + }, + { + "name": "password", + "type": "string" + }, + { + "name": "ipv6", + "type": "boolean" + }, + { + "name": "ipv4", + "type": "boolean" + }, + { + "name": "addr", + "type": "string" + }, + { + "name": "tls-port", + "type": "number" + }, + { + "name": "port", + "type": "number" + } + ], + "option": "spice" + }, + { + "parameters": [ + ], + "option": "acpi" + }, + { + "parameters": [ + { + "name": "sock_fd", + "type": "number" + }, + { + "name": "socket", + "type": "string" + }, + { + "name": "readonly", + "type": "boolean" + }, + { + "name": "writeout", + "type": "string" + }, + { + "name": "security_model", + "type": "string" + }, + { + "name": "mount_tag", + "type": "string" + }, + { + "name": "path", + "type": "string" + }, + { + "name": "fsdriver", + "type": "string" + } + ], + "option": "virtfs" + }, + { + "parameters": [ + { + "name": "sock_fd", + "type": "number" + }, + { + "name": "socket", + "type": "string" + }, + { + "name": "readonly", + "type": "boolean" + }, + { + "name": "writeout", + "type": "string" + }, + { + "name": "security_model", + "type": "string" + }, + { + "name": "path", + "type": "string" + }, + { + "name": "fsdriver", + "type": "string" + } + ], + "option": "fsdev" + }, + { + "parameters": [ + ], + "option": "smbios" + }, + { + "parameters": [ + { + "name": "file", + "help": "Sets the name of the file from which\nthe fw_cfg blob will be loaded", + "type": "string" + }, + { + "name": "name", + "help": "Sets the fw_cfg name of the blob to be inserted", + "type": "string" + } + ], + "option": "fw_cfg" + }, + { + "parameters": [ + { + "name": "arg", + "type": "string" + }, + { + "name": "target", + "type": "string" + }, + { + "name": "enable", + "type": "boolean" + } + ], + "option": "semihosting-config" + }, + { + "parameters": [ + { + "name": "sleep", + "type": "boolean" + }, + { + "name": "align", + "type": "boolean" + }, + { + "name": "shift", + "type": "string" + } + ], + "option": "icount" + }, + { + "parameters": [ + ], + "option": "numa" + }, + { + "parameters": [ + { + "name": "debug-threads", + "help": "When enabled, name the individual threads; defaults off.\nNOTE: The thread names are for debugging and not a\nstable API.", + "type": "boolean" + }, + { + "name": "process", + "help": "Sets the name of the QEMU process, as shown in top etc", + "type": "string" + }, + { + "name": "guest", + "help": "Sets the name of the guest.\nThis name will be displayed in the SDL window caption.\nThe name will also be used for the VNC server", + "type": "string" + } + ], + "option": "name" + }, + { + "parameters": [ + { + "name": "timestamp", + "type": "boolean" + } + ], + "option": "msg" + }, + { + "parameters": [ + { + "name": "mlock", + "type": "boolean" + } + ], + "option": "realtime" + }, + { + "parameters": [ + ], + "option": "tpmdev" + }, + { + "parameters": [ + ], + "option": "object" + }, + { + "parameters": [ + { + "name": "opaque", + "help": "free-form string used to describe fd", + "type": "string" + }, + { + "name": "set", + "help": "ID of the fd set to add fd to", + "type": "number" + }, + { + "name": "fd", + "help": "file descriptor of which a duplicate is added to fd set", + "type": "number" + } + ], + "option": "add-fd" + }, + { + "parameters": [ + { + "name": "enable", + "type": "boolean" + } + ], + "option": "sandbox" + }, + { + "parameters": [ + { + "name": "strict", + "type": "boolean" + }, + { + "name": "reboot-timeout", + "type": "string" + }, + { + "name": "splash-time", + "type": "string" + }, + { + "name": "splash", + "type": "string" + }, + { + "name": "menu", + "type": "boolean" + }, + { + "name": "once", + "type": "string" + }, + { + "name": "order", + "type": "string" + } + ], + "option": "boot-opts" + }, + { + "parameters": [ + { + "name": "maxcpus", + "type": "number" + }, + { + "name": "threads", + "type": "number" + }, + { + "name": "cores", + "type": "number" + }, + { + "name": "sockets", + "type": "number" + }, + { + "name": "cpus", + "type": "number" + } + ], + "option": "smp-opts" + }, + { + "parameters": [ + { + "name": "maxmem", + "type": "size" + }, + { + "name": "slots", + "type": "number" + }, + { + "name": "size", + "type": "size" + } + ], + "option": "memory" + }, + { + "parameters": [ + { + "name": "suppress-vmdesc", + "help": "Set on to disable self-describing migration", + "type": "boolean" + }, + { + "name": "iommu", + "help": "Set on/off to enable/disable Intel IOMMU (VT-d)", + "type": "boolean" + }, + { + "name": "firmware", + "help": "firmware image", + "type": "string" + }, + { + "name": "usb", + "help": "Set on/off to enable/disable usb", + "type": "boolean" + }, + { + "name": "mem-merge", + "help": "enable/disable memory merge support", + "type": "boolean" + }, + { + "name": "dump-guest-core", + "help": "Include guest memory in a core dump", + "type": "boolean" + }, + { + "name": "dt_compatible", + "help": "Overrides the \"compatible\" property of the dt root node", + "type": "string" + }, + { + "name": "phandle_start", + "help": "The first phandle ID we may generate dynamically", + "type": "number" + }, + { + "name": "dumpdtb", + "help": "Dump current dtb to a file and quit", + "type": "string" + }, + { + "name": "dtb", + "help": "Linux kernel device tree file", + "type": "string" + }, + { + "name": "append", + "help": "Linux kernel command line", + "type": "string" + }, + { + "name": "initrd", + "help": "Linux initial ramdisk file", + "type": "string" + }, + { + "name": "kernel", + "help": "Linux kernel image file", + "type": "string" + }, + { + "name": "kvm_shadow_mem", + "help": "KVM shadow MMU size", + "type": "size" + }, + { + "name": "kernel_irqchip", + "help": "use KVM in-kernel irqchip", + "type": "boolean" + }, + { + "name": "accel", + "help": "accelerator list", + "type": "string" + }, + { + "name": "type", + "help": "emulated machine", + "type": "string" + } + ], + "option": "machine" + }, + { + "parameters": [ + { + "name": "romfile", + "type": "string" + }, + { + "name": "bootindex", + "type": "number" + } + ], + "option": "option-rom" + }, + { + "parameters": [ + { + "name": "file", + "type": "string" + }, + { + "name": "events", + "type": "string" + } + ], + "option": "trace" + }, + { + "parameters": [ + { + "name": "pretty", + "type": "boolean" + }, + { + "name": "default", + "type": "boolean" + }, + { + "name": "chardev", + "type": "string" + }, + { + "name": "mode", + "type": "string" + } + ], + "option": "mon" + }, + { + "parameters": [ + { + "name": "value", + "type": "string" + }, + { + "name": "property", + "type": "string" + }, + { + "name": "driver", + "type": "string" + } + ], + "option": "global" + }, + { + "parameters": [ + { + "name": "driftfix", + "type": "string" + }, + { + "name": "clock", + "type": "string" + }, + { + "name": "base", + "type": "string" + } + ], + "option": "rtc" + }, + { + "parameters": [ + ], + "option": "net" + }, + { + "parameters": [ + ], + "option": "netdev" + }, + { + "parameters": [ + ], + "option": "device" + }, + { + "parameters": [ + { + "name": "chardev", + "type": "string" + }, + { + "name": "size", + "type": "size" + }, + { + "name": "debug", + "type": "number" + }, + { + "name": "name", + "type": "string" + }, + { + "name": "signal", + "type": "boolean" + }, + { + "name": "mux", + "type": "boolean" + }, + { + "name": "rows", + "type": "number" + }, + { + "name": "cols", + "type": "number" + }, + { + "name": "height", + "type": "number" + }, + { + "name": "width", + "type": "number" + }, + { + "name": "telnet", + "type": "boolean" + }, + { + "name": "reconnect", + "type": "number" + }, + { + "name": "delay", + "type": "boolean" + }, + { + "name": "server", + "type": "boolean" + }, + { + "name": "wait", + "type": "boolean" + }, + { + "name": "ipv6", + "type": "boolean" + }, + { + "name": "ipv4", + "type": "boolean" + }, + { + "name": "to", + "type": "number" + }, + { + "name": "localport", + "type": "string" + }, + { + "name": "localaddr", + "type": "string" + }, + { + "name": "port", + "type": "string" + }, + { + "name": "host", + "type": "string" + }, + { + "name": "path", + "type": "string" + }, + { + "name": "backend", + "type": "string" + } + ], + "option": "chardev" + }, + { + "parameters": [ + { + "name": "copy-on-read", + "help": "copy read data from backing file into image file", + "type": "boolean" + }, + { + "name": "werror", + "help": "write error action", + "type": "string" + }, + { + "name": "rerror", + "help": "read error action", + "type": "string" + }, + { + "name": "read-only", + "help": "open drive file as read-only", + "type": "boolean" + }, + { + "name": "file", + "help": "file name", + "type": "string" + }, + { + "name": "serial", + "help": "disk serial number", + "type": "string" + }, + { + "name": "addr", + "help": "pci address (virtio only)", + "type": "string" + }, + { + "name": "boot", + "help": "(deprecated, ignored)", + "type": "boolean" + }, + { + "name": "trans", + "help": "chs translation (auto, lba, none)", + "type": "string" + }, + { + "name": "secs", + "help": "number of sectors (ide disk geometry)", + "type": "number" + }, + { + "name": "heads", + "help": "number of heads (ide disk geometry)", + "type": "number" + }, + { + "name": "cyls", + "help": "number of cylinders (ide disk geometry)", + "type": "number" + }, + { + "name": "if", + "help": "interface (ide, scsi, sd, mtd, floppy, pflash, virtio)", + "type": "string" + }, + { + "name": "media", + "help": "media type (disk, cdrom)", + "type": "string" + }, + { + "name": "index", + "help": "index number", + "type": "number" + }, + { + "name": "unit", + "help": "unit number (i.e. lun for scsi)", + "type": "number" + }, + { + "name": "bus", + "help": "bus number", + "type": "number" + }, + { + "name": "detect-zeroes", + "help": "try to optimize zero writes (off, on, unmap)", + "type": "string" + }, + { + "name": "throttling.group", + "help": "name of the block throttling group", + "type": "string" + }, + { + "name": "throttling.iops-size", + "help": "when limiting by iops max size of an I/O in bytes", + "type": "number" + }, + { + "name": "throttling.bps-write-max", + "help": "total bytes write burst", + "type": "number" + }, + { + "name": "throttling.bps-read-max", + "help": "total bytes read burst", + "type": "number" + }, + { + "name": "throttling.bps-total-max", + "help": "total bytes burst", + "type": "number" + }, + { + "name": "throttling.iops-write-max", + "help": "I/O operations write burst", + "type": "number" + }, + { + "name": "throttling.iops-read-max", + "help": "I/O operations read burst", + "type": "number" + }, + { + "name": "throttling.iops-total-max", + "help": "I/O operations burst", + "type": "number" + }, + { + "name": "throttling.bps-write", + "help": "limit write bytes per second", + "type": "number" + }, + { + "name": "throttling.bps-read", + "help": "limit read bytes per second", + "type": "number" + }, + { + "name": "throttling.bps-total", + "help": "limit total bytes per second", + "type": "number" + }, + { + "name": "throttling.iops-write", + "help": "limit write operations per second", + "type": "number" + }, + { + "name": "throttling.iops-read", + "help": "limit read operations per second", + "type": "number" + }, + { + "name": "throttling.iops-total", + "help": "limit total I/O operations per second", + "type": "number" + }, + { + "name": "werror", + "help": "write error action", + "type": "string" + }, + { + "name": "format", + "help": "disk format (raw, qcow2, ...)", + "type": "string" + }, + { + "name": "aio", + "help": "host AIO implementation (threads, native)", + "type": "string" + }, + { + "name": "cache.no-flush", + "help": "ignore any flush requests for the device", + "type": "boolean" + }, + { + "name": "cache.direct", + "help": "enables use of O_DIRECT (bypass the host page cache)", + "type": "boolean" + }, + { + "name": "cache.writeback", + "help": "enables writeback mode for any caches", + "type": "boolean" + }, + { + "name": "discard", + "help": "discard operation (ignore/off, unmap/on)", + "type": "string" + }, + { + "name": "snapshot", + "help": "enable/disable snapshot mode", + "type": "boolean" + } + ], + "option": "drive" + } + ], + "id": "libvirt-37" +} + +{ + "return": [ + { + "state": false, + "capability": "xbzrle" + }, + { + "state": false, + "capability": "rdma-pin-all" + }, + { + "state": false, + "capability": "auto-converge" + }, + { + "state": false, + "capability": "zero-blocks" + }, + { + "state": false, + "capability": "compress" + }, + { + "state": false, + "capability": "events" + } + ], + "id": "libvirt-38" +} diff --git a/tests/qemucapabilitiestest.c b/tests/qemucapabilitiestest.c index 99abd02..fff8a76 100644 --- a/tests/qemucapabilitiestest.c +++ b/tests/qemucapabilitiestest.c @@ -190,6 +190,7 @@ mymain(void) DO_TEST("caps_1.6.0-1"); DO_TEST("caps_1.6.50-1"); DO_TEST("caps_2.1.1-1"); + DO_TEST("caps_2.4.0-1"); qemuTestDriverFree(&driver); -- 2.6.3

2 1

[libvirt] [PATCH] qemu: Fix style in qemuProcessStart
by Jiri Denemark 11 Nov '15

11 Nov '15

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/qemu/qemu_process.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 69a0f97..4545f77 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -4279,7 +4279,7 @@ int qemuProcessStart(virConnectPtr conn, */ VIR_DEBUG("Preparing network devices"); if (qemuNetworkPrepareDevices(vm->def) < 0) - goto error; + goto error; /* Must be run before security labelling */ VIR_DEBUG("Preparing host devices"); @@ -4636,9 +4636,8 @@ int qemuProcessStart(virConnectPtr conn, VIR_DEBUG("Setting up security labelling"); if (virSecurityManagerSetChildProcessLabel(driver->securityManager, - vm->def, cmd) < 0) { + vm->def, cmd) < 0) goto error; - } virCommandSetOutputFD(cmd, &logfile); virCommandSetErrorFD(cmd, &logfile); -- 2.6.3

2 1

[libvirt] [sandbox] Weird apparmor problems
by Cedric Bosdonnat 11 Nov '15

11 Nov '15

Hi all, I'm seeing weird apparmor errors when running virt-sandbox here. Here are the log entries: apparmor="ALLOWED" operation="mknod" parent=1 profile="libvirt-634ed189-cca0-4126-830c-4e4a76846b25" name="/var/lib/libvirt/qemu/sandbox.monitor" pid=2251 comm="qemu-system-x86" requested_mask="c" denied_mask="c" fsuid=493 ouid=493 apparmor="ALLOWED" operation="open" parent=1 profile="libvirt-634ed189-cca0-4126-830c-4e4a76846b25" name="/dev/ptmx" pid=2251 comm="qemu-system-x86" requested_mask="w" denied_mask="w" fsuid=493 ouid=0 apparmor="ALLOWED" operation="open" parent=1 profile="libvirt-634ed189-cca0-4126-830c-4e4a76846b25" name="/dev/pts/2" pid=2251 comm="qemu-system-x86" requested_mask="w" denied_mask="w" fsuid=493 ouid=493 apparmor="ALLOWED" operation="file_perm" parent=1 profile="libvirt-634ed189-cca0-4126-830c-4e4a76846b25" name="/var/log/libvirt/qemu/sandbox.log" pid=2251 comm="qemu-system-x86" requested_mask="w" denied_mask="w" fsuid=493 ouid=0 apparmor="ALLOWED" operation="open" parent=1 profile="libvirt-634ed189-cca0-4126-830c-4e4a76846b25" name="/dev/ptmx" pid=2251 comm="qemu-system-x86" requested_mask="w" denied_mask="w" fsuid=493 ouid=0 apparmor="ALLOWED" operation="open" parent=1 profile="libvirt-634ed189-cca0-4126-830c-4e4a76846b25" name="/dev/pts/3" pid=2251 comm="qemu-system-x86" requested_mask="w" denied_mask="w" fsuid=493 ouid=493 apparmor="ALLOWED" operation="file_perm" parent=1 profile="libvirt-634ed189-cca0-4126-830c-4e4a76846b25" name="/var/log/libvirt/qemu/sandbox.log" pid=2251 comm="qemu-system-x86" requested_mask="w" denied_mask="w" fsuid=493 ouid=0 apparmor="ALLOWED" operation="open" parent=1 profile="libvirt-634ed189-cca0-4126-830c-4e4a76846b25" name="/dev/kvm" pid=2251 comm="qemu-system-x86" requested_mask="w" denied_mask="w" fsuid=493 ouid=0 The weird thing is that /dev/kvm, /var/log/libvirt/qemu/sandbox.log and /var/lib/libvirt/qemu/sandbox.monitor already have rules. And I'm wondering if it's normal to have write access to /dev/pts/* and /dev/ptmx. Any idea? -- Cedric

3 4

[libvirt] [PATCH] qemuxmlnstest: Remove migrate{From,Fd}
by Jiri Denemark 11 Nov '15

11 Nov '15

They are unused and make no sense in this test. It was most likely a result of copy&paste from another test. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- tests/qemuxmlnstest.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/tests/qemuxmlnstest.c b/tests/qemuxmlnstest.c index 4d83f7a..6ca7847 100644 --- a/tests/qemuxmlnstest.c +++ b/tests/qemuxmlnstest.c @@ -30,8 +30,6 @@ static virQEMUDriver driver; static int testCompareXMLToArgvFiles(const char *xml, const char *cmdline, virQEMUCapsPtr extraFlags, - const char *migrateFrom, - int migrateFd, bool json, bool expectError) { @@ -106,7 +104,7 @@ static int testCompareXMLToArgvFiles(const char *xml, if (!(cmd = qemuBuildCommandLine(conn, &driver, vmdef, monitor_chr, json, extraFlags, - migrateFrom, migrateFd, NULL, + NULL, -1, NULL, VIR_NETDEV_VPORT_PROFILE_OP_NO_OP, &testCallbacks, false, false, NULL, NULL, NULL))) @@ -157,8 +155,6 @@ static int testCompareXMLToArgvFiles(const char *xml, struct testInfo { const char *name; virQEMUCapsPtr extraFlags; - const char *migrateFrom; - int migrateFd; bool json; bool expectError; }; @@ -184,7 +180,6 @@ testCompareXMLToArgvHelper(const void *data) goto cleanup; result = testCompareXMLToArgvFiles(xml, args, info->extraFlags, - info->migrateFrom, info->migrateFd, info->json, info->expectError); cleanup: @@ -212,10 +207,10 @@ mymain(void) if (VIR_STRDUP_QUIET(driver.config->libDir, "/tmp") < 0) return EXIT_FAILURE; -# define DO_TEST_FULL(name, migrateFrom, migrateFd, expectError, ...) \ +# define DO_TEST(name, expectError, ...) \ do { \ struct testInfo info = { \ - name, NULL, migrateFrom, migrateFd, json, expectError \ + name, NULL, json, expectError \ }; \ if (!(info.extraFlags = virQEMUCapsNew())) \ return EXIT_FAILURE; \ @@ -226,9 +221,6 @@ mymain(void) virObjectUnref(info.extraFlags); \ } while (0) -# define DO_TEST(name, expectError, ...) \ - DO_TEST_FULL(name, NULL, -1, expectError, __VA_ARGS__) - # define NONE QEMU_CAPS_LAST /* Unset or set all envvars here that are copied in qemudBuildCommandLine -- 2.6.3

2 2

[libvirt] [PATCH] qemu: Fix job entry debug message
by Jiri Denemark 11 Nov '15

11 Nov '15

Logging current async job while in BeginJob is useful, but the async job we want to start is even more interesting. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/qemu/qemu_domain.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 416ab5b..0a7437a 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -1476,17 +1476,23 @@ qemuDomainObjBeginJobInternal(virQEMUDriverPtr driver, unsigned long long now; unsigned long long then; bool nested = job == QEMU_JOB_ASYNC_NESTED; + bool async = job == QEMU_JOB_ASYNC; virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); const char *blocker = NULL; int ret = -1; unsigned long long duration = 0; unsigned long long asyncDuration = 0; + const char *jobStr; - VIR_DEBUG("Starting %s: %s (async=%s vm=%p name=%s)", - job == QEMU_JOB_ASYNC ? "async job" : "job", - qemuDomainJobTypeToString(job), - qemuDomainAsyncJobTypeToString(priv->job.asyncJob), - obj, obj->def->name); + if (async) + jobStr = qemuDomainAsyncJobTypeToString(asyncJob); + else + jobStr = qemuDomainJobTypeToString(job); + + VIR_DEBUG("Starting %s: %s (vm=%p name=%s, current job=%s async=%s)", + async ? "async job" : "job", jobStr, obj, obj->def->name, + qemuDomainJobTypeToString(priv->job.active), + qemuDomainAsyncJobTypeToString(priv->job.asyncJob)); if (virTimeMillisNow(&now) < 0) { virObjectUnref(cfg); -- 2.6.3

2 1

[libvirt] Abstracting device address allocation
by priyanshu jain 11 Nov '15

11 Nov '15

Hello, I am undergraduate computer science student in india .I am new to opensource and i want to contribute to project abstracting device address allocation . I have good knowledge of c . please suggest me how i contribute to this. Regards PriyanshuJain

2 1

[libvirt] discuss libvirt with lxc don't support network type:ethenet , thanks!
by Zhongguocheng 11 Nov '15

11 Nov '15

Dear, I find that:current libvirt version with lxc hypervisor don’t support network type :Ethernet For example: xml is： <domain type='lxc'> //hypervisor is lxc ………. <devices> <console type='pty'/> <interface type="ethernet"> //network type is ethernet <mac address="02:36:1d:18:2a:e4"/> <ip address='192.168.122.105' family='ipv4' prefix='24'/> <model type="virtio"/> <script path=""/> <target dev="tap361d182a-e14"/> </interface> </devices> </domain> When I start the lxc with that xml,it will report error,and start lxc failed. Now I resolved it,and hope to Contribute and commit the code to libvirt. What should I do? Thanks.

2 1

[libvirt] strange stale qemu processes after domain shutdown
by Vasiliy Tolstov 11 Nov '15

11 Nov '15

I have 58 active domains with status running, and 62 qemu-system-x86_64 processes. After investigating this issue, i found problem domains. How to fix this issue and not lost this qemu processes? ps auxww: root 29561 0.2 0.2 1599628 743796 ? Sl Aug13 224:44 qemu-system-x86_64 -enable-kvm -name 29953 -S -machine pc-i440fx-1.7,accel=kvm,usb=off -m 1024 -realtime mlock=off -smp 1,sockets=1,cores=1,threads=1 -uuid 7ca8e593-29f7-6389-9b35-000071cc3e1e -no-user-config -nodefaults -chardev socket,id=charmonitor,path=/var/lib/libvirt/qemu/29953.monitor,server,nowait -mon chardev=charmonitor,id=monitor,mode=control -rtc base=utc -no-shutdown -boot strict=on -device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 -device virtio-scsi-pci,id=scsi0,num_queues=1,bus=pci.0,addr=0x4 -device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x6 -drive file=/dev/vg3/29953,if=none,id=drive-scsi0-0-0-0,format=raw,cache=none,discard=unmap,aio=native,iops=5000 -device scsi-hd,bus=scsi0.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi0-0-0-0,id=scsi0-0-0-0,bootindex=1 -drive if=none,id=drive-scsi0-0-1-0,readonly=on,format=raw -device scsi-cd,bus=scsi0.0,channel=0,scsi-id=1,lun=0,drive=drive-scsi0-0-1-0,id=scsi0-0-1-0 -netdev tap,fd=353,id=hostnet0,vhost=on,vhostfd=354 -device virtio-net-pci,netdev=hostnet0,id=net0,mac=52:54:00:00:40:25,bus=pci.0,addr=0x3,rombar=0 -chardev pty,id=charserial0 -device isa-serial,chardev=charserial0,id=serial0 -chardev socket,id=charchannel0,path=/var/lib/libvirt/qemu/29953.agent,server,nowait -device virtserialport,bus=virtio-serial0.0,nr=1,chardev=charchannel0,id=channel0,name=org.qemu.guest_agent.0 -device usb-mouse,id=input0 -device usb-kbd,id=input1 -vnc [::]:23,password -device VGA,id=video0,vgamem_mb=16,bus=pci.0,addr=0x2 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5 -object rng-random,id=objrng0,filename=/dev/random -device virtio-rng-pci,rng=objrng0,id=rng0,max-bytes=1024,period=2000,bus=pci.0,addr=0x7 -msg timestamp=on libvirt log contains: 2015-10-13 06:52:05.504+0000: starting up libvirt version: 1.2.16, qemu version: 2.3.0 (Debian 2.3.0-2+0~20150518103251.26+wheezy~1.gbp820cc6) LC_ALL=C PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin HOME=/root USER=root LOGNAME=root QEMU_AUDIO_DRV=none /usr/bin/kvm -name 29953 -S -machine pc-i440fx-1.7,accel=kvm,usb=off -m 1024 -realtime mlock=off -smp 1,sockets=1,cores=1,threads=1 -uuid 7ca8e593-29f7-6389-9b35-000071cc3e1e -no-user-config -nodefaults -chardev socket,id=charmonitor,path=/var/lib/libvirt/qemu/29953.monitor,server,nowait -mon chardev=charmonitor,id=monitor,mode=control -rtc base=utc -no-shutdown -boot strict=on -device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 -device virtio-scsi-pci,id=scsi0,num_queues=1,bus=pci.0,addr=0x4 -device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x6 -drive file=/dev/vg3/29953,if=none,id=drive-scsi0-0-0-0,format=raw,cache=none,discard=unmap,aio=native,iops=5000 -device scsi-hd,bus=scsi0.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi0-0-0-0,id=scsi0-0-0-0,bootindex=1 -drive if=none,id=drive-scsi0-0-1-0,readonly=on,format=raw -device scsi-cd,bus=scsi0.0,channel=0,scsi-id=1,lun=0,drive=drive-scsi0-0-1-0,id=scsi0-0-1-0 -netdev tap,fd=92,id=hostnet0,vhost=on,vhostfd=109 -device virtio-net-pci,netdev=hostnet0,id=net0,mac=52:54:00:00:40:25,bus=pci.0,addr=0x3,rombar=0 -chardev pty,id=charserial0 -device isa-serial,chardev=charserial0,id=serial0 -chardev socket,id=charchannel0,path=/var/lib/libvirt/qemu/29953.agent,server,nowait -device virtserialport,bus=virtio-serial0.0,nr=1,chardev=charchannel0,id=channel0,name=org.qemu.guest_agent.0 -device usb-mouse,id=input0 -device usb-kbd,id=input1 -vnc [::]:46,password -device VGA,id=video0,vgamem_mb=16,bus=pci.0,addr=0x2 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5 -object rng-random,id=objrng0,filename=/dev/random -device virtio-rng-pci,rng=objrng0,id=rng0,max-bytes=1024,period=2000,bus=pci.0,addr=0x7 -msg timestamp=on Domain id=3262 is tainted: high-privileges char device redirected to /dev/pts/45 (label charserial0) qemu: terminating on signal 15 from pid 14945 2015-10-14 19:32:06.672+0000: shutting down -- Vasiliy Tolstov, e-mail: v.tolstov(a)selfip.ru

2 6

Re: [libvirt] [Xen-devel] [vbox-dev] Assert with libvirt + xen hvm
by Ian Jackson 11 Nov '15

11 Nov '15

Cole Robinson writes ("Re: [Xen-devel] [libvirt] [vbox-dev] Assert with libvirt + xen hvm"): > I took a cursory look at libxl's sigchld handling... it's intense to say the > least, but there's some driver options that tweak the handling. Maybe there's > a simple fix. Sadly the way that there's a single SIGCHLD handler in the Unix API is extremely awkward in multithreaded programs. The complicated code in libxl is trying to help cope with that. > On 01/26/2015 08:17 AM, Klaus Espenlaub wrote: > > The rationale why the runtime installs a dummy signal handler is that if > > SIGCHLD is set to be ignored (that's the default) then POSIX compliant > > waitpid() won't work. It's mentioned in the wait(2) man page on my linux > > system, see the notes about the ECHILD error code. I think you are wrong about this. SIGCHLD (like all signals) is set to SIG_DFL by default. But it is only SIG_IGN that causes automatic reaping of children. I normally use the online Open Group spec to check this kind of thing - it's more authoritative than manpages. http://pubs.opengroup.org/onlinepubs/9699919799/functions/V2_chap02.html#ta… SIG_IGN ... If the action for the SIGCHLD signal is set to SIG_IGN, child processes of the calling processes shall not be transformed into zombie processes when they terminate. If the calling process subsequently waits for its children, and the process has no unwaited-for children that were transformed into zombie processes, it shall block until all of its children terminate, and wait(), waitid(), and waitpid() shall fail and set errno to [ECHILD]. I don't know exactly what virtualbox does with children but if the only reason it is setting a SIGCHLD handler is to avoid its children being automatically reaped, leaving it set to SIG_DFL will work just fine. If virtualbox always reaps its children synchronously (ie, it does not use SIGCHLD to get notified of child death) then setting the libxl signal mode to libxl_sigchld_owner_libxl_always_selective_reap in libvirt should work. This is what libvirt (at laast in master) does. There would then be no need for virtualbox to do anything to SIGCHLD. Although, it might be worth checking that it isn't SIG_IGN and screaming somewhere if it is. Incidentally it seems to me possible that the reason why virtualbox explictly sets a SIGCHLD handler may be that at some point in the past you had encountered a bug with someone in the same process setting SIGCHLD to SIG_IGN. Ian.

1 0

[libvirt] [PATCH v2 0/2] vz: implement memory setting functions in driver
by Nikolay Shirokovskiy 11 Nov '15

11 Nov '15

Diff from v1. 1. Add a patch to factor out common domain config update checks. Nikolay Shirokovskiy (2): vz: implement memory setting functions in driver vz: factor out config update flags checks src/libvirt-domain.c | 5 +- src/vz/vz_driver.c | 129 +++++++++++++++++++++++++++++++++++--------------- src/vz/vz_sdk.c | 23 +++++++++ src/vz/vz_sdk.h | 1 + 4 files changed, 118 insertions(+), 40 deletions(-)

2 4

[libvirt] [PATCH 0/2] Hyper-v crash feature support
by Dmitry Andreev 11 Nov '15

11 Nov '15

A new Hyper-V cpu feature 'hv_crash' was added to QEMU. The feature will become available in v2.5.0. This patch adds support for this feature. Dmitry Andreev (2): conf: add crash to hyperv features qemu: add hv_crash support docs/formatdomain.html.in | 7 +++++++ docs/schemas/domaincommon.rng | 5 +++++ src/conf/domain_conf.c | 6 +++++- src/conf/domain_conf.h | 1 + src/qemu/qemu_command.c | 2 ++ tests/qemuxml2argvdata/qemuxml2argv-hyperv-off.xml | 1 + tests/qemuxml2argvdata/qemuxml2argv-hyperv.args | 4 ++-- tests/qemuxml2argvdata/qemuxml2argv-hyperv.xml | 1 + 8 files changed, 24 insertions(+), 3 deletions(-) -- 1.8.3.1

8 18

[libvirt] [PATCH] doc: fix memory setting API documentation inconsistencies
by Nikolay Shirokovskiy 11 Nov '15

11 Nov '15

Hi, everyone. Patch series "vz: implement memory setting functions in driver" besides doing what it declares also fixes inconsistency in documentation of domain API vs virsh CLI and somewhat biased to vz case. I've hoped that core mantainers check this out but suddenly realized that they are not as nothing in subject invites them to do it. So this letter instead of being an actual patch is an invitation for them to evaluate mentioned patch series in part that corresponds to documentation.

1 0

[libvirt] [PATCH] qemu: process: Fix automatic setting of locked memory limit for VFIO
by Peter Krempa 11 Nov '15

11 Nov '15

For VFIO passthrough the guest memory including the device memory to be resident in memory. Previously we used a magic constant of 1GiB that we added to the current memory size of the VM to accomodate all this. It is possible though that the device that is passed through exposes more than that. To avoid guessing wrong again in the future set the memory lock limit to unlimited at the point when VFIO will be used. This problem is similar to the issue where we tried to infer the hard limit for a VM according to it's configuration. This proved to be really problematic so we moved this burden to the user. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1273480 Additionally this patch also fixes a similar bug, where the mlock limit was not increased prior to a memory hotplug operation. https://bugzilla.redhat.com/show_bug.cgi?id=1273491 --- src/qemu/qemu_command.c | 17 +++++------------ src/qemu/qemu_hotplug.c | 20 +++++--------------- src/util/virprocess.c | 3 +++ 3 files changed, 13 insertions(+), 27 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 8824541..183aa85 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -11448,20 +11448,13 @@ qemuBuildCommandLine(virConnectPtr conn, } if (mlock) { - unsigned long long memKB; - - /* VFIO requires all of the guest's memory to be - * locked resident, plus some amount for IO - * space. Alex Williamson suggested adding 1GiB for IO - * space just to be safe (some finer tuning might be - * nice, though). - */ + /* VFIO requires all of the guest's memory and the IO space of the + * device to be locked resident. Since we can't really know what the + * users decide to plug in we need to set the limit to unlimited. */ if (virMemoryLimitIsSet(def->mem.hard_limit)) - memKB = def->mem.hard_limit; + virCommandSetMaxMemLock(cmd, def->mem.hard_limit << 10); else - memKB = virDomainDefGetMemoryActual(def) + 1024 * 1024; - - virCommandSetMaxMemLock(cmd, memKB * 1024); + virCommandSetMaxMemLock(cmd, ULLONG_MAX); } if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_MSG_TIMESTAMP) && diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 8f2fda9..1cf61ac 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1254,7 +1254,6 @@ qemuDomainAttachHostPCIDevice(virQEMUDriverPtr driver, bool teardowncgroup = false; bool teardownlabel = false; int backend; - unsigned long long memKB; virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); unsigned int flags = 0; @@ -1279,20 +1278,11 @@ qemuDomainAttachHostPCIDevice(virQEMUDriverPtr driver, goto error; } - /* VFIO requires all of the guest's memory to be locked - * resident (plus an additional 1GiB to cover IO space). During - * hotplug, the guest's memory may already be locked, but it - * doesn't hurt to "change" the limit to the same value. - * NB: the domain's memory tuning parameters are stored as - * Kibibytes, but virProcessSetMaxMemLock expects the value in - * bytes. - */ - if (virMemoryLimitIsSet(vm->def->mem.hard_limit)) - memKB = vm->def->mem.hard_limit; - else - memKB = virDomainDefGetMemoryActual(vm->def) + (1024 * 1024); - - virProcessSetMaxMemLock(vm->pid, memKB * 1024); + /* VFIO requires all of the guest's memory and the IO space of the + * device to be locked resident. Since we can't really know what the + * users decide to plug in we need to set the limit to unlimited. */ + if (!virMemoryLimitIsSet(vm->def->mem.hard_limit)) + virProcessSetMaxMemLock(vm->pid, ULLONG_MAX); break; default: diff --git a/src/util/virprocess.c b/src/util/virprocess.c index 103c114..92195df 100644 --- a/src/util/virprocess.c +++ b/src/util/virprocess.c @@ -749,6 +749,9 @@ virProcessSetMaxMemLock(pid_t pid, unsigned long long bytes) if (bytes == 0) return 0; + if (bytes == ULLONG_MAX) + bytes = RLIM_INFINITY; + rlim.rlim_cur = rlim.rlim_max = bytes; if (pid == 0) { if (setrlimit(RLIMIT_MEMLOCK, &rlim) < 0) { -- 2.6.2

4 11

[libvirt] Assert with libvirt + xen hvm
by CloudPatch Staff 11 Nov '15

11 Nov '15

We're hitting an assert whenever we try to create an HVM instance under Xen via libvirtd. System is running on Gentoo, package information as follows: app-emulation/xen-4.5.0 USE="api debug flask hvm pam pygrub python qemu screen" app-emulation/xen-tools-4.5.0 USE="api debug flask hvm pam pygrub python qemu screen" app-emulation/libvirt-1.2.11-r2:0/1.2.11 USE="caps libvirtd lvm macvtap nls qemu udev vepa virtualbox xen" The following commands are run in parallel: vmmachine ~ # libvirtd --listen 2015-01-22 16:33:13.596+0000: 2620: info : libvirt version: 1.2.11 2015-01-22 16:33:13.596+0000: 2620: error : udevGetDMIData:1607 : Failed to get udev device for syspath '/sys/devices/virtual/dmi/id' or '/sys/class/dmi/id' libvirtd: libxl_fork.c:350: sigchld_installhandler_core: Assertion `((void)"application must negotiate with libxl about SIGCHLD", !(sigchld_saved_action.sa_flags & 4) && (sigchld_saved_action.__sigaction_handler.sa_handler == ((__sighandler_t) 0) || sigchld_saved_action.__sigaction_handler.sa_handler == ((__sighandler_t) 1)))' failed. Aborted vmmachine ~ # VIRSH_DEBUG=0 virsh create xml create: file(optdata): xml libvirt: XML-RPC error : End of file while reading data: Input/output error error: Failed to create domain from xml error: End of file while reading data: Input/output error libvirt: Domain Config error : Requested operation is not valid: A different callback was requested

4 5

[libvirt] [PATCH 00/10] Allow memory hotplug without NUMA on ppc64
by Peter Krempa 11 Nov '15

11 Nov '15

Peter Krempa (10): conf: Make @def const in virDomainDefGetMemoryInitial conf: Turn targetNode in struct virDomainMemoryDef to signed qemu: command: Make qemuBuildMemoryBackendStr usable without NUMA qemu: command: Always execute memory device formatter qemu: domain: Add common function to perform memory hotplug checks qemu: command: Move dimm device checks from formatter to checker qemu: domain: Remove memory device check from post parse callback conf: Prepare making memory device target node optional qemu: command: Prepare memory device def formatter for missing target node qemu: ppc64: Support memory hotplug without NUMA enabled docs/formatdomain.html.in | 5 +- docs/schemas/domaincommon.rng | 8 +- src/conf/domain_conf.c | 18 ++- src/conf/domain_conf.h | 4 +- src/qemu/qemu_command.c | 143 +++++------------ src/qemu/qemu_command.h | 4 +- src/qemu/qemu_domain.c | 177 ++++++++++++++++++++- src/qemu/qemu_domain.h | 4 + src/qemu/qemu_hotplug.c | 11 +- .../qemuxml2argv-memory-hotplug-ppc64-nonuma.args | 19 +++ .../qemuxml2argv-memory-hotplug-ppc64-nonuma.xml | 38 +++++ tests/qemuxml2argvtest.c | 2 + 12 files changed, 296 insertions(+), 137 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-ppc64-nonuma.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-ppc64-nonuma.xml -- 2.4.5

3 25

[libvirt] Issue with Parallel/VZ driver on Parallel Cloud Server 6.0
by Frank Laszlo 11 Nov '15

11 Nov '15

Hello, I've been tasked with integrating libvirt into a server running Parallel Cloud Server 6.0. However, it seems I've ran into some trouble getting the vz/parallel driver to compile. It appears there might be an issue with the version of parallels-virtualization-sdk thats installed (6.10.24195) I first tried using the latest libvirt version, 1.2.21. After finding the magical configure arguments and ENV variables to get it to find the SDK, the configure script reported "Yes" next to the vz driver. I then proceeded to run a make, and was confronted with the following error message: vz/vz_sdk.c: In function 'prlsdkAddNet': vz/vz_sdk.c:2964: error: 'PRL_USE_VNET_NAME_FOR_BRIDGE_NAME' undeclared (first use in this function) vz/vz_sdk.c:2964: error: (Each undeclared identifier is reported only once vz/vz_sdk.c:2964: error: for each function it appears in.) make[3]: *** [vz/libvirt_driver_vz_la-vz_sdk.lo] Error 1 make[3]: Leaving directory `/root/libvirt-1.2.21/src' I then tried to use libvirt 1.2.16, thinking that if I go back a few versions to before the driver was renamed (parallels -> vz), it might work. This appears to have sorted out the compiler errors, however, when it goes to link the modules, I get the following: make[3]: Entering directory `/root/libvirt-1.2.16/src' CCLD libvirt_sanlock_helper ./.libs/libvirt.so: undefined reference to `PrlSrv_GetSrvConfig' ./.libs/libvirt.so: undefined reference to `PrlApi_Deinit' ./.libs/libvirt.so: undefined reference to `PrlSrv_AddVirtualNetwork' ./.libs/libvirt.so: undefined reference to `PrlVmCfg_GetNetAdaptersCount' ./.libs/libvirt.so: undefined reference to `PrlSrv_GetVmListEx' ./.libs/libvirt.so: undefined reference to `PrlJob_GetResult' ./.libs/libvirt.so: undefined reference to `PrlHandle_GetType' ./.libs/libvirt.so: undefined reference to `PrlEvent_GetType' ./.libs/libvirt.so: undefined reference to `PrlVm_BeginEdit' ./.libs/libvirt.so: undefined reference to `PrlVmDev_GetStackIndex' ./.libs/libvirt.so: undefined reference to `PrlVmDevNet_SetAdapterType' ./.libs/libvirt.so: undefined reference to `PrlVmDev_GetIfaceType' ./.libs/libvirt.so: undefined reference to `PrlVmCfg_SetDescription' ./.libs/libvirt.so: undefined reference to `PrlVmDevNet_SetHostInterfaceName' ./.libs/libvirt.so: undefined reference to `PrlVmDevHd_SetMountPoint' ./.libs/libvirt.so: undefined reference to `PrlVmCfg_GetVNCHostName' ./.libs/libvirt.so: undefined reference to `PrlVmDevNet_GetHostInterfaceName' ./.libs/libvirt.so: undefined reference to `PrlVmDev_SetEmulatedType' ./.libs/libvirt.so: undefined reference to `PrlVm_StopEx' ./.libs/libvirt.so: undefined reference to `PrlVmCfg_SetDiskCacheWriteBack' ./.libs/libvirt.so: undefined reference to `PrlSrv_Create' ./.libs/libvirt.so: undefined reference to `PrlBootDev_SetIndex' ./.libs/libvirt.so: undefined reference to `PrlJob_GetRetCode' ./.libs/libvirt.so: undefined reference to `PrlHndlList_GetItem' ./.libs/libvirt.so: undefined reference to `PrlVmCfg_GetAutoStart' ./.libs/libvirt.so: undefined reference to `PrlVmCfg_GetVmType' ./.libs/libvirt.so: undefined reference to `PrlVmDev_SetStackIndex' ./.libs/libvirt.so: undefined reference to `PrlVmDev_SetFriendlyName' ./.libs/libvirt.so: undefined reference to `PrlSrv_UnregEventHandler' ./.libs/libvirt.so: undefined reference to `PrlVmCfg_SetVNCPort' ./.libs/libvirt.so: undefined reference to `PrlVm_Pause' ./.libs/libvirt.so: undefined reference to `PrlVmDev_GetImagePath' ./.libs/libvirt.so: undefined reference to `PrlHandle_AddRef' ./.libs/libvirt.so: undefined reference to `PrlVm_RefreshConfig' ./.libs/libvirt.so: undefined reference to `PrlVmCfg_GetSerialPortsCount' ./.libs/libvirt.so: undefined reference to `PrlVm_Resume' ./.libs/libvirt.so: undefined reference to `PrlSrv_Logoff' ./.libs/libvirt.so: undefined reference to `PrlVmCfg_GetHomePath' ./.libs/libvirt.so: undefined reference to `PrlVmCfg_GetCpuMode' ./.libs/libvirt.so: undefined reference to `PrlVmCfg_GetCpuMask' ./.libs/libvirt.so: undefined reference to `PrlVm_CommitEx' ./.libs/libvirt.so: undefined reference to `PrlVmCfg_GetVNCMode' ./.libs/libvirt.so: undefined reference to `PrlJob_Wait' ./.libs/libvirt.so: undefined reference to `PrlVmDevNet_GetVirtualNetworkId' ./.libs/libvirt.so: undefined reference to `PrlEvent_GetIssuerId' ./.libs/libvirt.so: undefined reference to `PrlVm_RegEx' ./.libs/libvirt.so: undefined reference to `PrlResult_GetParamsCount' ./.libs/libvirt.so: undefined reference to `PrlVmDevNet_SetMacAddress' ./.libs/libvirt.so: undefined reference to `PrlVmDevNet_GetAdapterType' ./.libs/libvirt.so: undefined reference to `PrlVm_Suspend' ./.libs/libvirt.so: undefined reference to `PrlVmCfg_SetCpuMode' ./.libs/libvirt.so: undefined reference to `PrlVmCfg_SetCpuCount' ./.libs/libvirt.so: undefined reference to `PrlBootDev_SetSequenceIndex' ./.libs/libvirt.so: undefined reference to `PrlVmCfg_GetBootDev' ./.libs/libvirt.so: undefined reference to `PrlBootDev_SetInUse' ./.libs/libvirt.so: undefined reference to `PrlVmCfg_GetOpticalDisk' ./.libs/libvirt.so: undefined reference to `PrlVmCfg_GetEnvId' ./.libs/libvirt.so: undefined reference to `PrlVirtNet_SetNetworkId' ./.libs/libvirt.so: undefined reference to `PrlVmCfg_SetOfflineManagementEnabled' ./.libs/libvirt.so: undefined reference to `PrlVmDev_SetEnabled' ./.libs/libvirt.so: undefined reference to `PrlVmCfg_GetNetAdapter' ./.libs/libvirt.so: undefined reference to `PrlVmCfg_SetCpuMask' ./.libs/libvirt.so: undefined reference to `PrlVmCfg_GetHardDisk' ./.libs/libvirt.so: undefined reference to `PrlVmCfg_SetVNCMode' ./.libs/libvirt.so: undefined reference to `PrlVmCfg_GetBootDevCount' ./.libs/libvirt.so: undefined reference to `PrlBootDev_SetType' ./.libs/libvirt.so: undefined reference to `PrlVmCfg_GetCpuCount' ./.libs/libvirt.so: undefined reference to `PrlVmDev_SetIfaceType' ./.libs/libvirt.so: undefined reference to `PrlApi_InitEx' ./.libs/libvirt.so: undefined reference to `PrlVmDev_Remove' ./.libs/libvirt.so: undefined reference to `PrlJob_GetError' ./.libs/libvirt.so: undefined reference to `PrlEvent_GetErrCode' ./.libs/libvirt.so: undefined reference to `PrlVmCfg_GetRamSize' ./.libs/libvirt.so: undefined reference to `PrlVmCfg_SetVideoRamSize' ./.libs/libvirt.so: undefined reference to `PrlVmCfg_SetName' ./.libs/libvirt.so: undefined reference to `PrlApi_GetResultDescription' ./.libs/libvirt.so: undefined reference to `PrlVmCfg_GetVideoRamSize' ./.libs/libvirt.so: undefined reference to `PrlVmCfg_GetUuid' ./.libs/libvirt.so: undefined reference to `PrlVmCfg_SetOsTemplate' ./.libs/libvirt.so: undefined reference to `PrlVmCfg_SetDefaultConfig' ./.libs/libvirt.so: undefined reference to `PrlSrv_DeleteVirtualNetwork' ./.libs/libvirt.so: undefined reference to `PrlVmDev_GetIndex' ./.libs/libvirt.so: undefined reference to `PrlVmDevHd_GetMountPoint' ./.libs/libvirt.so: undefined reference to `PrlVm_Reg' ./.libs/libvirt.so: undefined reference to `PrlVmCfg_GetName' ./.libs/libvirt.so: undefined reference to `PrlVmCfg_GetVNCPort' ./.libs/libvirt.so: undefined reference to `PrlSrv_GetDefaultVmConfig' ./.libs/libvirt.so: undefined reference to `PrlSrv_CreateVm' ./.libs/libvirt.so: undefined reference to `PrlVmCfg_SetVNCHostName' ./.libs/libvirt.so: undefined reference to `PrlVm_DropSuspendedState' ./.libs/libvirt.so: undefined reference to `PrlSrv_GetVmConfig' ./.libs/libvirt.so: undefined reference to `PrlVmCfg_SetRamSize' ./.libs/libvirt.so: undefined reference to `PrlVm_Unreg' ./.libs/libvirt.so: undefined reference to `PrlVmDevNet_SetPktFilterPreventMacSpoof' ./.libs/libvirt.so: undefined reference to `PrlBootDev_Remove' ./.libs/libvirt.so: undefined reference to `PrlHndlList_GetItemsCount' ./.libs/libvirt.so: undefined reference to `PrlVmDev_SetImagePath' ./.libs/libvirt.so: undefined reference to `PrlVmCfg_GetHardDisksCount' ./.libs/libvirt.so: undefined reference to `PrlResult_GetParamByIndex' ./.libs/libvirt.so: undefined reference to `PrlSrv_LoginLocalEx' ./.libs/libvirt.so: undefined reference to `PrlVirtNet_Create' ./.libs/libvirt.so: undefined reference to `PrlVmDevSerial_SetSocketMode' ./.libs/libvirt.so: undefined reference to `PrlVmInfo_GetState' ./.libs/libvirt.so: undefined reference to `PrlVm_GetState' ./.libs/libvirt.so: undefined reference to `PrlEvtPrm_ToInt32' ./.libs/libvirt.so: undefined reference to `PrlVmDevNet_GetMacAddressCanonical' ./.libs/libvirt.so: undefined reference to `PrlVmDev_GetFriendlyName' ./.libs/libvirt.so: undefined reference to `PrlHandle_Free' ./.libs/libvirt.so: undefined reference to `PrlVmDev_IsConnected' ./.libs/libvirt.so: undefined reference to `PrlVm_StartEx' ./.libs/libvirt.so: undefined reference to `PrlVmDev_GetEmulatedType' ./.libs/libvirt.so: undefined reference to `PrlBootDev_GetType' ./.libs/libvirt.so: undefined reference to `PrlApi_SwitchConsoleLogging' ./.libs/libvirt.so: undefined reference to `PrlVirtNet_SetNetworkType' ./.libs/libvirt.so: undefined reference to `PrlEvent_GetParamByName' ./.libs/libvirt.so: undefined reference to `PrlVmCfg_SetUuid' ./.libs/libvirt.so: undefined reference to `PrlEvent_GetErrString' ./.libs/libvirt.so: undefined reference to `PrlVmCfg_GetSerialPort' ./.libs/libvirt.so: undefined reference to `PrlVmCfg_CreateVmDev' ./.libs/libvirt.so: undefined reference to `PrlVmDev_SetIndex' ./.libs/libvirt.so: undefined reference to `PrlVmCfg_GetAllDevices' ./.libs/libvirt.so: undefined reference to `PrlVmDev_SetSysName' ./.libs/libvirt.so: undefined reference to `PrlVmDev_SetConnected' ./.libs/libvirt.so: undefined reference to `PrlSrv_RegEventHandler' ./.libs/libvirt.so: undefined reference to `PrlVmCfg_CreateBootDev' ./.libs/libvirt.so: undefined reference to `PrlVmDevNet_SetVirtualNetworkId' ./.libs/libvirt.so: undefined reference to `PrlVmCfg_GetOpticalDisksCount' To me, these errors seem to be related to the parallels sdk, But I am unable to figure out a way to get around them. I've added PARALLELS_SDK_CFLAGS and PARALLELS_SDK_LIBS to my env with the proper compiler and linker flags, I've also tried adjusting CFLAGS and LDFLAGS directly with the same results. Any help with this would be great, as we would like to continue using libvirt as much as possible (We use it with a couple other drivers). Thank you -- Frank Laszlo Nexcess - Beyond Hosting 21700 Melrose Ave. Southfield, MI. 48075 Cell: +1.248.602.6123 Phone: +1.866.639.2377 Fax: +1.248.281.0473

2 1

[libvirt] [PATCH] vz: implement memory setting functions in driver
by Nikolay Shirokovskiy 10 Nov '15

10 Nov '15

Implement functions for vz containers only. vz VMs memory managment thru libvirt yet to be designed. vz memory management for containers is rather different from other drivers. 1. Whole bunch of memory settings functions change both cur_balloon and maximum memory to the same value. The reason is that active container memory settings is not limited by memory set at container startup as in virtual machine case. Thus there is no real need in 2 parameters and this patch takes an effort to map this situation to an existent interface. 2. virDomainSetMemory semantics is extended. Current documentation states that this function changes memory only for a current domain. At the same time virsh documentation states that behaviour of 'setmem' without flags (that eventually calls virDomainSetMemory) is hypervisor specific. I think we can extend sematics of the function to the defined in virsh. First this is already done for virDomainSetMaxMemory, second it would be convinient for vz driver. With current semantics virDomainSetMemory can't be implemented as vz always set persistent state if live state is set. With extended semantics function just holds the vz driver behaviour and we can use 'setmem' without flags to change domain memory. 3. VIR_DOMAIN_MEM_CURRENT is not supported. There are 2 reasons. First is to be consistent with vzDomainAttachDeviceFlags and vzDomainDetachDeviceFlags. Second is that this flag has no good correllation with vz behaviour. I'm not sure what use case of this flag is, I suppose it is to call the function without inquiring the current state of domain so you will not fail because of incorrect flags combination. But with vz this behaviour is impossible. The function will fail if domain is in active state and you specify this flag as you can't change running domain config only. Signed-off-by: Nikolay Shirokovskiy <nshirokovskiy(a)virtuozzo.com> --- src/libvirt-domain.c | 5 ++- src/vz/vz_driver.c | 81 ++++++++++++++++++++++++++++++++++++++++++++++++++ src/vz/vz_sdk.c | 23 ++++++++++++++ src/vz/vz_sdk.h | 1 + 4 files changed, 108 insertions(+), 2 deletions(-) diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index de7eb04..56ab907 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -1882,8 +1882,9 @@ virDomainSetMaxMemory(virDomainPtr domain, unsigned long memory) * to Domain0 i.e. the domain where the application runs. * This function may require privileged access to the hypervisor. * - * This command only changes the runtime configuration of the domain, - * so can only be called on an active domain. + * This command is hypervisor-specific for whether active, persistent, + * or both configurations are changed; for more control, use + * virDomainSetMemoryFlags(). * * Returns 0 in case of success and -1 in case of failure. */ diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c index 6f1cbfb..cab47ec 100644 --- a/src/vz/vz_driver.c +++ b/src/vz/vz_driver.c @@ -1438,6 +1438,84 @@ vzNodeGetFreeMemory(virConnectPtr conn ATTRIBUTE_UNUSED) return freeMem; } +static int vzDomainSetMemoryDefault(virDomainObjPtr dom, unsigned long memory) +{ + if (!IS_CT(dom->def)) { + virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", + _("Can't change memory size for vz VM")); + return -1; + } + + if (prlsdkSetMemsize(dom, memory >> 10) < 0) + return -1; + + virDomainDefSetMemoryInitial(dom->def, memory); + dom->def->mem.cur_balloon = memory; + + return 0; +} + +static int vzDomainSetMemoryFlags(virDomainPtr domain, unsigned long memory, + unsigned int flags) +{ + virDomainObjPtr dom = NULL; + int ret = -1; + + virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | + VIR_DOMAIN_AFFECT_CONFIG | + VIR_DOMAIN_MEM_MAXIMUM, -1); + + if (!(dom = vzDomObjFromDomain(domain))) + return -1; + + if (!(flags & VIR_DOMAIN_AFFECT_CONFIG)) { + virReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("device attach needs VIR_DOMAIN_AFFECT_CONFIG " + "flag to be set")); + goto cleanup; + } + + if (!virDomainObjIsActive(dom) && (flags & VIR_DOMAIN_AFFECT_LIVE)) { + virReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("cannot do live update a device on " + "inactive domain")); + goto cleanup; + } + + if (virDomainObjIsActive(dom) && !(flags & VIR_DOMAIN_AFFECT_LIVE)) { + virReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("Updates on a running domain need " + "VIR_DOMAIN_AFFECT_LIVE flag")); + goto cleanup; + } + + ret = vzDomainSetMemoryDefault(dom, memory); + + cleanup: + + virObjectUnlock(dom); + return ret; +} + +static int vzDomainSetMemory(virDomainPtr domain, unsigned long memory) +{ + virDomainObjPtr dom = NULL; + int ret = -1; + + if (!(dom = vzDomObjFromDomain(domain))) + return -1; + + ret = vzDomainSetMemoryDefault(dom, memory); + + virObjectUnlock(dom); + return ret; +} + +static int vzDomainSetMaxMemory(virDomainPtr domain, unsigned long memory) +{ + return vzDomainSetMemory(domain, memory); +} + static virHypervisorDriver vzDriver = { .name = "vz", .connectOpen = vzConnectOpen, /* 0.10.0 */ @@ -1499,6 +1577,9 @@ static virHypervisorDriver vzDriver = { .domainBlockStatsFlags = vzDomainBlockStatsFlags, /* 1.2.17 */ .domainInterfaceStats = vzDomainInterfaceStats, /* 1.2.17 */ .domainMemoryStats = vzDomainMemoryStats, /* 1.2.17 */ + .domainSetMemoryFlags = vzDomainSetMemoryFlags, /* 1.2.21 */ + .domainSetMemory = vzDomainSetMemory, /* 1.2.21 */ + .domainSetMaxMemory = vzDomainSetMaxMemory, /* 1.2.21 */ }; static virConnectDriver vzConnectDriver = { diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c index 89c9e89..2d0f688 100644 --- a/src/vz/vz_sdk.c +++ b/src/vz/vz_sdk.c @@ -4036,3 +4036,26 @@ prlsdkGetMemoryStats(virDomainObjPtr dom, return ret; } + +int prlsdkSetMemsize(virDomainObjPtr dom, unsigned int memsize) +{ + int ret = -1; + vzDomObjPtr privdom = dom->privateData; + PRL_HANDLE job = PRL_INVALID_HANDLE; + PRL_RESULT pret; + + job = PrlVm_BeginEdit(privdom->sdkdom); + if (PRL_FAILED(waitJob(job))) + goto out; + + pret = PrlVmCfg_SetRamSize(privdom->sdkdom, memsize); + prlsdkCheckRetGoto(pret, out); + + job = PrlVm_CommitEx(privdom->sdkdom, PVCF_DETACH_HDD_BUNDLE); + if (PRL_FAILED(waitJob(job))) + goto out; + + ret = 0; + out: + return ret; +} diff --git a/src/vz/vz_sdk.h b/src/vz/vz_sdk.h index ebe4591..88fef4a 100644 --- a/src/vz/vz_sdk.h +++ b/src/vz/vz_sdk.h @@ -76,3 +76,4 @@ int prlsdkGetVcpuStats(virDomainObjPtr dom, int idx, unsigned long long *time); int prlsdkGetMemoryStats(virDomainObjPtr dom, virDomainMemoryStatPtr stats, unsigned int nr_stats); +int prlsdkSetMemsize(virDomainObjPtr dom, unsigned int memsize); -- 1.7.1

3 3

[libvirt] [PATCH v2 0/8] libxl: domain statistics support
by Joao Martins 10 Nov '15

10 Nov '15

Hey, This series bring support for various statistics about domains regarding CPU, Memory, Network Interfaces, Block and Jobs. Not all of the statistics are implemented: qdisk support is missing in this series and some of the memory statistics aren't available. With this series we further implement 7 more functions of libvirt APIs. It is organized as follows: * Patch 1, 2: implements cpu/memory statistics. * Patch 3: implements network statistics * Patch 4: adds helper method virDiskNameParse as an extension to virDiskNameToIndex (New) * Patch 5: VBD block statistics. QDisk will follow up in a separate series regarding QEMU monitor integration. * Patch 6: implement fetching all domain statistics * Patch 7, 8: implements Job information statistics. Overall it looks big but 70% of the patch is due to #5 and #6 but doesn't add necessarily more complexity to the driver I believe. Patch #7 and #8 are of special importance because GetJobInfo and GetJobStats are now used in Openstack Kilo to monitor live-migration progress. These two patches together with the p2p migration I sent earlier let us sucessfully live-migrate with Openstack Kilo. Furthermore with this series we get to support nova diagnostics. Tested this series on 4.4.3 and 4.5 setups plus Openstack Kilo. Individual patches contain the changelog and comments addressed since v1. Thanks! Joao Martins (8): libxl: implement virDomainGetCPUStats libxl: implement virDomainMemorystats libxl: implement virDomainInterfaceStats util: add virDiskNameParse to handle disk and partition idx libxl: implement virDomainBlockStats libxl: implement virConnectGetAllDomainStats libxl: implement virDomainGetJobInfo libxl: implement virDomainGetJobStats configure.ac | 2 +- src/libvirt_private.syms | 1 + src/libxl/libxl_domain.c | 43 +++ src/libxl/libxl_domain.h | 6 + src/libxl/libxl_driver.c | 960 +++++++++++++++++++++++++++++++++++++++++++++++ src/util/virutil.c | 41 +- src/util/virutil.h | 1 + tests/utiltest.c | 56 +++ 8 files changed, 1105 insertions(+), 5 deletions(-) -- 2.1.4

1 8

[libvirt] [PATCH] vz: support cpu time in driver's domainGetInfo
by Nikolay Shirokovskiy 10 Nov '15

10 Nov '15

Just straight-forward patch. Use reference counting for privdom as stats internally could drop domain lock. Signed-off-by: Nikolay Shirokovskiy <nshirokovskiy(a)virtuozzo.com> --- src/vz/vz_driver.c | 19 ++++++++++++++++--- 1 files changed, 16 insertions(+), 3 deletions(-) diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c index 6f1cbfb..0a968b9 100644 --- a/src/vz/vz_driver.c +++ b/src/vz/vz_driver.c @@ -554,7 +554,7 @@ vzDomainGetInfo(virDomainPtr domain, virDomainInfoPtr info) virDomainObjPtr privdom; int ret = -1; - if (!(privdom = vzDomObjFromDomain(domain))) + if (!(privdom = vzDomObjFromDomainRef(domain))) goto cleanup; info->state = virDomainObjGetState(privdom, NULL); @@ -562,11 +562,24 @@ vzDomainGetInfo(virDomainPtr domain, virDomainInfoPtr info) info->maxMem = virDomainDefGetMemoryActual(privdom->def); info->nrVirtCpu = privdom->def->vcpus; info->cpuTime = 0; + + if (virDomainObjIsActive(privdom)) { + unsigned long long vtime; + size_t i; + + for (i = 0; i < privdom->def->vcpus; ++i) { + if (prlsdkGetVcpuStats(privdom, i, &vtime) < 0) { + virReportError(VIR_ERR_OPERATION_FAILED, "%s", + _("cannot read cputime for domain")); + goto cleanup; + } + info->cpuTime += vtime; + } + } ret = 0; cleanup: - if (privdom) - virObjectUnlock(privdom); + virDomainObjEndAPI(&privdom); return ret; } -- 1.7.1

3 2

[libvirt] [PATCH v2 0/3] qemu: Fix mlock limit on memory hotplug
by Peter Krempa 10 Nov '15

10 Nov '15

Peter Krempa (3): qemu: Extract logic to determine the mlock limit size for VFIO qemu: hotplug: Fix mlock limit handling on memory hotplug qemu: hotplug: Reject VFIO hotplug if setting RLIMIT_MEMLOCK fails src/qemu/qemu_command.c | 18 ++--------------- src/qemu/qemu_domain.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_domain.h | 3 +++ src/qemu/qemu_hotplug.c | 50 +++++++++++++++++++++++++++++---------------- 4 files changed, 92 insertions(+), 33 deletions(-) -- 2.6.2

3 10

[libvirt] [sandbox 0/2] virt-sandbox-config minor fixes
by Cédric Bosdonnat 09 Nov '15

09 Nov '15

Hi all, Here are two really trivial patches, one adding image format guess to -m host-image in the same way we do it for --disk, and one fixing some code formatting issue. Cédric Bosdonnat (2): Try guessing host-image image format Code formatting fix libvirt-sandbox/libvirt-sandbox-config.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) -- 2.1.4

2 4

[libvirt] [PATCH 0/2] qemu: Fix mlock limit on memory hotplug
by Peter Krempa 09 Nov '15

09 Nov '15

This is necessary so that VFIO doesn't break killing the guests. Peter Krempa (2): qemu: Extract logic to determine the mlock limit size for VFIO qemu: hotplug: Fix mlock limit handling on memory hotplug src/qemu/qemu_command.c | 18 ++---------------- src/qemu/qemu_domain.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_domain.h | 3 +++ src/qemu/qemu_hotplug.c | 32 +++++++++++++++++--------------- 4 files changed, 66 insertions(+), 31 deletions(-) -- 2.6.2

2 5

[libvirt] [PATCHv2] *** "Don't include .c file for editing support" bug was fixed***
by rodinasophie＠gmail.com 08 Nov '15

08 Nov '15

From: Sophia Rodina <rodinasophie(a)gmail.com> *** When editing an XML of a domain, network or anything else, it is implemented in virsh-edit.c and currently included as a C file with the behaviour being influenced by EDIT_ macros. This should be changed so that the same file is not being included over and over again, but its function is called instead. The behaviour should be affected by callbacks in some control structure. *** sonya rodina (1): "Don't include .c file for editing support" bug was fixed. Callbacks in special struct were added instead of EDIT-* macros tools/Makefile.am | 1 + tools/virsh-domain.c | 187 ++++++++++++++++++++++++++++++++++++------------ tools/virsh-edit.c | 79 ++++++-------------- tools/virsh-edit.h | 42 +++++++++++ tools/virsh-interface.c | 64 +++++++++++++---- tools/virsh-network.c | 62 ++++++++++++---- tools/virsh-nwfilter.c | 64 +++++++++++++---- tools/virsh-pool.c | 64 +++++++++++++---- tools/virsh-snapshot.c | 76 ++++++++++++++------ 9 files changed, 464 insertions(+), 175 deletions(-) create mode 100644 tools/virsh-edit.h -- 2.1.4

1 0