- Devel - libvirt List Archives

[libvirt] [PATCH] snapshot: Saner use of uuid
by Eric Blake 21 Feb '19

21 Feb '19

Most of the code base is fairly consistent about using the name 'uuidstr' when dealing with a formatted human-readable form, and 'uuid' when dealing with the smaller raw bytes form. Fix snapshot_conf to comply, as well as reducing the scope of a human string to only the error message that needs it. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing this one under the trivial rule. src/conf/snapshot_conf.h | 2 +- src/conf/snapshot_conf.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/conf/snapshot_conf.h b/src/conf/snapshot_conf.h index cc25164261..7a175dfc96 100644 --- a/src/conf/snapshot_conf.h +++ b/src/conf/snapshot_conf.h @@ -111,7 +111,7 @@ virDomainSnapshotDefPtr virDomainSnapshotDefParseNode(xmlDocPtr xml, virDomainXMLOptionPtr xmlopt, unsigned int flags); void virDomainSnapshotDefFree(virDomainSnapshotDefPtr def); -char *virDomainSnapshotDefFormat(const char *domain_uuid, +char *virDomainSnapshotDefFormat(const char *uuidstr, virDomainSnapshotDefPtr def, virCapsPtr caps, virDomainXMLOptionPtr xmlopt, diff --git a/src/conf/snapshot_conf.c b/src/conf/snapshot_conf.c index 1afc7de30c..489c25f511 100644 --- a/src/conf/snapshot_conf.c +++ b/src/conf/snapshot_conf.c @@ -688,7 +688,7 @@ virDomainSnapshotDiskDefFormat(virBufferPtr buf, char * -virDomainSnapshotDefFormat(const char *domain_uuid, +virDomainSnapshotDefFormat(const char *uuidstr, virDomainSnapshotDefPtr def, virCapsPtr caps, virDomainXMLOptionPtr xmlopt, @@ -744,10 +744,10 @@ virDomainSnapshotDefFormat(const char *domain_uuid, if (def->dom) { if (virDomainDefFormatInternal(def->dom, caps, flags, &buf, xmlopt) < 0) goto error; - } else if (domain_uuid) { + } else if (uuidstr) { virBufferAddLit(&buf, "<domain>\n"); virBufferAdjustIndent(&buf, 2); - virBufferAsprintf(&buf, "<uuid>%s</uuid>\n", domain_uuid); + virBufferAsprintf(&buf, "<uuid>%s</uuid>\n", uuidstr); virBufferAdjustIndent(&buf, -2); virBufferAddLit(&buf, "</domain>\n"); } @@ -1224,11 +1224,8 @@ virDomainSnapshotRedefinePrep(virDomainPtr domain, int ret = -1; int align_location = VIR_DOMAIN_SNAPSHOT_LOCATION_INTERNAL; bool align_match = true; - char uuidstr[VIR_UUID_STRING_BUFLEN]; virDomainSnapshotObjPtr other; - virUUIDFormat(domain->uuid, uuidstr); - /* Prevent circular chains */ if (def->parent) { if (STREQ(def->name, def->parent)) { @@ -1274,6 +1271,9 @@ virDomainSnapshotRedefinePrep(virDomainPtr domain, if (def->dom && memcmp(def->dom->uuid, domain->uuid, VIR_UUID_BUFLEN)) { + char uuidstr[VIR_UUID_STRING_BUFLEN]; + + virUUIDFormat(domain->uuid, uuidstr); virReportError(VIR_ERR_INVALID_ARG, _("definition for snapshot %s must use uuid %s"), def->name, uuidstr); -- 2.20.1

1 0

[libvirt] [jenkins-ci PATCH] lcitool: Don't import crypt
by Andrea Bolognani 20 Feb '19

20 Feb '19

It hasn't been needed since dbe55924f90d, and flake8 rightfully complains about that. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- guests/lcitool | 1 - 1 file changed, 1 deletion(-) diff --git a/guests/lcitool b/guests/lcitool index 759eff6..e8263da 100755 --- a/guests/lcitool +++ b/guests/lcitool @@ -17,7 +17,6 @@ # with this program. If not, see <https://www.gnu.org/licenses/>. import argparse -import crypt import fnmatch import json import os -- 2.20.1

2 1

[libvirt] libvirt 'make cov' vs gnulib 'make coverage'
by Cole Robinson 20 Feb '19

20 Feb '19

Recently I've played with libvirt coverage/gcov/lcov support. The libvirt specific way to enable it is: ./configure --enable-test-coverage make check make cov firefox coverage/index.html However it looks like gnulib provides an automagic way to get similar output. The process is: make coverage firefox doc/coverage/index.html 'make coverage' is composed of these 3 additional commands: make init-coverage # clear lcov counters make build-coverage # 'make check' with coverage flags, generate # lcov metadata make gen-coverage # generate the html report It seems like we can just drop our custom coverage implementation. * Less code for us * The gnulib implementation is more flexible with the split commands * libvirt impl needs an explicit directory list. right now gnulib output reports info for the tools/ dir but libvirt's doesn't * gnulib impl doesn't require a reconfigure * seems like libvirt impl never calls lcov --zerocounters which AFAICT means that every 'make check' run adds to the coverage stats. so if you wanted to check for coverage changes across commits we require a make clean in between to zero out the stats for testing. gnulib init-coverage takes care of that. Anyone know a reason not to rip this out? If not I'll send a patch Thanks, Cole

1 0

[libvirt] [PATCH v3 00/17] qemu: virtio-{non-}transitional support
by Cole Robinson 20 Feb '19

20 Feb '19

v2 libvirt patches: https://www.redhat.com/archives/libvir-list/2019-January/msg00877.html v1 libvirt patches: https://www.redhat.com/archives/libvir-list/2019-January/msg00593.html Previous incomplete RFC here: https://www.redhat.com/archives/libvir-list/2019-January/msg00346.html qemu patches, queued for qemu 4.0.0: https://lists.gnu.org/archive/html/qemu-devel/2018-12/msg00923.html Previous libvirt discussion around this: https://www.redhat.com/archives/libvir-list/2018-August/msg01073.html Changes since v2: * Some prep patches merged * filesystem model dropped the -9p naming, now uses virtio-{non-}transitional like other devices * Now uses a single capability QEMU_CAPS_VIRTIO_PCI_NON_TRANSITIONAL which is set whenever any of the -transitional or -non-transitional devices are present. * Add a formatdomain section 'Virtio transitional devices' and reference it from each relevant device section * if virtio-transitional specified, and qemu is too old but has the disable_X options, convert it to explicit disable-legacy=off,disable-modern=off * Misc small changes pointed out in review Thanks, Cole Cole Robinson (17): qemu: command: Add qemuCaps to BuildVirtioStr qemu: capabilities: Add virtio/vhost {non-}transitional conf: Add <disk model='virtio-{non-}transitional'/> qemu: Support disk model=virtio-{non-}transitional qemu: Support interface model=virtio-{non-}transitional conf: Add <hostdev model='virtio-{non-}transitional'/> qemu: Support hostdev model=virtio-{non-}transitional qemu: Support rng model=virtio-{non-}transitional conf: Add <filesystem model='virtio-{non-}transitional'/> qemu: Support filesystem model=virtio-{non-}transitional qemu: Support memballoon model=virtio-{non-}transitional qemu: Support vsock model=virtio-{non-}transitional conf: Add <input model='virtio-{non-}transitional'/> qemu: Support input model=virtio-{non-}transitional qemu: Support virtio-serial controller model=virtio-{non-}transitional qemu: Support scsi controller model=virtio-{non-}transitional qemu: domcaps: Report disk <enum name="model"> docs/formatdomain.html.in | 97 ++++++++- docs/schemas/domaincommon.rng | 61 +++++- src/conf/domain_capabilities.c | 1 + src/conf/domain_capabilities.h | 1 + src/conf/domain_conf.c | 184 ++++++++++++++++-- src/conf/domain_conf.h | 63 ++++++ src/libvirt_private.syms | 4 + src/libxl/libxl_conf.c | 2 + src/qemu/qemu_capabilities.c | 31 +++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 150 ++++++++++++-- src/qemu/qemu_domain.c | 17 +- src/qemu/qemu_domain_address.c | 110 +++++++++-- src/vbox/vbox_common.c | 2 + src/vmx/vmx.c | 5 +- .../bhyve_basic.x86_64.xml | 1 + .../bhyve_fbuf.x86_64.xml | 1 + .../bhyve_uefi.x86_64.xml | 1 + tests/domaincapsschemadata/full.xml | 6 + .../domaincapsschemadata/libxl-xenfv-usb.xml | 1 + .../domaincapsschemadata/libxl-xenpv-usb.xml | 1 + .../qemu_1.7.0.x86_64.xml | 3 + .../qemu_2.12.0-virt.aarch64.xml | 5 + .../qemu_2.12.0.ppc64.xml | 5 + .../qemu_2.12.0.s390x.xml | 5 + .../qemu_2.12.0.x86_64.xml | 5 + .../qemu_2.6.0-virt.aarch64.xml | 5 + .../qemu_2.6.0.aarch64.xml | 5 + .../domaincapsschemadata/qemu_2.6.0.ppc64.xml | 5 + .../qemu_2.6.0.x86_64.xml | 5 + .../domaincapsschemadata/qemu_2.7.0.s390x.xml | 5 + .../qemu_2.8.0-tcg.x86_64.xml | 5 + .../domaincapsschemadata/qemu_2.8.0.s390x.xml | 5 + .../qemu_2.8.0.x86_64.xml | 5 + .../qemu_2.9.0-q35.x86_64.xml | 5 + .../qemu_2.9.0-tcg.x86_64.xml | 5 + .../qemu_2.9.0.x86_64.xml | 5 + .../domaincapsschemadata/qemu_3.0.0.s390x.xml | 5 + .../qemu_4.0.0.x86_64.xml | 153 +++++++++++++++ tests/domaincapstest.c | 4 + .../caps_4.0.0.riscv32.xml | 1 + .../caps_4.0.0.riscv64.xml | 1 + .../caps_4.0.0.x86_64.xml | 1 + .../virtio-non-transitional.x86_64-3.1.0.args | 65 +++++++ ...virtio-non-transitional.x86_64-latest.args | 62 ++++++ .../virtio-non-transitional.xml | 39 ++++ .../virtio-transitional.x86_64-3.1.0.args | 56 ++++++ .../virtio-transitional.x86_64-latest.args | 52 +++++ .../qemuxml2argvdata/virtio-transitional.xml | 39 ++++ tests/qemuxml2argvtest.c | 6 + .../virtio-non-transitional.xml | 121 ++++++++++++ .../virtio-transitional.xml | 80 ++++++++ tests/qemuxml2xmltest.c | 17 ++ 53 files changed, 1470 insertions(+), 50 deletions(-) create mode 100644 tests/domaincapsschemadata/qemu_4.0.0.x86_64.xml create mode 100644 tests/qemuxml2argvdata/virtio-non-transitional.x86_64-3.1.0.args create mode 100644 tests/qemuxml2argvdata/virtio-non-transitional.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/virtio-non-transitional.xml create mode 100644 tests/qemuxml2argvdata/virtio-transitional.x86_64-3.1.0.args create mode 100644 tests/qemuxml2argvdata/virtio-transitional.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/virtio-transitional.xml create mode 100644 tests/qemuxml2xmloutdata/virtio-non-transitional.xml create mode 100644 tests/qemuxml2xmloutdata/virtio-transitional.xml -- 2.20.1

2 33

[libvirt] [PATCH 0/2] udev: Remove udev handle from main loop when udev thread stops
by Marc Hartmayer 20 Feb '19

20 Feb '19

Changelog: + RFC -> v1: - Remove the event handle in the error path of nodeStateInitializeEnumerate - Added patch 2: wake up udev thread in case of an error Marc Hartmayer (2): udev: nodeStateInitializeEnumerate: remove watch handle in case of an error udev: wake up the udev thread for stopping it src/node_device/node_device_udev.c | 3 +++ 1 file changed, 3 insertions(+) -- 2.17.0

2 3

[libvirt] [PATCH 0/4] Alter domain_conf to make use of autofree
by John Ferlan 20 Feb '19

20 Feb '19

Adding to the recent hype for autofree... It's more than just saving a few lines - in some cases the code is easier to read too. The last patch is really long - I suppose it could be broken up as could perhaps domain_conf into more easily process-able units. John Ferlan (4): conf: Use VIR_STEAL_PTR in domain_conf conf: Use VIR_AUTOPTR(virBitmap) in domain_conf conf: Fix XML ctxt swap in virDomainNetDefParseXML conf: Use VIR_AUTOFREE in domain_conf src/conf/domain_conf.c | 2108 ++++++++++++++-------------------------- 1 file changed, 737 insertions(+), 1371 deletions(-) -- 2.20.1

2 11

[libvirt] [PATCH v2 0/3] Couple of testuitls.c almost trivial fixes
by Michal Privoznik 20 Feb '19

20 Feb '19

This is v2 of: https://www.redhat.com/archives/libvir-list/2019-February/msg01077.html diff to v1: - Split one patch into smaller ones - Made myself a new coffee meanwhile Michal Prívozník (3): virTestCompareToULL: Use VIR_AUTOFREE() virTestCompareToULL: Rename local variables testutils: Explicitly name virTestCompare*() arguments tests/testutils.c | 51 +++++++++++++++++------------------------------ tests/testutils.h | 10 +++++----- 2 files changed, 23 insertions(+), 38 deletions(-) -- 2.19.2

4 10

[libvirt] [PATCH] testutils: Explicitly name virTestCompare*() arguments
by Michal Privoznik 20 Feb '19

20 Feb '19

Currently, some arguments are called strcontent and strsrc, or content and src or some other combination. This makes it impossible to see at the first glance what argument is supposed to represent 'expected' value and which one represents 'actual' value. Rename the arguments to make it obvious. At the same time, rework virTestCompareToULL a bit so that local variables are named in the same fashion. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- tests/testutils.c | 51 +++++++++++++++++------------------------------ tests/testutils.h | 10 +++++----- 2 files changed, 23 insertions(+), 38 deletions(-) diff --git a/tests/testutils.c b/tests/testutils.c index d2219ad21e..59c1d1fd6e 100644 --- a/tests/testutils.c +++ b/tests/testutils.c @@ -767,19 +767,19 @@ int virTestDifferenceBin(FILE *stream, } /* - * @param strcontent: String input content - * @param filename: File to compare strcontent against + * @param actual: String input content + * @param filename: File to compare @actual against * - * If @strcontent is NULL, it's treated as an empty string. + * If @actual is NULL, it's treated as an empty string. */ int -virTestCompareToFile(const char *strcontent, +virTestCompareToFile(const char *actual, const char *filename) { int ret = -1; char *filecontent = NULL; char *fixedcontent = NULL; - const char *cmpcontent = strcontent; + const char *cmpcontent = actual; if (!cmpcontent) cmpcontent = ""; @@ -814,43 +814,28 @@ virTestCompareToFile(const char *strcontent, return ret; } -/* - * @param content: Input content - * @param src: Source to compare @content against - */ int -virTestCompareToULL(unsigned long long content, - unsigned long long src) +virTestCompareToULL(unsigned long long expected, + unsigned long long actual) { - char *strcontent = NULL; - char *strsrc = NULL; - int ret = -1; + VIR_AUTOFREE(char *) expectedStr = NULL; + VIR_AUTOFREE(char *) actualStr = NULL; - if (virAsprintf(&strcontent, "%llu", content) < 0) - goto cleanup; + if (virAsprintf(&expectedStr, "%llu", expected) < 0) + return -1; - if (virAsprintf(&strsrc, "%llu", src) < 0) - goto cleanup; + if (virAsprintf(&actualStr, "%llu", actual) < 0) + return -1; - ret = virTestCompareToString(strcontent, strsrc); - - cleanup: - VIR_FREE(strcontent); - VIR_FREE(strsrc); - - return ret; + return virTestCompareToString(expectedStr, actualStr); } -/* - * @param strcontent: String input content - * @param strsrc: String source to compare strcontent against - */ int -virTestCompareToString(const char *strcontent, - const char *strsrc) +virTestCompareToString(const char *expected, + const char *actual) { - if (STRNEQ_NULLABLE(strcontent, strsrc)) { - virTestDifference(stderr, strcontent, strsrc); + if (STRNEQ_NULLABLE(expected, actual)) { + virTestDifference(stderr, expected, actual); return -1; } diff --git a/tests/testutils.h b/tests/testutils.h index 658f9053ad..1ed9f0b6d3 100644 --- a/tests/testutils.h +++ b/tests/testutils.h @@ -76,12 +76,12 @@ int virTestDifferenceBin(FILE *stream, const char *expect, const char *actual, size_t length); -int virTestCompareToFile(const char *strcontent, +int virTestCompareToFile(const char *actual, const char *filename); -int virTestCompareToString(const char *strcontent, - const char *strsrc); -int virTestCompareToULL(unsigned long long content, - unsigned long long src); +int virTestCompareToString(const char *expected, + const char *actual); +int virTestCompareToULL(unsigned long long expected, + unsigned long long actual); unsigned int virTestGetDebug(void); unsigned int virTestGetVerbose(void); -- 2.19.2

3 6

[libvirt] [PATCH v3 0/4] qemu: Report better error on dump/migrate failure
by Andrea Bolognani 20 Feb '19

20 Feb '19

Changes from [v2]: * Move error reporting from virFileWrapperFdFree() to virFileWrapperFdClose(). Changes from [v1]: * Use VIR_FREE() followed by VIR_ALLOC_N() instead of manually setting the last (and only) byte of the array returned by VIR_REALLOC_N() to zero. [v2] https://www.redhat.com/archives/libvir-list/2019-February/msg00782.html [v1] https://www.redhat.com/archives/libvir-list/2019-February/msg00156.html Andrea Bolognani (4): util: Make it safe to call virFileWrapperFdClose() multiple times qemu: Always call virFileWrapperFdClose() util: Move error reporting back to virFileWrapperFdClose() util: Report error in virFileWrapperFdClose() src/qemu/qemu_driver.c | 12 ++++++------ src/util/virfile.c | 18 ++++++++++++++---- 2 files changed, 20 insertions(+), 10 deletions(-) -- 2.20.1

2 12

[libvirt] [glib PATCH 00/15] po: improve translation handling
by Daniel P. Berrangé 20 Feb '19

20 Feb '19

This applies the same improvements previously done in libvirt: https://www.redhat.com/archives/libvir-list/2018-April/msg01004.html https://www.berrange.com/posts/2018/11/29/improved-translation-po-file-hand… The key problems with our current approach are: - The pot & po files stored in GIT contain huge set of annotations about source file names & line numbers. These are out of date as soon as a change is commited to git following a translation refresh. This makes diffs impossible to meaningfully review, as they are 98% noise, 2% signal. - The po file messages are sorted by source location, so when we move code between files, or rename files, the po file message order changes for no good reason. This makes diffs even more impossible to review. - The po files contain entries for all messages even if most have no translation, bloating size of po/ data stored in git - Whenever 'make dist' is run, it alters all the pot and po files, so developers need to then reset their content to match git HEAD manually. This is caused by having auto-generated content (source file locations) mixed in with the static content (the actual translated strings) After this series, we only minimized po files in git, with the redundated & outdated source locations info stripped. This stripped info is re-added automatically during build to create the real .po files, that we distribute, and/or upload to translators in Zanata. As a result the po directory is smaller in size, and when refreshing from Zanata, we have git commits that clearly show *only* the altered translations, nothing else. The importance of this cannot be overstated - by having these clear diffs when doing this change in libvirt, I discovered a serious bug in the Zanata client that has been screwing up translations in every project that uses Zanata by adding bogus "fuzzy" annotations. The particularly attractive statistic: 194 files changed, 2607 insertions(+), 14146 deletions(-) Daniel P. Berrangé (15): po: provide custom make rules for po file management po: remove language list from zanata configuration po: add rules for integration with zanata po: minimize & canonicalize translations stored in git po: minimize af am anp ar as ast bal be bg bn_IN po: minimize bn bo br brx bs ca cs cy da de_CH po: minimize de el en_GB eo es et eu fa fi po: minimize fr gl gu he hi hr hu ia po: minimize id ilo is it ja ka kk km kn ko po: minimize kw_GB kw@kkcor kw kw@uccor ky lt lv mai mk ml po: minimize mn mr ms nb nds ne nl nn nso po: minimize or pa pl pt_BR pt ro ru si sk sl po: minimize sq sr@latin sr sv ta te tg th tr tw po: minimize uk ur vi wba yo zh_CN zh_HK zh_TW zu po: refresh translations from zanata .gitignore | 10 +-- autogen.sh | 3 +- build-aux/minimize-po.pl | 37 ++++++++ configure.ac | 8 +- libvirt-gconfig/Makefile.am | 1 + libvirt-glib/Makefile.am | 1 + libvirt-gobject/Makefile.am | 1 + m4/virt-gettext.m4 | 5 -- m4/virt-nls.m4 | 45 ++++++++++ po/Makefile.am | 111 +++++++++++++++++++++++ po/{POTFILES.in => POTFILES} | 0 po/README.md | 76 ++++++++++++++++ po/af.mini.po | 20 +++++ po/af.po | 153 -------------------------------- po/am.mini.po | 20 +++++ po/am.po | 153 -------------------------------- po/anp.mini.po | 19 ++++ po/anp.po | 152 ------------------------------- po/ar.mini.po | 21 +++++ po/ar.po | 154 -------------------------------- po/as.mini.po | 20 +++++ po/as.po | 153 -------------------------------- po/ast.mini.po | 20 +++++ po/ast.po | 153 -------------------------------- po/bal.mini.po | 20 +++++ po/bal.po | 153 -------------------------------- po/be.mini.po | 21 +++++ po/be.po | 154 -------------------------------- po/bg.mini.po | 20 +++++ po/bg.po | 153 -------------------------------- po/bn.mini.po | 20 +++++ po/bn.po | 153 -------------------------------- po/bn_IN.mini.po | 20 +++++ po/bn_IN.po | 153 -------------------------------- po/bo.mini.po | 20 +++++ po/bo.po | 153 -------------------------------- po/br.mini.po | 20 +++++ po/br.po | 153 -------------------------------- po/brx.mini.po | 20 +++++ po/brx.po | 153 -------------------------------- po/bs.mini.po | 21 +++++ po/bs.po | 154 -------------------------------- po/{ca.po => ca.mini.po} | 152 ++++++++++++------------------- po/cs.mini.po | 119 +++++++++++++++++++++++++ po/cs.po | 155 -------------------------------- po/cy.mini.po | 21 +++++ po/cy.po | 154 -------------------------------- po/da.mini.po | 20 +++++ po/da.po | 153 -------------------------------- po/de.mini.po | 20 +++++ po/de.po | 153 -------------------------------- po/de_CH.mini.po | 20 +++++ po/de_CH.po | 153 -------------------------------- po/el.mini.po | 20 +++++ po/el.po | 153 -------------------------------- po/{en_GB.po => en_GB.mini.po} | 141 ++++++++++------------------- po/eo.mini.po | 20 +++++ po/eo.po | 153 -------------------------------- po/{es.po => es.mini.po} | 153 ++++++++++++-------------------- po/et.mini.po | 20 +++++ po/et.po | 153 -------------------------------- po/eu.mini.po | 20 +++++ po/eu.po | 153 -------------------------------- po/fa.mini.po | 20 +++++ po/fa.po | 153 -------------------------------- po/fi.mini.po | 44 +++++++++ po/fi.po | 154 -------------------------------- po/{fr.po => fr.mini.po} | 157 +++++++++++++-------------------- po/gl.mini.po | 20 +++++ po/gl.po | 153 -------------------------------- po/gu.mini.po | 20 +++++ po/gu.po | 153 -------------------------------- po/he.mini.po | 20 +++++ po/he.po | 153 -------------------------------- po/{hi.po => hi.mini.po} | 141 ++++++++++------------------- po/hr.mini.po | 21 +++++ po/hr.po | 154 -------------------------------- po/hu.mini.po | 20 +++++ po/hu.po | 153 -------------------------------- po/ia.mini.po | 20 +++++ po/ia.po | 153 -------------------------------- po/id.mini.po | 20 +++++ po/id.po | 153 -------------------------------- po/ilo.mini.po | 20 +++++ po/ilo.po | 153 -------------------------------- po/is.mini.po | 20 +++++ po/is.po | 153 -------------------------------- po/it.mini.po | 20 +++++ po/it.po | 153 -------------------------------- po/{ja.po => ja.mini.po} | 141 ++++++++++------------------- po/ka.mini.po | 20 +++++ po/ka.po | 153 -------------------------------- po/kk.mini.po | 20 +++++ po/kk.po | 153 -------------------------------- po/km.mini.po | 20 +++++ po/km.po | 153 -------------------------------- po/kn.mini.po | 20 +++++ po/kn.po | 153 -------------------------------- po/ko.mini.po | 20 +++++ po/ko.po | 153 -------------------------------- po/kw.mini.po | 20 +++++ po/kw.po | 153 -------------------------------- po/kw(a)kkcor.mini.po | 20 +++++ po/kw(a)kkcor.po | 153 -------------------------------- po/kw(a)uccor.mini.po | 20 +++++ po/kw(a)uccor.po | 153 -------------------------------- po/kw_GB.mini.po | 20 +++++ po/kw_GB.po | 153 -------------------------------- po/ky.mini.po | 20 +++++ po/ky.po | 153 -------------------------------- po/lt.mini.po | 21 +++++ po/lt.po | 154 -------------------------------- po/lv.mini.po | 21 +++++ po/lv.po | 154 -------------------------------- po/mai.mini.po | 20 +++++ po/mai.po | 153 -------------------------------- po/mk.mini.po | 20 +++++ po/mk.po | 153 -------------------------------- po/ml.mini.po | 20 +++++ po/ml.po | 153 -------------------------------- po/mn.mini.po | 20 +++++ po/mn.po | 153 -------------------------------- po/mr.mini.po | 20 +++++ po/mr.po | 153 -------------------------------- po/ms.mini.po | 20 +++++ po/ms.po | 153 -------------------------------- po/nb.mini.po | 20 +++++ po/nb.po | 153 -------------------------------- po/nds.mini.po | 20 +++++ po/nds.po | 153 -------------------------------- po/ne.mini.po | 20 +++++ po/ne.po | 153 -------------------------------- po/nl.mini.po | 20 +++++ po/nl.po | 153 -------------------------------- po/nn.mini.po | 20 +++++ po/nn.po | 153 -------------------------------- po/nso.mini.po | 20 +++++ po/nso.po | 153 -------------------------------- po/or.mini.po | 20 +++++ po/or.po | 153 -------------------------------- po/pa.mini.po | 20 +++++ po/pa.po | 153 -------------------------------- po/{pl.po => pl.mini.po} | 152 ++++++++++++------------------- po/pt.mini.po | 20 +++++ po/pt.po | 153 -------------------------------- po/{pt_BR.po => pt_BR.mini.po} | 141 ++++++++++------------------- po/ro.mini.po | 21 +++++ po/ro.po | 154 -------------------------------- po/ru.mini.po | 26 ++++++ po/ru.po | 155 -------------------------------- po/si.mini.po | 20 +++++ po/si.po | 153 -------------------------------- po/sk.mini.po | 20 +++++ po/sk.po | 153 -------------------------------- po/sl.mini.po | 21 +++++ po/sl.po | 154 -------------------------------- po/sq.mini.po | 20 +++++ po/sq.po | 153 -------------------------------- po/sr.mini.po | 21 +++++ po/sr.po | 154 -------------------------------- po/sr(a)latin.mini.po | 21 +++++ po/sr(a)latin.po | 154 -------------------------------- po/sv.mini.po | 20 +++++ po/sv.po | 153 -------------------------------- po/ta.mini.po | 20 +++++ po/ta.po | 153 -------------------------------- po/te.mini.po | 20 +++++ po/te.po | 153 -------------------------------- po/tg.mini.po | 20 +++++ po/tg.po | 153 -------------------------------- po/th.mini.po | 20 +++++ po/th.po | 153 -------------------------------- po/tr.mini.po | 20 +++++ po/tr.po | 153 -------------------------------- po/tw.mini.po | 19 ++++ po/tw.po | 152 ------------------------------- po/{uk.po => uk.mini.po} | 152 ++++++++++++------------------- po/ur.mini.po | 20 +++++ po/ur.po | 153 -------------------------------- po/vi.mini.po | 20 +++++ po/vi.po | 153 -------------------------------- po/wba.mini.po | 19 ++++ po/wba.po | 152 ------------------------------- po/yo.mini.po | 19 ++++ po/yo.po | 152 ------------------------------- po/zanata.xml | 99 --------------------- po/zh_CN.mini.po | 20 +++++ po/zh_CN.po | 153 -------------------------------- po/zh_HK.mini.po | 20 +++++ po/zh_HK.po | 153 -------------------------------- po/zh_TW.mini.po | 20 +++++ po/zh_TW.po | 153 -------------------------------- po/zu.mini.po | 20 +++++ po/zu.po | 153 -------------------------------- 194 files changed, 2607 insertions(+), 14146 deletions(-) create mode 100755 build-aux/minimize-po.pl delete mode 100644 m4/virt-gettext.m4 create mode 100644 m4/virt-nls.m4 create mode 100644 po/Makefile.am rename po/{POTFILES.in => POTFILES} (100%) create mode 100644 po/README.md create mode 100644 po/af.mini.po delete mode 100644 po/af.po create mode 100644 po/am.mini.po delete mode 100644 po/am.po create mode 100644 po/anp.mini.po delete mode 100644 po/anp.po create mode 100644 po/ar.mini.po delete mode 100644 po/ar.po create mode 100644 po/as.mini.po delete mode 100644 po/as.po create mode 100644 po/ast.mini.po delete mode 100644 po/ast.po create mode 100644 po/bal.mini.po delete mode 100644 po/bal.po create mode 100644 po/be.mini.po delete mode 100644 po/be.po create mode 100644 po/bg.mini.po delete mode 100644 po/bg.po create mode 100644 po/bn.mini.po delete mode 100644 po/bn.po create mode 100644 po/bn_IN.mini.po delete mode 100644 po/bn_IN.po create mode 100644 po/bo.mini.po delete mode 100644 po/bo.po create mode 100644 po/br.mini.po delete mode 100644 po/br.po create mode 100644 po/brx.mini.po delete mode 100644 po/brx.po create mode 100644 po/bs.mini.po delete mode 100644 po/bs.po rename po/{ca.po => ca.mini.po} (62%) create mode 100644 po/cs.mini.po delete mode 100644 po/cs.po create mode 100644 po/cy.mini.po delete mode 100644 po/cy.po create mode 100644 po/da.mini.po delete mode 100644 po/da.po create mode 100644 po/de.mini.po delete mode 100644 po/de.po create mode 100644 po/de_CH.mini.po delete mode 100644 po/de_CH.po create mode 100644 po/el.mini.po delete mode 100644 po/el.po rename po/{en_GB.po => en_GB.mini.po} (51%) create mode 100644 po/eo.mini.po delete mode 100644 po/eo.po rename po/{es.po => es.mini.po} (59%) create mode 100644 po/et.mini.po delete mode 100644 po/et.po create mode 100644 po/eu.mini.po delete mode 100644 po/eu.po create mode 100644 po/fa.mini.po delete mode 100644 po/fa.po create mode 100644 po/fi.mini.po delete mode 100644 po/fi.po rename po/{fr.po => fr.mini.po} (59%) create mode 100644 po/gl.mini.po delete mode 100644 po/gl.po create mode 100644 po/gu.mini.po delete mode 100644 po/gu.po create mode 100644 po/he.mini.po delete mode 100644 po/he.po rename po/{hi.po => hi.mini.po} (62%) create mode 100644 po/hr.mini.po delete mode 100644 po/hr.po create mode 100644 po/hu.mini.po delete mode 100644 po/hu.po create mode 100644 po/ia.mini.po delete mode 100644 po/ia.po create mode 100644 po/id.mini.po delete mode 100644 po/id.po create mode 100644 po/ilo.mini.po delete mode 100644 po/ilo.po create mode 100644 po/is.mini.po delete mode 100644 po/is.po create mode 100644 po/it.mini.po delete mode 100644 po/it.po rename po/{ja.po => ja.mini.po} (55%) create mode 100644 po/ka.mini.po delete mode 100644 po/ka.po create mode 100644 po/kk.mini.po delete mode 100644 po/kk.po create mode 100644 po/km.mini.po delete mode 100644 po/km.po create mode 100644 po/kn.mini.po delete mode 100644 po/kn.po create mode 100644 po/ko.mini.po delete mode 100644 po/ko.po create mode 100644 po/kw.mini.po delete mode 100644 po/kw.po create mode 100644 po/kw(a)kkcor.mini.po delete mode 100644 po/kw(a)kkcor.po create mode 100644 po/kw(a)uccor.mini.po delete mode 100644 po/kw(a)uccor.po create mode 100644 po/kw_GB.mini.po delete mode 100644 po/kw_GB.po create mode 100644 po/ky.mini.po delete mode 100644 po/ky.po create mode 100644 po/lt.mini.po delete mode 100644 po/lt.po create mode 100644 po/lv.mini.po delete mode 100644 po/lv.po create mode 100644 po/mai.mini.po delete mode 100644 po/mai.po create mode 100644 po/mk.mini.po delete mode 100644 po/mk.po create mode 100644 po/ml.mini.po delete mode 100644 po/ml.po create mode 100644 po/mn.mini.po delete mode 100644 po/mn.po create mode 100644 po/mr.mini.po delete mode 100644 po/mr.po create mode 100644 po/ms.mini.po delete mode 100644 po/ms.po create mode 100644 po/nb.mini.po delete mode 100644 po/nb.po create mode 100644 po/nds.mini.po delete mode 100644 po/nds.po create mode 100644 po/ne.mini.po delete mode 100644 po/ne.po create mode 100644 po/nl.mini.po delete mode 100644 po/nl.po create mode 100644 po/nn.mini.po delete mode 100644 po/nn.po create mode 100644 po/nso.mini.po delete mode 100644 po/nso.po create mode 100644 po/or.mini.po delete mode 100644 po/or.po create mode 100644 po/pa.mini.po delete mode 100644 po/pa.po rename po/{pl.po => pl.mini.po} (62%) create mode 100644 po/pt.mini.po delete mode 100644 po/pt.po rename po/{pt_BR.po => pt_BR.mini.po} (54%) create mode 100644 po/ro.mini.po delete mode 100644 po/ro.po create mode 100644 po/ru.mini.po delete mode 100644 po/ru.po create mode 100644 po/si.mini.po delete mode 100644 po/si.po create mode 100644 po/sk.mini.po delete mode 100644 po/sk.po create mode 100644 po/sl.mini.po delete mode 100644 po/sl.po create mode 100644 po/sq.mini.po delete mode 100644 po/sq.po create mode 100644 po/sr.mini.po delete mode 100644 po/sr.po create mode 100644 po/sr(a)latin.mini.po delete mode 100644 po/sr(a)latin.po create mode 100644 po/sv.mini.po delete mode 100644 po/sv.po create mode 100644 po/ta.mini.po delete mode 100644 po/ta.po create mode 100644 po/te.mini.po delete mode 100644 po/te.po create mode 100644 po/tg.mini.po delete mode 100644 po/tg.po create mode 100644 po/th.mini.po delete mode 100644 po/th.po create mode 100644 po/tr.mini.po delete mode 100644 po/tr.po create mode 100644 po/tw.mini.po delete mode 100644 po/tw.po rename po/{uk.po => uk.mini.po} (65%) create mode 100644 po/ur.mini.po delete mode 100644 po/ur.po create mode 100644 po/vi.mini.po delete mode 100644 po/vi.po create mode 100644 po/wba.mini.po delete mode 100644 po/wba.po create mode 100644 po/yo.mini.po delete mode 100644 po/yo.po create mode 100644 po/zh_CN.mini.po delete mode 100644 po/zh_CN.po create mode 100644 po/zh_HK.mini.po delete mode 100644 po/zh_HK.po create mode 100644 po/zh_TW.mini.po delete mode 100644 po/zh_TW.po create mode 100644 po/zu.mini.po delete mode 100644 po/zu.po -- 2.20.1

1 15

[libvirt] [libvirt-php] [PATCH 1/1] Add function libvirt_domain_undefine_flags and libvirt_domain_snapshot_create_xml
by Zhensheng Yuan 20 Feb '19

20 Feb '19

Hi, I created a patch for libvirt-php to support virDomainUndefineFlags and create snapshot from XML string. The test case file is "examples/domain_undefine_flags_and_snapshot_create_xml_test_case.php". Hoping this is useful for libvirt-php. >From e753d0014e8ce8cbcafb0fbd92159a6cc9f32168 Mon Sep 17 00:00:00 2001 From: Zhensheng Yuan <yuan(a)zhensheng.im> Date: Wed, 20 Feb 2019 18:25:05 +0800 Subject: [libvirt-php PATCH] Add function libvirt_domain_undefine_flags and libvirt_domain_snapshot_create_xml --- ...lags_and_snapshot_create_xml_test_case.php | 136 ++++++++++++++++++ src/libvirt-domain.c | 23 +++ src/libvirt-domain.h | 2 + src/libvirt-php.c | 12 ++ src/libvirt-snapshot.c | 35 +++++ src/libvirt-snapshot.h | 2 + 6 files changed, 210 insertions(+) create mode 100644 examples/domain_undefine_flags_and_snapshot_create_xml_test_case.php diff --git a/examples/domain_undefine_flags_and_snapshot_create_xml_test_case.php b/examples/domain_undefine_flags_and_snapshot_create_xml_test_case.php new file mode 100644 index 0000000..e6590ae --- /dev/null +++ b/examples/domain_undefine_flags_and_snapshot_create_xml_test_case.php @@ -0,0 +1,136 @@ +<?php +/** + * Created by PhpStorm. + * Date: 19-2-20 + * Time: 下午4:57 + */ + +namespace YunInternet\Libvirt\Test\Unit; + + +use PHPUnit\Framework\TestCase; + +class Test_libvirt_domain_undefine_flags extends TestCase +{ + public function testConstants() + { + $this->assertEquals(VIR_DOMAIN_UNDEFINE_MANAGED_SAVE, 1); + $this->assertEquals(VIR_DOMAIN_UNDEFINE_SNAPSHOTS_METADATA, 2); + $this->assertEquals(VIR_DOMAIN_UNDEFINE_NVRAM, 4); + $this->assertEquals(VIR_DOMAIN_UNDEFINE_KEEP_NVRAM, 8); + } + + public function testSnapshotAndUndefineFlags() + { + $libvirtResource = libvirt_connect("test:///default", false); + $this->assertTrue(is_resource($libvirtResource)); + + $domainResource = libvirt_domain_define_xml($libvirtResource, $this->getDomainXML()); + $this->assertTrue(is_resource($domainResource)); + + // Create a snapshot named snapshot1 + $snapshotResource = libvirt_domain_snapshot_create_xml($domainResource, <<<EOF +<domainsnapshot> + <name>snapshot1</name> +</domainsnapshot> +EOF +, VIR_SNAPSHOT_CREATE_LIVE | VIR_SNAPSHOT_CREATE_ATOMIC); + $this->assertTrue(is_resource($snapshotResource)); + + // Domain with snapshot can not be undefined directly + $this->assertFalse(@libvirt_domain_undefine($domainResource)); + + // Use VIR_DOMAIN_UNDEFINE_SNAPSHOTS_METADATA flag to undefine the domain + $this->assertTrue(libvirt_domain_undefine_flags($domainResource, VIR_DOMAIN_UNDEFINE_SNAPSHOTS_METADATA)); + } + + private function getDomainXML() + { + return <<<EOF +<domain type="test"> + <name>Test</name> + <memory unit="MiB">1024</memory> + <vcpu placement="static">8</vcpu> + <cpu mode="host-passthrough"> + <topology sockets="4" cores="1" threads="2"/> + </cpu> + <os> + <type arch="i686">hvm</type> + <loader readonly='yes' type='pflash'>/usr/share/ovmf/OVMF.fd</loader> + <nvram template='/usr/share/OVMF/OVMF_VARS.fd'>/var/lib/libvirt/qemu/nvram/guest_VARS.fd</nvram> + <bootmenu enable="yes" timeout="1000"/> + <boot dev="hd"/> + <boot dev="cdrom"/> + </os> + <pm> + <suspend-to-mem enable="yes"/> + </pm> + <devices> + <memballoon model="none"/> + <disk type="volume" device="disk"> + <driver name="qemu" type="qcow2"/> + <source pool="testPool1" volume="testVolume1"/> + <target bus="virtio" dev="vda"/> + </disk> + <disk type="volume" device="disk"> + <driver name="qemu" type="qcow2"/> + <source pool="testPool2" volume="testVolume2"/> + <target bus="virtio" dev="vdb"/> + <iotune> + <total_bytes_sec>102400</total_bytes_sec> + </iotune> + </disk> + <disk type="file" device="cdrom"> + <driver name="qemu" type="raw"/> + <source file="/iso/iso.iso"/> + <target bus="ide" dev="hda"/> + </disk> + <interface type="network"> + <source network="default"/> + <mac address="52:54:00:00:00:01"/> + <model type="virtio"/> + <filterref filter="clean-traffic"> + <parameter name="IP" value="192.168.122.2"/> + </filterref> + <bandwidth> + <inbound average="10240" burst="20480" peak="20480"/> + <outbound average="10240" burst="20480" peak="20480"/> + </bandwidth> + </interface> + <input type="tablet" bus="usb"/> + <graphics type="vnc" passwd="12345678" port="-1" autoport="yes"> + <listen type="address" address="0.0.0.0"/> + </graphics> + <channel> + <source mode="bind"/> + <target type="virtio" name="org.qemu.guest_agent.0"/> + </channel> + </devices> + <clock offset="utc"/> + <features> + <pae/> + <acpi/> + <apic/> + <hyperv> + <relaxed state="on"/> + <vapic state="on"/> + <spinlocks state="on" retries="8191"/> + </hyperv> + </features> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>restart</on_crash> + <blkiotune> + <weight>1000</weight> + <device> + <path>/dev/sda</path> + <weight>1000</weight> + <read_bytes_sec>10240</read_bytes_sec> + <write_bytes_sec>10240</write_bytes_sec> + </device> + </blkiotune> +</domain> +EOF + ; + } +} diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index 8b8bb45..e2dc33e 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -1467,6 +1467,29 @@ PHP_FUNCTION(libvirt_domain_undefine) RETURN_TRUE; } +/* + * Function name: libvirt_domain_undefine_flags + * Description: Function is used to undefine(with flags) the domain identified by it's resource + * Arguments: @res [resource]: libvirt domain resource, e.g. from libvirt_domain_lookup_by_*() + * @flags [int]: optional flags + * Returns: TRUE for success, FALSE on error + */ +PHP_FUNCTION(libvirt_domain_undefine_flags) +{ + php_libvirt_domain *domain = NULL; + zval *zdomain; + int retval; + zend_long flags = 0; + + GET_DOMAIN_FROM_ARGS("r|l", &zdomain, &flags); + + retval = virDomainUndefineFlags(domain->domain, flags); + DPRINTF("%s: virDomainUndefineFlags(%p) returned %d\n", PHPFUNC, domain->domain, retval); + if (retval != 0) + RETURN_FALSE; + RETURN_TRUE; +} + /* * Function name: libvirt_domain_reboot * Since version: 0.4.1(-1) diff --git a/src/libvirt-domain.h b/src/libvirt-domain.h index dc0ab46..6d98544 100644 --- a/src/libvirt-domain.h +++ b/src/libvirt-domain.h @@ -73,6 +73,7 @@ PHP_FE(libvirt_domain_suspend, arginfo_libvirt_conn) \ PHP_FE(libvirt_domain_managedsave, arginfo_libvirt_conn) \ PHP_FE(libvirt_domain_undefine, arginfo_libvirt_conn) \ + PHP_FE(libvirt_domain_undefine_flags, arginfo_libvirt_conn_flags) \ PHP_FE(libvirt_domain_reboot, arginfo_libvirt_conn_flags) \ PHP_FE(libvirt_domain_define_xml, arginfo_libvirt_conn_xml) \ PHP_FE(libvirt_domain_create_xml, arginfo_libvirt_conn_xml) \ @@ -163,6 +164,7 @@ PHP_FUNCTION(libvirt_domain_shutdown); PHP_FUNCTION(libvirt_domain_suspend); PHP_FUNCTION(libvirt_domain_managedsave); PHP_FUNCTION(libvirt_domain_undefine); +PHP_FUNCTION(libvirt_domain_undefine_flags); PHP_FUNCTION(libvirt_domain_reboot); PHP_FUNCTION(libvirt_domain_define_xml); PHP_FUNCTION(libvirt_domain_create_xml); diff --git a/src/libvirt-php.c b/src/libvirt-php.c index cf8fd7f..7e10b3d 100644 --- a/src/libvirt-php.c +++ b/src/libvirt-php.c @@ -468,6 +468,12 @@ ZEND_ARG_INFO(0, timeout) ZEND_ARG_INFO(0, flags) ZEND_END_ARG_INFO() +ZEND_BEGIN_ARG_INFO_EX(arginfo_libvirt_domain_snapshot_create_xml, 0, 0, 2) +ZEND_ARG_INFO(0, conn) +ZEND_ARG_INFO(0, xml) +ZEND_ARG_INFO(0, flags) +ZEND_END_ARG_INFO() + static zend_function_entry libvirt_functions[] = { PHP_FE_LIBVIRT_CONNECTION PHP_FE_LIBVIRT_STREAM @@ -1491,6 +1497,12 @@ PHP_MINIT_FUNCTION(libvirt) REGISTER_LONG_CONSTANT("VIR_KEYCODE_SET_WIN32", VIR_KEYCODE_SET_WIN32, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("VIR_KEYCODE_SET_RFB", VIR_KEYCODE_SET_RFB, CONST_CS | CONST_PERSISTENT); + /* virDomainUndefineFlagsValues */ + REGISTER_LONG_CONSTANT("VIR_DOMAIN_UNDEFINE_MANAGED_SAVE", VIR_DOMAIN_UNDEFINE_MANAGED_SAVE, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("VIR_DOMAIN_UNDEFINE_SNAPSHOTS_METADATA", VIR_DOMAIN_UNDEFINE_SNAPSHOTS_METADATA, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("VIR_DOMAIN_UNDEFINE_NVRAM", VIR_DOMAIN_UNDEFINE_NVRAM, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("VIR_DOMAIN_UNDEFINE_KEEP_NVRAM", VIR_DOMAIN_UNDEFINE_KEEP_NVRAM, CONST_CS | CONST_PERSISTENT); + REGISTER_INI_ENTRIES(); /* Initialize libvirt and set up error callback */ diff --git a/src/libvirt-snapshot.c b/src/libvirt-snapshot.c index 1388d88..f7e3e2b 100644 --- a/src/libvirt-snapshot.c +++ b/src/libvirt-snapshot.c @@ -130,6 +130,41 @@ PHP_FUNCTION(libvirt_domain_snapshot_create) VIRT_REGISTER_RESOURCE(res_snapshot, le_libvirt_snapshot); } +/* + * Function name: libvirt_domain_snapshot_create_xml + * Description: This function creates the domain snapshot from XML string for the domain identified by it's resource + * Arguments: @res [resource]: libvirt domain resource + * @xml [string]: xml + * @flags [int]: libvirt snapshot flags + * Returns: domain snapshot resource + */ +PHP_FUNCTION(libvirt_domain_snapshot_create_xml) +{ + php_libvirt_domain *domain = NULL; + php_libvirt_snapshot *res_snapshot; + zval *zdomain; + char *xml; + strsize_t xml_len; + virDomainSnapshotPtr snapshot = NULL; + zend_long flags = 0; + + GET_DOMAIN_FROM_ARGS("rs|l", &zdomain, &xml, &xml_len, &flags); + + snapshot = virDomainSnapshotCreateXML(domain->domain, xml, flags); + DPRINTF("%s: virDomainSnapshotCreateXML(%p, <xml>) returned %p\n", PHPFUNC, domain->domain, snapshot); + if (snapshot == NULL) + RETURN_FALSE; + + res_snapshot = (php_libvirt_snapshot *)emalloc(sizeof(php_libvirt_snapshot)); + res_snapshot->domain = domain; + res_snapshot->snapshot = snapshot; + + DPRINTF("%s: returning %p\n", PHPFUNC, res_snapshot->snapshot); + resource_change_counter(INT_RESOURCE_SNAPSHOT, domain->conn->conn, res_snapshot->snapshot, 1 TSRMLS_CC); + + VIRT_REGISTER_RESOURCE(res_snapshot, le_libvirt_snapshot); +} + /* * Function name: libvirt_domain_snapshot_get_xml * Since version: 0.4.1(-2) diff --git a/src/libvirt-snapshot.h b/src/libvirt-snapshot.h index e6092aa..970662c 100644 --- a/src/libvirt-snapshot.h +++ b/src/libvirt-snapshot.h @@ -16,6 +16,7 @@ PHP_FE(libvirt_domain_has_current_snapshot, arginfo_libvirt_conn_optflags) \ PHP_FE(libvirt_domain_snapshot_lookup_by_name, arginfo_libvirt_domain_snapshot_lookup_by_name) \ PHP_FE(libvirt_domain_snapshot_create, arginfo_libvirt_conn_optflags) \ + PHP_FE(libvirt_domain_snapshot_create_xml, arginfo_libvirt_domain_snapshot_create_xml) \ PHP_FE(libvirt_domain_snapshot_get_xml, arginfo_libvirt_conn_optflags) \ PHP_FE(libvirt_domain_snapshot_revert, arginfo_libvirt_conn_optflags) \ PHP_FE(libvirt_domain_snapshot_delete, arginfo_libvirt_conn_optflags) \ @@ -50,6 +51,7 @@ void php_libvirt_snapshot_dtor(virt_resource *rsrc TSRMLS_DC); PHP_FUNCTION(libvirt_domain_has_current_snapshot); PHP_FUNCTION(libvirt_domain_snapshot_lookup_by_name); PHP_FUNCTION(libvirt_domain_snapshot_create); +PHP_FUNCTION(libvirt_domain_snapshot_create_xml); PHP_FUNCTION(libvirt_domain_snapshot_get_xml); PHP_FUNCTION(libvirt_domain_snapshot_revert); PHP_FUNCTION(libvirt_domain_snapshot_delete); -- 2.17.1 Regards, Zhensheng Yuan

1 0

[libvirt] [RFC PATCH] udev: Remove udev handle from main loop when udev thread stops
by Marc Hartmayer 20 Feb '19

20 Feb '19

Commit "nodedev: Move device enumumeration out of nodeStateInitialize" (9f0ae0b18e3e620) has moved the heavy task of device enumeration into a separate thread. The problem with this commit is that there is a functionality change in the cleanup when udevEnumerateDevices fails. Before commit 9f0ae0b18e3e620, the entire driver was cleaned up by calling nodeStateCleanup (defined in node_device_udev.c) which resulted in libvirtd stopping with the error message 'daemonRunStateInit:800 : Driver state initialization failed'. With the commit 9f0ae0b18e3e620 there is only a signal to the udev thread that it must stop. This means that for example the watch handle isn't removed from the main loop and this can result in the main loop consuming 100% CPU time as soon as a new udev event occurs. This patch proposes a simple solution to the described problem. In case the udev thread stops the watch handle is removed from the main loop. Fixes: 9f0ae0b18e3e620 ("nodedev: Move device enumumeration out of nodeStateInitialize") Signed-off-by: Marc Hartmayer <mhartmay(a)linux.ibm.com> --- Note: I'm not sure whether we should stop libvirtd (as it would have been done before) or if this patch is already sufficient. --- src/node_device/node_device_udev.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c index b1e5f00067e8..299f55260129 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -1628,6 +1628,13 @@ udevEventHandleThread(void *opaque ATTRIBUTE_UNUSED) } if (priv->threadQuit) { + if (priv->watch != -1) { + /* Since the udev thread getting stopped remove the + * watch handle from the main loop */ + virEventRemoveHandle(priv->watch); + priv->watch = -1; + } + virObjectUnlock(priv); return; } -- 2.17.0

2 8

[libvirt] [PATCH v2 0/5] virDomainXMLFlags cleanups (incremental backup saga)
by Eric Blake 20 Feb '19

20 Feb '19

Since v1: add two new patches (1, 2), improve commit message wording of patch 4/5 [Dan]. Eric Blake (5): domain: Fix unknown flags diagnosis in virDomainGetXMLDesc qemu: Use correct domain xml flag domain: Document VIR_DOMAIN_XML_MIGRATABLE domain: Define explicit flags for saved image xml snapshot: Define explicit flags for snapshot xml include/libvirt/libvirt-domain-snapshot.h | 4 ++++ include/libvirt/libvirt-domain.h | 5 +++++ src/conf/domain_conf.h | 3 +++ src/bhyve/bhyve_driver.c | 2 ++ src/conf/domain_conf.c | 2 ++ src/esx/esx_driver.c | 2 +- src/hyperv/hyperv_driver.c | 2 +- src/libvirt-domain-snapshot.c | 9 ++++----- src/libvirt-domain.c | 22 +++++++++++++--------- src/libxl/libxl_driver.c | 2 +- src/lxc/lxc_driver.c | 2 +- src/openvz/openvz_driver.c | 2 +- src/phyp/phyp_driver.c | 2 +- src/qemu/qemu_driver.c | 11 ++++++----- src/remote/remote_protocol.x | 6 +++--- src/test/test_driver.c | 4 ++-- src/vbox/vbox_common.c | 2 +- src/vmware/vmware_driver.c | 2 +- src/vz/vz_driver.c | 4 ++-- 19 files changed, 54 insertions(+), 34 deletions(-) -- 2.20.1

2 20

[libvirt] [PATCH v2 0/6] dirty-bitmaps: deprecate @status field
by John Snow 19 Feb '19

19 Feb '19

The current internal meanings of "locked", "user_locked", "qmp_locked", "frozen", "enabled", and "disabled" are all a little muddled. Deprecate the @status field in favor of two new booleans that carry very specific meanings. Then, rename and rework some of the internal semantics to help make the API a bit more clear and easier to read. Well, in my opinion. Based on my current bitmaps branch (includes Eric's patch and my documentation update patch.) V2: - All of Eric's suggestions, I hope. - Vladimir's phrasing suggestion on patch 1 - Added a sixth patch that's mostly just motion. I'm on PTO the next two days, so I didn't get to writing a test for the busy bit. I think test 223 is a good candidate, because it uses the NBD functionality. To test with push mode, I need to come up with a blockdebug configuration that will let me pause an incremental backup so I can test race-free. Maybe for V3, sorry. John Snow (6): block/dirty-bitmap: add recording and busy properties block/dirty-bitmaps: rename frozen predicate helper block/dirty-bitmap: change semantics of enabled predicate block/dirty-bitmap: explicitly lock bitmaps with successors block/dirty-bitmaps: unify qmp_locked and user_locked calls block/dirty-bitmaps: move comment block block/dirty-bitmap.c | 110 ++++++++++++++++++--------------- blockdev.c | 18 +++--- include/block/dirty-bitmap.h | 7 +-- migration/block-dirty-bitmap.c | 8 +-- nbd/server.c | 6 +- qapi/block-core.json | 10 ++- qemu-deprecated.texi | 6 ++ tests/qemu-iotests/236.out | 28 +++++++++ 8 files changed, 122 insertions(+), 71 deletions(-) -- 2.17.2

3 23

[libvirt] [PATCH] iohelper: Remove remaining newlines from error messages
by Andrea Bolognani 19 Feb '19

19 Feb '19

The iohelper is an internal program that's only supposed to be called by libvirt, and whatever output it might produce will ultimately be passed to virReportError() or similar. Since we do not want strings passed to those functions to contain newlines, we can simply not output them in the first place. This is what happens in pretty much all cases already, but in a couple instances newlines have managed to slip in. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- src/util/iohelper.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/util/iohelper.c b/src/util/iohelper.c index aed7ef3184..ddc338b7c7 100644 --- a/src/util/iohelper.c +++ b/src/util/iohelper.c @@ -181,7 +181,7 @@ usage(int status) if (status) { fprintf(stderr, _("%s: try --help for more details"), program_name); } else { - printf(_("Usage: %s FILENAME FD\n"), program_name); + printf(_("Usage: %s FILENAME FD"), program_name); } exit(status); } @@ -198,7 +198,7 @@ main(int argc, char **argv) if (virGettextInitialize() < 0 || virThreadInitialize() < 0 || virErrorInitialize() < 0) { - fprintf(stderr, _("%s: initialization failed\n"), program_name); + fprintf(stderr, _("%s: initialization failed"), program_name); exit(EXIT_FAILURE); } -- 2.20.1

2 1

[libvirt] [PATCH v7 00/20] Refactor virQEMUCapsInitQMPCommand (for BaselineHypervisorCPU using QEMU QMP exchanges)
by Jiri Denemark 19 Feb '19

19 Feb '19

This series is a replacement for the refactoring part (the first 22 patches) of the "BaselineHypervisorCPU using QEMU QMP exchanges" series [1] from Chris. In a nutshell this series moves virQEMUCapsInitQMPCommand related code to qemu_process.c and refactors it so that it can be used by both the QEMU capabilities probing code and the upcoming code for calling QMP commands internally for some CPU related APIs on s390. I'm sending this refactoring part separated because it's mostly ready for being pushed. I ACKed most of the patches in v6, but some patches needed to be modified a bit or replaced by a bit different code. Thus I'm sending them for review rather than pushing this part right away. See individual patches for changes since v6. [1] https://www.redhat.com/archives/libvir-list/2019-January/msg00310.html Chris Venteicher (15): qemu_process: Move process code from qemu_capabilities qemu_process: Rename identifiers moved from qemu_capabilities qemu_process: Limit qemuProcessQMPNew to const input strings qemu_process: Refer to proc not cmd in process code qemu_process: Use consistent name for stop process function qemu_capabilities: Stop QEMU process before freeing qemu_process: Use qemuProcessQMP struct for a single process qemu_process: Introduce qemuProcessQMPStart qemu_process: Move monitor code to qemuProcessQMPConnectMonitor qemu_process: Store libDir in qemuProcessQMP struct qemu_process: Setup paths within qemuProcessQMPInit qemu_process: Stop retaining monitor config in qemuProcessQMP qemu_process: Document and cleanup qemuProcessQMPNew qemu_process: Use unique directories for QMP processes qemu_process: Enter QMP command mode when starting QEMU Process Jiri Denemark (5): qemu_capabilities: Refactor virQEMUCapsInitQMP qemu_process: Don't ignore errors in virQEMUCapsInit qemu_capabilities: Log probe failure in virQEMUCapsInitQMPSingle qemu_process: Hide qmperr inside qemuProcessQMP qemu_process: Hide qemuProcessQMPStop src/qemu/qemu_capabilities.c | 356 ++++++----------------------------- src/qemu/qemu_process.c | 324 +++++++++++++++++++++++++++++++ src/qemu/qemu_process.h | 29 +++ src/qemu/qemu_processpriv.h | 2 + tests/qemucapabilitiestest.c | 9 + 5 files changed, 419 insertions(+), 301 deletions(-) -- 2.20.1

2 41

[libvirt] [PATCH v2 0/3] qemu: Report better error on dump/migrate failure
by Andrea Bolognani 19 Feb '19

19 Feb '19

Changes from [v1]: * Use VIR_FREE() followed by VIR_ALLOC_N() instead of manually setting the last (and only) byte of the array returned by VIR_REALLOC_N() to zero. [v1] https://www.redhat.com/archives/libvir-list/2019-February/msg00156.html Andrea Bolognani (3): vircommand: Ensure buffers are NULL-terminated virfile: Report error in virFileWrapperFdFree() iohelper: Don't include newlines in error messages src/util/iohelper.c | 2 +- src/util/vircommand.c | 6 ++++-- src/util/virfile.c | 6 +++++- 3 files changed, 10 insertions(+), 4 deletions(-) -- 2.20.1

3 17

[libvirt] [jenkins-ci PATCH 0/5] Tidy up top-level directory and fix a few small issues
by Andrea Bolognani 19 Feb '19

19 Feb '19

Andrea Bolognani (5): jenkins: Move all Jenkins-related files README: Add short overview of the repository guests: Fix a small issue in README jenkins: Fix a couple small issues in README jenkins: Add YAML start of document marker README.markdown | 56 ++++--------------- guests/README.markdown | 2 +- README.markdown => jenkins/README.markdown | 18 +++--- {jobs => jenkins/jobs}/autotools.yaml | 2 +- {jobs => jenkins/jobs}/defaults.yaml | 2 +- {jobs => jenkins/jobs}/generic.yaml | 2 +- {jobs => jenkins/jobs}/go.yaml | 2 +- {jobs => jenkins/jobs}/perl-modulebuild.yaml | 2 +- {jobs => jenkins/jobs}/python-distutils.yaml | 2 +- .../projects}/libosinfo+mingw32.yaml | 2 +- .../projects}/libosinfo+mingw64.yaml | 2 +- {projects => jenkins/projects}/libosinfo.yaml | 2 +- .../projects}/libvirt+mingw32.yaml | 2 +- .../projects}/libvirt+mingw64.yaml | 2 +- .../projects}/libvirt-cim.yaml | 2 +- .../projects}/libvirt-dbus.yaml | 2 +- .../projects}/libvirt-glib+mingw32.yaml | 2 +- .../projects}/libvirt-glib+mingw64.yaml | 2 +- .../projects}/libvirt-glib.yaml | 2 +- .../projects}/libvirt-go-xml.yaml | 2 +- .../projects}/libvirt-go.yaml | 2 +- .../projects}/libvirt-ocaml.yaml | 2 +- .../projects}/libvirt-perl.yaml | 2 +- .../projects}/libvirt-python.yaml | 2 +- .../projects}/libvirt-sandbox.yaml | 2 +- .../projects}/libvirt-tck.yaml | 2 +- {projects => jenkins/projects}/libvirt.yaml | 2 +- .../projects}/osinfo-db-tools+mingw32.yaml | 2 +- .../projects}/osinfo-db-tools+mingw64.yaml | 2 +- .../projects}/osinfo-db-tools.yaml | 2 +- {projects => jenkins/projects}/osinfo-db.yaml | 2 +- .../projects}/virt-manager.yaml | 2 +- .../projects}/virt-viewer+mingw32.yaml | 2 +- .../projects}/virt-viewer+mingw64.yaml | 2 +- .../projects}/virt-viewer.yaml | 2 +- 35 files changed, 51 insertions(+), 89 deletions(-) copy README.markdown => jenkins/README.markdown (65%) rename {jobs => jenkins/jobs}/autotools.yaml (99%) rename {jobs => jenkins/jobs}/defaults.yaml (99%) rename {jobs => jenkins/jobs}/generic.yaml (99%) rename {jobs => jenkins/jobs}/go.yaml (99%) rename {jobs => jenkins/jobs}/perl-modulebuild.yaml (99%) rename {jobs => jenkins/jobs}/python-distutils.yaml (99%) rename {projects => jenkins/projects}/libosinfo+mingw32.yaml (98%) rename {projects => jenkins/projects}/libosinfo+mingw64.yaml (98%) rename {projects => jenkins/projects}/libosinfo.yaml (99%) rename {projects => jenkins/projects}/libvirt+mingw32.yaml (98%) rename {projects => jenkins/projects}/libvirt+mingw64.yaml (98%) rename {projects => jenkins/projects}/libvirt-cim.yaml (98%) rename {projects => jenkins/projects}/libvirt-dbus.yaml (99%) rename {projects => jenkins/projects}/libvirt-glib+mingw32.yaml (98%) rename {projects => jenkins/projects}/libvirt-glib+mingw64.yaml (98%) rename {projects => jenkins/projects}/libvirt-glib.yaml (99%) rename {projects => jenkins/projects}/libvirt-go-xml.yaml (99%) rename {projects => jenkins/projects}/libvirt-go.yaml (99%) rename {projects => jenkins/projects}/libvirt-ocaml.yaml (99%) rename {projects => jenkins/projects}/libvirt-perl.yaml (99%) rename {projects => jenkins/projects}/libvirt-python.yaml (99%) rename {projects => jenkins/projects}/libvirt-sandbox.yaml (99%) rename {projects => jenkins/projects}/libvirt-tck.yaml (99%) rename {projects => jenkins/projects}/libvirt.yaml (99%) rename {projects => jenkins/projects}/osinfo-db-tools+mingw32.yaml (98%) rename {projects => jenkins/projects}/osinfo-db-tools+mingw64.yaml (98%) rename {projects => jenkins/projects}/osinfo-db-tools.yaml (99%) rename {projects => jenkins/projects}/osinfo-db.yaml (99%) rename {projects => jenkins/projects}/virt-manager.yaml (99%) rename {projects => jenkins/projects}/virt-viewer+mingw32.yaml (98%) rename {projects => jenkins/projects}/virt-viewer+mingw64.yaml (98%) rename {projects => jenkins/projects}/virt-viewer.yaml (99%) -- 2.20.1

