- Devel - libvirt List Archives

[libvirt] [PATCH] tests: Drop unnecessary variables
by Andrea Bolognani 12 Mar '19

12 Mar '19

In qemuxml2xmltest, both activeVcpus and blockjobs members of the testInfo struct have been entirely unused ever since commit d1a7fc8bb303. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Pushed as trivial. tests/qemuxml2xmltest.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index e08d30c676..3efa498114 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -30,9 +30,6 @@ struct testInfo { char *outActiveName; char *outInactiveName; - virBitmapPtr activeVcpus; - bool blockjobs; - virQEMUCapsPtr qemuCaps; }; @@ -108,9 +105,6 @@ testInfoClear(struct testInfo *info) VIR_FREE(info->outActiveName); VIR_FREE(info->outInactiveName); - virBitmapFree(info->activeVcpus); - info->activeVcpus = NULL; - virObjectUnref(info->qemuCaps); } -- 2.20.1

1 0

[libvirt] [jenkins-ci PATCH 0/3] lcitool: tweaks to exception handling
by Daniel P. Berrangé 12 Mar '19

12 Mar '19

A few tweaks to exception handling identified in previous discussions about the use of Exception. Daniel P. Berrangé (3): lcitool: remove Error class for exception handling lcitool: push exception catching down into run method lcitool: add support for --debug / -d argument guests/lcitool | 72 +++++++++++++++++++++++++------------------------- 1 file changed, 36 insertions(+), 36 deletions(-) -- 2.20.1

2 7

[libvirt] [PATCH] virsh: Make self-test failures noisy
by Eric Blake 12 Mar '19

12 Mar '19