2 6

[libvirt] [PATCH v4 RESEND] openvswitch: Add new port VLAN mode "dot1q-tunnel"(802.1ad double-tagged)
by 芦志朋 18 Feb '19

18 Feb '19

This patch adds functionality to allow libvirt to configure the 'dot1q-tunnel' modes(802.1ad double-tagged) on openvswitch networks. For example: <interface type='bridge'> <mac address='2c:da:41:1d:05:42'/> <source bridge='ovs0'/> <vlan> <tag id='41' nativeMode='dot1q-tunnel'/> </vlan> <virtualport type='openvswitch'> <parameters interfaceid='6401a152-0b99-40b5-92be-858810aa6d37'/> </virtualport> <model type='virtio'/> <driver name='vhost'/> <alias name='net0'/> </interface> Signed-off-by: ZhiPeng Lu <luzhipeng(a)uniudc.com> --- v1->v2: 1. Fix "make syntax-check" failure v2->v3: 1. remove other_config when updating vlan v3->v4: 1. add commit message that has a brief description of the new feature 2. add tests for 'dot1q-tunnel' vlan mode docs/formatdomain.html.in | 20 ++++++++++++++------ docs/formatnetwork.html.in | 20 +++++++++++--------- docs/schemas/networkcommon.rng | 1 + src/conf/netdev_vlan_conf.c | 2 +- src/util/virnetdevopenvswitch.c | 7 +++++++ src/util/virnetdevvlan.h | 1 + tests/networkxml2xmlin/openvswitch-net.xml | 9 +++++++++ tests/networkxml2xmlout/openvswitch-net.xml | 9 +++++++++ .../openvswitch-net-modified.xml | 9 +++++++++ .../openvswitch-net-more-portgroups.xml | 9 +++++++++ .../openvswitch-net-without-alice.xml | 9 +++++++++ 11 files changed, 80 insertions(+), 16 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 2ae5006..2a53d7c 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -6085,8 +6085,14 @@ qemu-kvm -net nic,model=? /dev/null <tag id='42'/> <tag id='123' nativeMode='untagged'/> </vlan> - ... </interface> + <interface type='bridge'> + <vlan trunk='yes'> + <tag id='42'/> + <tag id='123' nativeMode='dot1q-tunnel'/> + </vlan> + </interface> +... </devices> ...</pre> @@ -6122,11 +6128,13 @@ qemu-kvm -net nic,model=? /dev/null For network connections using Open vSwitch it is also possible - to configure 'native-tagged' and 'native-untagged' VLAN modes - Since 1.1.0. This is done with the - optional <code>nativeMode</code> attribute on - the <code><tag></code> subelement: <code>nativeMode</code> - may be set to 'tagged' or 'untagged'. The <code>id</code> + to configure 'native-tagged' and 'native-untagged' + Since 1.1.0. and 'dot1q-tunnel' + (802.1ad double-tagged) Since 5.0.0. + VLAN modes This is done with the optional <code>nativeMode</code> + attribute on the <code><tag></code> subelement: + <code>nativeMode</code> may be set to 'tagged' or 'untagged' or + 'dot1q-tunnel'. The <code>id</code> attribute of the <code><tag></code> subelement containing <code>nativeMode</code> sets which VLAN is considered to be the "native" VLAN for this interface, and diff --git a/docs/formatnetwork.html.in b/docs/formatnetwork.html.in index 509cca9..cfce4a1 100644 --- a/docs/formatnetwork.html.in +++ b/docs/formatnetwork.html.in @@ -705,16 +705,18 @@ For network connections using Open vSwitch it is also possible - to configure 'native-tagged' and 'native-untagged' VLAN modes - Since 1.1.0. This is done with the - optional <code>nativeMode</code> attribute on - the <code><tag></code> subelement: <code>nativeMode</code> - may be set to 'tagged' or 'untagged'. The <code>id</code> - attribute of the <code><tag></code> subelement - containing <code>nativeMode</code> sets which VLAN is considered - to be the "native" VLAN for this interface, and + to configure 'native-tagged' and 'native-untagged' + Since 1.1.0. + and 'dot1q-tunnel'(802.1ad double-tagged) VLAN modes. + Since 5.0.0. This is done with the + optional <code>nativeMode</code> attribute on the + <code><tag></code> subelement: <code>nativeMode</code> + may be set to 'tagged' or 'untagged' or 'dot1q-tunnel'. + The <code>id</code> attribute of the <code><tag></code> + subelement containing <code>nativeMode</code> sets which VLAN is + considered to be the "native" VLAN for this interface, and the <code>nativeMode</code> attribute determines whether or not - traffic for that VLAN will be tagged. + traffic for that VLAN will be tagged or QinQ. <code><vlan></code> elements can also be specified in diff --git a/docs/schemas/networkcommon.rng b/docs/schemas/networkcommon.rng index 2699555..11c48ff 100644 --- a/docs/schemas/networkcommon.rng +++ b/docs/schemas/networkcommon.rng @@ -223,6 +223,7 @@ <choice> <value>tagged</value> <value>untagged</value> + <value>dot1q-tunnel</value> </choice> </attribute> </optional> diff --git a/src/conf/netdev_vlan_conf.c b/src/conf/netdev_vlan_conf.c index 57d73ed..892d31c 100644 --- a/src/conf/netdev_vlan_conf.c +++ b/src/conf/netdev_vlan_conf.c @@ -25,7 +25,7 @@ #define VIR_FROM_THIS VIR_FROM_NONE VIR_ENUM_IMPL(virNativeVlanMode, VIR_NATIVE_VLAN_MODE_LAST, - "default", "tagged", "untagged", + "default", "tagged", "untagged", "dot1q-tunnel", ); int diff --git a/src/util/virnetdevopenvswitch.c b/src/util/virnetdevopenvswitch.c index 4fa3a57..dd2aeac 100644 --- a/src/util/virnetdevopenvswitch.c +++ b/src/util/virnetdevopenvswitch.c @@ -85,6 +85,11 @@ virNetDevOpenvswitchConstructVlans(virCommandPtr cmd, virNetDevVlanPtr virtVlan) virCommandAddArg(cmd, "vlan_mode=native-untagged"); virCommandAddArgFormat(cmd, "tag=%d", virtVlan->nativeTag); break; + case VIR_NATIVE_VLAN_MODE_DOT1Q_TUNNEL: + virCommandAddArg(cmd, "vlan_mode=dot1q-tunnel"); + virCommandAddArg(cmd, "other_config:qinq-ethtype=802.1q"); + virCommandAddArgFormat(cmd, "tag=%d", virtVlan->nativeTag); + break; case VIR_NATIVE_VLAN_MODE_DEFAULT: default: break; @@ -498,6 +503,8 @@ int virNetDevOpenvswitchUpdateVlan(const char *ifname, "--", "--if-exists", "clear", "Port", ifname, "tag", "--", "--if-exists", "clear", "Port", ifname, "trunk", "--", "--if-exists", "clear", "Port", ifname, "vlan_mode", + "--", "--if-exists", "remove", "Port", ifname, + "other_config", "qinq-ethtype", "--", "--if-exists", "set", "Port", ifname, NULL); if (virNetDevOpenvswitchConstructVlans(cmd, virtVlan) < 0) diff --git a/src/util/virnetdevvlan.h b/src/util/virnetdevvlan.h index 2a13759..9d0a2bd 100644 --- a/src/util/virnetdevvlan.h +++ b/src/util/virnetdevvlan.h @@ -27,6 +27,7 @@ typedef enum { VIR_NATIVE_VLAN_MODE_DEFAULT = 0, VIR_NATIVE_VLAN_MODE_TAGGED, VIR_NATIVE_VLAN_MODE_UNTAGGED, + VIR_NATIVE_VLAN_MODE_DOT1Q_TUNNEL, VIR_NATIVE_VLAN_MODE_LAST } virNativeVlanMode; diff --git a/tests/networkxml2xmlin/openvswitch-net.xml b/tests/networkxml2xmlin/openvswitch-net.xml index 2f6084d..0952859 100644 --- a/tests/networkxml2xmlin/openvswitch-net.xml +++ b/tests/networkxml2xmlin/openvswitch-net.xml @@ -30,4 +30,13 @@ <parameters profileid='native-profile'/> </virtualport> </portgroup> + <portgroup name='8021ad'> + <vlan trunk='yes'> + <tag id='555' nativeMode='dot1q-tunnel'/> + <tag id='666'/> + </vlan> + <virtualport> + <parameters profileid='8021ad-profile'/> + </virtualport> + </portgroup> </network> diff --git a/tests/networkxml2xmlout/openvswitch-net.xml b/tests/networkxml2xmlout/openvswitch-net.xml index 2f6084d..0952859 100644 --- a/tests/networkxml2xmlout/openvswitch-net.xml +++ b/tests/networkxml2xmlout/openvswitch-net.xml @@ -30,4 +30,13 @@ <parameters profileid='native-profile'/> </virtualport> </portgroup> + <portgroup name='8021ad'> + <vlan trunk='yes'> + <tag id='555' nativeMode='dot1q-tunnel'/> + <tag id='666'/> + </vlan> + <virtualport> + <parameters profileid='8021ad-profile'/> + </virtualport> + </portgroup> </network> diff --git a/tests/networkxml2xmlupdateout/openvswitch-net-modified.xml b/tests/networkxml2xmlupdateout/openvswitch-net-modified.xml index cc0c344..e5794fc 100644 --- a/tests/networkxml2xmlupdateout/openvswitch-net-modified.xml +++ b/tests/networkxml2xmlupdateout/openvswitch-net-modified.xml @@ -30,4 +30,13 @@ <parameters profileid='native-profile'/> </virtualport> </portgroup> + <portgroup name='8021ad'> + <vlan trunk='yes'> + <tag id='555' nativeMode='dot1q-tunnel'/> + <tag id='666'/> + </vlan> + <virtualport> + <parameters profileid='8021ad-profile'/> + </virtualport> + </portgroup> </network> diff --git a/tests/networkxml2xmlupdateout/openvswitch-net-more-portgroups.xml b/tests/networkxml2xmlupdateout/openvswitch-net-more-portgroups.xml index 7c19ad9..3df0b96 100644 --- a/tests/networkxml2xmlupdateout/openvswitch-net-more-portgroups.xml +++ b/tests/networkxml2xmlupdateout/openvswitch-net-more-portgroups.xml @@ -41,4 +41,13 @@ <parameters profileid='native-profile'/> </virtualport> </portgroup> + <portgroup name='8021ad'> + <vlan trunk='yes'> + <tag id='555' nativeMode='dot1q-tunnel'/> + <tag id='666'/> + </vlan> + <virtualport> + <parameters profileid='8021ad-profile'/> + </virtualport> + </portgroup> </network> diff --git a/tests/networkxml2xmlupdateout/openvswitch-net-without-alice.xml b/tests/networkxml2xmlupdateout/openvswitch-net-without-alice.xml index 4104424..38846aa 100644 --- a/tests/networkxml2xmlupdateout/openvswitch-net-without-alice.xml +++ b/tests/networkxml2xmlupdateout/openvswitch-net-without-alice.xml @@ -20,4 +20,13 @@ <parameters profileid='native-profile'/> </virtualport> </portgroup> + <portgroup name='8021ad'> + <vlan trunk='yes'> + <tag id='555' nativeMode='dot1q-tunnel'/> + <tag id='666'/> + </vlan> + <virtualport> + <parameters profileid='8021ad-profile'/> + </virtualport> + </portgroup> </network> -- 1.8.3.1

2 1

[libvirt] [PATCH] remove remains of kqemu
by Ján Tomko 18 Feb '19

18 Feb '19

We dropped support in commit 8e91a40 (November 2015), but some occurrences still remained, even in live code. Signed-off-by: Ján Tomko <jtomko(a)redhat.com> Reported-by: Thomas Huth <thuth(a)redhat.com> --- docs/drvqemu.html.in | 2 +- docs/formatdomain.html.in | 2 +- src/qemu/qemu.conf | 2 +- src/qemu/qemu_cgroup.c | 2 +- src/qemu/qemu_driver.c | 3 --- src/qemu/test_libvirtd_qemu.aug.in | 5 ++--- src/security/apparmor/libvirt-qemu | 1 - 7 files changed, 6 insertions(+), 11 deletions(-) diff --git a/docs/drvqemu.html.in b/docs/drvqemu.html.in index 5ad956740f..0218b5a7a9 100644 --- a/docs/drvqemu.html.in +++ b/docs/drvqemu.html.in @@ -395,7 +395,7 @@ chmod o+x /path/to/directory <pre> /dev/null, /dev/full, /dev/zero, /dev/random, /dev/urandom, -/dev/ptmx, /dev/kvm, /dev/kqemu, +/dev/ptmx, /dev/kvm, /dev/rtc, /dev/hpet </pre> diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 2ae5006849..7882c54bc1 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -22,7 +22,7 @@ <a id="attributeDomainType"><code>type</code></a> specifies the hypervisor used for running the domain. The allowed values are driver specific, but - include "xen", "kvm", "qemu", "lxc" and "kqemu". The + include "xen", "kvm", "qemu" and "lxc". The second attribute is <code>id</code> which is a unique integer identifier for the running guest machine. Inactive machines have no id value. diff --git a/src/qemu/qemu.conf b/src/qemu/qemu.conf index 7820e72dd8..334b4cd4ee 100644 --- a/src/qemu/qemu.conf +++ b/src/qemu/qemu.conf @@ -489,7 +489,7 @@ #cgroup_device_acl = [ # "/dev/null", "/dev/full", "/dev/zero", # "/dev/random", "/dev/urandom", -# "/dev/ptmx", "/dev/kvm", "/dev/kqemu", +# "/dev/ptmx", "/dev/kvm", # "/dev/rtc","/dev/hpet" #] # diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c index e88cb8c45f..c23f0af2aa 100644 --- a/src/qemu/qemu_cgroup.c +++ b/src/qemu/qemu_cgroup.c @@ -45,7 +45,7 @@ VIR_LOG_INIT("qemu.qemu_cgroup"); const char *const defaultDeviceACL[] = { "/dev/null", "/dev/full", "/dev/zero", "/dev/random", "/dev/urandom", - "/dev/ptmx", "/dev/kvm", "/dev/kqemu", + "/dev/ptmx", "/dev/kvm", "/dev/rtc", "/dev/hpet", NULL, }; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 024ee5b62d..5118f4ad42 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1260,9 +1260,6 @@ qemuConnectGetMaxVcpus(virConnectPtr conn ATTRIBUTE_UNUSED, const char *type) if (STRCASEEQ(type, "kvm")) return virHostCPUGetKVMMaxVCPUs(); - if (STRCASEEQ(type, "kqemu")) - return 1; - virReportError(VIR_ERR_INVALID_ARG, _("unknown type '%s'"), type); return -1; diff --git a/src/qemu/test_libvirtd_qemu.aug.in b/src/qemu/test_libvirtd_qemu.aug.in index 51a7ad5892..fea1d308b7 100644 --- a/src/qemu/test_libvirtd_qemu.aug.in +++ b/src/qemu/test_libvirtd_qemu.aug.in @@ -60,9 +60,8 @@ module Test_libvirtd_qemu = { "5" = "/dev/urandom" } { "6" = "/dev/ptmx" } { "7" = "/dev/kvm" } - { "8" = "/dev/kqemu" } - { "9" = "/dev/rtc" } - { "10" = "/dev/hpet" } + { "8" = "/dev/rtc" } + { "9" = "/dev/hpet" } } { "save_image_format" = "raw" } { "dump_image_format" = "raw" } diff --git a/src/security/apparmor/libvirt-qemu b/src/security/apparmor/libvirt-qemu index eaa5167525..7d28faa163 100644 --- a/src/security/apparmor/libvirt-qemu +++ b/src/security/apparmor/libvirt-qemu @@ -23,7 +23,6 @@ /dev/net/tun rw, /dev/kvm rw, /dev/ptmx rw, - /dev/kqemu rw, @{PROC}/*/status r, # When qemu is signaled to terminate, it will read cmdline of signaling # process for reporting purposes. Allowing read access to a process -- 2.19.2