In local testing, I accidentally introduced a self-test failure, and spent way too much time debugging it. Make sure the testsuite log includes some hint as to why command option validation failed. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- tools/vsh.c | 56 +++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 42 insertions(+), 14 deletions(-) diff --git a/tools/vsh.c b/tools/vsh.c index 2fd1564d15..1d30019c2c 100644 --- a/tools/vsh.c +++ b/tools/vsh.c @@ -331,21 +331,26 @@ vshCmddefGetInfo(const vshCmdDef * cmd, const char *name) /* Check if the internal command definitions are correct */ static int -vshCmddefCheckInternals(const vshCmdDef *cmd) +vshCmddefCheckInternals(vshControl *ctl, + const vshCmdDef *cmd) { size_t i; const char *help = NULL; /* in order to perform the validation resolve the alias first */ if (cmd->flags & VSH_CMD_FLAG_ALIAS) { - if (!cmd->alias) + if (!cmd->alias) { + vshError(ctl, _("command '%s' has inconsistent alias"), cmd->name); return -1; + } cmd = vshCmddefSearch(cmd->alias); } /* Each command has to provide a non-empty help string. */ - if (!(help = vshCmddefGetInfo(cmd, "help")) || !*help) + if (!(help = vshCmddefGetInfo(cmd, "help")) || !*help) { + vshError(ctl, _("command '%s' lacks help"), cmd->name); return -1; + } if (!cmd->opts) return 0; @@ -353,14 +358,19 @@ vshCmddefCheckInternals(const vshCmdDef *cmd) for (i = 0; cmd->opts[i].name; i++) { const vshCmdOptDef *opt = &cmd->opts[i]; - if (i > 63) + if (i > 63) { + vshError(ctl, _("command '%s' has too many options"), cmd->name); return -1; /* too many options */ + } switch (opt->type) { case VSH_OT_STRING: case VSH_OT_BOOL: - if (opt->flags & VSH_OFLAG_REQ) - return -1; /* nor bool nor string options can't be mandatory */ + if (opt->flags & VSH_OFLAG_REQ) { + vshError(ctl, _("command '%s' misused VSH_OFLAG_REQ"), + cmd->name); + return -1; /* neither bool nor string options can be mandatory */ + } break; case VSH_OT_ALIAS: { @@ -368,11 +378,17 @@ vshCmddefCheckInternals(const vshCmdDef *cmd) char *name = (char *)opt->help; /* cast away const */ char *p; - if (opt->flags || !opt->help) + if (opt->flags || !opt->help) { + vshError(ctl, _("command '%s' has incorrect alias option"), + cmd->name); return -1; /* alias options are tracked by the original name */ + } if ((p = strchr(name, '=')) && - VIR_STRNDUP(name, name, p - name) < 0) + VIR_STRNDUP(name, name, p - name) < 0) { + vshError(ctl, _("allocation failure while checking command '%s'"), + cmd->name); return -1; + } for (j = i + 1; cmd->opts[j].name; j++) { if (STREQ(name, cmd->opts[j].name) && cmd->opts[j].type != VSH_OT_ALIAS) @@ -381,21 +397,33 @@ vshCmddefCheckInternals(const vshCmdDef *cmd) if (name != opt->help) { VIR_FREE(name); /* If alias comes with value, replacement must not be bool */ - if (cmd->opts[j].type == VSH_OT_BOOL) + if (cmd->opts[j].type == VSH_OT_BOOL) { + vshError(ctl, _("command '%s' has mismatched alias type"), + cmd->name); return -1; + } } - if (!cmd->opts[j].name) + if (!cmd->opts[j].name) { + vshError(ctl, _("command '%s' has missing alias option"), + cmd->name); return -1; /* alias option must map to a later option name */ + } } break; case VSH_OT_ARGV: - if (cmd->opts[i + 1].name) + if (cmd->opts[i + 1].name) { + vshError(ctl, _("command '%s' has option after argv"), + cmd->name); return -1; /* argv option must be listed last */ + } break; case VSH_OT_DATA: - if (!(opt->flags & VSH_OFLAG_REQ)) + if (!(opt->flags & VSH_OFLAG_REQ)) { + vshError(ctl, _("command '%s' has non-required VSH_OT_DATA"), + cmd->name); return -1; /* OT_DATA should always be required. */ + } break; case VSH_OT_INT: @@ -3405,7 +3433,7 @@ const vshCmdInfo info_selftest[] = { * That runs vshCmddefOptParse which validates * the per-command options structure. */ bool -cmdSelfTest(vshControl *ctl ATTRIBUTE_UNUSED, +cmdSelfTest(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) { const vshCmdGrp *grp; @@ -3413,7 +3441,7 @@ cmdSelfTest(vshControl *ctl ATTRIBUTE_UNUSED, for (grp = cmdGroups; grp->name; grp++) { for (def = grp->commands; def->name; def++) { - if (vshCmddefCheckInternals(def) < 0) + if (vshCmddefCheckInternals(ctl, def) < 0) return false; } } -- 2.20.1

3 4

[libvirt] [libvirt-go PATCH] connect: Add the new libvirt API virConnectGetStoragePoolCapabilities
by Erik Skultety 12 Mar '19

12 Mar '19

Signed-off-by: Erik Skultety <eskultet(a)redhat.com> --- connect.go | 17 +++++++++++++++++ connect_wrapper.go | 13 +++++++++++++ connect_wrapper.h | 4 ++++ 3 files changed, 34 insertions(+) diff --git a/connect.go b/connect.go index 0d5118c..04badfc 100644 --- a/connect.go +++ b/connect.go @@ -2985,3 +2985,20 @@ func (c *Connect) NWFilterBindingCreateXML(xmlConfig string, flags uint32) (*NWF } return &NWFilterBinding{ptr: ptr}, nil } + +// See also https://libvirt.org/html/libvirt-libvirt-storage.html#virConnectGetStorageP… +func (c *Connect) GetStoragePoolCapabilities(flags uint32) (string, error) { + if C.LIBVIR_VERSION_NUMBER < 5002000 { + return "", makeNotImplementedError("virConnectGetStoragePoolCapabilities") + } + + var err C.virError + ret := C.virConnectGetStoragePoolCapabilitiesWrapper(c.ptr, C.uint(flags), &err) + if ret == nil { + return "", makeError(&err) + } + + defer C.free(unsafe.Pointer(ret)) + + return C.GoString(ret), nil +} diff --git a/connect_wrapper.go b/connect_wrapper.go index 89727d0..7be3361 100644 --- a/connect_wrapper.go +++ b/connect_wrapper.go @@ -1761,6 +1761,19 @@ virStreamNewWrapper(virConnectPtr conn, } +char * +virConnectGetStoragePoolCapabilitiesWrapper(virConnectPtr conn, + unsigned int flags, + virErrorPtr err) +{ + char * ret = virConnectGetStoragePoolCapabilities(conn, flags); + if (!ret) { + virCopyLastError(err); + } + return ret; +} + + //////////////////////////////////////////////// */ import "C" diff --git a/connect_wrapper.h b/connect_wrapper.h index 5c282d2..2e57ebd 100644 --- a/connect_wrapper.h +++ b/connect_wrapper.h @@ -726,5 +726,9 @@ virStreamNewWrapper(virConnectPtr conn, unsigned int flags, virErrorPtr err); +char * +virConnectGetStoragePoolCapabilitiesWrapper(virConnectPtr conn, + unsigned int flags, + virErrorPtr err); #endif /* LIBVIRT_GO_CONNECT_WRAPPER_H__ */ -- 2.20.1

2 3

Re: [libvirt] Contributing to Libvirt
by Dan Fries 12 Mar '19

12 Mar '19

Hi Libvirt, It's often said that persistence and patience are the keys to success in life. I think persons managing content and marketing at Libvirt would be remiss for not trying out my work. Hoping to hear from you soon. Best, Dan On Monday, March 4, 2019 at 7:36 AM, Dan Fries <dan(a)danfries.net> wrote: > Hello again Libvirt, > > Following up in case my previous message was lost or buried. Reiterating > my interest to contribute to Libvirt. > > Warmly, > Dan > > On Wednesday, February 27, 2019 at 3:27 AM, Dan Fries <dan(a)danfries.net> > wrote: > >> Dear Libvirt, >> >> I hope you do not mind me contacting you directly, as I was given your >> email by a colleague. My name is Dan Fries, and I am a technical copywriter >> focused on the open source / free software community. >> >> I'm reaching out to you today in the hopes of writing for Libvirt. Is >> there any availability to contribute to the site as a guest author? I'm >> not seeking employment nor remuneration, only volunteer work. >> >> Thanks for your time and consideration. >> >> Dan >> __ >> *Daniel Fries - Linkedin >> <http://go.danfries.net/x/d?c=3582051&l=ae0cb955-cae7-4cb8-9c98-35ef497e8942…>* >> >> >> If I've reached you in error or you would prefer to not receive another >> message at this address, I apologize for the inconvenience. Click here >> <http://go.danfries.net/x/u?u=95b4b2a0-e834-43d9-ab3d-30462ef34ab1> and >> you shouldn't hear from me again. >> >> >

2 1

[libvirt] [PATCH v3 0/4] PPC64 support for NVIDIA V100 GPU with NVLink2 passthrough
by Daniel Henrique Barboza 12 Mar '19

12 Mar '19

This series includes Libvirt support for a new QEMU feature for the spapr (PPC64) machine, NVIDIA V100 + P9 passthrough. Refer to [1] for the version 3 of this feature (same version used as a reference for this series). Changes in v3: - added a new patch (patch 2) that isolates the PPC64 exclusive code to calculate the memLockLimit (suggested by Erik Skultety) - fixed 'make syntax-check' errors across all patches - v2 can be found at [2] [1] https://patchwork.kernel.org/cover/10831413/ [2] https://www.redhat.com/archives/libvir-list/2019-March/msg00059.html Daniel Henrique Barboza (4): qemu_domain: simplify non-VFIO memLockLimit calc for PPC64 qemu_domain: add a PPC64 memLockLimit helper qemu_domain: NVLink2 device tree functions for PPC64 PPC64 support for NVIDIA V100 GPU with NVLink2 passthrough src/qemu/qemu_domain.c | 402 ++++++++++++++++++++++++++++++++--------- 1 file changed, 321 insertions(+), 81 deletions(-) -- 2.20.1

4 19

[libvirt] [dockerfiles PATCH] Fix name for ppc64le architecture
by Andrea Bolognani 12 Mar '19

12 Mar '19

lcitool expects libvirt architecture names, which means the correct value for little-endian 64-bit PowerPC is ppc64le (VIR_ARCH_PPC64LE). Note that, while "ppc64el" is not an architecture name libvirt would recognize, mips64el (VIR_ARCH_MIPS64EL) and mipsel (VIR_ARCH_MIPSEL) are indeed correct. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- ...c64el.Dockerfile => buildenv-debian-9-cross-ppc64le.Dockerfile | 0 ...4el.Dockerfile => buildenv-debian-sid-cross-ppc64le.Dockerfile | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename buildenv-debian-9-cross-ppc64el.Dockerfile => buildenv-debian-9-cross-ppc64le.Dockerfile (100%) rename buildenv-debian-sid-cross-ppc64el.Dockerfile => buildenv-debian-sid-cross-ppc64le.Dockerfile (100%) diff --git a/buildenv-debian-9-cross-ppc64el.Dockerfile b/buildenv-debian-9-cross-ppc64le.Dockerfile similarity index 100% rename from buildenv-debian-9-cross-ppc64el.Dockerfile rename to buildenv-debian-9-cross-ppc64le.Dockerfile diff --git a/buildenv-debian-sid-cross-ppc64el.Dockerfile b/buildenv-debian-sid-cross-ppc64le.Dockerfile similarity index 100% rename from buildenv-debian-sid-cross-ppc64el.Dockerfile rename to buildenv-debian-sid-cross-ppc64le.Dockerfile -- 2.20.1

1 1

[libvirt] [jenkins-ci PATCH] lcitool: Raise Error instead of Exception
by Andrea Bolognani 12 Mar '19

12 Mar '19

This results in $ ./lcitool dockerfile dockerfile -x foo libvirt-debian-9 libvirt FROM debian:9 ./lcitool: Unsupported architecture ppc64el being printed on error, instead of the much nastier $ ./lcitool dockerfile dockerfile -x foo libvirt-debian-9 libvirt FROM debian:9 Traceback (most recent call last): File "./lcitool", line 704, in <module> Application().run() File "./lcitool", line 699, in run args.func(args) File "./lcitool", line 643, in _action_dockerfile deb_arch = Util.native_arch_to_deb_arch(args.cross_arch) File "./lcitool", line 126, in native_arch_to_deb_arch raise Exception("Unsupported architecture {}".format(native_arch)) Exception: Unsupported architecture foo Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- guests/lcitool | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/guests/lcitool b/guests/lcitool index d6c8105..1119aaf 100755 --- a/guests/lcitool +++ b/guests/lcitool @@ -105,7 +105,7 @@ class Util: "x86_64": "x86_64-linux-gnu", } if native_arch not in archmap: - raise Exception("Unsupported architecture {}".format(native_arch)) + raise Error("Unsupported architecture {}".format(native_arch)) return archmap[native_arch] @staticmethod @@ -123,7 +123,7 @@ class Util: "x86_64": "amd64", } if native_arch not in archmap: - raise Exception("Unsupported architecture {}".format(native_arch)) + raise Error("Unsupported architecture {}".format(native_arch)) return archmap[native_arch] -- 2.20.1

3 5

[libvirt] [PATCH] resctrl: Fix testing line
by Martin Kletzander 12 Mar '19

12 Mar '19

Forgot to remove this before pushing. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- Pushed as trivial. src/util/virresctrl.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/util/virresctrl.c b/src/util/virresctrl.c index ab977b995c4d..9e477fc064ed 100644 --- a/src/util/virresctrl.c +++ b/src/util/virresctrl.c @@ -2166,10 +2166,8 @@ virResctrlAllocCopyMemBW(virResctrlAllocPtr dst, return -1; for (i = 0; i < src_bw->nbandwidths; i++) { - if (dst_bw->bandwidths[i]) { - *dst_bw->bandwidths[i] = 123; + if (dst_bw->bandwidths[i]) continue; - } if (VIR_ALLOC(dst_bw->bandwidths[i]) < 0) return -1; *dst_bw->bandwidths[i] = *src_bw->bandwidths[i]; -- 2.21.0

1 0

[libvirt] [PATCH 0/2] Add function for XML yes|no string handling
by Shotaro Gotanda 12 Mar '19

12 Mar '19

These patches are based on a bite-sized task proposed in https://wiki.libvirt.org/page/BiteSizedTasks and the mentor of this bite-sized task is Cole Robinson <crobinso(a)redhat.com> (Do I need to put the mentor in cc, in this case?) The function virStringParseYesNo() convert the string "yes" into bool true and "no" into false, and error if we receive anything other than those values. To be honest, I'm not confident on the error handling in libvirt. So, please check that point. Regards, Shotaro Shotaro Gotanda (2): util: add virStringParseYesNo() conf: Use virStringParseYesNo() src/conf/domain_conf.c | 30 +++++------------------------- src/conf/secret_conf.c | 12 ++---------- src/util/virstring.c | 32 ++++++++++++++++++++++++++++++++ src/util/virstring.h | 3 +++ 4 files changed, 42 insertions(+), 35 deletions(-) -- 2.19.1

4 9

[libvirt] [PATCH python v2] Fix handling of optional params in blockCopy()
by Nir Soffer 12 Mar '19

12 Mar '19

Commit 2b4bd07e0a22 (Add check for params, nparams being a dictionary) changed the way the optional params argument is treated. If libvirt.virDomain.blockCopy() is called without specifying params, params is None, and the call will fail with: TypeError: block params must be a dictionary This is wrong as params is defined as kwarg, breaking existing libvirt users like oVirt. Add a check for Py_None, so we accept either a dict or None and fail with TypeError with anything else. Resolves: https://bugzilla.redhat.com/1687114 Signed-off-by: Nir Soffer <nsoffer(a)redhat.com> --- libvirt-override.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libvirt-override.c b/libvirt-override.c index 857c018..c5e2908 100644 --- a/libvirt-override.c +++ b/libvirt-override.c @@ -8835,11 +8835,11 @@ libvirt_virDomainBlockCopy(PyObject *self ATTRIBUTE_UNUSED, if (virPyDictToTypedParams(pyobj_dict, &params, &nparams, virPyDomainBlockCopyParams, VIR_N_ELEMENTS(virPyDomainBlockCopyParams)) < 0) { return NULL; } - } else { + } else if (pyobj_dict != Py_None) { PyErr_Format(PyExc_TypeError, "block params must be a dictionary"); return NULL; } dom = (virDomainPtr) PyvirDomain_Get(pyobj_dom); -- 2.17.2

3 2

[libvirt] [jenkins-ci PATCH] lcitool: Fix name for ppc64le architecture
by Andrea Bolognani 11 Mar '19

11 Mar '19

We're only exposing libvirt architecture names externally, which means the correct value for little-endian 64-bit PowerPC is ppc64le (VIR_ARCH_PPC64LE). Note that, while "ppc64el" is not an architecture name libvirt would recognize, mips64el (VIR_ARCH_MIPS64EL) and mipsel (VIR_ARCH_MIPSEL) are indeed correct. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- guests/lcitool | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/guests/lcitool b/guests/lcitool index 1d17c04..d6c8105 100755 --- a/guests/lcitool +++ b/guests/lcitool @@ -100,7 +100,7 @@ class Util: "mips": "mips-linux-gnu", "mipsel": "mipsel-linux-gnu", "mips64el": "mips64el-linux-gnuabi64", - "ppc64el": "powerpc64le-linux-gnu", + "ppc64le": "powerpc64le-linux-gnu", "s390x": "s390x-linux-gnu", "x86_64": "x86_64-linux-gnu", } @@ -118,7 +118,7 @@ class Util: "mips": "mips", "mipsel": "mipsel", "mips64el": "mips64el", - "ppc64el": "ppc64el", + "ppc64le": "ppc64el", "s390x": "s390x", "x86_64": "amd64", } -- 2.20.1

2 2

[libvirt] [PATCH 0/2] rbd: improvements to actual disk-usage calculation
by jdillama＠redhat.com 11 Mar '19

11 Mar '19

From: Jason Dillaman <dillaman(a)redhat.com> The RBD fast-diff feature can vastly reduce the amount of time needed to calculate actual disk usage of volumes, but it might still be a slow operation for large RBD pools or pools with large RBD images. Therefore, this feature should be able to be optionally disabled if needed. Additionally, the fast-diff feature can only be used if the fast-diff map isn't flagged as invalid. Otherwise, librbd will silently perform a costly block-by-block scan to calculate the disk usage. Jason Dillaman (2): rbd: do not attempt to use fast-diff if it's marked invalid rbd: optionally disable actual disk-usage during pool/volume refresh docs/formatstorage.html.in | 13 ++++- src/storage/storage_backend_rbd.c | 80 ++++++++++++++++++++++++++++--- 2 files changed, 84 insertions(+), 9 deletions(-) -- 2.20.1

3 4

[libvirt] [dockerfiles PATCH 0/4] Add cross-compilation Dockerfiles
by Andrea Bolognani 11 Mar '19

11 Mar '19

lcitool supports generating Dockerfiles targeting cross-compilation of libvirt, so all that's left to do is teach the refresh script how to pass the necessary information to lcitool. Andrea Bolognani (4): refresh: Drop shell implementation refresh: Add Python implementation refresh: Add support for cross-compilation Dockerfiles Add cross-compilation Dockerfiles buildenv-debian-9-cross-aarch64.Dockerfile | 95 +++++++++++ buildenv-debian-9-cross-armv6l.Dockerfile | 93 +++++++++++ buildenv-debian-9-cross-armv7l.Dockerfile | 94 +++++++++++ buildenv-debian-9-cross-mips.Dockerfile | 94 +++++++++++ buildenv-debian-9-cross-mips64el.Dockerfile | 94 +++++++++++ buildenv-debian-9-cross-mipsel.Dockerfile | 94 +++++++++++ buildenv-debian-9-cross-ppc64el.Dockerfile | 94 +++++++++++ buildenv-debian-9-cross-s390x.Dockerfile | 94 +++++++++++ buildenv-debian-sid-cross-aarch64.Dockerfile | 94 +++++++++++ buildenv-debian-sid-cross-armv6l.Dockerfile | 92 ++++++++++ buildenv-debian-sid-cross-armv7l.Dockerfile | 93 +++++++++++ buildenv-debian-sid-cross-mips.Dockerfile | 93 +++++++++++ buildenv-debian-sid-cross-mips64el.Dockerfile | 93 +++++++++++ buildenv-debian-sid-cross-mipsel.Dockerfile | 93 +++++++++++ buildenv-debian-sid-cross-ppc64el.Dockerfile | 93 +++++++++++ buildenv-debian-sid-cross-s390x.Dockerfile | 93 +++++++++++ refresh | 158 +++++++++++++++--- 17 files changed, 1631 insertions(+), 23 deletions(-) create mode 100644 buildenv-debian-9-cross-aarch64.Dockerfile create mode 100644 buildenv-debian-9-cross-armv6l.Dockerfile create mode 100644 buildenv-debian-9-cross-armv7l.Dockerfile create mode 100644 buildenv-debian-9-cross-mips.Dockerfile create mode 100644 buildenv-debian-9-cross-mips64el.Dockerfile create mode 100644 buildenv-debian-9-cross-mipsel.Dockerfile create mode 100644 buildenv-debian-9-cross-ppc64el.Dockerfile create mode 100644 buildenv-debian-9-cross-s390x.Dockerfile create mode 100644 buildenv-debian-sid-cross-aarch64.Dockerfile create mode 100644 buildenv-debian-sid-cross-armv6l.Dockerfile create mode 100644 buildenv-debian-sid-cross-armv7l.Dockerfile create mode 100644 buildenv-debian-sid-cross-mips.Dockerfile create mode 100644 buildenv-debian-sid-cross-mips64el.Dockerfile create mode 100644 buildenv-debian-sid-cross-mipsel.Dockerfile create mode 100644 buildenv-debian-sid-cross-ppc64el.Dockerfile create mode 100644 buildenv-debian-sid-cross-s390x.Dockerfile -- 2.20.1

2 6

[libvirt] [PATCH 0/1] Fix valgrind.supp path in Makefile.am
by Shotaro Gotanda 11 Mar '19

11 Mar '19

Hello, I'm Shotaro Gotanda from the University of Tokyo. I'm currently working toward GSOC'19, and creating several pathes for a bite-sized task. In that process, I encountered a problem in valgrind test. In detail, "make -C tests valgrind" failed with several cases even in master branch(commit 7a05c739c26decb8ff0eef4f6c75ce3ef729532d). I found a lot of error message like following in test-suite.log ==25680== FATAL: can't open suppressions file "./.valgrind.supp" This problem occurs in several environment; Lubuntu18.10(native), Ubuntu18.04(VM), Ubuntu16.04(VM). Though I have little idea about why this problem occured, the test succeeded with this patch. P.S. Because this is my first contribution to libvirt, I'm not familiar with reporting bugs, sending patches, and so on. So, I'll be so glad if you give me any feedback :) Shotaro Gotanda (1): tests: fix valgrind.supp path in Makefile tests/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.19.1

2 2

[libvirt] [PULL 0/7] Ui 20190307 patches
by Gerd Hoffmann 11 Mar '19

11 Mar '19

The following changes since commit 32694e98b8d7a246345448a8f707d2e11d6c65e2: Merge remote-tracking branch 'remotes/ehabkost/tags/machine-next-pull-request' into staging (2019-03-06 18:52:19 +0000) are available in the Git repository at: git://git.kraxel.org/qemu tags/ui-20190307-pull-request for you to fetch changes up to 9b3c34835094760732c65a829bf0c07512126496: monitor: deprecate acl_show, acl_reset, acl_policy, acl_add, acl_remove (2019-03-07 14:23:22 +0100) ---------------------------------------------------------------- curses: better wide char support. vnc: acl update, stall fix. ---------------------------------------------------------------- Daniel P. Berrangé (2): vnc: allow specifying a custom authorization object name monitor: deprecate acl_show, acl_reset, acl_policy, acl_add, acl_remove Gerd Hoffmann (1): vnc: fix update stalls Samuel Thibault (4): Reduce curses escdelay from 1s to 25ms curses: support wide input iconv: detect and make curses depend on it curses: add option to specify VGA font encoding configure | 45 ++++- ui/curses_keys.h | 113 +++++++------ monitor.c | 23 +++ ui/curses.c | 394 ++++++++++++++++++++++++++++++++++++------- ui/vnc.c | 64 ++++++- vl.c | 2 +- qapi/ui.json | 14 ++ qemu-deprecated.texi | 11 ++ qemu-options.hx | 40 +++-- 9 files changed, 574 insertions(+), 132 deletions(-) -- 2.18.1

3 10

[libvirt] [PULL 0/5] Ui 20190311 v2 patches
by Gerd Hoffmann 11 Mar '19

11 Mar '19

The following changes since commit e2a18635a400b0e68679614132e9ef6316105590: Merge remote-tracking branch 'remotes/ericb/tags/pull-nbd-2019-03-08' into staging (2019-03-09 20:55:44 +0000) are available in the Git repository at: git://git.kraxel.org/qemu tags/ui-20190311-v2-pull-request for you to fetch changes up to 0143840771548e8ffece831398d745880ddfa080: monitor: deprecate acl_show, acl_reset, acl_policy, acl_add, acl_remove (2019-03-11 08:39:02 +0100) ---------------------------------------------------------------- curses: wide char input support. vnc: acl update, stall fix. ---------------------------------------------------------------- Daniel P. Berrangé (2): vnc: allow specifying a custom authorization object name monitor: deprecate acl_show, acl_reset, acl_policy, acl_add, acl_remove Gerd Hoffmann (1): vnc: fix update stalls Samuel Thibault (2): Reduce curses escdelay from 1s to 25ms curses: support wide input ui/curses_keys.h | 113 +++++++++++++++++++++++++------------------ monitor.c | 23 +++++++++ ui/curses.c | 79 ++++++++++++++++++++++++------ ui/vnc.c | 64 ++++++++++++++++++++---- qemu-deprecated.texi | 11 +++++ qemu-options.hx | 35 ++++++++++---- 6 files changed, 243 insertions(+), 82 deletions(-) -- 2.18.1

3 7

[libvirt] [PATCH 0/2] Miscellaneous MBA fixes
by Martin Kletzander 11 Mar '19

11 Mar '19

Both together fix https://bugzilla.redhat.com/show_bug.cgi?id=1686274 Martin Kletzander (2): resctrl: Do not calculate free bandwidth for MBA resctrl: Set MBA defaults properly src/util/virresctrl.c | 89 +++++++++++++++++++++++++------------------ 1 file changed, 52 insertions(+), 37 deletions(-) -- 2.21.0

2 3

[libvirt] [PATCH python] Fix handling of optional params in blockCopy()
by Nir Soffer 11 Mar '19

11 Mar '19

Commit 2b4bd07e0a22 (Add check for params, nparams being a dictionary) changed the way the optional params argument is treated. If libvirt.virDomain.blockCopy() is called without specifying params, params is None, and the call will fail with: TypeError: block params must be a dictionary This is wrong as params is defined as kwarg, breaking existing libvirt users like oVirt. Remove the check, restoring the previous behaviour. Resolves: https://bugzilla.redhat.com/1687114 Signed-off-by: Nir Soffer <nsoffer(a)redhat.com> --- libvirt-override.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/libvirt-override.c b/libvirt-override.c index 857c018..127d71c 100644 --- a/libvirt-override.c +++ b/libvirt-override.c @@ -8829,19 +8829,17 @@ libvirt_virDomainBlockCopy(PyObject *self ATTRIBUTE_UNUSED, if (!PyArg_ParseTuple(args, (char *) "Ozz|OI:virDomainBlockCopy", &pyobj_dom, &disk, &destxml, &pyobj_dict, &flags)) return NULL; + /* Note: params is optional in libvirt.py */ if (PyDict_Check(pyobj_dict)) { if (virPyDictToTypedParams(pyobj_dict, &params, &nparams, virPyDomainBlockCopyParams, VIR_N_ELEMENTS(virPyDomainBlockCopyParams)) < 0) { return NULL; } - } else { - PyErr_Format(PyExc_TypeError, "block params must be a dictionary"); - return NULL; } dom = (virDomainPtr) PyvirDomain_Get(pyobj_dom); LIBVIRT_BEGIN_ALLOW_THREADS; -- 2.17.2

3 2

[libvirt] [perl][PATCH] Add virConnectGetStoragePoolCapabilities binding
by Michal Privoznik 11 Mar '19

11 Mar '19

Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Changes | 1 + examples/node-info.pl | 13 +++++++++++++ lib/Sys/Virt.pm | 6 ++++++ lib/Sys/Virt.xs | 16 ++++++++++++++++ 4 files changed, 36 insertions(+) diff --git a/Changes b/Changes index 6bff52d..39a1bd5 100644 --- a/Changes +++ b/Changes @@ -7,6 +7,7 @@ Revision history for perl module Sys::Virt - Add VIR_DOMAIN_MIGRATE_MAX_SPEED_POSTCOPY constant - Add VIR_DOMAIN_SAVE_IMAGE_XML_SECURE and VIR_DOMAIN_SNAPSHOT_XML_SECURE constants + - Add virConnectGetStoragePoolCapabilities binding 5.0.0 2019-01-21 diff --git a/examples/node-info.pl b/examples/node-info.pl index 9655ab4..b31e90f 100644 --- a/examples/node-info.pl +++ b/examples/node-info.pl @@ -4,6 +4,8 @@ use strict; use warnings; use Sys::Virt; +use XML::XPath; +use XML::XPath::XMLParser; my $addr = @ARGV ? shift @ARGV : ""; @@ -33,5 +35,16 @@ foreach my $info (@info) { print "\n"; } +my $poolCaps = $hv->get_storage_pool_capabilities(); +my @poolTypes = (); + +my $xp = XML::XPath->new(xml => $poolCaps); +my $nodeset = $xp->find('/storagepoolCapabilities/pool[@supported="yes"]/@type'); +foreach my $node ($nodeset->get_nodelist) { + push (@poolTypes, $node->getNodeValue()); +} + +print "Supported pool types: @poolTypes\n"; + my $xml = $hv->get_domain_capabilities(undef, "x86_64", undef, "kvm"); print $xml; diff --git a/lib/Sys/Virt.pm b/lib/Sys/Virt.pm index 8fd3e23..549dc54 100644 --- a/lib/Sys/Virt.pm +++ b/lib/Sys/Virt.pm @@ -1869,6 +1869,12 @@ an optional name of a guest machine, and C<$virttype> is an optional name of the virtualization type. C<$flags> is unused and defaults to zero. +=item my $xml = $con->get_storage_pool_capabilities($flags=0); + +Returns an XML document describing the storage pool driver +capabilities (e.g. which storage pool types are supported and so +on). C<$flags> is currently unused and defaults to zero. + =item my $result = $con->compare_cpu($xml, $flags=0); Checks whether the CPU definition in C<$xml> is compatible with the diff --git a/lib/Sys/Virt.xs b/lib/Sys/Virt.xs index bc9320d..056d767 100644 --- a/lib/Sys/Virt.xs +++ b/lib/Sys/Virt.xs @@ -2774,6 +2774,22 @@ PREINIT: RETVAL +SV * +get_storage_pool_capabilities(con, flags=0) + virConnectPtr con; + unsigned int flags; +PREINIT: + char *xml; + CODE: + if (!(xml = virConnectGetStoragePoolCapabilities(con, flags))) + _croak_error(); + + RETVAL = newSVpv(xml, 0); + free(xml); + OUTPUT: + RETVAL + + SV * compare_cpu(con, xml, flags=0) virConnectPtr con; -- 2.19.2

2 1

[libvirt] [PATCH] virfilewrapper: Fix indentation
by Martin Kletzander 11 Mar '19

11 Mar '19

Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- Pushed as trivial. tests/virfilewrapper.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/virfilewrapper.h b/tests/virfilewrapper.h index 9e3816b64493..044c53223251 100644 --- a/tests/virfilewrapper.h +++ b/tests/virfilewrapper.h @@ -21,7 +21,7 @@ int virFileWrapperAddPrefix(const char *prefix, - const char *override); + const char *override); void virFileWrapperRemovePrefix(const char *prefix); -- 2.21.0

1 0

[libvirt] [PATCH 0/2] qemu: Fixes for (non-)transitional virtio devices
by Andrea Bolognani 11 Mar '19

11 Mar '19

Andrea Bolognani (2): qemu: Improve validation for virtio input devices docs: Document configuration quirks for virtio devices docs/formatdomain.html.in | 18 +++++++++++ src/libvirt_private.syms | 1 + src/qemu/qemu_domain.c | 32 +++++++++++++++++++ .../virtio-transitional-not-supported.xml | 11 +++++++ tests/qemuxml2argvtest.c | 4 +++ 5 files changed, 66 insertions(+) create mode 100644 tests/qemuxml2argvdata/virtio-transitional-not-supported.xml -- 2.20.1

2 5

[libvirt] [PATCH v6 03/14] audio: -audiodev command line option: documentation
by Kővágó, Zoltán 08 Mar '19

08 Mar '19

This patch adds documentation of an -audiodev command line option, that deprecates the old QEMU_* environment variables for audio backend configuration. It's syntax is similar to existing options (-netdev, -device, etc): -audiodev driver_name,property=value,... Although now it's possible to specify multiple -audiodev options on command line, multiple audio backends are not supported yet. Signed-off-by: Kővágó, Zoltán <DirtY.iCE.hu(a)gmail.com> --- Notes: Changes from v4: * deprecated QEMU_AUDIO_ env vars * updated to reflect qapi changes * added info to qemu-deprecated.texi qemu-deprecated.texi | 7 ++ qemu-options.hx | 236 ++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 240 insertions(+), 3 deletions(-) diff --git a/qemu-deprecated.texi b/qemu-deprecated.texi index 45c57952da..5c07ad4acb 100644 --- a/qemu-deprecated.texi +++ b/qemu-deprecated.texi @@ -60,6 +60,13 @@ Support for invalid topologies will be removed, the user must ensure topologies described with -smp include all possible cpus, i.e. @math{@var{sockets} * @var{cores} * @var{threads} = @var{maxcpus}}. +@subsection QEMU_AUDIO_ environment variables and -audio-help (since 4.0) + +The ``-audiodev'' argument is now the preferred way to specify audio +backend settings instead of environment variables. To ease migration to +the new format, the ``-audiodev-help'' option can be used to convert +the current values of the environment variables to ``-audiodev'' options. + @section QEMU Machine Protocol (QMP) commands @subsection block-dirty-bitmap-add "autoload" parameter (since 2.12.0) diff --git a/qemu-options.hx b/qemu-options.hx index 1cf9aac1fe..52ea13e6a2 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -416,14 +416,244 @@ The default is @code{en-us}. ETEXI +HXCOMM Deprecated by -audiodev DEF("audio-help", 0, QEMU_OPTION_audio_help, - "-audio-help print list of audio drivers and their options\n", + "-audio-help show -audiodev equivalent of the currently specified audio settings\n", QEMU_ARCH_ALL) STEXI @item -audio-help @findex -audio-help -Will show the audio subsystem help: list of drivers, tunable -parameters. +Will show the -audiodev equivalent of the currently specified +(deprecated) environment variables. +ETEXI + +DEF("audiodev", HAS_ARG, QEMU_OPTION_audiodev, + "-audiodev [driver=]driver,id=id[,prop[=value][,...]]\n" + " specifies the audio backend to use\n" + " id= identifier of the backend\n" + " timer-period= timer period in microseconds\n" + " in|out.fixed-settings= use fixed settings for host audio\n" + " in|out.frequency= frequency to use with fixed settings\n" + " in|out.channels= number of channels to use with fixed settings\n" + " in|out.format= sample format to use with fixed settings\n" + " valid values: s8, s16, s32, u8, u16, u32\n" + " in|out.voices= number of voices to use\n" + " in|out.buffer-len= length of buffer in microseconds\n" + "-audiodev none,id=id,[,prop[=value][,...]]\n" + " dummy driver that discards all output\n" +#ifdef CONFIG_AUDIO_ALSA + "-audiodev alsa,id=id[,prop[=value][,...]]\n" + " in|out.dev= name of the audio device to use\n" + " in|out.period-len= length of period in microseconds\n" + " in|out.try-poll= attempt to use poll mode\n" + " threshold= threshold (in microseconds) when playback starts\n" +#endif +#ifdef CONFIG_AUDIO_COREAUDIO + "-audiodev coreaudio,id=id[,prop[=value][,...]]\n" + " in|out.buffer-count= number of buffers\n" +#endif +#ifdef CONFIG_AUDIO_DSOUND + "-audiodev dsound,id=id[,prop[=value][,...]]\n" + " latency= add extra latency to playback in microseconds\n" +#endif +#ifdef CONFIG_AUDIO_OSS + "-audiodev oss,id=id[,prop[=value][,...]]\n" + " in|out.dev= path of the audio device to use\n" + " in|out.buffer-count= number of buffers\n" + " in|out.try-poll= attempt to use poll mode\n" + " try-mmap= try using memory mapped access\n" + " exclusive= open device in exclusive mode\n" + " dsp-policy= set timing policy (0..10), -1 to use fragment mode\n" +#endif +#ifdef CONFIG_AUDIO_PA + "-audiodev pa,id=id[,prop[=value][,...]]\n" + " server= PulseAudio server address\n" + " in|out.name= source/sink device name\n" +#endif +#ifdef CONFIG_AUDIO_SDL + "-audiodev sdl,id=id[,prop[=value][,...]]\n" +#endif +#ifdef CONFIG_SPICE + "-audiodev spice,id=id[,prop[=value][,...]]\n" +#endif + "-audiodev wav,id=id[,prop[=value][,...]]\n" + " path= path of wav file to record\n", + QEMU_ARCH_ALL) +STEXI +@item -audiodev [driver=]@var{driver},id=@var{id}[,@var{prop}[=@var{value}][,...]] +@findex -audiodev +Adds a new audio backend @var{driver} identified by @var{id}. There are +global and driver specific properties. Some values can be set +differently for input and output, they're marked with @code{in|out.}. +You can set the input's property with @code{in.@var{prop}} and the +output's property with @code{out.@var{prop}}. For example: +@example +-audiodev alsa,id=example,in.frequency=44110,out.frequency=8000 +-audiodev alsa,id=example,out.channels=1 # leaves in.channels unspecified +@end example + +Valid global options are: + +@table @option +@item id=@var{identifier} +Identifies the audio backend. + +@item timer-period=@var{period} +Sets the timer @var{period} used by the audio subsystem in microseconds. +Default is 10000 (10 ms). + +@item in|out.fixed-settings=on|off +Use fixed settings for host audio. When off, it will change based on +how the guest opens the sound card. In this case you must not specify +@var{frequency}, @var{channels} or @var{format}. Default is on. + +@item in|out.frequency=@var{frequency} +Specify the @var{frequency} to use when using @var{fixed-settings}. +Default is 44100Hz. + +@item in|out.channels=@var{channels} +Specify the number of @var{channels} to use when using +@var{fixed-settings}. Default is 2 (stereo). + +@item in|out.format=@var{format} +Specify the sample @var{format} to use when using @var{fixed-settings}. +Valid values are: @code{s8}, @code{s16}, @code{s32}, @code{u8}, +@code{u16}, @code{u32}. Default is @code{s16}. + +@item in|out.voices=@var{voices} +Specify the number of @var{voices} to use. Default is 1. + +@item in|out.buffer=@var{usecs} +Sets the size of the buffer in microseconds. + +@end table + +@item -audiodev none,id=@var{id}[,@var{prop}[=@var{value}][,...]] +Creates a dummy backend that discards all outputs. This backend has no +backend specific properties. + +@item -audiodev alsa,id=@var{id}[,@var{prop}[=@var{value}][,...]] +Creates backend using the ALSA. This backend is only available on +Linux. + +ALSA specific options are: + +@table @option + +@item in|out.dev=@var{device} +Specify the ALSA @var{device} to use for input and/or output. Default +is @code{default}. + +@item in|out.period-len=@var{usecs} +Sets the period length in microseconds. + +@item in|out.try-poll=on|off +Attempt to use poll mode with the device. Default is on. + +@item threshold=@var{threshold} +Threshold (in microseconds) when playback starts. Default is 0. + +@end table + +@item -audiodev coreaudio,id=@var{id}[,@var{prop}[=@var{value}][,...]] +Creates a backend using Apple's Core Audio. This backend is only +available on Mac OS and only supports playback. + +Core Audio specific options are: + +@table @option + +@item in|out.buffer-count=@var{count} +Sets the @var{count} of the buffers. + +@end table + +@item -audiodev dsound,id=@var{id}[,@var{prop}[=@var{value}][,...]] +Creates a backend using Microsoft's DirectSound. This backend is only +available on Windows and only supports playback. + +DirectSound specific options are: + +@table @option + +@item latency=@var{usecs} +Add extra @var{usecs} microseconds latency to playback. Default is +10000 (10 ms). + +@end table + +@item -audiodev oss,id=@var{id}[,@var{prop}[=@var{value}][,...]] +Creates a backend using OSS. This backend is available on most +Unix-like systems. + +OSS specific options are: + +@table @option + +@item in|out.dev=@var{device} +Specify the file name of the OSS @var{device} to use. Default is +@code{/dev/dsp}. + +@item in|out.buffer-count=@var{count} +Sets the @var{count} of the buffers. + +@item in|out.try-poll=on|of +Attempt to use poll mode with the device. Default is on. + +@item try-mmap=on|off +Try using memory mapped device access. Default is off. + +@item exclusive=on|off +Open the device in exclusive mode (vmix won't work in this case). +Default is off. + +@item dsp-policy=@var{policy} +Sets the timing policy (between 0 and 10, where smaller number means +smaller latency but higher CPU usage). Use -1 to use buffer sizes +specified by @code{buffer} and @code{buffer-count}. This option is +ignored if you do not have OSS 4. Default is 5. + +@end table + +@item -audiodev pa,id=@var{id}[,@var{prop}[=@var{value}][,...]] +Creates a backend using PulseAudio. This backend is available on most +systems. + +PulseAudio specific options are: + +@table @option + +@item server=@var{server} +Sets the PulseAudio @var{server} to connect to. + +@item in|out.name=@var{sink} +Use the specified source/sink for recording/playback. + +@end table + +@item -audiodev sdl,id=@var{id}[,@var{prop}[=@var{value}][,...]] +Creates a backend using SDL. This backend is available on most systems, +but you should use your platform's native backend if possible. This +backend has no backend specific properties. + +@item -audiodev spice,id=@var{id}[,@var{prop}[=@var{value}][,...]] +Creates a backend that sends audio through SPICE. This backend requires +@code{-spice} and automatically selected in that case, so usually you +can ignore this option. This backend has no backend specific +properties. + +@item -audiodev wav,id=@var{id}[,@var{prop}[=@var{value}][,...]] +Creates a backend that writes audio to a WAV file. + +Backend specific options are: + +@table @option + +@item path=@var{path} +Write recorded audio into the specified file. Default is +(a)code{qemu.wav}. + +@end table ETEXI DEF("soundhw", HAS_ARG, QEMU_OPTION_soundhw, -- 2.20.1

1 0

[libvirt] [PATCH 0/2] qemu: Allow creating ppc64 guests with graphics and no USB mouse
by Andrea Bolognani 08 Mar '19

08 Mar '19

See patch 2/2. Andrea Bolognani (2): tests: Add simple guests with graphics to qemuxml2argv qemu: Allow creating ppc64 guests with graphics and no USB mouse src/qemu/qemu_domain.c | 20 +++++++ .../aarch64-virt-graphics.aarch64-latest.args | 59 +++++++++++++++++++ .../aarch64-virt-graphics.xml | 50 ++++++++++++++++ .../ppc64-pseries-graphics.ppc64-latest.args | 47 +++++++++++++++ .../ppc64-pseries-graphics.xml | 44 ++++++++++++++ .../x86_64-pc-graphics.x86_64-latest.args | 51 ++++++++++++++++ tests/qemuxml2argvdata/x86_64-pc-graphics.xml | 55 +++++++++++++++++ .../x86_64-q35-graphics.x86_64-latest.args | 59 +++++++++++++++++++ .../qemuxml2argvdata/x86_64-q35-graphics.xml | 55 +++++++++++++++++ tests/qemuxml2argvtest.c | 6 ++ 10 files changed, 446 insertions(+) create mode 100644 tests/qemuxml2argvdata/aarch64-virt-graphics.aarch64-latest.args create mode 100644 tests/qemuxml2argvdata/aarch64-virt-graphics.xml create mode 100644 tests/qemuxml2argvdata/ppc64-pseries-graphics.ppc64-latest.args create mode 100644 tests/qemuxml2argvdata/ppc64-pseries-graphics.xml create mode 100644 tests/qemuxml2argvdata/x86_64-pc-graphics.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/x86_64-pc-graphics.xml create mode 100644 tests/qemuxml2argvdata/x86_64-q35-graphics.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/x86_64-q35-graphics.xml -- 2.20.1

2 3

[libvirt] [PATCH] test: storage: Fill in default vol types for every pool
by Cole Robinson 08 Mar '19

08 Mar '19

Fill in a default volume type for every pool type, as reported by the VolGetInfo API. Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- A more complete fix would take into account VolDef->type, so test driver users could set this value via volume XML. That would require adding a PostParse callback to the storage driver infrastructure. This is still an improvement in the interim and would be part of a complete fix anyways src/test/test_driver.c | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index ce0df1f8e3..3f37b2ede7 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -5164,13 +5164,26 @@ testStorageVolDelete(virStorageVolPtr vol, static int testStorageVolumeTypeForPool(int pooltype) { - switch (pooltype) { - case VIR_STORAGE_POOL_DIR: - case VIR_STORAGE_POOL_FS: - case VIR_STORAGE_POOL_NETFS: - return VIR_STORAGE_VOL_FILE; - default: - return VIR_STORAGE_VOL_BLOCK; + switch ((virStoragePoolType) pooltype) { + case VIR_STORAGE_POOL_DIR: + case VIR_STORAGE_POOL_FS: + case VIR_STORAGE_POOL_NETFS: + case VIR_STORAGE_POOL_VSTORAGE: + return VIR_STORAGE_VOL_FILE; + case VIR_STORAGE_POOL_SHEEPDOG: + case VIR_STORAGE_POOL_ISCSI_DIRECT: + case VIR_STORAGE_POOL_GLUSTER: + case VIR_STORAGE_POOL_RBD: + return VIR_STORAGE_VOL_NETWORK; + case VIR_STORAGE_POOL_LOGICAL: + case VIR_STORAGE_POOL_DISK: + case VIR_STORAGE_POOL_MPATH: + case VIR_STORAGE_POOL_ISCSI: + case VIR_STORAGE_POOL_SCSI: + case VIR_STORAGE_POOL_ZFS: + case VIR_STORAGE_POOL_LAST: + default: + return VIR_STORAGE_VOL_BLOCK; } } -- 2.20.1

3 3