3 2

[libvirt] [PATCH] util: Use virStorageSourceNew in virStorageFileMetadataNew
by Peter Krempa 18 Feb '19

18 Feb '19

Commit dcda2bf4c110 forgot to fix this one instance. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/util/virstoragefile.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index 5927140a66..b2e308d81d 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -1119,22 +1119,20 @@ static virStorageSourcePtr virStorageFileMetadataNew(const char *path, int format) { - virStorageSourcePtr def = NULL; + VIR_AUTOUNREF(virStorageSourcePtr) def = NULL; + virStorageSourcePtr ret = NULL; - if (VIR_ALLOC(def) < 0) + if (!(def = virStorageSourceNew())) return NULL; def->format = format; def->type = VIR_STORAGE_TYPE_FILE; if (VIR_STRDUP(def->path, path) < 0) - goto error; - - return def; + return NULL; - error: - virObjectUnref(def); - return NULL; + VIR_STEAL_PTR(ret, def); + return ret; } -- 2.20.1

3 5

[libvirt] [PATCH 0/5] util: Turn virStorageSource into a virObject (blockdev-add saga)
by Peter Krempa 18 Feb '19

18 Feb '19

In todays side story we witness the transmutation of virStorageSource into a virObject. Peter Krempa (5): util: Introduce function for allocating virStorageSource util: storage: Turn virStorageSource into a virObject util: alloc: Introduce VIR_AUTOUNREF macro util: Remove the AUTOPTR func for virStorageSource util: Replace virStorageSourceFree with virObjectUnref src/conf/domain_conf.c | 20 +++---- src/conf/snapshot_conf.c | 6 +-- src/conf/storage_conf.c | 2 +- src/libvirt_private.syms | 3 +- src/qemu/qemu_blockjob.c | 10 ++-- src/qemu/qemu_domain.c | 8 +-- src/qemu/qemu_driver.c | 14 ++--- src/qemu/qemu_hotplug.c | 2 +- src/qemu/qemu_migration.c | 8 +-- src/storage/storage_backend_gluster.c | 4 +- src/storage/storage_backend_logical.c | 2 +- src/storage/storage_util.c | 10 ++-- src/util/viralloc.h | 10 ++++ src/util/virobject.c | 13 +++++ src/util/virobject.h | 3 ++ src/util/virstoragefile.c | 75 ++++++++++++++++++--------- src/util/virstoragefile.h | 5 +- tests/qemublocktest.c | 6 +-- tests/virstoragetest.c | 14 ++--- 19 files changed, 134 insertions(+), 81 deletions(-) -- 2.20.1

3 15

[libvirt] [PATCH] bhyve: use virDomainDiskDefNew to instead of VIR_ALLOC
by Peter Krempa 18 Feb '19

18 Feb '19

Use the proper function to allocate a disk definition. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/bhyve/bhyve_parse_command.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/bhyve/bhyve_parse_command.c b/src/bhyve/bhyve_parse_command.c index 1c9191fb96..bd93070dfb 100644 --- a/src/bhyve/bhyve_parse_command.c +++ b/src/bhyve/bhyve_parse_command.c @@ -430,10 +430,8 @@ bhyveParsePCIDisk(virDomainDefPtr def, int idx = -1; virDomainDiskDefPtr disk = NULL; - if (VIR_ALLOC(disk) < 0) + if (!(disk = virDomainDiskDefNew(NULL))) goto cleanup; - if (VIR_ALLOC(disk->src) < 0) - goto error; disk->bus = bus; disk->device = device; -- 2.20.1

2 1

[libvirt] [PATCH 0/7] conf: Rework virDomainDeviceDefPostParseCommon()
by Andrea Bolognani 18 Feb '19

18 Feb '19

Split actual functionality into a series of small helpers and turn it into a dispatcher. Andrea Bolognani (7): conf: Introduce virDomainChrDefPostParse() conf: Introduce virDomainRNGDefPostParse() conf: Introduce virDomainDiskDefPostParse() conf: Introduce virDomainVideoDefPostParse() conf: Introduce virDomainControllerDefPostParse() conf: Introduce virDomainNetDefPostParse() conf: Rework virDomainDeviceDefPostParseCommon() src/conf/domain_conf.c | 285 +++++++++++++++++++++++++++-------------- 1 file changed, 187 insertions(+), 98 deletions(-) -- 2.20.1

3 17

[libvirt] [PATCH v4 00/17] Add authorization support to all network services
by Daniel P. Berrangé 16 Feb '19

16 Feb '19

v1: https://lists.gnu.org/archive/html/qemu-devel/2018-06/msg04482.html v2: https://lists.gnu.org/archive/html/qemu-devel/2018-06/msg05727.html v3: https://lists.gnu.org/archive/html/qemu-devel/2018-10/msg01639.html This series builds on the core authorization framework: v8: https://lists.gnu.org/archive/html/qemu-devel/2019-02/msg04253.html enabling its use with the VNC, chardev, NBD and migration network servers. In combination with TLS x509 client certificates, this allows these services to whitelist specific clients, which avoids the need to setup restricted child certificate authorities. In VNC it also allows whitelisting based on SASL user names. Changed in v4: - Update deprecation versions to 4.0 - Rebased to latest git Changed in v3: - Rebased to latest git master Changed in v2: - Document that authz objects are resolved at time of use, not time of network service activation - Improve docs for tls-authz parameters on services - Fix 2.13 -> 3.0 version tags - Remove redundant conditionals around g_strdup - Fix arg syntax for qemu-nbd s/-/--/ - Remove QAPI (optional) annotation - Fix some outdated usage example Based-on: <20190215155709.15777-1-berrange(a)redhat.com> Daniel P. Berrangé (17): util: add helper APIs for dealing with inotify in portable manner qom: don't require user creatable objects to be registered hw/usb: don't set IN_ISDIR for inotify watch in MTP driver hw/usb: fix const-ness for string params in MTP driver hw/usb: switch MTP to use new inotify APIs authz: add QAuthZ object as an authorization base class authz: add QAuthZSimple object type for easy whitelist auth checks authz: add QAuthZList object type for an access control list authz: add QAuthZListFile object type for a file access control list authz: add QAuthZPAM object type for authorizing using PAM authz: delete existing ACL implementation qemu-nbd: add support for authorization of TLS clients nbd: allow authorization with nbd-server-start QMP command migration: add support for a "tls-authz" migration parameter chardev: add support for authorization for TLS clients vnc: allow specifying a custom authorization object name monitor: deprecate acl_show, acl_reset, acl_policy, acl_add, acl_remove MAINTAINERS | 15 + Makefile | 10 +- Makefile.objs | 10 +- Makefile.target | 2 + authz/Makefile.objs | 7 + authz/base.c | 82 ++++ authz/list.c | 271 +++++++++++++ authz/listfile.c | 283 ++++++++++++++ authz/pamacct.c | 149 +++++++ authz/simple.c | 115 ++++++ authz/trace-events | 18 + blockdev-nbd.c | 11 +- chardev/char-socket.c | 12 +- chardev/char.c | 3 + configure | 54 ++- crypto/tlssession.c | 35 +- crypto/trace-events | 2 +- hmp.c | 11 +- hw/usb/dev-mtp.c | 281 ++++++-------- hw/usb/trace-events | 2 +- include/authz/base.h | 112 ++++++ include/authz/list.h | 106 +++++ include/authz/listfile.h | 111 ++++++ include/authz/pamacct.h | 100 +++++ include/authz/simple.h | 84 ++++ include/block/nbd.h | 4 +- include/qemu/acl.h | 66 ---- include/qemu/filemonitor.h | 128 ++++++ migration/migration.c | 8 + migration/tls.c | 2 +- monitor.c | 202 +++++++--- nbd/server.c | 10 +- qapi/authz.json | 58 +++ qapi/block.json | 8 +- qapi/char.json | 6 + qapi/migration.json | 14 +- qapi/qapi-schema.json | 1 + qemu-deprecated.texi | 11 + qemu-nbd.c | 14 +- qemu-nbd.texi | 4 + qemu-options.hx | 149 ++++++- qom/object.c | 12 +- qom/object_interfaces.c | 16 +- tests/Makefile.include | 16 +- tests/qemu-iotests/233 | 31 +- tests/qemu-iotests/233.out | 11 + tests/test-authz-list.c | 159 ++++++++ tests/test-authz-listfile.c | 195 ++++++++++ tests/test-authz-pam.c | 124 ++++++ tests/test-authz-simple.c | 50 +++ tests/test-crypto-tlssession.c | 15 +- tests/test-io-channel-tls.c | 16 +- tests/test-util-filemonitor.c | 685 +++++++++++++++++++++++++++++++++ ui/vnc-auth-sasl.c | 23 +- ui/vnc-auth-sasl.h | 5 +- ui/vnc-auth-vencrypt.c | 2 +- ui/vnc-ws.c | 2 +- ui/vnc.c | 85 +++- ui/vnc.h | 4 +- util/Makefile.objs | 4 +- util/acl.c | 179 --------- util/filemonitor-inotify.c | 338 ++++++++++++++++ util/filemonitor-stub.c | 59 +++ util/trace-events | 9 + 64 files changed, 4013 insertions(+), 598 deletions(-) create mode 100644 authz/Makefile.objs create mode 100644 authz/base.c create mode 100644 authz/list.c create mode 100644 authz/listfile.c create mode 100644 authz/pamacct.c create mode 100644 authz/simple.c create mode 100644 authz/trace-events create mode 100644 include/authz/base.h create mode 100644 include/authz/list.h create mode 100644 include/authz/listfile.h create mode 100644 include/authz/pamacct.h create mode 100644 include/authz/simple.h delete mode 100644 include/qemu/acl.h create mode 100644 include/qemu/filemonitor.h create mode 100644 qapi/authz.json create mode 100644 tests/test-authz-list.c create mode 100644 tests/test-authz-listfile.c create mode 100644 tests/test-authz-pam.c create mode 100644 tests/test-authz-simple.c create mode 100644 tests/test-util-filemonitor.c delete mode 100644 util/acl.c create mode 100644 util/filemonitor-inotify.c create mode 100644 util/filemonitor-stub.c -- 2.20.1

2 3

[libvirt] [PATCH] conf: make virPCIDeviceAddressFormat void
by Daniel P. Berrangé 15 Feb '19

15 Feb '19

Only one of the three callers of virPCIDeviceAddressFormat correctly handles an error return status. Fortunately it can't fail so can be made void. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/conf/device_conf.c | 3 +-- src/conf/device_conf.h | 6 +++--- src/conf/domain_conf.c | 6 ++---- src/conf/network_conf.c | 7 +++---- src/conf/storage_adapter_conf.c | 4 ++-- 5 files changed, 11 insertions(+), 15 deletions(-) diff --git a/src/conf/device_conf.c b/src/conf/device_conf.c index 32628c6448..cd994057c5 100644 --- a/src/conf/device_conf.c +++ b/src/conf/device_conf.c @@ -308,7 +308,7 @@ virPCIDeviceAddressParseXML(xmlNodePtr node, return ret; } -int +void virPCIDeviceAddressFormat(virBufferPtr buf, virPCIDeviceAddress addr, bool includeTypeInAddr) @@ -320,7 +320,6 @@ virPCIDeviceAddressFormat(virBufferPtr buf, addr.bus, addr.slot, addr.function); - return 0; } bool diff --git a/src/conf/device_conf.h b/src/conf/device_conf.h index 56745707d9..7a3455f99f 100644 --- a/src/conf/device_conf.h +++ b/src/conf/device_conf.h @@ -202,9 +202,9 @@ bool virDeviceInfoPCIAddressExtensionIsPresent(const virDomainDeviceInfo *info); int virPCIDeviceAddressParseXML(xmlNodePtr node, virPCIDeviceAddressPtr addr); -int virPCIDeviceAddressFormat(virBufferPtr buf, - virPCIDeviceAddress addr, - bool includeTypeInAddr); +void virPCIDeviceAddressFormat(virBufferPtr buf, + virPCIDeviceAddress addr, + bool includeTypeInAddr); bool virDomainDeviceCCWAddressIsValid(virDomainDeviceCCWAddressPtr addr); int virDomainDeviceCCWAddressParseXML(xmlNodePtr node, diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index cd69323f28..95510a5157 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -25136,10 +25136,8 @@ virDomainHostdevDefFormatSubsys(virBufferPtr buf, } break; case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI: - if (virPCIDeviceAddressFormat(buf, pcisrc->addr, - includeTypeInAddr) != 0) - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("PCI address Formatting failed")); + virPCIDeviceAddressFormat(buf, pcisrc->addr, + includeTypeInAddr); if ((flags & VIR_DOMAIN_DEF_FORMAT_PCI_ORIG_STATES) && (def->origstates.states.pci.unbind_from_stub || diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index ac0069cbec..87bf158049 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -2485,10 +2485,9 @@ virNetworkDefFormatBuf(virBufferPtr buf, virBufferAddLit(buf, "/>\n"); } else { if (def->forward.ifs[i].type == VIR_NETWORK_FORWARD_HOSTDEV_DEVICE_PCI) { - if (virPCIDeviceAddressFormat(buf, - def->forward.ifs[i].device.pci, - true) < 0) - goto error; + virPCIDeviceAddressFormat(buf, + def->forward.ifs[i].device.pci, + true); } } } diff --git a/src/conf/storage_adapter_conf.c b/src/conf/storage_adapter_conf.c index 3118b1a310..18bcb5eb9e 100644 --- a/src/conf/storage_adapter_conf.c +++ b/src/conf/storage_adapter_conf.c @@ -326,8 +326,8 @@ virStorageAdapterFormatSCSIHost(virBufferPtr buf, virBufferAsprintf(buf, "<parentaddr unique_id='%d'>\n", scsi_host->unique_id); virBufferAdjustIndent(buf, 2); - ignore_value(virPCIDeviceAddressFormat(buf, scsi_host->parentaddr, - false)); + virPCIDeviceAddressFormat(buf, scsi_host->parentaddr, + false); virBufferAdjustIndent(buf, -2); virBufferAddLit(buf, "</parentaddr>\n"); virBufferAdjustIndent(buf, -2); -- 2.20.1

2 1

[libvirt] [tck PATCH 0/4] A few libvirt-tck patches to fix false failures
by Laine Stump 15 Feb '19

15 Feb '19

I found these when I ran the tck on RHEL8 beta. Laine Stump (4): storage: skip qcow1 tests when qcow1 isn't supported by qemu-img storage: fix/improve diagnostic messages networks: remove stray use of brctl command nwfilter: allow for ebtables *not* removing leading 0 from mac addresses scripts/networks/340-guest-network-bridge.t | 4 +- scripts/nwfilter/100-ping-still-working.t | 4 +- scripts/nwfilter/210-no-mac-spoofing.t | 4 +- scripts/storage/100-create-vol-dir.t | 36 +++++++++------- scripts/storage/200-clone-vol-dir.t | 48 ++++++++++++--------- 5 files changed, 54 insertions(+), 42 deletions(-) -- 2.20.1

3 22

[libvirt] [PATCH v4 0/6] Add authorization support to all network services
by Daniel P. Berrangé 15 Feb '19

15 Feb '19

v1: https://lists.gnu.org/archive/html/qemu-devel/2018-06/msg04482.html v2: https://lists.gnu.org/archive/html/qemu-devel/2018-06/msg05727.html v3: https://lists.gnu.org/archive/html/qemu-devel/2018-10/msg01639.html This series builds on the core authorization framework: v8: https://lists.gnu.org/archive/html/qemu-devel/2019-02/msg04253.html enabling its use with the VNC, chardev, NBD and migration network servers. In combination with TLS x509 client certificates, this allows these services to whitelist specific clients, which avoids the need to setup restricted child certificate authorities. In VNC it also allows whitelisting based on SASL user names. Changed in v4: - Update deprecation versions to 4.0 - Rebased to latest git Changed in v3: - Rebased to latest git master Changed in v2: - Document that authz objects are resolved at time of use, not time of network service activation - Improve docs for tls-authz parameters on services - Fix 2.13 -> 3.0 version tags - Remove redundant conditionals around g_strdup - Fix arg syntax for qemu-nbd s/-/--/ - Remove QAPI (optional) annotation - Fix some outdated usage example Based-on: <20190215155709.15777-1-berrange(a)redhat.com> Daniel P. Berrangé (6): qemu-nbd: add support for authorization of TLS clients nbd: allow authorization with nbd-server-start QMP command migration: add support for a "tls-authz" migration parameter chardev: add support for authorization for TLS clients vnc: allow specifying a custom authorization object name monitor: deprecate acl_show, acl_reset, acl_policy, acl_add, acl_remove blockdev-nbd.c | 11 ++++++-- chardev/char-socket.c | 12 +++++++- chardev/char.c | 3 ++ hmp.c | 11 +++++++- include/block/nbd.h | 4 +-- migration/migration.c | 8 ++++++ migration/tls.c | 2 +- monitor.c | 23 +++++++++++++++ nbd/server.c | 10 +++---- qapi/block.json | 8 +++++- qapi/char.json | 6 ++++ qapi/migration.json | 14 ++++++++- qemu-deprecated.texi | 11 ++++++++ qemu-nbd.c | 14 ++++++++- qemu-nbd.texi | 4 +++ qemu-options.hx | 44 +++++++++++++++++++++-------- tests/qemu-iotests/233 | 31 ++++++++++++++++++-- tests/qemu-iotests/233.out | 11 ++++++++ ui/vnc.c | 58 ++++++++++++++++++++++++++++++++------ 19 files changed, 245 insertions(+), 40 deletions(-) -- 2.20.1

1 6

[libvirt] [PATCH] network: explicitly allow icmp/icmpv6 in libvirt zonefile
by Laine Stump 15 Feb '19

15 Feb '19

The libvirt zonefile for firewalld (added in commit 3b71f2e4) does the following: 1) lists specific services it wants to allow, then 2) uses a lower priority <reject/> rule to block all other services to the host, and then finally, 3) relies on the zone's default "accept" policy to, accept all forwarded traffic (since forwarded traffic is ignored by the slightly higher priority <reject/> rule in (2)). I had assumed that icmp traffic was either being allowed at the top of the rules, or that it would be ignored by the <reject/> rule and passed by the default accept policy (similar to forwarded traffic), but this assumption was incorrect; the <reject/> rule does block icmp traffic. This became apparent when DHCPv6 which requires ICMPv6 in addition to udp/dhcpv6) failed to work. This all means that in order to achieve our original goal of "similar behavior to a default reject policy, but also allowing forwarded traffic", we need to add rules to allow all icmp and icmpv6 traffic to the libvirt zone, and that's what this patch does. This is a further refinement of the resolution to https://bugzilla.redhat.com/1650320 Signed-off-by: Laine Stump <laine(a)laine.org> --- src/network/libvirt.zone | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/network/libvirt.zone b/src/network/libvirt.zone index bf81db1b6e..b1e84b52ec 100644 --- a/src/network/libvirt.zone +++ b/src/network/libvirt.zone @@ -15,6 +15,8 @@ <rule priority='32767'> <reject/> </rule> +<protocol value='icmp'/> +<protocol value='ipv6-icmp'/> <service name='dhcp'/> <service name='dhcpv6'/> <service name='dns'/> -- 2.20.1

3 2

Re: [libvirt] [Qemu-devel] [PULL 00/14] Trivial branch patches
by Peter Maydell 14 Feb '19

14 Feb '19

On Thu, 14 Feb 2019 at 10:58, Laurent Vivier <laurent(a)vivier.eu> wrote: > > The following changes since commit 0b5e750bea635b167eb03d86c3d9a09bbd43bc06: > > Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging (2019-02-12 10:53:37 +0000) > > are available in the Git repository at: > > git://github.com/vivier/qemu.git tags/trivial-branch-pull-request > > for you to fetch changes up to 96566d09aa105ee04cbc1c9539cf8a9a40e8e422: > > configure: improve usbfs check (2019-02-14 11:46:30 +0100) > > ---------------------------------------------------------------- > - some configure updates (HAX/NetBSD, remove "wav", -Waddress-of-packed-member) > - remove deprecated options > - some trace and error cleanup > - typo fixes > Applied, thanks. Please update the changelog at https://wiki.qemu.org/ChangeLog/4.0 for any user-visible changes. -- PMM

1 0

[libvirt] [dockerfiles PATCH] Refresh after installing modprobe for libvirt
by Andrea Bolognani 14 Feb '19

14 Feb '19

The corresponding libvirt-jenkins-ci commit is bb67e0969566. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Pushed under the Dockerfiles refresh rule. buildenv-centos-7.Dockerfile | 1 + buildenv-debian-8.Dockerfile | 1 + buildenv-debian-9.Dockerfile | 1 + buildenv-debian-sid.Dockerfile | 1 + buildenv-fedora-28.Dockerfile | 1 + buildenv-fedora-29.Dockerfile | 1 + buildenv-fedora-rawhide.Dockerfile | 1 + buildenv-ubuntu-16.Dockerfile | 1 + buildenv-ubuntu-18.Dockerfile | 1 + 9 files changed, 9 insertions(+) diff --git a/buildenv-centos-7.Dockerfile b/buildenv-centos-7.Dockerfile index ab6f2c5..e85d132 100644 --- a/buildenv-centos-7.Dockerfile +++ b/buildenv-centos-7.Dockerfile @@ -25,6 +25,7 @@ RUN yum update -y && \ gnutls-devel \ iproute \ iscsi-initiator-utils \ + kmod \ libacl-devel \ libattr-devel \ libblkid-devel \ diff --git a/buildenv-debian-8.Dockerfile b/buildenv-debian-8.Dockerfile index 587b06f..fa92347 100644 --- a/buildenv-debian-8.Dockerfile +++ b/buildenv-debian-8.Dockerfile @@ -20,6 +20,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ git \ glusterfs-common \ iproute2 \ + kmod \ libacl1-dev \ libapparmor-dev \ libattr1-dev \ diff --git a/buildenv-debian-9.Dockerfile b/buildenv-debian-9.Dockerfile index 359d9c4..9d81f03 100644 --- a/buildenv-debian-9.Dockerfile +++ b/buildenv-debian-9.Dockerfile @@ -20,6 +20,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ git \ glusterfs-common \ iproute2 \ + kmod \ libacl1-dev \ libapparmor-dev \ libattr1-dev \ diff --git a/buildenv-debian-sid.Dockerfile b/buildenv-debian-sid.Dockerfile index 8e49c0c..3be8a9f 100644 --- a/buildenv-debian-sid.Dockerfile +++ b/buildenv-debian-sid.Dockerfile @@ -19,6 +19,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ gettext \ git \ iproute2 \ + kmod \ libacl1-dev \ libapparmor-dev \ libattr1-dev \ diff --git a/buildenv-fedora-28.Dockerfile b/buildenv-fedora-28.Dockerfile index fe96282..447304e 100644 --- a/buildenv-fedora-28.Dockerfile +++ b/buildenv-fedora-28.Dockerfile @@ -28,6 +28,7 @@ RUN yum update -y && \ iproute \ iproute-tc \ iscsi-initiator-utils \ + kmod \ libacl-devel \ libattr-devel \ libblkid-devel \ diff --git a/buildenv-fedora-29.Dockerfile b/buildenv-fedora-29.Dockerfile index 1d10a5f..81879ae 100644 --- a/buildenv-fedora-29.Dockerfile +++ b/buildenv-fedora-29.Dockerfile @@ -28,6 +28,7 @@ RUN yum update -y && \ iproute \ iproute-tc \ iscsi-initiator-utils \ + kmod \ libacl-devel \ libattr-devel \ libblkid-devel \ diff --git a/buildenv-fedora-rawhide.Dockerfile b/buildenv-fedora-rawhide.Dockerfile index f6e427c..e5996ec 100644 --- a/buildenv-fedora-rawhide.Dockerfile +++ b/buildenv-fedora-rawhide.Dockerfile @@ -29,6 +29,7 @@ RUN yum update -y --nogpgcheck fedora-gpg-keys && \ iproute \ iproute-tc \ iscsi-initiator-utils \ + kmod \ libacl-devel \ libattr-devel \ libblkid-devel \ diff --git a/buildenv-ubuntu-16.Dockerfile b/buildenv-ubuntu-16.Dockerfile index 1d49b1f..dc1b16f 100644 --- a/buildenv-ubuntu-16.Dockerfile +++ b/buildenv-ubuntu-16.Dockerfile @@ -20,6 +20,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ git \ glusterfs-common \ iproute2 \ + kmod \ libacl1-dev \ libapparmor-dev \ libattr1-dev \ diff --git a/buildenv-ubuntu-18.Dockerfile b/buildenv-ubuntu-18.Dockerfile index 7ab5686..3e4c48f 100644 --- a/buildenv-ubuntu-18.Dockerfile +++ b/buildenv-ubuntu-18.Dockerfile @@ -20,6 +20,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ git \ glusterfs-common \ iproute2 \ + kmod \ libacl1-dev \ libapparmor-dev \ libattr1-dev \ -- 2.20.1

1 0

[libvirt] [PATCH] virkmodtest: Don't fail if modprobe doesn't exist
by Michal Privoznik 14 Feb '19

14 Feb '19

On some very basic installations (e.g. some container images) the modprobe binary might be missing. If that is the case, don't fail virkmodtest. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- tests/virkmodtest.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tests/virkmodtest.c b/tests/virkmodtest.c index c90830a23c..80029244ff 100644 --- a/tests/virkmodtest.c +++ b/tests/virkmodtest.c @@ -46,7 +46,12 @@ testKModConfig(const void *args ATTRIBUTE_UNUSED) */ outbuf = virKModConfig(); if (!outbuf) { - fprintf(stderr, "Failed to get config\n"); + if (virFileIsExecutable(MODPROBE)) { + fprintf(stderr, "Failed to get config\n"); + } else { + /* modprobe doesn't exist, do not claim error. */ + ret = 0; + } goto cleanup; } ret = 0; -- 2.19.2

2 1

[libvirt] [jenkins-ci PATCH 0/2] guests: Install modprobe for libvirt
by Andrea Bolognani 14 Feb '19

14 Feb '19

Turns out some Docker base images (eg. ubuntu:18.04) don't include it, so we have to drag it in manually. It's a crazy world we live in these days :) Andrea Bolognani (2): guests: Add mapping for modprobe guests: Install modprobe for libvirt guests/vars/mappings.yml | 4 ++++ guests/vars/projects/libvirt.yml | 1 + 2 files changed, 5 insertions(+) -- 2.20.1

2 4

[libvirt] [jenkins-ci PATCH v2 0/9] Add support for cross compiling libvirt via Debian
by Daniel P. Berrangé 14 Feb '19

14 Feb '19

Changed in v2: - Fix multiple package name mistakes - Modify lcitool to generate cross-arch docker files - Add --no-install-recommended flag to apt-get - Add DEBIAN_FRONTEND=noninteractive env to apt-get - Improve error reporting in lcitool - Add make rule for generating dockerfiles locally Daniel P. Berrangé (9): guests: use libpcap0.8-dev package on Debian guests: add xfsprogs development package for libvirt guests: fix glusterfs package name on Debian lcitool: include root cause when failing to load facts lcitool: force non-interactive apt-get frontend lcitool: avoid installing recommended packages lcitool: avoid using an env var to store package list lcitool: support generating cross compiler dockerfiles docker: add a makefile for building docker images locally .gitignore | 1 + dockerfiles/Makefile | 33 +++++ guests/host_vars/libvirt-debian-9/docker.yml | 57 ++++++++ .../host_vars/libvirt-debian-sid/docker.yml | 62 +++++++++ guests/lcitool | 123 ++++++++++++++---- guests/vars/mappings.yml | 9 +- guests/vars/projects/libvirt.yml | 1 + 7 files changed, 257 insertions(+), 29 deletions(-) create mode 100644 dockerfiles/Makefile -- 2.20.1

3 27

[libvirt] [PATCH] virsh: fix snapshot list --parent
by Ján Tomko 14 Feb '19

14 Feb '19

The root snapshot does not have a parent. Use NULLSTR_EMPTY to pass an empty string instead of putting too few columns in the table. https://bugzilla.redhat.com/show_bug.cgi?id=1662849 Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- tools/virsh-snapshot.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/virsh-snapshot.c b/tools/virsh-snapshot.c index 90000ef1aa..6cadb2b0d6 100644 --- a/tools/virsh-snapshot.c +++ b/tools/virsh-snapshot.c @@ -1608,7 +1608,8 @@ cmdSnapshotList(vshControl *ctl, const vshCmd *cmd) &time_info); if (parent) { - if (vshTableRowAppend(table, snap_name, timestr, state, parent_snap, + if (vshTableRowAppend(table, snap_name, timestr, state, + NULLSTR_EMPTY(parent_snap), NULL) < 0) goto cleanup; } else { -- 2.19.2

2 1

[libvirt] [PATCH v2] udev: only report a warning if udev_enumerate_scan_devices fails
by Marc Hartmayer 14 Feb '19

14 Feb '19

Even if an error is reported by `udev_enumerate_scan_devices`, e.g. because a driver of a device has an bug, we can still enumerate all other devices. Additionally the documentation of udev_enumerate_scan_devices says that on success an integer >= 0 is returned (see man udev_enumerate_scan_devices(3)). Reviewed-by: Bjoern Walk <bwalk(a)linux.ibm.com> Signed-off-by: Marc Hartmayer <mhartmay(a)linux.ibm.com> --- src/node_device/node_device_udev.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c index 299f55260129..eb4d8b3cfe4a 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -1480,13 +1480,8 @@ udevEnumerateDevices(struct udev *udev) if (udevEnumerateAddMatches(udev_enumerate) < 0) goto cleanup; - ret = udev_enumerate_scan_devices(udev_enumerate); - if (ret != 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("udev scan devices returned %d"), - ret); - goto cleanup; - } + if (udev_enumerate_scan_devices(udev_enumerate) < 0) + VIR_WARN("udev scan devices failed"); udev_list_entry_foreach(list_entry, udev_enumerate_get_list_entry(udev_enumerate)) { @@ -1494,6 +1489,7 @@ udevEnumerateDevices(struct udev *udev) udevProcessDeviceListEntry(udev, list_entry); } + ret = 0; cleanup: udev_enumerate_unref(udev_enumerate); return ret; -- 2.17.0

2 1

[libvirt] [PATCH] qemu_hotplug: Initialize @charAlias in qemuDomainRemoveChrDevice
by Michal Privoznik 14 Feb '19

14 Feb '19

My change in 112f3a8d0f32 was too drastic. The @charAlias variable is initialized only if @monitor == true. However, it is used even outside of that condition, at which point it's just uninitialized pointer. Reported-by: John Ferlan <jferlan(a)redhat.com> Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_hotplug.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index a5c352f44b..78c9a77f2d 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -4754,13 +4754,12 @@ qemuDomainRemoveChrDevice(virQEMUDriverPtr driver, VIR_DEBUG("Removing character device %s from domain %p %s", chr->info.alias, vm, vm->def->name); + if (!(charAlias = qemuAliasChardevFromDevAlias(chr->info.alias))) + goto cleanup; + if (monitor) { - if (!(charAlias = qemuAliasChardevFromDevAlias(chr->info.alias))) - goto cleanup; - qemuDomainObjEnterMonitor(driver, vm); rc = qemuMonitorDetachCharDev(priv->mon, charAlias); - if (qemuDomainObjExitMonitor(driver, vm) < 0) goto cleanup; } -- 2.19.2

2 1

[libvirt] [PATCH v2 0/2] add debugcon-isa chardev guest interface
by Nikolay Shirokovskiy 14 Feb '19

14 Feb '19

Diff from v1 [1]: ================= - expose the device as serial device instead of channel in config I use isa-debugcon name becase libvirt passes these names to qemu as-is so I don't want to make exception for this device. First version discussion: [1] https://www.redhat.com/archives/libvir-list/2019-January/msg00951.html Nikolay Shirokovskiy (2): conf: add debugcon chardev guest interface qemu: implement debugcon-isa chardev docs/formatdomain.html.in | 3 +- docs/schemas/domaincommon.rng | 1 + src/conf/domain_conf.c | 4 +++ src/conf/domain_conf.h | 1 + src/qemu/qemu_command.c | 10 ++++-- src/qemu/qemu_domain.c | 3 ++ tests/qemuxml2argvdata/isa-serial-debugcon.args | 29 ++++++++++++++++ tests/qemuxml2argvdata/isa-serial-debugcon.xml | 36 ++++++++++++++++++++ tests/qemuxml2argvtest.c | 1 + tests/qemuxml2xmloutdata/isa-serial-debugcon.xml | 43 ++++++++++++++++++++++++ tests/qemuxml2xmltest.c | 2 ++ 11 files changed, 129 insertions(+), 4 deletions(-) create mode 100644 tests/qemuxml2argvdata/isa-serial-debugcon.args create mode 100644 tests/qemuxml2argvdata/isa-serial-debugcon.xml create mode 100644 tests/qemuxml2xmloutdata/isa-serial-debugcon.xml -- 1.8.3.1

4 23

[libvirt] [PATCH 0/2] qemu_hotplug: Two simple qemuDomainDetachChrDevice fixes
by Michal Privoznik 14 Feb '19

14 Feb '19

*** BLURB HERE *** Michal Prívozník (2): qemu_hotplug: Don't build device string in qemuDomainDetachChrDevice qemu_hotplug: Assume chardev alias always exists in qemuDomainDetachChrDevice src/qemu/qemu_hotplug.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) -- 2.19.2

2 3

[libvirt] [jenkins-ci PATCH 0/5] do testing of the libvirt-jenkins-ci project
by Daniel P. Berrangé 14 Feb '19

14 Feb '19

This sets things up so that we do testing of the libvirt-jenkins-ci via flake8, and also validate the docker file builder works. Daniel P. Berrangé (5): make: add a rule for running a 'syntax-check' with flake8 lcitool: use subparsers for commands lcitool: allow restricting host list to those supporting docker make: add a simple build target that generates all dockerfiles Add project for CI testing libvirt-jenkins-ci Makefile | 23 +++ guests/lcitool | 145 +++++++++++------- guests/playbooks/build/jobs/defaults.yml | 2 + .../build/projects/libvirt-jenkins-ci.yml | 15 ++ guests/vars/projects/libvirt-jenkins-ci.yml | 4 + jobs/defaults.yaml | 2 + projects/libvirt-jenkins-ci.yaml | 14 ++ 7 files changed, 148 insertions(+), 57 deletions(-) create mode 100644 Makefile create mode 100644 guests/playbooks/build/projects/libvirt-jenkins-ci.yml create mode 100644 guests/vars/projects/libvirt-jenkins-ci.yml create mode 100644 projects/libvirt-jenkins-ci.yaml -- 2.20.1

1 5

[libvirt] [dockerfiles PATCH] Refresh after recent changes
by Andrea Bolognani 14 Feb '19

14 Feb '19

The corresponding libvirt-jenkins-ci commit is eb8dbc6ffdd1. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Pushed under the Dockerfiles refresh rule. buildenv-centos-7.Dockerfile | 137 ++++++++++---------- buildenv-debian-8.Dockerfile | 151 +++++++++++----------- buildenv-debian-9.Dockerfile | 155 +++++++++++----------- buildenv-debian-sid.Dockerfile | 154 +++++++++++----------- buildenv-fedora-28.Dockerfile | 153 +++++++++++----------- buildenv-fedora-29.Dockerfile | 153 +++++++++++----------- buildenv-fedora-rawhide.Dockerfile | 201 +++++++++++++++-------------- buildenv-ubuntu-16.Dockerfile | 157 +++++++++++----------- buildenv-ubuntu-18.Dockerfile | 157 +++++++++++----------- 9 files changed, 718 insertions(+), 700 deletions(-) diff --git a/buildenv-centos-7.Dockerfile b/buildenv-centos-7.Dockerfile index db05f91..ab6f2c5 100644 --- a/buildenv-centos-7.Dockerfile +++ b/buildenv-centos-7.Dockerfile @@ -1,72 +1,73 @@ FROM centos:centos7 -ENV PACKAGES audit-libs-devel \ - augeas \ - autoconf \ - automake \ - avahi-devel \ - bash \ - bash-completion \ - chrony \ - cyrus-sasl-devel \ - dbus-devel \ - device-mapper-devel \ - dnsmasq \ - ebtables \ - fuse-devel \ - gcc \ - gettext \ - gettext-devel \ - git \ - glibc-common \ - glibc-devel \ - glusterfs-api-devel \ - gnutls-devel \ - iproute \ - iscsi-initiator-utils \ - libacl-devel \ - libattr-devel \ - libblkid-devel \ - libcap-ng-devel \ - libcurl-devel \ - libiscsi-devel \ - libnl3-devel \ - libpcap-devel \ - libpciaccess-devel \ - librbd1-devel \ - libselinux-devel \ - libssh-devel \ - libssh2-devel \ - libtirpc-devel \ - libtool \ - libudev-devel \ - libwsman-devel \ - libxml2 \ - libxml2-devel \ - libxslt \ - lvm2 \ - make \ - netcf-devel \ - nfs-utils \ - numactl-devel \ - numad \ - parted \ - parted-devel \ - patch \ - perl \ - pkgconfig \ - polkit \ - qemu-img \ - radvd \ - readline-devel \ - rpm-build \ - sanlock-devel \ - screen \ - scrub \ - sudo \ - systemtap-sdt-devel \ - vim \ - yajl-devel + RUN yum update -y && \ - yum install -y ${PACKAGES} && \ + yum install -y audit-libs-devel \ + augeas \ + autoconf \ + automake \ + avahi-devel \ + bash \ + bash-completion \ + chrony \ + cyrus-sasl-devel \ + dbus-devel \ + device-mapper-devel \ + dnsmasq \ + ebtables \ + fuse-devel \ + gcc \ + gettext \ + gettext-devel \ + git \ + glibc-common \ + glibc-devel \ + glusterfs-api-devel \ + gnutls-devel \ + iproute \ + iscsi-initiator-utils \ + libacl-devel \ + libattr-devel \ + libblkid-devel \ + libcap-ng-devel \ + libcurl-devel \ + libiscsi-devel \ + libnl3-devel \ + libpcap-devel \ + libpciaccess-devel \ + librbd1-devel \ + libselinux-devel \ + libssh-devel \ + libssh2-devel \ + libtirpc-devel \ + libtool \ + libudev-devel \ + libwsman-devel \ + libxml2 \ + libxml2-devel \ + libxslt \ + lvm2 \ + make \ + netcf-devel \ + nfs-utils \ + numactl-devel \ + numad \ + parted \ + parted-devel \ + patch \ + perl \ + pkgconfig \ + polkit \ + qemu-img \ + radvd \ + readline-devel \ + rpm-build \ + sanlock-devel \ + screen \ + scrub \ + sudo \ + systemtap-sdt-devel \ + vim \ + xfsprogs-devel \ + yajl-devel && \ yum autoremove -y && \ yum clean all -y diff --git a/buildenv-debian-8.Dockerfile b/buildenv-debian-8.Dockerfile index aaae616..587b06f 100644 --- a/buildenv-debian-8.Dockerfile +++ b/buildenv-debian-8.Dockerfile @@ -1,78 +1,81 @@ FROM debian:8 -ENV PACKAGES augeas-tools \ - autoconf \ - automake \ - autopoint \ - bash \ - bash-completion \ - ccache \ - chrony \ - dnsmasq-base \ - dwarves \ - ebtables \ - gcc \ - gettext \ - git \ - glusterfs-client \ - iproute2 \ - libacl1-dev \ - libapparmor-dev \ - libattr1-dev \ - libaudit-dev \ - libavahi-client-dev \ - libblkid-dev \ - libc-dev-bin \ - libc6-dev \ - libcap-ng-dev \ - libcurl4-gnutls-dev \ - libdbus-1-dev \ - libdevmapper-dev \ - libfuse-dev \ - libgnutls28-dev \ - libiscsi-dev \ - libnetcf-dev \ - libnl-3-dev \ - libnl-route-3-dev \ - libnuma-dev \ - libparted-dev \ - libpcap-dev \ - libpciaccess-dev \ - librbd-dev \ - libreadline-dev \ - libsanlock-dev \ - libsasl2-dev \ - libselinux1-dev \ - libssh-gcrypt-dev \ - libssh2-1-dev \ - libtirpc-dev \ - libtool \ - libtool-bin \ - libudev-dev \ - libxen-dev \ - libxml2-dev \ - libxml2-utils \ - libyajl-dev \ - lvm2 \ - make \ - nfs-common \ - open-iscsi \ - parted \ - patch \ - perl \ - pkgconf \ - policykit-1 \ - qemu-utils \ - radvd \ - screen \ - scrub \ - sheepdog \ - sudo \ - systemtap-sdt-dev \ - vim \ - xsltproc \ - zfs-fuse -RUN apt-get update && \ + +RUN export DEBIAN_FRONTEND=noninteractive && \ + apt-get update && \ apt-get dist-upgrade -y && \ - apt-get install -y ${PACKAGES} && \ + apt-get install --no-install-recommends -y \ + augeas-tools \ + autoconf \ + automake \ + autopoint \ + bash \ + bash-completion \ + ccache \ + chrony \ + dnsmasq-base \ + dwarves \ + ebtables \ + gcc \ + gettext \ + git \ + glusterfs-common \ + iproute2 \ + libacl1-dev \ + libapparmor-dev \ + libattr1-dev \ + libaudit-dev \ + libavahi-client-dev \ + libblkid-dev \ + libc-dev-bin \ + libc6-dev \ + libcap-ng-dev \ + libcurl4-gnutls-dev \ + libdbus-1-dev \ + libdevmapper-dev \ + libfuse-dev \ + libgnutls28-dev \ + libiscsi-dev \ + libnetcf-dev \ + libnl-3-dev \ + libnl-route-3-dev \ + libnuma-dev \ + libparted-dev \ + libpcap0.8-dev \ + libpciaccess-dev \ + librbd-dev \ + libreadline-dev \ + libsanlock-dev \ + libsasl2-dev \ + libselinux1-dev \ + libssh-gcrypt-dev \ + libssh2-1-dev \ + libtirpc-dev \ + libtool \ + libtool-bin \ + libudev-dev \ + libxen-dev \ + libxml2-dev \ + libxml2-utils \ + libyajl-dev \ + lvm2 \ + make \ + nfs-common \ + open-iscsi \ + parted \ + patch \ + perl \ + pkgconf \ + policykit-1 \ + qemu-utils \ + radvd \ + screen \ + scrub \ + sheepdog \ + sudo \ + systemtap-sdt-dev \ + vim \ + xfslibs-dev \ + xsltproc \ + zfs-fuse && \ apt-get autoremove -y && \ apt-get autoclean -y diff --git a/buildenv-debian-9.Dockerfile b/buildenv-debian-9.Dockerfile index 0af6061..359d9c4 100644 --- a/buildenv-debian-9.Dockerfile +++ b/buildenv-debian-9.Dockerfile @@ -1,80 +1,83 @@ FROM debian:9 -ENV PACKAGES augeas-tools \ - autoconf \ - automake \ - autopoint \ - bash \ - bash-completion \ - ccache \ - chrony \ - dnsmasq-base \ - dwarves \ - ebtables \ - gcc \ - gettext \ - git \ - glusterfs-client \ - iproute2 \ - libacl1-dev \ - libapparmor-dev \ - libattr1-dev \ - libaudit-dev \ - libavahi-client-dev \ - libblkid-dev \ - libc-dev-bin \ - libc6-dev \ - libcap-ng-dev \ - libcurl4-gnutls-dev \ - libdbus-1-dev \ - libdevmapper-dev \ - libfuse-dev \ - libgnutls28-dev \ - libiscsi-dev \ - libnetcf-dev \ - libnl-3-dev \ - libnl-route-3-dev \ - libnuma-dev \ - libparted-dev \ - libpcap-dev \ - libpciaccess-dev \ - librbd-dev \ - libreadline-dev \ - libsanlock-dev \ - libsasl2-dev \ - libselinux1-dev \ - libssh-gcrypt-dev \ - libssh2-1-dev \ - libtirpc-dev \ - libtool \ - libtool-bin \ - libudev-dev \ - libxen-dev \ - libxml2-dev \ - libxml2-utils \ - libyajl-dev \ - lvm2 \ - make \ - nfs-common \ - numad \ - open-iscsi \ - parted \ - patch \ - perl \ - pkgconf \ - policykit-1 \ - qemu-utils \ - radvd \ - screen \ - scrub \ - sheepdog \ - sudo \ - systemtap-sdt-dev \ - vim \ - wireshark-dev \ - xsltproc \ - zfs-fuse -RUN apt-get update && \ + +RUN export DEBIAN_FRONTEND=noninteractive && \ + apt-get update && \ apt-get dist-upgrade -y && \ - apt-get install -y ${PACKAGES} && \ + apt-get install --no-install-recommends -y \ + augeas-tools \ + autoconf \ + automake \ + autopoint \ + bash \ + bash-completion \ + ccache \ + chrony \ + dnsmasq-base \ + dwarves \ + ebtables \ + gcc \ + gettext \ + git \ + glusterfs-common \ + iproute2 \ + libacl1-dev \ + libapparmor-dev \ + libattr1-dev \ + libaudit-dev \ + libavahi-client-dev \ + libblkid-dev \ + libc-dev-bin \ + libc6-dev \ + libcap-ng-dev \ + libcurl4-gnutls-dev \ + libdbus-1-dev \ + libdevmapper-dev \ + libfuse-dev \ + libgnutls28-dev \ + libiscsi-dev \ + libnetcf-dev \ + libnl-3-dev \ + libnl-route-3-dev \ + libnuma-dev \ + libparted-dev \ + libpcap0.8-dev \ + libpciaccess-dev \ + librbd-dev \ + libreadline-dev \ + libsanlock-dev \ + libsasl2-dev \ + libselinux1-dev \ + libssh-gcrypt-dev \ + libssh2-1-dev \ + libtirpc-dev \ + libtool \ + libtool-bin \ + libudev-dev \ + libxen-dev \ + libxml2-dev \ + libxml2-utils \ + libyajl-dev \ + lvm2 \ + make \ + nfs-common \ + numad \ + open-iscsi \ + parted \ + patch \ + perl \ + pkgconf \ + policykit-1 \ + qemu-utils \ + radvd \ + screen \ + scrub \ + sheepdog \ + sudo \ + systemtap-sdt-dev \ + vim \ + wireshark-dev \ + xfslibs-dev \ + xsltproc \ + zfs-fuse && \ apt-get autoremove -y && \ apt-get autoclean -y diff --git a/buildenv-debian-sid.Dockerfile b/buildenv-debian-sid.Dockerfile index 4c4c99b..8e49c0c 100644 --- a/buildenv-debian-sid.Dockerfile +++ b/buildenv-debian-sid.Dockerfile @@ -1,80 +1,82 @@ FROM debian:sid -ENV PACKAGES augeas-tools \ - autoconf \ - automake \ - autopoint \ - bash \ - bash-completion \ - ccache \ - chrony \ - dnsmasq-base \ - dwarves \ - ebtables \ - gcc \ - gettext \ - git \ - glusterfs-client \ - iproute2 \ - libacl1-dev \ - libapparmor-dev \ - libattr1-dev \ - libaudit-dev \ - libavahi-client-dev \ - libblkid-dev \ - libc-dev-bin \ - libc6-dev \ - libcap-ng-dev \ - libcurl4-gnutls-dev \ - libdbus-1-dev \ - libdevmapper-dev \ - libfuse-dev \ - libgnutls28-dev \ - libiscsi-dev \ - libnetcf-dev \ - libnl-3-dev \ - libnl-route-3-dev \ - libnuma-dev \ - libparted-dev \ - libpcap-dev \ - libpciaccess-dev \ - librbd-dev \ - libreadline-dev \ - libsanlock-dev \ - libsasl2-dev \ - libselinux1-dev \ - libssh-gcrypt-dev \ - libssh2-1-dev \ - libtirpc-dev \ - libtool \ - libtool-bin \ - libudev-dev \ - libxen-dev \ - libxml2-dev \ - libxml2-utils \ - libyajl-dev \ - lvm2 \ - make \ - nfs-common \ - numad \ - open-iscsi \ - parted \ - patch \ - perl \ - pkgconf \ - policykit-1 \ - qemu-utils \ - radvd \ - screen \ - scrub \ - sheepdog \ - sudo \ - systemtap-sdt-dev \ - vim \ - wireshark-dev \ - xsltproc \ - zfs-fuse -RUN apt-get update && \ + +RUN export DEBIAN_FRONTEND=noninteractive && \ + apt-get update && \ apt-get dist-upgrade -y && \ - apt-get install -y ${PACKAGES} && \ + apt-get install --no-install-recommends -y \ + augeas-tools \ + autoconf \ + automake \ + autopoint \ + bash \ + bash-completion \ + ccache \ + chrony \ + dnsmasq-base \ + dwarves \ + ebtables \ + gcc \ + gettext \ + git \ + iproute2 \ + libacl1-dev \ + libapparmor-dev \ + libattr1-dev \ + libaudit-dev \ + libavahi-client-dev \ + libblkid-dev \ + libc-dev-bin \ + libc6-dev \ + libcap-ng-dev \ + libcurl4-gnutls-dev \ + libdbus-1-dev \ + libdevmapper-dev \ + libfuse-dev \ + libglusterfs-dev \ + libgnutls28-dev \ + libiscsi-dev \ + libnetcf-dev \ + libnl-3-dev \ + libnl-route-3-dev \ + libnuma-dev \ + libparted-dev \ + libpcap0.8-dev \ + libpciaccess-dev \ + librbd-dev \ + libreadline-dev \ + libsanlock-dev \ + libsasl2-dev \ + libselinux1-dev \ + libssh-gcrypt-dev \ + libssh2-1-dev \ + libtirpc-dev \ + libtool \ + libtool-bin \ + libudev-dev \ + libxen-dev \ + libxml2-dev \ + libxml2-utils \ + libyajl-dev \ + lvm2 \ + make \ + nfs-common \ + numad \ + open-iscsi \ + parted \ + patch \ + perl \ + pkgconf \ + policykit-1 \ + qemu-utils \ + radvd \ + screen \ + scrub \ + sudo \ + systemtap-sdt-dev \ + vim \ + wireshark-dev \ + xfslibs-dev \ + xsltproc \ + zfs-fuse && \ apt-get autoremove -y && \ apt-get autoclean -y diff --git a/buildenv-fedora-28.Dockerfile b/buildenv-fedora-28.Dockerfile index 0b4d24f..fe96282 100644 --- a/buildenv-fedora-28.Dockerfile +++ b/buildenv-fedora-28.Dockerfile @@ -1,80 +1,81 @@ FROM fedora:28 -ENV PACKAGES audit-libs-devel \ - augeas \ - autoconf \ - automake \ - avahi-devel \ - bash \ - bash-completion \ - ccache \ - chrony \ - cppi \ - cyrus-sasl-devel \ - dbus-devel \ - device-mapper-devel \ - dnsmasq \ - dwarves \ - ebtables \ - fuse-devel \ - gcc \ - gettext \ - gettext-devel \ - git \ - glibc-devel \ - glusterfs-api-devel \ - gnutls-devel \ - iproute \ - iproute-tc \ - iscsi-initiator-utils \ - libacl-devel \ - libattr-devel \ - libblkid-devel \ - libcap-ng-devel \ - libcurl-devel \ - libiscsi-devel \ - libnl3-devel \ - libpcap-devel \ - libpciaccess-devel \ - librbd-devel \ - libselinux-devel \ - libssh-devel \ - libssh2-devel \ - libtirpc-devel \ - libtool \ - libudev-devel \ - libwsman-devel \ - libxml2 \ - libxml2-devel \ - libxslt \ - lvm2 \ - make \ - netcf-devel \ - nfs-utils \ - numactl-devel \ - numad \ - parted \ - parted-devel \ - patch \ - perl \ - pkgconfig \ - polkit \ - qemu-img \ - radvd \ - readline-devel \ - rpcgen \ - rpm-build \ - sanlock-devel \ - screen \ - scrub \ - sheepdog \ - sudo \ - systemtap-sdt-devel \ - vim \ - wireshark-devel \ - xen-devel \ - yajl-devel \ - zfs-fuse + RUN yum update -y && \ - yum install -y ${PACKAGES} && \ + yum install -y audit-libs-devel \ + augeas \ + autoconf \ + automake \ + avahi-devel \ + bash \ + bash-completion \ + ccache \ + chrony \ + cppi \ + cyrus-sasl-devel \ + dbus-devel \ + device-mapper-devel \ + dnsmasq \ + dwarves \ + ebtables \ + fuse-devel \ + gcc \ + gettext \ + gettext-devel \ + git \ + glibc-devel \ + glusterfs-api-devel \ + gnutls-devel \ + iproute \ + iproute-tc \ + iscsi-initiator-utils \ + libacl-devel \ + libattr-devel \ + libblkid-devel \ + libcap-ng-devel \ + libcurl-devel \ + libiscsi-devel \ + libnl3-devel \ + libpcap-devel \ + libpciaccess-devel \ + librbd-devel \ + libselinux-devel \ + libssh-devel \ + libssh2-devel \ + libtirpc-devel \ + libtool \ + libudev-devel \ + libwsman-devel \ + libxml2 \ + libxml2-devel \ + libxslt \ + lvm2 \ + make \ + netcf-devel \ + nfs-utils \ + numactl-devel \ + numad \ + parted \ + parted-devel \ + patch \ + perl \ + pkgconfig \ + polkit \ + qemu-img \ + radvd \ + readline-devel \ + rpcgen \ + rpm-build \ + sanlock-devel \ + screen \ + scrub \ + sheepdog \ + sudo \ + systemtap-sdt-devel \ + vim \ + wireshark-devel \ + xen-devel \ + xfsprogs-devel \ + yajl-devel \ + zfs-fuse && \ yum autoremove -y && \ yum clean all -y diff --git a/buildenv-fedora-29.Dockerfile b/buildenv-fedora-29.Dockerfile index 2842691..1d10a5f 100644 --- a/buildenv-fedora-29.Dockerfile +++ b/buildenv-fedora-29.Dockerfile @@ -1,80 +1,81 @@ FROM fedora:29 -ENV PACKAGES audit-libs-devel \ - augeas \ - autoconf \ - automake \ - avahi-devel \ - bash \ - bash-completion \ - ccache \ - chrony \ - cppi \ - cyrus-sasl-devel \ - dbus-devel \ - device-mapper-devel \ - dnsmasq \ - dwarves \ - ebtables \ - fuse-devel \ - gcc \ - gettext \ - gettext-devel \ - git \ - glibc-devel \ - glusterfs-api-devel \ - gnutls-devel \ - iproute \ - iproute-tc \ - iscsi-initiator-utils \ - libacl-devel \ - libattr-devel \ - libblkid-devel \ - libcap-ng-devel \ - libcurl-devel \ - libiscsi-devel \ - libnl3-devel \ - libpcap-devel \ - libpciaccess-devel \ - librbd-devel \ - libselinux-devel \ - libssh-devel \ - libssh2-devel \ - libtirpc-devel \ - libtool \ - libudev-devel \ - libwsman-devel \ - libxml2 \ - libxml2-devel \ - libxslt \ - lvm2 \ - make \ - netcf-devel \ - nfs-utils \ - numactl-devel \ - numad \ - parted \ - parted-devel \ - patch \ - perl \ - pkgconfig \ - polkit \ - qemu-img \ - radvd \ - readline-devel \ - rpcgen \ - rpm-build \ - sanlock-devel \ - screen \ - scrub \ - sheepdog \ - sudo \ - systemtap-sdt-devel \ - vim \ - wireshark-devel \ - xen-devel \ - yajl-devel \ - zfs-fuse + RUN yum update -y && \ - yum install -y ${PACKAGES} && \ + yum install -y audit-libs-devel \ + augeas \ + autoconf \ + automake \ + avahi-devel \ + bash \ + bash-completion \ + ccache \ + chrony \ + cppi \ + cyrus-sasl-devel \ + dbus-devel \ + device-mapper-devel \ + dnsmasq \ + dwarves \ + ebtables \ + fuse-devel \ + gcc \ + gettext \ + gettext-devel \ + git \ + glibc-devel \ + glusterfs-api-devel \ + gnutls-devel \ + iproute \ + iproute-tc \ + iscsi-initiator-utils \ + libacl-devel \ + libattr-devel \ + libblkid-devel \ + libcap-ng-devel \ + libcurl-devel \ + libiscsi-devel \ + libnl3-devel \ + libpcap-devel \ + libpciaccess-devel \ + librbd-devel \ + libselinux-devel \ + libssh-devel \ + libssh2-devel \ + libtirpc-devel \ + libtool \ + libudev-devel \ + libwsman-devel \ + libxml2 \ + libxml2-devel \ + libxslt \ + lvm2 \ + make \ + netcf-devel \ + nfs-utils \ + numactl-devel \ + numad \ + parted \ + parted-devel \ + patch \ + perl \ + pkgconfig \ + polkit \ + qemu-img \ + radvd \ + readline-devel \ + rpcgen \ + rpm-build \ + sanlock-devel \ + screen \ + scrub \ + sheepdog \ + sudo \ + systemtap-sdt-devel \ + vim \ + wireshark-devel \ + xen-devel \ + xfsprogs-devel \ + yajl-devel \ + zfs-fuse && \ yum autoremove -y && \ yum clean all -y diff --git a/buildenv-fedora-rawhide.Dockerfile b/buildenv-fedora-rawhide.Dockerfile index 50d38d8..f6e427c 100644 --- a/buildenv-fedora-rawhide.Dockerfile +++ b/buildenv-fedora-rawhide.Dockerfile @@ -1,105 +1,106 @@ FROM fedora:rawhide -ENV PACKAGES audit-libs-devel \ - augeas \ - autoconf \ - automake \ - avahi-devel \ - bash \ - bash-completion \ - ccache \ - chrony \ - cppi \ - cyrus-sasl-devel \ - dbus-devel \ - device-mapper-devel \ - dnsmasq \ - dwarves \ - ebtables \ - fuse-devel \ - gcc \ - gettext \ - gettext-devel \ - git \ - glibc-devel \ - glusterfs-api-devel \ - gnutls-devel \ - iproute \ - iproute-tc \ - iscsi-initiator-utils \ - libacl-devel \ - libattr-devel \ - libblkid-devel \ - libcap-ng-devel \ - libcurl-devel \ - libiscsi-devel \ - libnl3-devel \ - libpcap-devel \ - libpciaccess-devel \ - librbd-devel \ - libselinux-devel \ - libssh-devel \ - libssh2-devel \ - libtirpc-devel \ - libtool \ - libudev-devel \ - libwsman-devel \ - libxml2 \ - libxml2-devel \ - libxslt \ - lvm2 \ - make \ - mingw32-curl \ - mingw32-dbus \ - mingw32-dlfcn \ - mingw32-gcc \ - mingw32-gettext \ - mingw32-gnutls \ - mingw32-libssh2 \ - mingw32-libxml2 \ - mingw32-openssl \ - mingw32-pkg-config \ - mingw32-portablexdr \ - mingw32-readline \ - mingw64-curl \ - mingw64-dbus \ - mingw64-dlfcn \ - mingw64-gcc \ - mingw64-gettext \ - mingw64-gnutls \ - mingw64-libssh2 \ - mingw64-libxml2 \ - mingw64-openssl \ - mingw64-pkg-config \ - mingw64-portablexdr \ - mingw64-readline \ - netcf-devel \ - nfs-utils \ - numactl-devel \ - numad \ - parted \ - parted-devel \ - patch \ - perl \ - pkgconfig \ - polkit \ - qemu-img \ - radvd \ - readline-devel \ - rpcgen \ - rpm-build \ - sanlock-devel \ - screen \ - scrub \ - sheepdog \ - sudo \ - systemtap-sdt-devel \ - vim \ - wireshark-devel \ - xen-devel \ - yajl-devel \ - zfs-fuse + RUN yum update -y --nogpgcheck fedora-gpg-keys && \ yum update -y && \ - yum install -y ${PACKAGES} && \ + yum install -y audit-libs-devel \ + augeas \ + autoconf \ + automake \ + avahi-devel \ + bash \ + bash-completion \ + ccache \ + chrony \ + cppi \ + cyrus-sasl-devel \ + dbus-devel \ + device-mapper-devel \ + dnsmasq \ + dwarves \ + ebtables \ + fuse-devel \ + gcc \ + gettext \ + gettext-devel \ + git \ + glibc-devel \ + glusterfs-api-devel \ + gnutls-devel \ + iproute \ + iproute-tc \ + iscsi-initiator-utils \ + libacl-devel \ + libattr-devel \ + libblkid-devel \ + libcap-ng-devel \ + libcurl-devel \ + libiscsi-devel \ + libnl3-devel \ + libpcap-devel \ + libpciaccess-devel \ + librbd-devel \ + libselinux-devel \ + libssh-devel \ + libssh2-devel \ + libtirpc-devel \ + libtool \ + libudev-devel \ + libwsman-devel \ + libxml2 \ + libxml2-devel \ + libxslt \ + lvm2 \ + make \ + mingw32-curl \ + mingw32-dbus \ + mingw32-dlfcn \ + mingw32-gcc \ + mingw32-gettext \ + mingw32-gnutls \ + mingw32-libssh2 \ + mingw32-libxml2 \ + mingw32-openssl \ + mingw32-pkg-config \ + mingw32-portablexdr \ + mingw32-readline \ + mingw64-curl \ + mingw64-dbus \ + mingw64-dlfcn \ + mingw64-gcc \ + mingw64-gettext \ + mingw64-gnutls \ + mingw64-libssh2 \ + mingw64-libxml2 \ + mingw64-openssl \ + mingw64-pkg-config \ + mingw64-portablexdr \ + mingw64-readline \ + netcf-devel \ + nfs-utils \ + numactl-devel \ + numad \ + parted \ + parted-devel \ + patch \ + perl \ + pkgconfig \ + polkit \ + qemu-img \ + radvd \ + readline-devel \ + rpcgen \ + rpm-build \ + sanlock-devel \ + screen \ + scrub \ + sheepdog \ + sudo \ + systemtap-sdt-devel \ + vim \ + wireshark-devel \ + xen-devel \ + xfsprogs-devel \ + yajl-devel \ + zfs-fuse && \ yum autoremove -y && \ yum clean all -y diff --git a/buildenv-ubuntu-16.Dockerfile b/buildenv-ubuntu-16.Dockerfile index ec51612..1d49b1f 100644 --- a/buildenv-ubuntu-16.Dockerfile +++ b/buildenv-ubuntu-16.Dockerfile @@ -1,81 +1,84 @@ FROM ubuntu:16.04 -ENV PACKAGES augeas-tools \ - autoconf \ - automake \ - autopoint \ - bash \ - bash-completion \ - ccache \ - chrony \ - dnsmasq-base \ - dwarves \ - ebtables \ - gcc \ - gettext \ - git \ - glusterfs-client \ - iproute2 \ - libacl1-dev \ - libapparmor-dev \ - libattr1-dev \ - libaudit-dev \ - libavahi-client-dev \ - libblkid-dev \ - libc-dev-bin \ - libc6-dev \ - libcap-ng-dev \ - libcurl4-gnutls-dev \ - libdbus-1-dev \ - libdevmapper-dev \ - libfuse-dev \ - libgnutls28-dev \ - libiscsi-dev \ - libnetcf-dev \ - libnl-3-dev \ - libnl-route-3-dev \ - libnuma-dev \ - libopenwsman-dev \ - libparted-dev \ - libpcap-dev \ - libpciaccess-dev \ - librbd-dev \ - libreadline-dev \ - libsanlock-dev \ - libsasl2-dev \ - libselinux1-dev \ - libssh-dev \ - libssh2-1-dev \ - libtirpc-dev \ - libtool \ - libtool-bin \ - libudev-dev \ - libxen-dev \ - libxml2-dev \ - libxml2-utils \ - libyajl-dev \ - lvm2 \ - make \ - nfs-common \ - numad \ - open-iscsi \ - parted \ - patch \ - perl \ - pkgconf \ - policykit-1 \ - qemu-utils \ - radvd \ - screen \ - scrub \ - sheepdog \ - sudo \ - systemtap-sdt-dev \ - vim \ - wireshark-dev \ - xsltproc \ - zfs-fuse -RUN apt-get update && \ + +RUN export DEBIAN_FRONTEND=noninteractive && \ + apt-get update && \ apt-get dist-upgrade -y && \ - apt-get install -y ${PACKAGES} && \ + apt-get install --no-install-recommends -y \ + augeas-tools \ + autoconf \ + automake \ + autopoint \ + bash \ + bash-completion \ + ccache \ + chrony \ + dnsmasq-base \ + dwarves \ + ebtables \ + gcc \ + gettext \ + git \ + glusterfs-common \ + iproute2 \ + libacl1-dev \ + libapparmor-dev \ + libattr1-dev \ + libaudit-dev \ + libavahi-client-dev \ + libblkid-dev \ + libc-dev-bin \ + libc6-dev \ + libcap-ng-dev \ + libcurl4-gnutls-dev \ + libdbus-1-dev \ + libdevmapper-dev \ + libfuse-dev \ + libgnutls28-dev \ + libiscsi-dev \ + libnetcf-dev \ + libnl-3-dev \ + libnl-route-3-dev \ + libnuma-dev \ + libopenwsman-dev \ + libparted-dev \ + libpcap0.8-dev \ + libpciaccess-dev \ + librbd-dev \ + libreadline-dev \ + libsanlock-dev \ + libsasl2-dev \ + libselinux1-dev \ + libssh-dev \ + libssh2-1-dev \ + libtirpc-dev \ + libtool \ + libtool-bin \ + libudev-dev \ + libxen-dev \ + libxml2-dev \ + libxml2-utils \ + libyajl-dev \ + lvm2 \ + make \ + nfs-common \ + numad \ + open-iscsi \ + parted \ + patch \ + perl \ + pkgconf \ + policykit-1 \ + qemu-utils \ + radvd \ + screen \ + scrub \ + sheepdog \ + sudo \ + systemtap-sdt-dev \ + vim \ + wireshark-dev \ + xfslibs-dev \ + xsltproc \ + zfs-fuse && \ apt-get autoremove -y && \ apt-get autoclean -y diff --git a/buildenv-ubuntu-18.Dockerfile b/buildenv-ubuntu-18.Dockerfile index d2565e9..7ab5686 100644 --- a/buildenv-ubuntu-18.Dockerfile +++ b/buildenv-ubuntu-18.Dockerfile @@ -1,81 +1,84 @@ FROM ubuntu:18.04 -ENV PACKAGES augeas-tools \ - autoconf \ - automake \ - autopoint \ - bash \ - bash-completion \ - ccache \ - chrony \ - dnsmasq-base \ - dwarves \ - ebtables \ - gcc \ - gettext \ - git \ - glusterfs-client \ - iproute2 \ - libacl1-dev \ - libapparmor-dev \ - libattr1-dev \ - libaudit-dev \ - libavahi-client-dev \ - libblkid-dev \ - libc-dev-bin \ - libc6-dev \ - libcap-ng-dev \ - libcurl4-gnutls-dev \ - libdbus-1-dev \ - libdevmapper-dev \ - libfuse-dev \ - libgnutls28-dev \ - libiscsi-dev \ - libnetcf-dev \ - libnl-3-dev \ - libnl-route-3-dev \ - libnuma-dev \ - libopenwsman-dev \ - libparted-dev \ - libpcap-dev \ - libpciaccess-dev \ - librbd-dev \ - libreadline-dev \ - libsanlock-dev \ - libsasl2-dev \ - libselinux1-dev \ - libssh-dev \ - libssh2-1-dev \ - libtirpc-dev \ - libtool \ - libtool-bin \ - libudev-dev \ - libxen-dev \ - libxml2-dev \ - libxml2-utils \ - libyajl-dev \ - lvm2 \ - make \ - nfs-common \ - numad \ - open-iscsi \ - parted \ - patch \ - perl \ - pkgconf \ - policykit-1 \ - qemu-utils \ - radvd \ - screen \ - scrub \ - sheepdog \ - sudo \ - systemtap-sdt-dev \ - vim \ - wireshark-dev \ - xsltproc \ - zfs-fuse -RUN apt-get update && \ + +RUN export DEBIAN_FRONTEND=noninteractive && \ + apt-get update && \ apt-get dist-upgrade -y && \ - apt-get install -y ${PACKAGES} && \ + apt-get install --no-install-recommends -y \ + augeas-tools \ + autoconf \ + automake \ + autopoint \ + bash \ + bash-completion \ + ccache \ + chrony \ + dnsmasq-base \ + dwarves \ + ebtables \ + gcc \ + gettext \ + git \ + glusterfs-common \ + iproute2 \ + libacl1-dev \ + libapparmor-dev \ + libattr1-dev \ + libaudit-dev \ + libavahi-client-dev \ + libblkid-dev \ + libc-dev-bin \ + libc6-dev \ + libcap-ng-dev \ + libcurl4-gnutls-dev \ + libdbus-1-dev \ + libdevmapper-dev \ + libfuse-dev \ + libgnutls28-dev \ + libiscsi-dev \ + libnetcf-dev \ + libnl-3-dev \ + libnl-route-3-dev \ + libnuma-dev \ + libopenwsman-dev \ + libparted-dev \ + libpcap0.8-dev \ + libpciaccess-dev \ + librbd-dev \ + libreadline-dev \ + libsanlock-dev \ + libsasl2-dev \ + libselinux1-dev \ + libssh-dev \ + libssh2-1-dev \ + libtirpc-dev \ + libtool \ + libtool-bin \ + libudev-dev \ + libxen-dev \ + libxml2-dev \ + libxml2-utils \ + libyajl-dev \ + lvm2 \ + make \ + nfs-common \ + numad \ + open-iscsi \ + parted \ + patch \ + perl \ + pkgconf \ + policykit-1 \ + qemu-utils \ + radvd \ + screen \ + scrub \ + sheepdog \ + sudo \ + systemtap-sdt-dev \ + vim \ + wireshark-dev \ + xfslibs-dev \ + xsltproc \ + zfs-fuse && \ apt-get autoremove -y && \ apt-get autoclean -y -- 2.20.1

1 0

[libvirt] [libvirt-glib 1/3] config: Fix gvir_config_xml_node_to_string() leak
by Christophe Fergeau 14 Feb '19

14 Feb '19

If xmlNodeDump() fails, we would be leaking the xmlBuffer we created. This commit ensures we don't return early before this buffer is freed. Signed-off-by: Christophe Fergeau <cfergeau(a)redhat.com> --- libvirt-gconfig/libvirt-gconfig-helpers.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libvirt-gconfig/libvirt-gconfig-helpers.c b/libvirt-gconfig/libvirt-gconfig-helpers.c index 0314a72f..e8f9664a 100644 --- a/libvirt-gconfig/libvirt-gconfig-helpers.c +++ b/libvirt-gconfig/libvirt-gconfig-helpers.c @@ -293,7 +293,7 @@ gvir_config_xml_node_to_string(xmlNodePtr node) xmlbuf = xmlBufferCreate(); if (xmlNodeDump(xmlbuf, node->doc, node, 0, 1) < 0) - return NULL; + xml = NULL; else xml = g_strndup((gchar *)xmlBufferContent(xmlbuf), xmlBufferLength(xmlbuf)); -- 2.20.1

2 5

[libvirt] [jenkins-ci PATCH v3 00/10] Add support for cross compiling libvirt via Debian
by Daniel P. Berrangé 14 Feb '19

14 Feb '19

Changed in v3: - Remove sheepdog more generally - Use .format() style printf - Split config to cross-build.yml - Make glusterfs name per-distro customized - Misc code style changes - Rename fields in cross-build.yml - Don't use crossbuild-essential packages Changed in v2: - Fix multiple package name mistakes - Modify lcitool to generate cross-arch docker files - Add --no-install-recommended flag to apt-get - Add DEBIAN_FRONTEND=noninteractive env to apt-get - Improve error reporting in lcitool - Add make rule for generating dockerfiles locally Daniel P. Berrangé (10): guests: use libpcap0.8-dev package on Debian guests: add xfsprogs development package for libvirt guests: fix glusterfs package name on Debian guests: Debian SID has dropped the sheepdog package lcitool: include root cause when reporting errors lcitool: force non-interactive apt-get frontend lcitool: avoid installing recommended packages lcitool: refactor logic for building package list lcitool: avoid using an env var to store package list lcitool: support generating cross compiler dockerfiles .../libvirt-debian-9/cross-build.yml | 50 ++++++ .../libvirt-debian-sid/cross-build.yml | 52 +++++++ guests/lcitool | 146 ++++++++++++------ guests/vars/mappings.yml | 13 +- guests/vars/projects/libvirt.yml | 1 + 5 files changed, 213 insertions(+), 49 deletions(-) create mode 100644 guests/host_vars/libvirt-debian-9/cross-build.yml create mode 100644 guests/host_vars/libvirt-debian-sid/cross-build.yml -- 2.20.1

2 17

[libvirt] [PATCH 0/3] virDomainXMLFlags cleanups
by Eric Blake 14 Feb '19

14 Feb '19

Nir has asked that my upcoming checkpoint APIs have a way to do bulk operations: grab the XML for ALL checkpoints in one call, and in turn redefine checkpoints on a new host using the dumped XML from an old host in one call. But since checkpoints borrow heavily from the APIs used for snapshots, it makes sense to do the same thing for checkpoints. And in the process of implementing that code, I discovered some oddities in the use of flags when dumping domain-related XML, which this series aims to fix. Eric Blake (3): domain: Document VIR_DOMAIN_XML_MIGRATABLE domain: Define explicit flags for saved image xml snapshot: Define explicit flags for snapshot xml include/libvirt/libvirt-domain-snapshot.h | 4 ++++ include/libvirt/libvirt-domain.h | 5 +++++ src/libvirt-domain-snapshot.c | 9 ++++----- src/libvirt-domain.c | 22 +++++++++++++--------- src/qemu/qemu_driver.c | 6 +++--- src/remote/remote_protocol.x | 6 +++--- src/test/test_driver.c | 2 +- src/vz/vz_driver.c | 2 +- 8 files changed, 34 insertions(+), 22 deletions(-) -- 2.20.1

2 4

[libvirt] [PATCH] udev: only report a warning if udev_enumerate_scan_devices fails
by Marc Hartmayer 14 Feb '19

14 Feb '19

Even if an error is reported by `udev_enumerate_scan_devices`, e.g. because a driver of a device has an bug, we can still enumerate all other devices. Additionally the documentation of udev_enumerate_scan_devices says that on success an integer >= 0 is returned (see man udev_enumerate_scan_devices(3)). Reviewed-by: Bjoern Walk <bwalk(a)linux.ibm.com> Signed-off-by: Marc Hartmayer <mhartmay(a)linux.ibm.com> --- src/node_device/node_device_udev.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c index 299f55260129..90168eb8a969 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -1480,13 +1480,8 @@ udevEnumerateDevices(struct udev *udev) if (udevEnumerateAddMatches(udev_enumerate) < 0) goto cleanup; - ret = udev_enumerate_scan_devices(udev_enumerate); - if (ret != 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("udev scan devices returned %d"), - ret); - goto cleanup; - } + if (udev_enumerate_scan_devices(udev_enumerate) < 0) + VIR_WARN("udev scan devices failed"); udev_list_entry_foreach(list_entry, udev_enumerate_get_list_entry(udev_enumerate)) { -- 2.17.0

2 2

[libvirt] [PATCH] qemu: Escape external snapshot names containing comma
by Eric Blake 13 Feb '19

13 Feb '19

The code for creating external snapshots for an offline domain called out to qemu-img without escaping commas in the manner that qemu-img expects. This also fixes a typo in the comment. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Noticed by code inspection; I did not try very hard to see how easy or hard it would be to convince libvirt to actually try and create an external snapshot to /path/file,with,comma to see how things break. src/qemu/qemu_driver.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index dc51de0310..971f915619 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -100,6 +100,7 @@ #include "virnuma.h" #include "dirname.h" #include "netdev_bandwidth_conf.h" +#include "virqemu.h" #define VIR_FROM_THIS VIR_FROM_QEMU @@ -14561,6 +14562,7 @@ qemuDomainSnapshotCreateInactiveExternal(virQEMUDriverPtr driver, virBitmapPtr created = NULL; virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); int ret = -1; + virBuffer buf = VIR_BUFFER_INITIALIZER; if (!(qemuImgPath = qemuFindQemuImgBinary(driver))) goto cleanup; @@ -14589,13 +14591,15 @@ qemuDomainSnapshotCreateInactiveExternal(virQEMUDriverPtr driver, NULL))) goto cleanup; - /* adds cmd line arg: backing_file=/path/to/backing/file,backing_fmd=format */ - virCommandAddArgFormat(cmd, "backing_file=%s,backing_fmt=%s", - defdisk->src->path, - virStorageFileFormatTypeToString(defdisk->src->format)); + /* adds cmd line arg: backing_fmt=format,backing_file=/path/to/backing/file */ + virBufferAsprintf(&buf, "backing_fmt=%s,backing_file=", + virStorageFileFormatTypeToString(defdisk->src->format)); + virQEMUBuildBufferEscapeComma(&buf, defdisk->src->path); + virCommandAddArgBuffer(cmd, &buf); /* adds cmd line args: /path/to/target/file */ - virCommandAddArg(cmd, snapdisk->src->path); + virQEMUBuildBufferEscapeComma(&buf, snapdisk->src->path); + virCommandAddArgBuffer(cmd, &buf); /* If the target does not exist, we're going to create it possibly */ if (!virFileExists(snapdisk->src->path)) @@ -14629,6 +14633,7 @@ qemuDomainSnapshotCreateInactiveExternal(virQEMUDriverPtr driver, ret = 0; cleanup: + virBufferFreeAndReset(&buf); virCommandFree(cmd); /* unlink images if creation has failed */ -- 2.20.1

2 2

[libvirt] [PATCH v4 RESEND] openvswitch: Add new port VLAN mode "dot1q-tunnel"(802.1ad double-tagged)
by luzhipeng＠uniudc.com 13 Feb '19

13 Feb '19

From: ZhiPeng Lu <luzhipeng(a)uniudc.com> This patch adds functionality to allow libvirt to configure the 'dot1q-tunnel' modes(802.1ad double-tagged) on openvswitch networks. For example: <interface type='bridge'> <mac address='2c:da:41:1d:05:42'/> <source bridge='ovs0'/> <vlan> <tag id='41' nativeMode='dot1q-tunnel'/> </vlan> <virtualport type='openvswitch'> <parameters interfaceid='6401a152-0b99-40b5-92be-858810aa6d37'/> </virtualport> <model type='virtio'/> <driver name='vhost'/> <alias name='net0'/> </interface> Signed-off-by: ZhiPeng Lu <luzhipeng(a)uniudc.com> --- v1->v2: 1. Fix "make syntax-check" failure v2->v3: 1. remove other_config when updating vlan v3->v4: 1. add commit message that has a brief description of the new feature 2. add tests for 'dot1q-tunnel' vlan mode docs/formatdomain.html.in | 20 ++++++++++++++------ docs/formatnetwork.html.in | 20 +++++++++++--------- docs/schemas/networkcommon.rng | 1 + src/conf/netdev_vlan_conf.c | 2 +- src/util/virnetdevopenvswitch.c | 7 +++++++ src/util/virnetdevvlan.h | 1 + tests/networkxml2xmlin/openvswitch-net.xml | 9 +++++++++ tests/networkxml2xmlout/openvswitch-net.xml | 9 +++++++++ .../openvswitch-net-modified.xml | 9 +++++++++ .../openvswitch-net-more-portgroups.xml | 9 +++++++++ .../openvswitch-net-without-alice.xml | 9 +++++++++ 11 files changed, 80 insertions(+), 16 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 84259c4..ced21c0 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -6085,8 +6085,14 @@ qemu-kvm -net nic,model=? /dev/null <tag id='42'/> <tag id='123' nativeMode='untagged'/> </vlan> - ... </interface> + <interface type='bridge'> + <vlan trunk='yes'> + <tag id='42'/> + <tag id='123' nativeMode='dot1q-tunnel'/> + </vlan> + </interface> +... </devices> ...</pre> @@ -6122,11 +6128,13 @@ qemu-kvm -net nic,model=? /dev/null For network connections using Open vSwitch it is also possible - to configure 'native-tagged' and 'native-untagged' VLAN modes - Since 1.1.0. This is done with the - optional <code>nativeMode</code> attribute on - the <code><tag></code> subelement: <code>nativeMode</code> - may be set to 'tagged' or 'untagged'. The <code>id</code> + to configure 'native-tagged' and 'native-untagged' + Since 1.1.0. and 'dot1q-tunnel' + (802.1ad double-tagged) Since 5.0.0. + VLAN modes This is done with the optional <code>nativeMode</code> + attribute on the <code><tag></code> subelement: + <code>nativeMode</code> may be set to 'tagged' or 'untagged' or + 'dot1q-tunnel'. The <code>id</code> attribute of the <code><tag></code> subelement containing <code>nativeMode</code> sets which VLAN is considered to be the "native" VLAN for this interface, and diff --git a/docs/formatnetwork.html.in b/docs/formatnetwork.html.in index 363a72b..d9ac9f7 100644 --- a/docs/formatnetwork.html.in +++ b/docs/formatnetwork.html.in @@ -688,16 +688,18 @@ For network connections using Open vSwitch it is also possible - to configure 'native-tagged' and 'native-untagged' VLAN modes - Since 1.1.0. This is done with the - optional <code>nativeMode</code> attribute on - the <code><tag></code> subelement: <code>nativeMode</code> - may be set to 'tagged' or 'untagged'. The <code>id</code> - attribute of the <code><tag></code> subelement - containing <code>nativeMode</code> sets which VLAN is considered - to be the "native" VLAN for this interface, and + to configure 'native-tagged' and 'native-untagged' + Since 1.1.0. + and 'dot1q-tunnel'(802.1ad double-tagged) VLAN modes. + Since 5.0.0. This is done with the + optional <code>nativeMode</code> attribute on the + <code><tag></code> subelement: <code>nativeMode</code> + may be set to 'tagged' or 'untagged' or 'dot1q-tunnel'. + The <code>id</code> attribute of the <code><tag></code> + subelement containing <code>nativeMode</code> sets which VLAN is + considered to be the "native" VLAN for this interface, and the <code>nativeMode</code> attribute determines whether or not - traffic for that VLAN will be tagged. + traffic for that VLAN will be tagged or QinQ. <code><vlan></code> elements can also be specified in diff --git a/docs/schemas/networkcommon.rng b/docs/schemas/networkcommon.rng index 2699555..11c48ff 100644 --- a/docs/schemas/networkcommon.rng +++ b/docs/schemas/networkcommon.rng @@ -223,6 +223,7 @@ <choice> <value>tagged</value> <value>untagged</value> + <value>dot1q-tunnel</value> </choice> </attribute> </optional> diff --git a/src/conf/netdev_vlan_conf.c b/src/conf/netdev_vlan_conf.c index dff49c6..79710d9 100644 --- a/src/conf/netdev_vlan_conf.c +++ b/src/conf/netdev_vlan_conf.c @@ -29,7 +29,7 @@ #define VIR_FROM_THIS VIR_FROM_NONE VIR_ENUM_IMPL(virNativeVlanMode, VIR_NATIVE_VLAN_MODE_LAST, - "default", "tagged", "untagged") + "default", "tagged", "untagged", "dot1q-tunnel") int virNetDevVlanParse(xmlNodePtr node, xmlXPathContextPtr ctxt, virNetDevVlanPtr def) diff --git a/src/util/virnetdevopenvswitch.c b/src/util/virnetdevopenvswitch.c index 8fe06fd..2cc576f 100644 --- a/src/util/virnetdevopenvswitch.c +++ b/src/util/virnetdevopenvswitch.c @@ -91,6 +91,11 @@ virNetDevOpenvswitchConstructVlans(virCommandPtr cmd, virNetDevVlanPtr virtVlan) virCommandAddArg(cmd, "vlan_mode=native-untagged"); virCommandAddArgFormat(cmd, "tag=%d", virtVlan->nativeTag); break; + case VIR_NATIVE_VLAN_MODE_DOT1Q_TUNNEL: + virCommandAddArg(cmd, "vlan_mode=dot1q-tunnel"); + virCommandAddArg(cmd, "other_config:qinq-ethtype=802.1q"); + virCommandAddArgFormat(cmd, "tag=%d", virtVlan->nativeTag); + break; case VIR_NATIVE_VLAN_MODE_DEFAULT: default: break; @@ -504,6 +509,8 @@ int virNetDevOpenvswitchUpdateVlan(const char *ifname, "--", "--if-exists", "clear", "Port", ifname, "tag", "--", "--if-exists", "clear", "Port", ifname, "trunk", "--", "--if-exists", "clear", "Port", ifname, "vlan_mode", + "--", "--if-exists", "remove", "Port", ifname, "other_config", + "qinq-ethtype", "--", "--if-exists", "set", "Port", ifname, NULL); if (virNetDevOpenvswitchConstructVlans(cmd, virtVlan) < 0) diff --git a/src/util/virnetdevvlan.h b/src/util/virnetdevvlan.h index be85f59..0667f9d 100644 --- a/src/util/virnetdevvlan.h +++ b/src/util/virnetdevvlan.h @@ -29,6 +29,7 @@ typedef enum { VIR_NATIVE_VLAN_MODE_DEFAULT = 0, VIR_NATIVE_VLAN_MODE_TAGGED, VIR_NATIVE_VLAN_MODE_UNTAGGED, + VIR_NATIVE_VLAN_MODE_DOT1Q_TUNNEL, VIR_NATIVE_VLAN_MODE_LAST } virNativeVlanMode; diff --git a/tests/networkxml2xmlin/openvswitch-net.xml b/tests/networkxml2xmlin/openvswitch-net.xml index 2f6084d..0952859 100644 --- a/tests/networkxml2xmlin/openvswitch-net.xml +++ b/tests/networkxml2xmlin/openvswitch-net.xml @@ -30,4 +30,13 @@ <parameters profileid='native-profile'/> </virtualport> </portgroup> + <portgroup name='8021ad'> + <vlan trunk='yes'> + <tag id='555' nativeMode='dot1q-tunnel'/> + <tag id='666'/> + </vlan> + <virtualport> + <parameters profileid='8021ad-profile'/> + </virtualport> + </portgroup> </network> diff --git a/tests/networkxml2xmlout/openvswitch-net.xml b/tests/networkxml2xmlout/openvswitch-net.xml index 2f6084d..0952859 100644 --- a/tests/networkxml2xmlout/openvswitch-net.xml +++ b/tests/networkxml2xmlout/openvswitch-net.xml @@ -30,4 +30,13 @@ <parameters profileid='native-profile'/> </virtualport> </portgroup> + <portgroup name='8021ad'> + <vlan trunk='yes'> + <tag id='555' nativeMode='dot1q-tunnel'/> + <tag id='666'/> + </vlan> + <virtualport> + <parameters profileid='8021ad-profile'/> + </virtualport> + </portgroup> </network> diff --git a/tests/networkxml2xmlupdateout/openvswitch-net-modified.xml b/tests/networkxml2xmlupdateout/openvswitch-net-modified.xml index cc0c344..e5794fc 100644 --- a/tests/networkxml2xmlupdateout/openvswitch-net-modified.xml +++ b/tests/networkxml2xmlupdateout/openvswitch-net-modified.xml @@ -30,4 +30,13 @@ <parameters profileid='native-profile'/> </virtualport> </portgroup> + <portgroup name='8021ad'> + <vlan trunk='yes'> + <tag id='555' nativeMode='dot1q-tunnel'/> + <tag id='666'/> + </vlan> + <virtualport> + <parameters profileid='8021ad-profile'/> + </virtualport> + </portgroup> </network> diff --git a/tests/networkxml2xmlupdateout/openvswitch-net-more-portgroups.xml b/tests/networkxml2xmlupdateout/openvswitch-net-more-portgroups.xml index 7c19ad9..3df0b96 100644 --- a/tests/networkxml2xmlupdateout/openvswitch-net-more-portgroups.xml +++ b/tests/networkxml2xmlupdateout/openvswitch-net-more-portgroups.xml @@ -41,4 +41,13 @@ <parameters profileid='native-profile'/> </virtualport> </portgroup> + <portgroup name='8021ad'> + <vlan trunk='yes'> + <tag id='555' nativeMode='dot1q-tunnel'/> + <tag id='666'/> + </vlan> + <virtualport> + <parameters profileid='8021ad-profile'/> + </virtualport> + </portgroup> </network> diff --git a/tests/networkxml2xmlupdateout/openvswitch-net-without-alice.xml b/tests/networkxml2xmlupdateout/openvswitch-net-without-alice.xml index 4104424..38846aa 100644 --- a/tests/networkxml2xmlupdateout/openvswitch-net-without-alice.xml +++ b/tests/networkxml2xmlupdateout/openvswitch-net-without-alice.xml @@ -20,4 +20,13 @@ <parameters profileid='native-profile'/> </virtualport> </portgroup> + <portgroup name='8021ad'> + <vlan trunk='yes'> + <tag id='555' nativeMode='dot1q-tunnel'/> + <tag id='666'/> + </vlan> + <virtualport> + <parameters profileid='8021ad-profile'/> + </virtualport> + </portgroup> </network> -- 1.8.3.1

2 1

[libvirt] [PATCH 0/5] qemu: Fix guestfwd hot(un-)plug
by Michal Privoznik 13 Feb '19

13 Feb '19

*** BLURB HERE *** Michal Prívozník (5): qemuDomainDetachChrDevice: Use @tmpChr to build device string qemuL: Drop "user-" prefix for guestfwd netdev qemu_hotplug: Attach guestfwd using netdev_add qemu_hotplug: Detach guestfwd using netdev_del qemuhotplugtest: Test guestfwd attach and detach src/qemu/qemu_command.c | 2 +- src/qemu/qemu_hotplug.c | 70 +++++++++++++------ tests/qemuhotplugtest.c | 6 ++ .../qemuhotplug-guestfwd.xml | 4 ++ .../qemuhotplug-base-live+guestfwd.xml | 55 +++++++++++++++ tests/qemuxml2argvdata/channel-guestfwd.args | 2 +- .../channel-unix-guestfwd.x86_64-2.5.0.args | 4 +- .../channel-unix-guestfwd.x86_64-latest.args | 4 +- tests/qemuxml2argvdata/name-escape.args | 2 +- 9 files changed, 121 insertions(+), 28 deletions(-) create mode 100644 tests/qemuhotplugtestdevices/qemuhotplug-guestfwd.xml create mode 100644 tests/qemuhotplugtestdomains/qemuhotplug-base-live+guestfwd.xml -- 2.19.2

2 15

[libvirt] [PATCH] util: fix memory leak in virFirewallDInterfaceSetZone()
by Laine Stump 13 Feb '19

13 Feb '19

commit 3bba4825 added the new function virFirewallDInterfaceSetZone() which calledsends virDBUSCallMethod a DBusMessage** for the reply message, but doesn't use the reply, and also doesn't free it. Since this arg is allowed to be NULL, this patch simply sets it to NULL so we don't have to deal with it. Signed-off-by: Laine Stump <laine(a)laine.org> --- src/util/virfirewalld.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/util/virfirewalld.c b/src/util/virfirewalld.c index 47bacdcf4a..f8965eea09 100644 --- a/src/util/virfirewalld.c +++ b/src/util/virfirewalld.c @@ -351,13 +351,12 @@ virFirewallDInterfaceSetZone(const char *iface, const char *zone) { DBusConnection *sysbus = virDBusGetSystemBus(); - DBusMessage *reply = NULL; if (!sysbus) return -1; return virDBusCallMethod(sysbus, - &reply, + NULL, NULL, VIR_FIREWALL_FIREWALLD_SERVICE, "/org/fedoraproject/FirewallD1", -- 2.20.1

2 1

[libvirt] [PATCH 0/3] virjsontest: separate some tests into files
by Ján Tomko 13 Feb '19

13 Feb '19

Ján Tomko (3): virjsontest: introduce DO_TEST_PARSE_FILE virjsontest: switch DO_TEST_PARSE_FILE to use output files virjsontest: switch AddAndRemove tests to work with files tests/virjsondata/add-remove-failure-in.json | 1 + tests/virjsondata/add-remove-success-in.json | 1 + tests/virjsondata/add-remove-success-out.json | 1 + tests/virjsondata/parse-Harder-in.json | 4 + tests/virjsondata/parse-Harder-out.json | 4 + tests/virjsondata/parse-NotSoSimple-in.json | 3 + tests/virjsondata/parse-NotSoSimple-out.json | 3 + tests/virjsondata/parse-Simple-in.json | 1 + tests/virjsondata/parse-Simple-out.json | 1 + tests/virjsondata/parse-VeryHard-in.json | 24 ++++ tests/virjsondata/parse-VeryHard-out.json | 24 ++++ tests/virjsontest.c | 135 ++++++++++-------- 12 files changed, 145 insertions(+), 57 deletions(-) create mode 100644 tests/virjsondata/add-remove-failure-in.json create mode 100644 tests/virjsondata/add-remove-success-in.json create mode 100644 tests/virjsondata/add-remove-success-out.json create mode 100644 tests/virjsondata/parse-Harder-in.json create mode 100644 tests/virjsondata/parse-Harder-out.json create mode 100644 tests/virjsondata/parse-NotSoSimple-in.json create mode 100644 tests/virjsondata/parse-NotSoSimple-out.json create mode 100644 tests/virjsondata/parse-Simple-in.json create mode 100644 tests/virjsondata/parse-Simple-out.json create mode 100644 tests/virjsondata/parse-VeryHard-in.json create mode 100644 tests/virjsondata/parse-VeryHard-out.json -- 2.19.2

2 8