- Devel - libvirt List Archives

[libvirt] [PULL 00/14] Ui 20190205 patches
by Gerd Hoffmann 05 Feb '19

05 Feb '19

The following changes since commit 773c4a6228fd910556cee2d477ee56c591a30000: test-filter-mirror: pass UNIX domain socket through fd (2019-02-04 16:03:20 +0000) are available in the git repository at: git://git.kraxel.org/qemu tags/ui-20190205-pull-request for you to fetch changes up to 19c1b9fd3dd5955893c0d3c187a4180313e9a0f1: keymap: fix keyup mappings (2019-02-05 10:45:44 +0100) ---------------------------------------------------------------- ui: add kbd stats tracker. ui: gtk scroll fixes. ui: egl cursor scale fix. ui: more sdl1 cleanup. ---------------------------------------------------------------- Brendan Shanks (1): ui/cocoa.m: Fix macOS 10.14 deprecation warnings Chen Zhang (1): ui/egl-helpers: Augment parameter list of egl_texture_blend() to convey scales of viewport Gerd Hoffmann (8): kbd-state: add keyboard state tracker sdl2: remove sdl2_reset_keys() function kbd-state: use state tracker for sdl2 sdl2: use only QKeyCode in sdl2_process_key() kbd-state: use state tracker for gtk kbd-state: use state tracker for vnc keymap: pass full keyboard state to keysym2scancode keymap: fix keyup mappings Sergio Lopez (2): ui: don't send any event if delta_y == 0 ui: listen for GDK_SMOOTH_SCROLL events Thomas Huth (2): Remove deprecated -no-frame option ui/sdl_keysym: Remove obsolete SDL1.2 related code include/sysemu/sysemu.h | 1 - include/ui/egl-helpers.h | 2 +- include/ui/gtk.h | 2 + include/ui/kbd-state.h | 101 +++++++++++++++++ include/ui/sdl2.h | 3 +- ui/keymaps.h | 3 +- ui/sdl_keysym.h | 278 ----------------------------------------------- ui/vnc.h | 5 +- ui/curses.c | 2 +- ui/egl-headless.c | 3 +- ui/egl-helpers.c | 9 +- ui/gtk-egl.c | 3 +- ui/gtk.c | 43 ++------ ui/kbd-state.c | 130 ++++++++++++++++++++++ ui/keymaps.c | 55 ++++++---- ui/sdl2-input.c | 50 +-------- ui/sdl2.c | 12 +- ui/spice-display.c | 2 +- ui/vnc.c | 119 ++++++-------------- vl.c | 23 +--- qemu-deprecated.texi | 6 - qemu-options.hx | 11 -- ui/Makefile.objs | 2 +- ui/cocoa.m | 28 ++++- 24 files changed, 360 insertions(+), 533 deletions(-) create mode 100644 include/ui/kbd-state.h delete mode 100644 ui/sdl_keysym.h create mode 100644 ui/kbd-state.c -- 2.9.3

2 15

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

05 Feb '19

A detailed explanation of why this is needed can be found at https://bugzilla.redhat.com/show_bug.cgi?id=1578741#c8 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 | 2 ++ src/util/virfile.c | 6 +++++- 3 files changed, 8 insertions(+), 2 deletions(-) -- 2.20.1

2 5

[libvirt] [PATCH 00/10] snapshot: misc fixes
by Nikolay Shirokovskiy 05 Feb '19

05 Feb '19

The patch series aims to uniformly handle snapshot attribute for disks from multiple places - snapshot definitions, domain definitions, snapshot operation and defaults which is done in [1] utimately. Patch [2] makes a step towards this goal. Other patches are fixes along the way that disables some invalid cases on conversely enable previously disable valid cases. The patches with most reasoning ([2] and [3]) are effectively revert Eric's patch f9670bf thus I hope Eric will take a look. Nikolay Shirokovskiy (10): conf: snapshot: fix comment in _virDomainSnapshotDef conf: snapshot: don't pass flags from different family conf: snapshot: check disk with path on parse conf: snapshot: align exernal/internal snapshot the same way [2] conf: snapshot: remove snapshot mode checking from disk align [3] conf: virDomainSnapshotAlignDisks: use convinient variable qemu: disable internal snapshot of readonly disk qemu: snapshot: fix for case of disk with empty source qemu: snapshot: align disks consistently [1] conf: snapshot: make disk aligns same on redefinition src/conf/domain_conf.c | 6 +-- src/conf/snapshot_conf.c | 103 ++++++++++++++++++++++------------------------- src/conf/snapshot_conf.h | 5 +-- src/qemu/qemu_driver.c | 27 ++++++++++--- src/test/test_driver.c | 5 +-- 5 files changed, 74 insertions(+), 72 deletions(-) -- 1.8.3.1

2 12

[libvirt] [PULL 1/8] qemu-nbd: Deprecate qemu-nbd --partition
by Eric Blake 05 Feb '19

05 Feb '19

The existing qemu-nbd --partition code claims to handle logical partitions up to 8, since its introduction in 2008 (commit 7a5ca86). However, the implementation is bogus (actual MBR logical partitions form a sort of linked list, with one partition per extended table entry, rather than four logical partitions in a single extended table), making the code unlikely to work for anything beyond -P5 on actual guest images. What's more, the code does not support GPT partitions, which are becoming more popular, and maintaining device subsetting in both NBD and the raw device is unnecessary duplication of effort (even if it is not too difficult). Note that obtaining the offsets of a partition (MBR or GPT) can be learned by using 'qemu-nbd -c /dev/nbd0 file.qcow2 && sfdisk --dump /dev/nbd0', but by the time you've done that, you might as well just mount /dev/nbd0p1 that the kernel creates for you instead of bothering with qemu exporting a subset. Or, keeping to just user-space code, use nbdkit's partition filter, which has already known both GPT and primary MBR partitions for a while, and was just recently enhanced to support arbitrary logical MBR parititions. Start the clock on the deprecation cycle, with examples of how to accomplish device subsetting without using -P. Signed-off-by: Eric Blake <eblake(a)redhat.com> Message-Id: <20190125234837.2272-1-eblake(a)redhat.com> Reviewed-by: Richard W.M. Jones <rjones(a)redhat.com> Reviewed-by: Stefano Garzarella <sgarzare(a)redhat.com> --- qemu-deprecated.texi | 33 +++++++++++++++++++++++++++++++++ qemu-nbd.texi | 6 ++++-- qemu-nbd.c | 2 ++ 3 files changed, 39 insertions(+), 2 deletions(-) diff --git a/qemu-deprecated.texi b/qemu-deprecated.texi index 9cc20b365c5..8a6174df0c1 100644 --- a/qemu-deprecated.texi +++ b/qemu-deprecated.texi @@ -160,3 +160,36 @@ Example of legacy encoding: The above, converted to the current supported format: @code{json:@{"file.driver":"rbd", "file.pool":"rbd", "file.image":"name"@}} + +@section Related binaries + +@subsection qemu-nbd --partition (since 4.0.0) + +The ``qemu-nbd --partition $digit'' code (also spelled @option{-P}) +can only handle MBR partitions, and has never correctly handled +logical partitions beyond partition 5. If you know the offset and +length of the partition (perhaps by using @code{sfdisk} within the +guest), you can achieve the effect of exporting just that subset of +the disk by use of the @option{--image-opts} option with a raw +blockdev using the @code{offset} and @code{size} parameters layered on +top of any other existing blockdev. For example, if partition 1 is +100MiB long starting at 1MiB, the old command: + +@code{qemu-nbd -t -P 1 -f qcow2 file.qcow2} + +can be rewritten as: + +@code{qemu-nbd -t --image-opts driver=raw,offset=1M,size=100M,file.driver=qcow2,file.backing.driver=file,file.backing.filename=file.qcow2} + +Alternatively, the @code{nbdkit} project provides a more powerful +partition filter on top of its nbd plugin, which can be used to select +an arbitrary MBR or GPT partition on top of any other full-image NBD +export. Using this to rewrite the above example results in: + +@code{qemu-nbd -t -k /tmp/sock -f qcow2 file.qcow2 &} +@code{nbdkit -f --filter=partition nbd socket=/tmp/sock partition=1} + +Note that if you are exposing the export via /dev/nbd0, it is easier +to just export the entire image and then mount only /dev/nbd0p1 than +it is to reinvoke @command{qemu-nbd -c /dev/nbd0} limited to just a +subset of the image. diff --git a/qemu-nbd.texi b/qemu-nbd.texi index 386bece4680..d0c51828149 100644 --- a/qemu-nbd.texi +++ b/qemu-nbd.texi @@ -56,8 +56,10 @@ auto-detecting. @item -r, --read-only Export the disk as read-only. @item -P, --partition=@var{num} -Only expose MBR partition @var{num}. Understands physical partitions -1-4 and logical partitions 5-8. +Deprecated: Only expose MBR partition @var{num}. Understands physical +partitions 1-4 and logical partition 5. New code should instead use +@option{--image-opts} with the raw driver wrapping a subset of the +original image. @item -B, --bitmap=@var{name} If @var{filename} has a qcow2 persistent bitmap @var{name}, expose that bitmap via the ``qemu:dirty-bitmap:@var{name}'' context diff --git a/qemu-nbd.c b/qemu-nbd.c index 1f7b2a03f5d..00c07fd27ea 100644 --- a/qemu-nbd.c +++ b/qemu-nbd.c @@ -787,6 +787,8 @@ int main(int argc, char **argv) flags &= ~BDRV_O_RDWR; break; case 'P': + warn_report("The '-P' option is deprecated; use --image-opts with " + "a raw device wrapper for subset exports instead"); if (qemu_strtoi(optarg, NULL, 0, &partition) < 0 || partition < 1 || partition > 8) { error_report("Invalid partition '%s'", optarg); -- 2.20.1

1 0

[libvirt] [PATCH RFC] qemu: caps: Don't try to ask for CAP_DAC_OVERRIDE if non-root
by Peter Krempa 04 Feb '19

04 Feb '19

It will not work. This breaks qemu capabilities probing as a user. --- src/qemu/qemu_capabilities.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 7ed5f94803..81ef0357e7 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -4524,7 +4524,8 @@ virQEMUCapsInitQMPCommandRun(virQEMUCapsInitQMPCommandPtr cmd, #if WITH_CAPNG /* QEMU might run into permission issues, e.g. /dev/sev (0600), override * them just for the purpose of probing */ - virCommandAllowCap(cmd->cmd, CAP_DAC_OVERRIDE); + if (geteuid() == 0) + virCommandAllowCap(cmd->cmd, CAP_DAC_OVERRIDE); #endif virCommandSetGID(cmd->cmd, cmd->runGid); -- 2.20.1

3 3

[libvirt] [PATCH] qemu: Refresh state before starting the VCPUs
by Marc Hartmayer 04 Feb '19

04 Feb '19

For normal starts (no incoming migration) the refresh of the QEMU state must be done before the VCPUs getting started since otherwise there might be a race condition between a possible shutdown of the guest OS and the QEMU monitor queries. This fixes "qemu: migration: Refresh device information after transferring state" (93db7eea1b864). Signed-off-by: Marc Hartmayer <mhartmay(a)linux.ibm.com> --- src/qemu/qemu_process.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index dace5aaca102..2a3763f40d49 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -6929,10 +6929,17 @@ qemuProcessStart(virConnectPtr conn, } relabel = true; - if (incoming && - incoming->deferredURI && - qemuMigrationDstRun(driver, vm, incoming->deferredURI, asyncJob) < 0) - goto stop; + if (incoming) { + if (incoming->deferredURI && + qemuMigrationDstRun(driver, vm, incoming->deferredURI, asyncJob) < 0) + goto stop; + } else { + /* Refresh state of devices from QEMU. During migration this + * needs to happen after the state information is fully + * transferred. */ + if (qemuProcessRefreshState(driver, vm, asyncJob) < 0) + goto stop; + } if (qemuProcessFinishStartup(driver, vm, asyncJob, !(flags & VIR_QEMU_PROCESS_START_PAUSED), @@ -6945,11 +6952,6 @@ qemuProcessStart(virConnectPtr conn, /* Keep watching qemu log for errors during incoming migration, otherwise * unset reporting errors from qemu log. */ qemuMonitorSetDomainLog(priv->mon, NULL, NULL, NULL); - - /* Refresh state of devices from qemu. During migration this needs to - * happen after the state information is fully transferred. */ - if (qemuProcessRefreshState(driver, vm, asyncJob) < 0) - goto stop; } ret = 0; -- 2.17.0

3 6

[libvirt] [jenkins-ci PATCH 0/2] guests: Install isoinfo for virt-manager
by Andrea Bolognani 04 Feb '19

04 Feb '19

Andrea Bolognani (2): guests: Add mapping for isoinfo guests: Install isoinfo for virt-manager guests/vars/mappings.yml | 4 ++++ guests/vars/projects/virt-manager.yml | 1 + 2 files changed, 5 insertions(+) -- 2.20.1

2 3

[libvirt] [PATCH v2] qemu: Assume migration with a network disk migration is safe
by Michal Privoznik 04 Feb '19

04 Feb '19

If a domain has a disk that is type='network' we require specific cache mode to allow migration with it (either 'directsync' or 'none'). This doesn't make much sense since network disks are supposed to be safe to migrate by default. At the same time, we should be checking for the actual source type, not apparent type set in the domain XML. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- v2 of: https://www.redhat.com/archives/libvir-list/2019-January/msg01070.html diff to v1: - Allow just every network disk - Check for actual disk type not the apparent one src/qemu/qemu_migration.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 52aa665640..1433b2c2f3 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -1236,7 +1236,7 @@ qemuMigrationSrcIsSafe(virDomainDefPtr def, continue; /* However, disks on local FS (e.g. ext4) are not safe. */ - if (virDomainDiskGetType(disk) == VIR_STORAGE_TYPE_FILE) { + if (virStorageSourceGetActualType(disk->src) == VIR_STORAGE_TYPE_FILE) { if ((rc = virFileIsSharedFS(src)) < 0) { return false; } else if (rc == 0) { @@ -1248,8 +1248,8 @@ qemuMigrationSrcIsSafe(virDomainDefPtr def, return false; else if (rc == 1) continue; - } else if (disk->src->type == VIR_STORAGE_TYPE_NETWORK && - disk->src->protocol == VIR_STORAGE_NET_PROTOCOL_RBD) { + } else if (virStorageSourceGetActualType(disk->src) == VIR_STORAGE_TYPE_NETWORK) { + /* But network disks are safe again. */ continue; } -- 2.19.2

2 1

[libvirt] [PATCH 0/3] scsi-disk: Device Identification fixes
by Kevin Wolf 04 Feb '19

04 Feb '19

The vendor specific designator in the Device Identification VPD page has two problems: 1. It defaults to the BlockBackend name (-drive id=...), which everyone expected to be a host detail that the guest never sees 2. With -blockdev based setups it defaults to an empty string; if this default is used with more than one disk, the guest OS will interpret this as a single multipath disk. We can address problem 2 immediately, and start running the deprecation clock for problem 1. Related bug reports: https://bugzilla.redhat.com/show_bug.cgi?id=1669446 https://bugzilla.redhat.com/show_bug.cgi?id=1668248 Kevin Wolf (3): scsi-disk: Don't use empty string as device id scsi-disk: Add device_id property scsi-disk: Deprecate device_id fallback to BlockBackend name hw/scsi/scsi-disk.c | 41 ++++++++++++++++++++++++++++------------- qemu-deprecated.texi | 22 +++++++++++++++++++++- 2 files changed, 49 insertions(+), 14 deletions(-) -- 2.20.1

6 19

[libvirt] [PATCH] tests: Unify qemucaps2xml output files
by Andrea Bolognani 04 Feb '19

04 Feb '19

Turns out different versions of QEMU on the same architecture produce the same output, so we can have a single output file per architecture instead of duplicating the same data over and over again. Spotted-by: Ján Tomko <jtomko(a)redhat.com> Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- ...ps_2.10.0.aarch64.xml => caps.aarch64.xml} | 0 .../{caps_2.10.0.ppc64.xml => caps.ppc64.xml} | 0 ...aps_3.0.0.riscv32.xml => caps.riscv32.xml} | 0 ...aps_3.0.0.riscv64.xml => caps.riscv64.xml} | 0 .../{caps_2.10.0.s390x.xml => caps.s390x.xml} | 0 ...{caps_1.5.3.x86_64.xml => caps.x86_64.xml} | 0 .../qemucaps2xmloutdata/caps_1.6.0.x86_64.xml | 28 ------------------- .../qemucaps2xmloutdata/caps_1.7.0.x86_64.xml | 28 ------------------- .../qemucaps2xmloutdata/caps_2.1.1.x86_64.xml | 28 ------------------- .../caps_2.10.0.x86_64.xml | 28 ------------------- .../qemucaps2xmloutdata/caps_2.11.0.s390x.xml | 26 ----------------- .../caps_2.11.0.x86_64.xml | 28 ------------------- .../caps_2.12.0.aarch64.xml | 27 ------------------ .../qemucaps2xmloutdata/caps_2.12.0.ppc64.xml | 26 ----------------- .../qemucaps2xmloutdata/caps_2.12.0.s390x.xml | 26 ----------------- .../caps_2.12.0.x86_64.xml | 28 ------------------- .../qemucaps2xmloutdata/caps_2.4.0.x86_64.xml | 28 ------------------- .../qemucaps2xmloutdata/caps_2.5.0.x86_64.xml | 28 ------------------- .../caps_2.6.0.aarch64.xml | 27 ------------------ .../qemucaps2xmloutdata/caps_2.6.0.ppc64.xml | 26 ----------------- .../qemucaps2xmloutdata/caps_2.6.0.x86_64.xml | 28 ------------------- .../qemucaps2xmloutdata/caps_2.7.0.s390x.xml | 26 ----------------- .../qemucaps2xmloutdata/caps_2.7.0.x86_64.xml | 28 ------------------- .../qemucaps2xmloutdata/caps_2.8.0.s390x.xml | 26 ----------------- .../qemucaps2xmloutdata/caps_2.8.0.x86_64.xml | 28 ------------------- .../qemucaps2xmloutdata/caps_2.9.0.ppc64.xml | 26 ----------------- .../qemucaps2xmloutdata/caps_2.9.0.s390x.xml | 26 ----------------- .../qemucaps2xmloutdata/caps_2.9.0.x86_64.xml | 28 ------------------- .../qemucaps2xmloutdata/caps_3.0.0.ppc64.xml | 26 ----------------- .../qemucaps2xmloutdata/caps_3.0.0.s390x.xml | 26 ----------------- .../qemucaps2xmloutdata/caps_3.0.0.x86_64.xml | 28 ------------------- .../qemucaps2xmloutdata/caps_3.1.0.ppc64.xml | 26 ----------------- .../qemucaps2xmloutdata/caps_3.1.0.x86_64.xml | 28 ------------------- .../caps_4.0.0.riscv32.xml | 25 ----------------- .../caps_4.0.0.riscv64.xml | 25 ----------------- .../qemucaps2xmloutdata/caps_4.0.0.x86_64.xml | 28 ------------------- tests/qemucaps2xmltest.c | 4 +-- 37 files changed, 2 insertions(+), 812 deletions(-) rename tests/qemucaps2xmloutdata/{caps_2.10.0.aarch64.xml => caps.aarch64.xml} (100%) rename tests/qemucaps2xmloutdata/{caps_2.10.0.ppc64.xml => caps.ppc64.xml} (100%) rename tests/qemucaps2xmloutdata/{caps_3.0.0.riscv32.xml => caps.riscv32.xml} (100%) rename tests/qemucaps2xmloutdata/{caps_3.0.0.riscv64.xml => caps.riscv64.xml} (100%) rename tests/qemucaps2xmloutdata/{caps_2.10.0.s390x.xml => caps.s390x.xml} (100%) rename tests/qemucaps2xmloutdata/{caps_1.5.3.x86_64.xml => caps.x86_64.xml} (100%) delete mode 100644 tests/qemucaps2xmloutdata/caps_1.6.0.x86_64.xml delete mode 100644 tests/qemucaps2xmloutdata/caps_1.7.0.x86_64.xml delete mode 100644 tests/qemucaps2xmloutdata/caps_2.1.1.x86_64.xml delete mode 100644 tests/qemucaps2xmloutdata/caps_2.10.0.x86_64.xml delete mode 100644 tests/qemucaps2xmloutdata/caps_2.11.0.s390x.xml delete mode 100644 tests/qemucaps2xmloutdata/caps_2.11.0.x86_64.xml delete mode 100644 tests/qemucaps2xmloutdata/caps_2.12.0.aarch64.xml delete mode 100644 tests/qemucaps2xmloutdata/caps_2.12.0.ppc64.xml delete mode 100644 tests/qemucaps2xmloutdata/caps_2.12.0.s390x.xml delete mode 100644 tests/qemucaps2xmloutdata/caps_2.12.0.x86_64.xml delete mode 100644 tests/qemucaps2xmloutdata/caps_2.4.0.x86_64.xml delete mode 100644 tests/qemucaps2xmloutdata/caps_2.5.0.x86_64.xml delete mode 100644 tests/qemucaps2xmloutdata/caps_2.6.0.aarch64.xml delete mode 100644 tests/qemucaps2xmloutdata/caps_2.6.0.ppc64.xml delete mode 100644 tests/qemucaps2xmloutdata/caps_2.6.0.x86_64.xml delete mode 100644 tests/qemucaps2xmloutdata/caps_2.7.0.s390x.xml delete mode 100644 tests/qemucaps2xmloutdata/caps_2.7.0.x86_64.xml delete mode 100644 tests/qemucaps2xmloutdata/caps_2.8.0.s390x.xml delete mode 100644 tests/qemucaps2xmloutdata/caps_2.8.0.x86_64.xml delete mode 100644 tests/qemucaps2xmloutdata/caps_2.9.0.ppc64.xml delete mode 100644 tests/qemucaps2xmloutdata/caps_2.9.0.s390x.xml delete mode 100644 tests/qemucaps2xmloutdata/caps_2.9.0.x86_64.xml delete mode 100644 tests/qemucaps2xmloutdata/caps_3.0.0.ppc64.xml delete mode 100644 tests/qemucaps2xmloutdata/caps_3.0.0.s390x.xml delete mode 100644 tests/qemucaps2xmloutdata/caps_3.0.0.x86_64.xml delete mode 100644 tests/qemucaps2xmloutdata/caps_3.1.0.ppc64.xml delete mode 100644 tests/qemucaps2xmloutdata/caps_3.1.0.x86_64.xml delete mode 100644 tests/qemucaps2xmloutdata/caps_4.0.0.riscv32.xml delete mode 100644 tests/qemucaps2xmloutdata/caps_4.0.0.riscv64.xml delete mode 100644 tests/qemucaps2xmloutdata/caps_4.0.0.x86_64.xml diff --git a/tests/qemucaps2xmloutdata/caps_2.10.0.aarch64.xml b/tests/qemucaps2xmloutdata/caps.aarch64.xml similarity index 100% rename from tests/qemucaps2xmloutdata/caps_2.10.0.aarch64.xml rename to tests/qemucaps2xmloutdata/caps.aarch64.xml diff --git a/tests/qemucaps2xmloutdata/caps_2.10.0.ppc64.xml b/tests/qemucaps2xmloutdata/caps.ppc64.xml similarity index 100% rename from tests/qemucaps2xmloutdata/caps_2.10.0.ppc64.xml rename to tests/qemucaps2xmloutdata/caps.ppc64.xml diff --git a/tests/qemucaps2xmloutdata/caps_3.0.0.riscv32.xml b/tests/qemucaps2xmloutdata/caps.riscv32.xml similarity index 100% rename from tests/qemucaps2xmloutdata/caps_3.0.0.riscv32.xml rename to tests/qemucaps2xmloutdata/caps.riscv32.xml diff --git a/tests/qemucaps2xmloutdata/caps_3.0.0.riscv64.xml b/tests/qemucaps2xmloutdata/caps.riscv64.xml similarity index 100% rename from tests/qemucaps2xmloutdata/caps_3.0.0.riscv64.xml rename to tests/qemucaps2xmloutdata/caps.riscv64.xml diff --git a/tests/qemucaps2xmloutdata/caps_2.10.0.s390x.xml b/tests/qemucaps2xmloutdata/caps.s390x.xml similarity index 100% rename from tests/qemucaps2xmloutdata/caps_2.10.0.s390x.xml rename to tests/qemucaps2xmloutdata/caps.s390x.xml diff --git a/tests/qemucaps2xmloutdata/caps_1.5.3.x86_64.xml b/tests/qemucaps2xmloutdata/caps.x86_64.xml similarity index 100% rename from tests/qemucaps2xmloutdata/caps_1.5.3.x86_64.xml rename to tests/qemucaps2xmloutdata/caps.x86_64.xml diff --git a/tests/qemucaps2xmloutdata/caps_1.6.0.x86_64.xml b/tests/qemucaps2xmloutdata/caps_1.6.0.x86_64.xml deleted file mode 100644 index d41693a001..0000000000 --- a/tests/qemucaps2xmloutdata/caps_1.6.0.x86_64.xml +++ /dev/null @@ -1,28 +0,0 @@ -<capabilities> - - <host> - <cpu> - <arch>x86_64</arch> - </cpu> - <power_management/> - <iommu support='no'/> - </host> - - <guest> - <os_type>hvm</os_type> - <arch name='x86_64'> - <wordsize>64</wordsize> - <emulator>/usr/bin/qemu-system-x86_64</emulator> - <domain type='qemu'/> - <domain type='kvm'/> - </arch> - <features> - <cpuselection/> - <deviceboot/> - <disksnapshot default='on' toggle='no'/> - <acpi default='on' toggle='yes'/> - <apic default='on' toggle='no'/> - </features> - </guest> - -</capabilities> diff --git a/tests/qemucaps2xmloutdata/caps_1.7.0.x86_64.xml b/tests/qemucaps2xmloutdata/caps_1.7.0.x86_64.xml deleted file mode 100644 index d41693a001..0000000000 --- a/tests/qemucaps2xmloutdata/caps_1.7.0.x86_64.xml +++ /dev/null @@ -1,28 +0,0 @@ -<capabilities> - - <host> - <cpu> - <arch>x86_64</arch> - </cpu> - <power_management/> - <iommu support='no'/> - </host> - - <guest> - <os_type>hvm</os_type> - <arch name='x86_64'> - <wordsize>64</wordsize> - <emulator>/usr/bin/qemu-system-x86_64</emulator> - <domain type='qemu'/> - <domain type='kvm'/> - </arch> - <features> - <cpuselection/> - <deviceboot/> - <disksnapshot default='on' toggle='no'/> - <acpi default='on' toggle='yes'/> - <apic default='on' toggle='no'/> - </features> - </guest> - -</capabilities> diff --git a/tests/qemucaps2xmloutdata/caps_2.1.1.x86_64.xml b/tests/qemucaps2xmloutdata/caps_2.1.1.x86_64.xml deleted file mode 100644 index d41693a001..0000000000 --- a/tests/qemucaps2xmloutdata/caps_2.1.1.x86_64.xml +++ /dev/null @@ -1,28 +0,0 @@ -<capabilities> - - <host> - <cpu> - <arch>x86_64</arch> - </cpu> - <power_management/> - <iommu support='no'/> - </host> - - <guest> - <os_type>hvm</os_type> - <arch name='x86_64'> - <wordsize>64</wordsize> - <emulator>/usr/bin/qemu-system-x86_64</emulator> - <domain type='qemu'/> - <domain type='kvm'/> - </arch> - <features> - <cpuselection/> - <deviceboot/> - <disksnapshot default='on' toggle='no'/> - <acpi default='on' toggle='yes'/> - <apic default='on' toggle='no'/> - </features> - </guest> - -</capabilities> diff --git a/tests/qemucaps2xmloutdata/caps_2.10.0.x86_64.xml b/tests/qemucaps2xmloutdata/caps_2.10.0.x86_64.xml deleted file mode 100644 index d41693a001..0000000000 --- a/tests/qemucaps2xmloutdata/caps_2.10.0.x86_64.xml +++ /dev/null @@ -1,28 +0,0 @@ -<capabilities> - - <host> - <cpu> - <arch>x86_64</arch> - </cpu> - <power_management/> - <iommu support='no'/> - </host> - - <guest> - <os_type>hvm</os_type> - <arch name='x86_64'> - <wordsize>64</wordsize> - <emulator>/usr/bin/qemu-system-x86_64</emulator> - <domain type='qemu'/> - <domain type='kvm'/> - </arch> - <features> - <cpuselection/> - <deviceboot/> - <disksnapshot default='on' toggle='no'/> - <acpi default='on' toggle='yes'/> - <apic default='on' toggle='no'/> - </features> - </guest> - -</capabilities> diff --git a/tests/qemucaps2xmloutdata/caps_2.11.0.s390x.xml b/tests/qemucaps2xmloutdata/caps_2.11.0.s390x.xml deleted file mode 100644 index bb82a15040..0000000000 --- a/tests/qemucaps2xmloutdata/caps_2.11.0.s390x.xml +++ /dev/null @@ -1,26 +0,0 @@ -<capabilities> - - <host> - <cpu> - <arch>s390x</arch> - </cpu> - <power_management/> - <iommu support='no'/> - </host> - - <guest> - <os_type>hvm</os_type> - <arch name='s390x'> - <wordsize>64</wordsize> - <emulator>/usr/bin/qemu-system-s390x</emulator> - <domain type='qemu'/> - <domain type='kvm'/> - </arch> - <features> - <cpuselection/> - <deviceboot/> - <disksnapshot default='on' toggle='no'/> - </features> - </guest> - -</capabilities> diff --git a/tests/qemucaps2xmloutdata/caps_2.11.0.x86_64.xml b/tests/qemucaps2xmloutdata/caps_2.11.0.x86_64.xml deleted file mode 100644 index d41693a001..0000000000 --- a/tests/qemucaps2xmloutdata/caps_2.11.0.x86_64.xml +++ /dev/null @@ -1,28 +0,0 @@ -<capabilities> - - <host> - <cpu> - <arch>x86_64</arch> - </cpu> - <power_management/> - <iommu support='no'/> - </host> - - <guest> - <os_type>hvm</os_type> - <arch name='x86_64'> - <wordsize>64</wordsize> - <emulator>/usr/bin/qemu-system-x86_64</emulator> - <domain type='qemu'/> - <domain type='kvm'/> - </arch> - <features> - <cpuselection/> - <deviceboot/> - <disksnapshot default='on' toggle='no'/> - <acpi default='on' toggle='yes'/> - <apic default='on' toggle='no'/> - </features> - </guest> - -</capabilities> diff --git a/tests/qemucaps2xmloutdata/caps_2.12.0.aarch64.xml b/tests/qemucaps2xmloutdata/caps_2.12.0.aarch64.xml deleted file mode 100644 index f6572c8ecd..0000000000 --- a/tests/qemucaps2xmloutdata/caps_2.12.0.aarch64.xml +++ /dev/null @@ -1,27 +0,0 @@ -<capabilities> - - <host> - <cpu> - <arch>aarch64</arch> - </cpu> - <power_management/> - <iommu support='no'/> - </host> - - <guest> - <os_type>hvm</os_type> - <arch name='aarch64'> - <wordsize>64</wordsize> - <emulator>/usr/bin/qemu-system-aarch64</emulator> - <domain type='qemu'/> - <domain type='kvm'/> - </arch> - <features> - <cpuselection/> - <deviceboot/> - <disksnapshot default='on' toggle='no'/> - <acpi default='on' toggle='yes'/> - </features> - </guest> - -</capabilities> diff --git a/tests/qemucaps2xmloutdata/caps_2.12.0.ppc64.xml b/tests/qemucaps2xmloutdata/caps_2.12.0.ppc64.xml deleted file mode 100644 index 85623f3980..0000000000 --- a/tests/qemucaps2xmloutdata/caps_2.12.0.ppc64.xml +++ /dev/null @@ -1,26 +0,0 @@ -<capabilities> - - <host> - <cpu> - <arch>ppc64</arch> - </cpu> - <power_management/> - <iommu support='no'/> - </host> - - <guest> - <os_type>hvm</os_type> - <arch name='ppc64'> - <wordsize>64</wordsize> - <emulator>/usr/bin/qemu-system-ppc64</emulator> - <domain type='qemu'/> - <domain type='kvm'/> - </arch> - <features> - <cpuselection/> - <deviceboot/> - <disksnapshot default='on' toggle='no'/> - </features> - </guest> - -</capabilities> diff --git a/tests/qemucaps2xmloutdata/caps_2.12.0.s390x.xml b/tests/qemucaps2xmloutdata/caps_2.12.0.s390x.xml deleted file mode 100644 index bb82a15040..0000000000 --- a/tests/qemucaps2xmloutdata/caps_2.12.0.s390x.xml +++ /dev/null @@ -1,26 +0,0 @@ -<capabilities> - - <host> - <cpu> - <arch>s390x</arch> - </cpu> - <power_management/> - <iommu support='no'/> - </host> - - <guest> - <os_type>hvm</os_type> - <arch name='s390x'> - <wordsize>64</wordsize> - <emulator>/usr/bin/qemu-system-s390x</emulator> - <domain type='qemu'/> - <domain type='kvm'/> - </arch> - <features> - <cpuselection/> - <deviceboot/> - <disksnapshot default='on' toggle='no'/> - </features> - </guest> - -</capabilities> diff --git a/tests/qemucaps2xmloutdata/caps_2.12.0.x86_64.xml b/tests/qemucaps2xmloutdata/caps_2.12.0.x86_64.xml deleted file mode 100644 index d41693a001..0000000000 --- a/tests/qemucaps2xmloutdata/caps_2.12.0.x86_64.xml +++ /dev/null @@ -1,28 +0,0 @@ -<capabilities> - - <host> - <cpu> - <arch>x86_64</arch> - </cpu> - <power_management/> - <iommu support='no'/> - </host> - - <guest> - <os_type>hvm</os_type> - <arch name='x86_64'> - <wordsize>64</wordsize> - <emulator>/usr/bin/qemu-system-x86_64</emulator> - <domain type='qemu'/> - <domain type='kvm'/> - </arch> - <features> - <cpuselection/> - <deviceboot/> - <disksnapshot default='on' toggle='no'/> - <acpi default='on' toggle='yes'/> - <apic default='on' toggle='no'/> - </features> - </guest> - -</capabilities> diff --git a/tests/qemucaps2xmloutdata/caps_2.4.0.x86_64.xml b/tests/qemucaps2xmloutdata/caps_2.4.0.x86_64.xml deleted file mode 100644 index d41693a001..0000000000 --- a/tests/qemucaps2xmloutdata/caps_2.4.0.x86_64.xml +++ /dev/null @@ -1,28 +0,0 @@ -<capabilities> - - <host> - <cpu> - <arch>x86_64</arch> - </cpu> - <power_management/> - <iommu support='no'/> - </host> - - <guest> - <os_type>hvm</os_type> - <arch name='x86_64'> - <wordsize>64</wordsize> - <emulator>/usr/bin/qemu-system-x86_64</emulator> - <domain type='qemu'/> - <domain type='kvm'/> - </arch> - <features> - <cpuselection/> - <deviceboot/> - <disksnapshot default='on' toggle='no'/> - <acpi default='on' toggle='yes'/> - <apic default='on' toggle='no'/> - </features> - </guest> - -</capabilities> diff --git a/tests/qemucaps2xmloutdata/caps_2.5.0.x86_64.xml b/tests/qemucaps2xmloutdata/caps_2.5.0.x86_64.xml deleted file mode 100644 index d41693a001..0000000000 --- a/tests/qemucaps2xmloutdata/caps_2.5.0.x86_64.xml +++ /dev/null @@ -1,28 +0,0 @@ -<capabilities> - - <host> - <cpu> - <arch>x86_64</arch> - </cpu> - <power_management/> - <iommu support='no'/> - </host> - - <guest> - <os_type>hvm</os_type> - <arch name='x86_64'> - <wordsize>64</wordsize> - <emulator>/usr/bin/qemu-system-x86_64</emulator> - <domain type='qemu'/> - <domain type='kvm'/> - </arch> - <features> - <cpuselection/> - <deviceboot/> - <disksnapshot default='on' toggle='no'/> - <acpi default='on' toggle='yes'/> - <apic default='on' toggle='no'/> - </features> - </guest> - -</capabilities> diff --git a/tests/qemucaps2xmloutdata/caps_2.6.0.aarch64.xml b/tests/qemucaps2xmloutdata/caps_2.6.0.aarch64.xml deleted file mode 100644 index f6572c8ecd..0000000000 --- a/tests/qemucaps2xmloutdata/caps_2.6.0.aarch64.xml +++ /dev/null @@ -1,27 +0,0 @@ -<capabilities> - - <host> - <cpu> - <arch>aarch64</arch> - </cpu> - <power_management/> - <iommu support='no'/> - </host> - - <guest> - <os_type>hvm</os_type> - <arch name='aarch64'> - <wordsize>64</wordsize> - <emulator>/usr/bin/qemu-system-aarch64</emulator> - <domain type='qemu'/> - <domain type='kvm'/> - </arch> - <features> - <cpuselection/> - <deviceboot/> - <disksnapshot default='on' toggle='no'/> - <acpi default='on' toggle='yes'/> - </features> - </guest> - -</capabilities> diff --git a/tests/qemucaps2xmloutdata/caps_2.6.0.ppc64.xml b/tests/qemucaps2xmloutdata/caps_2.6.0.ppc64.xml deleted file mode 100644 index 85623f3980..0000000000 --- a/tests/qemucaps2xmloutdata/caps_2.6.0.ppc64.xml +++ /dev/null @@ -1,26 +0,0 @@ -<capabilities> - - <host> - <cpu> - <arch>ppc64</arch> - </cpu> - <power_management/> - <iommu support='no'/> - </host> - - <guest> - <os_type>hvm</os_type> - <arch name='ppc64'> - <wordsize>64</wordsize> - <emulator>/usr/bin/qemu-system-ppc64</emulator> - <domain type='qemu'/> - <domain type='kvm'/> - </arch> - <features> - <cpuselection/> - <deviceboot/> - <disksnapshot default='on' toggle='no'/> - </features> - </guest> - -</capabilities> diff --git a/tests/qemucaps2xmloutdata/caps_2.6.0.x86_64.xml b/tests/qemucaps2xmloutdata/caps_2.6.0.x86_64.xml deleted file mode 100644 index d41693a001..0000000000 --- a/tests/qemucaps2xmloutdata/caps_2.6.0.x86_64.xml +++ /dev/null @@ -1,28 +0,0 @@ -<capabilities> - - <host> - <cpu> - <arch>x86_64</arch> - </cpu> - <power_management/> - <iommu support='no'/> - </host> - - <guest> - <os_type>hvm</os_type> - <arch name='x86_64'> - <wordsize>64</wordsize> - <emulator>/usr/bin/qemu-system-x86_64</emulator> - <domain type='qemu'/> - <domain type='kvm'/> - </arch> - <features> - <cpuselection/> - <deviceboot/> - <disksnapshot default='on' toggle='no'/> - <acpi default='on' toggle='yes'/> - <apic default='on' toggle='no'/> - </features> - </guest> - -</capabilities> diff --git a/tests/qemucaps2xmloutdata/caps_2.7.0.s390x.xml b/tests/qemucaps2xmloutdata/caps_2.7.0.s390x.xml deleted file mode 100644 index bb82a15040..0000000000 --- a/tests/qemucaps2xmloutdata/caps_2.7.0.s390x.xml +++ /dev/null @@ -1,26 +0,0 @@ -<capabilities> - - <host> - <cpu> - <arch>s390x</arch> - </cpu> - <power_management/> - <iommu support='no'/> - </host> - - <guest> - <os_type>hvm</os_type> - <arch name='s390x'> - <wordsize>64</wordsize> - <emulator>/usr/bin/qemu-system-s390x</emulator> - <domain type='qemu'/> - <domain type='kvm'/> - </arch> - <features> - <cpuselection/> - <deviceboot/> - <disksnapshot default='on' toggle='no'/> - </features> - </guest> - -</capabilities> diff --git a/tests/qemucaps2xmloutdata/caps_2.7.0.x86_64.xml b/tests/qemucaps2xmloutdata/caps_2.7.0.x86_64.xml deleted file mode 100644 index d41693a001..0000000000 --- a/tests/qemucaps2xmloutdata/caps_2.7.0.x86_64.xml +++ /dev/null @@ -1,28 +0,0 @@ -<capabilities> - - <host> - <cpu> - <arch>x86_64</arch> - </cpu> - <power_management/> - <iommu support='no'/> - </host> - - <guest> - <os_type>hvm</os_type> - <arch name='x86_64'> - <wordsize>64</wordsize> - <emulator>/usr/bin/qemu-system-x86_64</emulator> - <domain type='qemu'/> - <domain type='kvm'/> - </arch> - <features> - <cpuselection/> - <deviceboot/> - <disksnapshot default='on' toggle='no'/> - <acpi default='on' toggle='yes'/> - <apic default='on' toggle='no'/> - </features> - </guest> - -</capabilities> diff --git a/tests/qemucaps2xmloutdata/caps_2.8.0.s390x.xml b/tests/qemucaps2xmloutdata/caps_2.8.0.s390x.xml deleted file mode 100644 index bb82a15040..0000000000 --- a/tests/qemucaps2xmloutdata/caps_2.8.0.s390x.xml +++ /dev/null @@ -1,26 +0,0 @@ -<capabilities> - - <host> - <cpu> - <arch>s390x</arch> - </cpu> - <power_management/> - <iommu support='no'/> - </host> - - <guest> - <os_type>hvm</os_type> - <arch name='s390x'> - <wordsize>64</wordsize> - <emulator>/usr/bin/qemu-system-s390x</emulator> - <domain type='qemu'/> - <domain type='kvm'/> - </arch> - <features> - <cpuselection/> - <deviceboot/> - <disksnapshot default='on' toggle='no'/> - </features> - </guest> - -</capabilities> diff --git a/tests/qemucaps2xmloutdata/caps_2.8.0.x86_64.xml b/tests/qemucaps2xmloutdata/caps_2.8.0.x86_64.xml deleted file mode 100644 index d41693a001..0000000000 --- a/tests/qemucaps2xmloutdata/caps_2.8.0.x86_64.xml +++ /dev/null @@ -1,28 +0,0 @@ -<capabilities> - - <host> - <cpu> - <arch>x86_64</arch> - </cpu> - <power_management/> - <iommu support='no'/> - </host> - - <guest> - <os_type>hvm</os_type> - <arch name='x86_64'> - <wordsize>64</wordsize> - <emulator>/usr/bin/qemu-system-x86_64</emulator> - <domain type='qemu'/> - <domain type='kvm'/> - </arch> - <features> - <cpuselection/> - <deviceboot/> - <disksnapshot default='on' toggle='no'/> - <acpi default='on' toggle='yes'/> - <apic default='on' toggle='no'/> - </features> - </guest> - -</capabilities> diff --git a/tests/qemucaps2xmloutdata/caps_2.9.0.ppc64.xml b/tests/qemucaps2xmloutdata/caps_2.9.0.ppc64.xml deleted file mode 100644 index 85623f3980..0000000000 --- a/tests/qemucaps2xmloutdata/caps_2.9.0.ppc64.xml +++ /dev/null @@ -1,26 +0,0 @@ -<capabilities> - - <host> - <cpu> - <arch>ppc64</arch> - </cpu> - <power_management/> - <iommu support='no'/> - </host> - - <guest> - <os_type>hvm</os_type> - <arch name='ppc64'> - <wordsize>64</wordsize> - <emulator>/usr/bin/qemu-system-ppc64</emulator> - <domain type='qemu'/> - <domain type='kvm'/> - </arch> - <features> - <cpuselection/> - <deviceboot/> - <disksnapshot default='on' toggle='no'/> - </features> - </guest> - -</capabilities> diff --git a/tests/qemucaps2xmloutdata/caps_2.9.0.s390x.xml b/tests/qemucaps2xmloutdata/caps_2.9.0.s390x.xml deleted file mode 100644 index bb82a15040..0000000000 --- a/tests/qemucaps2xmloutdata/caps_2.9.0.s390x.xml +++ /dev/null @@ -1,26 +0,0 @@ -<capabilities> - - <host> - <cpu> - <arch>s390x</arch> - </cpu> - <power_management/> - <iommu support='no'/> - </host> - - <guest> - <os_type>hvm</os_type> - <arch name='s390x'> - <wordsize>64</wordsize> - <emulator>/usr/bin/qemu-system-s390x</emulator> - <domain type='qemu'/> - <domain type='kvm'/> - </arch> - <features> - <cpuselection/> - <deviceboot/> - <disksnapshot default='on' toggle='no'/> - </features> - </guest> - -</capabilities> diff --git a/tests/qemucaps2xmloutdata/caps_2.9.0.x86_64.xml b/tests/qemucaps2xmloutdata/caps_2.9.0.x86_64.xml deleted file mode 100644 index d41693a001..0000000000 --- a/tests/qemucaps2xmloutdata/caps_2.9.0.x86_64.xml +++ /dev/null @@ -1,28 +0,0 @@ -<capabilities> - - <host> - <cpu> - <arch>x86_64</arch> - </cpu> - <power_management/> - <iommu support='no'/> - </host> - - <guest> - <os_type>hvm</os_type> - <arch name='x86_64'> - <wordsize>64</wordsize> - <emulator>/usr/bin/qemu-system-x86_64</emulator> - <domain type='qemu'/> - <domain type='kvm'/> - </arch> - <features> - <cpuselection/> - <deviceboot/> - <disksnapshot default='on' toggle='no'/> - <acpi default='on' toggle='yes'/> - <apic default='on' toggle='no'/> - </features> - </guest> - -</capabilities> diff --git a/tests/qemucaps2xmloutdata/caps_3.0.0.ppc64.xml b/tests/qemucaps2xmloutdata/caps_3.0.0.ppc64.xml deleted file mode 100644 index 85623f3980..0000000000 --- a/tests/qemucaps2xmloutdata/caps_3.0.0.ppc64.xml +++ /dev/null @@ -1,26 +0,0 @@ -<capabilities> - - <host> - <cpu> - <arch>ppc64</arch> - </cpu> - <power_management/> - <iommu support='no'/> - </host> - - <guest> - <os_type>hvm</os_type> - <arch name='ppc64'> - <wordsize>64</wordsize> - <emulator>/usr/bin/qemu-system-ppc64</emulator> - <domain type='qemu'/> - <domain type='kvm'/> - </arch> - <features> - <cpuselection/> - <deviceboot/> - <disksnapshot default='on' toggle='no'/> - </features> - </guest> - -</capabilities> diff --git a/tests/qemucaps2xmloutdata/caps_3.0.0.s390x.xml b/tests/qemucaps2xmloutdata/caps_3.0.0.s390x.xml deleted file mode 100644 index bb82a15040..0000000000 --- a/tests/qemucaps2xmloutdata/caps_3.0.0.s390x.xml +++ /dev/null @@ -1,26 +0,0 @@ -<capabilities> - - <host> - <cpu> - <arch>s390x</arch> - </cpu> - <power_management/> - <iommu support='no'/> - </host> - - <guest> - <os_type>hvm</os_type> - <arch name='s390x'> - <wordsize>64</wordsize> - <emulator>/usr/bin/qemu-system-s390x</emulator> - <domain type='qemu'/> - <domain type='kvm'/> - </arch> - <features> - <cpuselection/> - <deviceboot/> - <disksnapshot default='on' toggle='no'/> - </features> - </guest> - -</capabilities> diff --git a/tests/qemucaps2xmloutdata/caps_3.0.0.x86_64.xml b/tests/qemucaps2xmloutdata/caps_3.0.0.x86_64.xml deleted file mode 100644 index d41693a001..0000000000 --- a/tests/qemucaps2xmloutdata/caps_3.0.0.x86_64.xml +++ /dev/null @@ -1,28 +0,0 @@ -<capabilities> - - <host> - <cpu> - <arch>x86_64</arch> - </cpu> - <power_management/> - <iommu support='no'/> - </host> - - <guest> - <os_type>hvm</os_type> - <arch name='x86_64'> - <wordsize>64</wordsize> - <emulator>/usr/bin/qemu-system-x86_64</emulator> - <domain type='qemu'/> - <domain type='kvm'/> - </arch> - <features> - <cpuselection/> - <deviceboot/> - <disksnapshot default='on' toggle='no'/> - <acpi default='on' toggle='yes'/> - <apic default='on' toggle='no'/> - </features> - </guest> - -</capabilities> diff --git a/tests/qemucaps2xmloutdata/caps_3.1.0.ppc64.xml b/tests/qemucaps2xmloutdata/caps_3.1.0.ppc64.xml deleted file mode 100644 index 85623f3980..0000000000 --- a/tests/qemucaps2xmloutdata/caps_3.1.0.ppc64.xml +++ /dev/null @@ -1,26 +0,0 @@ -<capabilities> - - <host> - <cpu> - <arch>ppc64</arch> - </cpu> - <power_management/> - <iommu support='no'/> - </host> - - <guest> - <os_type>hvm</os_type> - <arch name='ppc64'> - <wordsize>64</wordsize> - <emulator>/usr/bin/qemu-system-ppc64</emulator> - <domain type='qemu'/> - <domain type='kvm'/> - </arch> - <features> - <cpuselection/> - <deviceboot/> - <disksnapshot default='on' toggle='no'/> - </features> - </guest> - -</capabilities> diff --git a/tests/qemucaps2xmloutdata/caps_3.1.0.x86_64.xml b/tests/qemucaps2xmloutdata/caps_3.1.0.x86_64.xml deleted file mode 100644 index d41693a001..0000000000 --- a/tests/qemucaps2xmloutdata/caps_3.1.0.x86_64.xml +++ /dev/null @@ -1,28 +0,0 @@ -<capabilities> - - <host> - <cpu> - <arch>x86_64</arch> - </cpu> - <power_management/> - <iommu support='no'/> - </host> - - <guest> - <os_type>hvm</os_type> - <arch name='x86_64'> - <wordsize>64</wordsize> - <emulator>/usr/bin/qemu-system-x86_64</emulator> - <domain type='qemu'/> - <domain type='kvm'/> - </arch> - <features> - <cpuselection/> - <deviceboot/> - <disksnapshot default='on' toggle='no'/> - <acpi default='on' toggle='yes'/> - <apic default='on' toggle='no'/> - </features> - </guest> - -</capabilities> diff --git a/tests/qemucaps2xmloutdata/caps_4.0.0.riscv32.xml b/tests/qemucaps2xmloutdata/caps_4.0.0.riscv32.xml deleted file mode 100644 index 63c374da7f..0000000000 --- a/tests/qemucaps2xmloutdata/caps_4.0.0.riscv32.xml +++ /dev/null @@ -1,25 +0,0 @@ -<capabilities> - - <host> - <cpu> - <arch>riscv32</arch> - </cpu> - <power_management/> - <iommu support='no'/> - </host> - - <guest> - <os_type>hvm</os_type> - <arch name='riscv32'> - <wordsize>32</wordsize> - <emulator>/usr/bin/qemu-system-riscv32</emulator> - <domain type='qemu'/> - </arch> - <features> - <cpuselection/> - <deviceboot/> - <disksnapshot default='on' toggle='no'/> - </features> - </guest> - -</capabilities> diff --git a/tests/qemucaps2xmloutdata/caps_4.0.0.riscv64.xml b/tests/qemucaps2xmloutdata/caps_4.0.0.riscv64.xml deleted file mode 100644 index 09b7eb7f2f..0000000000 --- a/tests/qemucaps2xmloutdata/caps_4.0.0.riscv64.xml +++ /dev/null @@ -1,25 +0,0 @@ -<capabilities> - - <host> - <cpu> - <arch>riscv64</arch> - </cpu> - <power_management/> - <iommu support='no'/> - </host> - - <guest> - <os_type>hvm</os_type> - <arch name='riscv64'> - <wordsize>64</wordsize> - <emulator>/usr/bin/qemu-system-riscv64</emulator> - <domain type='qemu'/> - </arch> - <features> - <cpuselection/> - <deviceboot/> - <disksnapshot default='on' toggle='no'/> - </features> - </guest> - -</capabilities> diff --git a/tests/qemucaps2xmloutdata/caps_4.0.0.x86_64.xml b/tests/qemucaps2xmloutdata/caps_4.0.0.x86_64.xml deleted file mode 100644 index d41693a001..0000000000 --- a/tests/qemucaps2xmloutdata/caps_4.0.0.x86_64.xml +++ /dev/null @@ -1,28 +0,0 @@ -<capabilities> - - <host> - <cpu> - <arch>x86_64</arch> - </cpu> - <power_management/> - <iommu support='no'/> - </host> - - <guest> - <os_type>hvm</os_type> - <arch name='x86_64'> - <wordsize>64</wordsize> - <emulator>/usr/bin/qemu-system-x86_64</emulator> - <domain type='qemu'/> - <domain type='kvm'/> - </arch> - <features> - <cpuselection/> - <deviceboot/> - <disksnapshot default='on' toggle='no'/> - <acpi default='on' toggle='yes'/> - <apic default='on' toggle='no'/> - </features> - </guest> - -</capabilities> diff --git a/tests/qemucaps2xmltest.c b/tests/qemucaps2xmltest.c index ec9d16e8dd..0d9b4e679a 100644 --- a/tests/qemucaps2xmltest.c +++ b/tests/qemucaps2xmltest.c @@ -128,8 +128,8 @@ testQemuCapsXML(const void *opaque) char *capsXml = NULL; virCapsPtr capsProvided = NULL; - if (virAsprintf(&xmlFile, "%s/qemucaps2xmloutdata/%s.%s.xml", - abs_srcdir, data->base, data->archName) < 0) + if (virAsprintf(&xmlFile, "%s/qemucaps2xmloutdata/caps.%s.xml", + abs_srcdir, data->archName) < 0) goto cleanup; if (virAsprintf(&capsFile, "%s/qemucapabilitiesdata/%s.%s.xml", -- 2.20.1

2 1

[libvirt] [PATCH] news: Fix typo
by Andrea Bolognani 04 Feb '19

04 Feb '19

Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Pushed as trivial. docs/news.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/news.xml b/docs/news.xml index a443af013b..8d6d58ae6a 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -70,7 +70,7 @@ <description> By default, libvirt runs the QEMU process as <code>qemu:qemu</code> which could cause issues during probing as some features like AMD SEV - might be inaccesible to QEMU because of file system permissions. + might be inaccessible to QEMU because of file system permissions. Therefore, <code>CAP_DAC_OVERRIDE</code> is granted to overcome these for the purposes of probing. </description> -- 2.20.1

1 0

[libvirt] [PATCH 0/9] Add semicolon to macro calls
by Cole Robinson 03 Feb '19

03 Feb '19

Recently I was experimenting with the vim-ale plugin for basic code validation on file write. For C the simplest option seemed to be using cppcheck. However cppcheck when trivially invoked on many files in our codebase will error if a macro call is missing an ending semicolon. Example: $ cppcheck -q src/qemu/qemu_command.c [src/qemu/qemu_command.c:109]: (error) There is an unknown macro here somewhere. Configuration is required. If VIR_ENUM_DECL is a macro then please configure it. Googling around it sounds like it's generally considered good practice to end macro calls with a semicolon, and we have mixed usage throughout the code. So let's standardize on adding semicolon to a few macro calls. The first 4 patches add semicolons to all VIR_ENUM_DECL, VIR_ENUM_IMPL, VIR_LOG_INIT, VIR_ONCE_GLOBAL INIT calls The next 4 patches rework the macro definitions slightly so that the compiler will _require_ callers to specify use a semicolon. I don't know if this is controversial or not so I kept the patches separate, but they can be squashed together if desired. The only one that's kinda suspect is adding a dummy struct to eat the semicolon in VIR_ONCE_GLOBAL_INIT, maybe someone has a better suggestion. The last patch is a bit of a detour but if we are interested in doing it now is as good a time as we will get: it changes VIR_ENUM_IMPL to add a newline after the last entry. This means diffs extending the enum value list only generate one line diff instead of two. An example is in the patch description. If people agree with the idea, it could be squashed into patch #2 to reduce 'git blame' pollution Thanks, Cole Cole Robinson (9): Add semicolon to VIR_ENUM_DECL calls Add semicolon to VIR_ENUM_IMPL calls Add semicolon to VIR_LOG_INIT calls Add semicolon to VIR_ONCE_GLOBAL_INIT calls Require a semicolon for VIR_ENUM_DECL calls Require a semicolon for VIR_ENUM_IMPL calls Require a semicolon for VIR_LOG_INIT calls Require a semicolon for VIR_ONCE_GLOBAL_INIT calls Add newline after last entry in VIR_ENUM_IMPL calls src/access/viraccessperm.c | 30 ++- src/bhyve/bhyve_conf.c | 2 +- src/conf/capabilities.c | 9 +- src/conf/cpu_conf.c | 21 +- src/conf/cpu_conf.h | 12 +- src/conf/domain_capabilities.c | 5 +- src/conf/domain_conf.c | 313 ++++++++++++++++-------- src/conf/domain_conf.h | 220 ++++++++--------- src/conf/domain_event.c | 2 +- src/conf/interface_conf.c | 3 +- src/conf/interface_conf.h | 2 +- src/conf/netdev_vlan_conf.c | 3 +- src/conf/network_conf.c | 17 +- src/conf/network_conf.h | 8 +- src/conf/network_event.c | 2 +- src/conf/node_device_conf.c | 12 +- src/conf/node_device_conf.h | 8 +- src/conf/node_device_event.c | 2 +- src/conf/numa_conf.c | 9 +- src/conf/numa_conf.h | 6 +- src/conf/nwfilter_conf.c | 21 +- src/conf/object_event.c | 2 +- src/conf/secret_event.c | 2 +- src/conf/snapshot_conf.c | 6 +- src/conf/snapshot_conf.h | 4 +- src/conf/storage_adapter_conf.c | 3 +- src/conf/storage_adapter_conf.h | 2 +- src/conf/storage_conf.c | 24 +- src/conf/storage_conf.h | 16 +- src/conf/storage_event.c | 2 +- src/conf/virdomainobjlist.c | 2 +- src/conf/virinterfaceobj.c | 2 +- src/conf/virnetworkobj.c | 2 +- src/conf/virnodedeviceobj.c | 2 +- src/conf/virnwfilterbindingobj.c | 2 +- src/conf/virnwfilterbindingobjlist.c | 2 +- src/conf/virsecretobj.c | 2 +- src/conf/virstorageobj.c | 4 +- src/datatypes.c | 2 +- src/interface/interface_backend_netcf.c | 2 +- src/libxl/libxl_conf.c | 2 +- src/libxl/libxl_domain.c | 2 +- src/libxl/libxl_domain.h | 2 +- src/libxl/libxl_migration.c | 2 +- src/locking/lock_daemon.c | 5 +- src/logging/log_daemon.c | 5 +- src/logging/log_handler.c | 2 +- src/lxc/lxc_conf.c | 2 +- src/lxc/lxc_domain.c | 6 +- src/lxc/lxc_domain.h | 6 +- src/lxc/lxc_monitor.c | 2 +- src/network/leaseshelper.c | 3 +- src/node_device/node_device_udev.c | 2 +- src/qemu/qemu_agent.c | 8 +- src/qemu/qemu_blockjob.c | 2 +- src/qemu/qemu_capabilities.c | 2 +- src/qemu/qemu_command.c | 43 ++-- src/qemu/qemu_command.h | 2 +- src/qemu/qemu_conf.c | 2 +- src/qemu/qemu_domain.c | 14 +- src/qemu/qemu_domain.h | 8 +- src/qemu/qemu_driver.c | 10 +- src/qemu/qemu_extdevice.c | 2 +- src/qemu/qemu_migration.h | 2 +- src/qemu/qemu_migration_cookie.c | 3 +- src/qemu/qemu_migration_params.c | 4 +- src/qemu/qemu_migration_params.h | 2 +- src/qemu/qemu_monitor.c | 16 +- src/qemu/qemu_monitor.h | 8 +- src/qemu/qemu_monitor_json.c | 18 +- src/qemu/qemu_tpm.c | 2 +- src/remote/remote_daemon.c | 5 +- src/rpc/virkeepalive.c | 2 +- src/rpc/virnetclient.c | 2 +- src/rpc/virnetclientprogram.c | 2 +- src/rpc/virnetclientstream.c | 2 +- src/rpc/virnetdaemon.c | 2 +- src/rpc/virnetsaslcontext.c | 2 +- src/rpc/virnetserver.c | 2 +- src/rpc/virnetserverclient.c | 2 +- src/rpc/virnetserverprogram.c | 2 +- src/rpc/virnetserverservice.c | 2 +- src/rpc/virnetsocket.c | 2 +- src/rpc/virnettlscontext.c | 2 +- src/test/test_driver.c | 2 +- src/util/vircgroup.c | 3 +- src/util/vircgroupbackend.c | 3 +- src/util/vircgroupv1.c | 3 +- src/util/vircgroupv2.c | 3 +- src/util/virclosecallbacks.c | 2 +- src/util/virconf.c | 3 +- src/util/virconf.h | 2 +- src/util/virdevmapper.c | 2 +- src/util/virdnsmasq.c | 2 +- src/util/virerror.c | 4 +- src/util/virfdstream.c | 2 +- src/util/virfilecache.c | 4 +- src/util/virfirewall.c | 12 +- src/util/virgic.c | 2 +- src/util/virhash.c | 2 +- src/util/virhook.c | 35 +-- src/util/virhostdev.c | 2 +- src/util/viridentity.c | 2 +- src/util/virkeycode.c | 2 +- src/util/virlog.c | 5 +- src/util/virlog.h | 2 +- src/util/virmdev.c | 5 +- src/util/virmdev.h | 2 +- src/util/virnetdev.c | 9 +- src/util/virnetdev.h | 6 +- src/util/virnetdevmacvlan.c | 3 +- src/util/virnetdevmacvlan.h | 2 +- src/util/virnetdevvlan.h | 2 +- src/util/virnetdevvportprofile.c | 6 +- src/util/virnetdevvportprofile.h | 4 +- src/util/virpci.c | 9 +- src/util/virpci.h | 4 +- src/util/virperf.c | 3 +- src/util/virportallocator.c | 2 +- src/util/virprocess.c | 3 +- src/util/virresctrl.c | 18 +- src/util/virscsi.c | 2 +- src/util/virscsivhost.c | 2 +- src/util/virsecret.c | 3 +- src/util/virsecret.h | 2 +- src/util/virstorageencryption.c | 7 +- src/util/virstorageencryption.h | 4 +- src/util/virstoragefile.c | 20 +- src/util/virstoragefile.h | 10 +- src/util/virstoragefilebackend.c | 2 +- src/util/virsysinfo.c | 3 +- src/util/virsysinfo.h | 2 +- src/util/virthread.h | 5 +- src/util/virthreadjob.c | 2 +- src/util/virtypedparam.c | 3 +- src/util/virtypedparam.h | 2 +- src/util/virusb.c | 2 +- src/util/virutil.c | 6 +- src/util/virutil.h | 10 +- src/vmware/vmware_conf.c | 3 +- src/vmware/vmware_conf.h | 2 +- src/vmx/vmx.c | 2 +- src/vz/vz_driver.c | 2 +- tests/virfilecachetest.c | 2 +- tools/virsh-domain-monitor.c | 60 +++-- tools/virsh-domain.c | 102 ++++---- tools/virsh-network.c | 12 +- tools/virsh-nodedev.c | 4 +- tools/virsh-pool.c | 8 +- tools/virsh-secret.c | 4 +- tools/virsh-volume.c | 6 +- tools/virt-admin.c | 4 +- 152 files changed, 861 insertions(+), 622 deletions(-) -- 2.20.1

3 13

[libvirt] ANNOUNCE: virt-manager 2.1.0 released
by Cole Robinson 03 Feb '19

03 Feb '19

I'm happy to announce the release of virt-manager 2.1.0! The release can be downloaded from: http://virt-manager.org/download/ This release includes: - Bash autocompletion support (Lin Ma, Cole Robinson) - UI and command line --vsock support (Slavomir Kaslev) - virt-xml: Add --os-variant option (Andrea Bolognani) - virt-install: use libosinfo cpu, mem, disk size defaults (Fabiano Fidencio) - virt-install: Better usage of libosinfo -unknown distro IDs (Fabiano Fidencio) - virt-install: More usage of libosinfo for ISO --location detection - virt-install: Add --location LOCATION,kernel=X,initrd=Y for pointing to kernel/initrd in media that virt-install/libosinfo fails to detect - Various bug fixes and improvements Thanks to everyone who has contributed to this release through testing, bug reporting, submitting patches, and otherwise sending in feedback! Thanks, Cole

1 0

[libvirt] [PULL 0/5] Ui 20190201 patches
by Gerd Hoffmann 03 Feb '19

03 Feb '19

The following changes since commit e8977901b79fb678f288dd372261b640bbeccd0d: Merge remote-tracking branch 'remotes/vivier2/tags/trivial-branch-pull-request' into staging (2019-01-31 15:40:39 +0000) are available in the git repository at: git://git.kraxel.org/qemu tags/ui-20190201-pull-request for you to fetch changes up to 0015ca5cbabe0b31d31610ddfaafd90a9e5911a4: ui: remove support for SDL1.2 in favour of SDL2 (2019-02-01 11:59:12 +0100) ---------------------------------------------------------------- ui: fix build with SDL disabled, drop SDL1 support. ---------------------------------------------------------------- Daniel P. Berrangé (1): ui: remove support for SDL1.2 in favour of SDL2 Philippe Mathieu-Daudé (4): hw/display: Move Milkymist specific hardware out of common-obj list configure: LM32 Milkymist Texture Mapping Unit (tmu2) also depends of X11 hw/display/milkymist-tmu2: Explicit the dependency to both X11 / OpenGL hw/display/milkymist-tmu2: Move inlined code from header to source configure | 70 +-- hw/lm32/milkymist-hw.h | 63 --- include/hw/display/milkymist_tmu2.h | 41 ++ ui/sdl_zoom.h | 25 - ui/sdl_zoom_template.h | 219 -------- hw/display/milkymist-tmu2.c | 49 ++ hw/lm32/milkymist.c | 1 + ui/sdl.c | 1027 ----------------------------------- ui/sdl_zoom.c | 93 ---- MAINTAINERS | 1 + default-configs/lm32-softmmu.mak | 2 +- hw/display/Makefile.objs | 8 +- qemu-deprecated.texi | 9 - ui/Makefile.objs | 5 - 14 files changed, 114 insertions(+), 1499 deletions(-) create mode 100644 include/hw/display/milkymist_tmu2.h delete mode 100644 ui/sdl_zoom.h delete mode 100644 ui/sdl_zoom_template.h delete mode 100644 ui/sdl.c delete mode 100644 ui/sdl_zoom.c -- 2.9.3

3 7

[libvirt] [PATCH] util: remove test code accidentally committed to virFirewallDZoneExists
by Laine Stump 03 Feb '19

03 Feb '19

Just before pushing the series containing commit 3bba4825 I had added a "return true" to the top of virFirewallDZoneExists() to measure the impact of calling that function once per network during startup. I found that the effect was minimal, but forgot to remove the "return true" before pushing. This unfortunately causes a failure to start networks on systems that have a firewalld version that doesn't support our libvirt zone file (i.e. pretty much everyone). This patch removes the unintended line. Signed-off-by: Laine Stump <laine(a)laine.org> --- Pushed as trivial / buildbreaker. src/util/virfirewalld.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/util/virfirewalld.c b/src/util/virfirewalld.c index ca03020f74..47bacdcf4a 100644 --- a/src/util/virfirewalld.c +++ b/src/util/virfirewalld.c @@ -235,8 +235,6 @@ virFirewallDZoneExists(const char *match) char **zones = NULL; bool result = false; - return true; - if (virFirewallDGetZones(&zones, &nzones) < 0) goto cleanup; -- 2.20.1

1 0

[libvirt] [PATCH 0/3] bhyve: bhyve:commandline followup fixes
by Roman Bogorodskiy 01 Feb '19

01 Feb '19

Roman Bogorodskiy (3): bhyve: bhyveDomainDefNamespaceFormatXML cleanup bhyve: emit warning when using bhyve:commandline docs: bhyve: warn about bhyve:commandline risks docs/drvbhyve.html.in | 5 +++++ src/bhyve/bhyve_command.c | 4 ++++ src/bhyve/bhyve_domain.c | 4 ++-- 3 files changed, 11 insertions(+), 2 deletions(-) -- 2.20.1

2 5

[libvirt] [PATCH v2] qemu-nbd: Deprecate qemu-nbd --partition
by Eric Blake 01 Feb '19

01 Feb '19

The existing qemu-nbd --partition code claims to handle logical partitions up to 8, since its introduction in 2008 (commit 7a5ca86). However, the implementation is bogus (actual MBR logical partitions form a sort of linked list, with one partition per extended table entry, rather than four logical partitions in a single extended table), making the code unlikely to work for anything beyond -P5 on actual guest images. What's more, the code does not support GPT partitions, which are becoming more popular, and maintaining device subsetting in both NBD and the raw device is unnecessary duplication of effort (even if it is not too difficult). Note that obtaining the offsets of a partition (MBR or GPT) can be learned by using 'qemu-nbd -c /dev/nbd0 file.qcow2 && sfdisk --dump /dev/nbd0', but by the time you've done that, you might as well just mount /dev/nbd0p1 that the kernel creates for you instead of bothering with qemu exporting a subset. Or, keeping to just user-space code, use nbdkit's partition filter, which has already known both GPT and primary MBR partitions for a while, and was just recently enhanced to support arbitrary logical MBR parititions. Start the clock on the deprecation cycle, with examples of how to write device subsetting without using -P. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- v2: actual nbdkit example [Rich], improved doc wording --- qemu-deprecated.texi | 33 +++++++++++++++++++++++++++++++++ qemu-nbd.texi | 6 ++++-- qemu-nbd.c | 2 ++ 3 files changed, 39 insertions(+), 2 deletions(-) diff --git a/qemu-deprecated.texi b/qemu-deprecated.texi index 219206a836f..d35e78c81ff 100644 --- a/qemu-deprecated.texi +++ b/qemu-deprecated.texi @@ -175,3 +175,36 @@ The above, converted to the current supported format: @subsubsection "irq": "" (since 3.0.0) The ``irq'' property is obsoleted. + +@section Related binaries + +@subsection qemu-nbd --partition (since 4.0.0) + +The ``qemu-nbd --partition $digit'' code (also spelled @option{-P}) +can only handle MBR partitions, and has never correctly handled +logical partitions beyond partition 5. If you know the offset and +length of the partition (perhaps by using @code{sfdisk} within the +guest), you can achieve the effect of exporting just that subset of +the disk by use of the @option{--image-opts} option with a raw +blockdev using the @code{offset} and @code{size} parameters layered on +top of any other existing blockdev. For example, if partition 1 is +100MiB long starting at 1MiB, the old command: + +@code{qemu-nbd -t -P 1 -f qcow2 file.qcow2} + +can be rewritten as: + +@code{qemu-nbd -t --image-opts driver=raw,offset=1M,size=100M,file.driver=qcow2,file.backing.driver=file,file.backing.filename=file.qcow2} + +Alternatively, the @code{nbdkit} project provides a more powerful +partition filter on top of its nbd plugin, which can be used to select +an arbitrary MBR or GPT partition on top of any other full-image NBD +export. Using this to rewrite the above example results in: + +@code{qemu-nbd -t -k /tmp/sock -f qcow2 file.qcow2 &} +@code{nbdkit -f --filter=partition nbd socket=/tmp/sock partition=1} + +Note that if you are exposing the export via /dev/nbd0, it is easier +to just export the entire image and then mount only /dev/nbd0p1 than +it is to reinvoke @command{qemu-nbd -c /dev/nbd0} limited to just a +subset of the image. diff --git a/qemu-nbd.texi b/qemu-nbd.texi index 386bece4680..d0c51828149 100644 --- a/qemu-nbd.texi +++ b/qemu-nbd.texi @@ -56,8 +56,10 @@ auto-detecting. @item -r, --read-only Export the disk as read-only. @item -P, --partition=@var{num} -Only expose MBR partition @var{num}. Understands physical partitions -1-4 and logical partitions 5-8. +Deprecated: Only expose MBR partition @var{num}. Understands physical +partitions 1-4 and logical partition 5. New code should instead use +@option{--image-opts} with the raw driver wrapping a subset of the +original image. @item -B, --bitmap=@var{name} If @var{filename} has a qcow2 persistent bitmap @var{name}, expose that bitmap via the ``qemu:dirty-bitmap:@var{name}'' context diff --git a/qemu-nbd.c b/qemu-nbd.c index 1f7b2a03f5d..00c07fd27ea 100644 --- a/qemu-nbd.c +++ b/qemu-nbd.c @@ -787,6 +787,8 @@ int main(int argc, char **argv) flags &= ~BDRV_O_RDWR; break; case 'P': + warn_report("The '-P' option is deprecated; use --image-opts with " + "a raw device wrapper for subset exports instead"); if (qemu_strtoi(optarg, NULL, 0, &partition) < 0 || partition < 1 || partition > 8) { error_report("Invalid partition '%s'", optarg); -- 2.20.1

3 3

[libvirt] [PATCH] qemu: command: Don't skip 'readonly' and throttling info for empty drive
by Peter Krempa 01 Feb '19

01 Feb '19

In commit f80eae8c2ae I was too agresive in removing properties of -drive for empty drives. It turns out that qemu actually persists the state of 'readonly' and the throttling information even for the empty drive. Removing 'readonly' thus made qemu open any subsequent images added via the 'change' command as RW which was forbidden by selinux thanks to the restrictive sVirt label for readonly media. Fix this by formating the property again and bump the tests and leave a note detailing why the rest of the properties needs to be skipped. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/qemu/qemu_command.c | 18 +++++++++++++----- tests/qemuxml2argvdata/disk-cdrom.args | 4 ++-- .../disk-cdrom.x86_64-2.12.0.args | 4 ++-- .../disk-cdrom.x86_64-latest.args | 4 ++-- 4 files changed, 19 insertions(+), 11 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index a59583fb75..6d3aa69569 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1764,10 +1764,18 @@ qemuBuildDriveStr(virDomainDiskDefPtr disk, } } + if (disk->src->readonly) + virBufferAddLit(&opt, ",readonly=on"); + + /* qemu rejects some parameters for an empty -drive, so we need to skip + * them in that case: + * cache: modifies properties of the format driver which is not present + * copy_on_read: really only works for floppies + * discard: modifies properties of format driver + * detect_zeroes: works but really depends on discard so it's useless + * iomode: setting it to 'native' requires a specific cache mode + */ if (!virStorageSourceIsEmpty(disk->src)) { - if (disk->src->readonly) - virBufferAddLit(&opt, ",readonly=on"); - if (disk->cachemode) { virBufferAsprintf(&opt, ",cache=%s", qemuDiskCacheV2TypeToString(disk->cachemode)); @@ -1792,10 +1800,10 @@ qemuBuildDriveStr(virDomainDiskDefPtr disk, virBufferAsprintf(&opt, ",aio=%s", virDomainDiskIoTypeToString(disk->iomode)); } - - qemuBuildDiskThrottling(disk, &opt); } + qemuBuildDiskThrottling(disk, &opt); + if (virBufferCheckError(&opt) < 0) goto error; diff --git a/tests/qemuxml2argvdata/disk-cdrom.args b/tests/qemuxml2argvdata/disk-cdrom.args index a9f60aa477..4823ae82de 100644 --- a/tests/qemuxml2argvdata/disk-cdrom.args +++ b/tests/qemuxml2argvdata/disk-cdrom.args @@ -27,7 +27,7 @@ bootindex=1 \ -drive file=/root/boot.iso,format=raw,if=none,id=drive-ide0-0-1,media=cdrom,\ readonly=on \ -device ide-drive,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 \ --drive if=none,id=drive-ide0-1-0,media=cdrom \ +-drive if=none,id=drive-ide0-1-0,media=cdrom,readonly=on \ -device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \ --drive if=none,id=drive-ide0-1-1,media=cdrom \ +-drive if=none,id=drive-ide0-1-1,media=cdrom,readonly=on \ -device ide-drive,bus=ide.1,unit=1,drive=drive-ide0-1-1,id=ide0-1-1 diff --git a/tests/qemuxml2argvdata/disk-cdrom.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-cdrom.x86_64-2.12.0.args index a39d920f67..2fe84177b8 100644 --- a/tests/qemuxml2argvdata/disk-cdrom.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-cdrom.x86_64-2.12.0.args @@ -28,10 +28,10 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -drive file=/root/boot.iso,format=raw,if=none,id=drive-ide0-0-1,readonly=on \ -device ide-cd,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 \ --drive if=none,id=drive-ide0-1-0 \ +-drive if=none,id=drive-ide0-1-0,readonly=on \ -device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,\ write-cache=on \ --drive if=none,id=drive-ide0-1-1 \ +-drive if=none,id=drive-ide0-1-1,readonly=on \ -device ide-cd,bus=ide.1,unit=1,drive=drive-ide0-1-1,id=ide0-1-1 \ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\ resourcecontrol=deny \ diff --git a/tests/qemuxml2argvdata/disk-cdrom.x86_64-latest.args b/tests/qemuxml2argvdata/disk-cdrom.x86_64-latest.args index 029ae23dfa..9b9451f435 100644 --- a/tests/qemuxml2argvdata/disk-cdrom.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-cdrom.x86_64-latest.args @@ -28,10 +28,10 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -drive file=/root/boot.iso,format=raw,if=none,id=drive-ide0-0-1,readonly=on \ -device ide-cd,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 \ --drive if=none,id=drive-ide0-1-0 \ +-drive if=none,id=drive-ide0-1-0,readonly=on \ -device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,\ write-cache=on \ --drive if=none,id=drive-ide0-1-1 \ +-drive if=none,id=drive-ide0-1-1,readonly=on \ -device ide-cd,bus=ide.1,unit=1,drive=drive-ide0-1-1,id=ide0-1-1 \ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\ resourcecontrol=deny \ -- 2.20.1

2 1

[libvirt] [PATCH] util: Fix build issue with virStorageFileGetNPIVKey
by John Ferlan 01 Feb '19

01 Feb '19

Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- pushed as build breaker <sigh>... src/util/virstoragefile.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index d83d84fcf5..6df0885669 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -1564,7 +1564,7 @@ virStorageFileGetNPIVKey(const char *path, return ret; } #else -int virStorageFileGetNPIVKey(const char *path, +int virStorageFileGetNPIVKey(const char *path ATTRIBUTE_UNUSED, char **key ATTRIBUTE_UNUSED) { return -1; -- 2.20.1

1 0

[libvirt] [PATCH 0/3] qemu: Improve handling of format for 'network' and 'volume' disks (blockdev-add saga)
by Peter Krempa 01 Feb '19

01 Feb '19

Peter Krempa (3): tests: qemu: Test network disks without format specified explicitly qemu: domain: Assume 'raw' default storage format also for network storage qemu: domain: Treat 'volume' disks as 'raw' if neiter user nor pool provided format src/qemu/qemu_domain.c | 8 ++++++-- tests/qemuxml2argvdata/disk-network-gluster.xml | 2 +- tests/qemuxml2argvdata/disk-network-iscsi.xml | 2 +- tests/qemuxml2argvdata/disk-network-nbd.xml | 2 +- tests/qemuxml2argvdata/disk-source-pool-mode.args | 6 +++--- tests/qemuxml2argvdata/disk-source-pool.args | 4 ++-- 6 files changed, 14 insertions(+), 10 deletions(-) -- 2.20.1

3 5

[libvirt] [PATCH] docs: news: Update the release notes with the SEV permission fix
by Erik Skultety 01 Feb '19

01 Feb '19

Signed-off-by: Erik Skultety <eskultet(a)redhat.com> --- docs/news.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/docs/news.xml b/docs/news.xml index 55d6a3926b..fcc42698b3 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -50,6 +50,18 @@ <section title="Improvements"> </section> <section title="Bug fixes"> + <change> + <summary> + qemu: Use CAP_DAC_OVERRIDE during QEMU capabilities probing + </summary> + <description> + By default, libvirt runs the QEMU process as qemu:qemu which could + cause issues during probing as some features (like AMD SEV) might be + inaccesible to QEMU because of file system permissions. Therefore, + CAP_DAC_OVERRIDE is granted to overcome these for the purposes of + probing. + </description> + </change> <change> <summary> storage: Add default mount options for fs/netfs storage pools -- 2.20.1

2 2

[libvirt] [PATCH v2 0/7] network: fix networking for firewalld+nftables
by Laine Stump 01 Feb '19

01 Feb '19

Resolves: https://bugzilla.redhat.com/1638342 Creates-and-Resolves: https://bugzilla.redhat.com/1650320 V1: https://www.redhat.com/archives/libvir-list/2019-January/msg00227.html The detailed explanation of this is in Patch 4/7 and 5/7. Basically, when firewalld enables their new nftables backend, libvirt virtual networks lose all ability to forward packets from guests out to the physical network, and can only communicate with the host itself as much as firewalld's "public" zone will allow (which isn't much, and doesn't include DHCP or DNS). I *think* I've addressed everything in Daniel and John's review comments. In particular, I've made installation of the libvirt zone file optional, and if the libvirt zone is missing, I only log an error if the firewalld backend is set to nftables. Laine Stump (7): configure: change HAVE_FIREWALLD to WITH_FIREWALLD util: move all firewalld-specific stuff into its own files util: new virFirewallD APIs + docs configure: selectively install a firewalld 'libvirt' zone network: set firewalld zone of bridges to "libvirt" zone when appropriate network: allow configuring firewalld zone for virtual network bridge device docs: update news.xml for firewalld zone changes configure.ac | 3 + docs/firewall.html.in | 38 +++ docs/formatnetwork.html.in | 17 + docs/news.xml | 40 +++ docs/schemas/basictypes.rng | 6 + docs/schemas/network.rng | 6 + include/libvirt/virterror.h | 1 + libvirt.spec.in | 31 ++ m4/virt-firewalld-zone.m4 | 45 +++ m4/virt-firewalld.m4 | 4 +- src/conf/network_conf.c | 14 +- src/conf/network_conf.h | 1 + src/libvirt_private.syms | 10 + src/network/Makefile.inc.am | 10 +- src/network/bridge_driver.c | 6 +- src/network/bridge_driver_linux.c | 67 ++++ src/network/libvirt.zone | 23 ++ src/nwfilter/nwfilter_driver.c | 6 +- src/util/Makefile.inc.am | 3 + src/util/virerror.c | 3 +- src/util/virfirewall.c | 86 +---- src/util/virfirewalld.c | 373 +++++++++++++++++++++ src/util/virfirewalld.h | 46 +++ src/util/virfirewalldpriv.h | 30 ++ src/util/virfirewallpriv.h | 2 - tests/networkxml2xmlin/routed-network.xml | 2 +- tests/networkxml2xmlout/routed-network.xml | 2 +- tests/virfirewalltest.c | 2 + 28 files changed, 779 insertions(+), 98 deletions(-) create mode 100644 m4/virt-firewalld-zone.m4 create mode 100644 src/network/libvirt.zone create mode 100644 src/util/virfirewalld.c create mode 100644 src/util/virfirewalld.h create mode 100644 src/util/virfirewalldpriv.h -- 2.20.1

3 23

[libvirt] [PATCH v2 0/4] storage: More uniquely identify NPIV LUNs
by John Ferlan 01 Feb '19

01 Feb '19

v1: https://www.redhat.com/archives/libvir-list/2018-December/msg00562.html but no review until January, see: https://www.redhat.com/archives/libvir-list/2019-January/msg00079.html Changes since v1: * Rework code to have virStorageBackendSCSISerial use the existing virStorageFileGetSCSIKey * Then introduce and use virStorageFileGetNPIVKey in order to get a more unique key for NPIV LUNs. Follows same fallback policy as SCSI LUNs if the called *Key function either doesn't exist or fails to return a valid value. John Ferlan (4): util: Modify virStorageFileGetSCSIKey return storage: Rework virStorageBackendSCSISerial util: Introduce virStorageFileGetNPIVKey storage: Fetch a unique key for vHBA/NPIV LUNs src/libvirt_private.syms | 1 + src/storage/storage_util.c | 45 +++++++---------- src/util/virstoragefile.c | 101 +++++++++++++++++++++++++++++++++++-- src/util/virstoragefile.h | 2 + 4 files changed, 118 insertions(+), 31 deletions(-) -- 2.20.1

3 14

[libvirt] [PATCH] tests: Update qemucaps2xml for QEMU 4.0.0 on x86_64
by Andrea Bolognani 01 Feb '19

01 Feb '19

Commit fb0d0d6c5492 added capabilities data and updated qemucapabilitiestest but forgot to update qemucaps2xmltest at the same time. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- *cough* and of course the reviewer didn't notice *cough* .../qemucaps2xmloutdata/caps_4.0.0.x86_64.xml | 28 +++++++++++++++++++ tests/qemucaps2xmltest.c | 1 + 2 files changed, 29 insertions(+) create mode 100644 tests/qemucaps2xmloutdata/caps_4.0.0.x86_64.xml diff --git a/tests/qemucaps2xmloutdata/caps_4.0.0.x86_64.xml b/tests/qemucaps2xmloutdata/caps_4.0.0.x86_64.xml new file mode 100644 index 0000000000..d41693a001 --- /dev/null +++ b/tests/qemucaps2xmloutdata/caps_4.0.0.x86_64.xml @@ -0,0 +1,28 @@ +<capabilities> + + <host> + <cpu> + <arch>x86_64</arch> + </cpu> + <power_management/> + <iommu support='no'/> + </host> + + <guest> + <os_type>hvm</os_type> + <arch name='x86_64'> + <wordsize>64</wordsize> + <emulator>/usr/bin/qemu-system-x86_64</emulator> + <domain type='qemu'/> + <domain type='kvm'/> + </arch> + <features> + <cpuselection/> + <deviceboot/> + <disksnapshot default='on' toggle='no'/> + <acpi default='on' toggle='yes'/> + <apic default='on' toggle='no'/> + </features> + </guest> + +</capabilities> diff --git a/tests/qemucaps2xmltest.c b/tests/qemucaps2xmltest.c index dd9fc6917a..9d6b6f474c 100644 --- a/tests/qemucaps2xmltest.c +++ b/tests/qemucaps2xmltest.c @@ -198,6 +198,7 @@ mymain(void) DO_TEST("x86_64", "caps_2.12.0"); DO_TEST("x86_64", "caps_3.0.0"); DO_TEST("x86_64", "caps_3.1.0"); + DO_TEST("x86_64", "caps_4.0.0"); DO_TEST("aarch64", "caps_2.6.0"); DO_TEST("aarch64", "caps_2.10.0"); DO_TEST("aarch64", "caps_2.12.0"); -- 2.20.1

2 2

[libvirt] [PATCH 0/5] Override the permissions on /dev/sev when probing
by Erik Skultety 01 Feb '19

01 Feb '19

The problem with /dev/sev's default permissions (0600 root:root) is that we can't make it more permissive at the moment otherwise we'd weaken the security of SEV and potentially open the door for a DOS attack. Therefore, the alternative approach is to set CAP_DAC_OVERRIDE capability for the probing QEMU process (and *only* when probing) so that libvirt truly works with SEV. As a necessary side job, this series also makes /dev/sev only available to machines that need it, thus mitigating the possible attack surface even more. Erik Skultety (5): qemu: conf: Remove /dev/sev from the default cgroup device acl list qemu: cgroup: Expose /dev/sev/ only to domains that require SEV qemu: domain: Add /dev/sev into the domain mount namespace selectively security: dac: Relabel /dev/sev in the namespace qemu: caps: Use CAP_DAC_OVERRIDE for probing to avoid permission issues docs/drvqemu.html.in | 2 +- src/qemu/qemu.conf | 2 +- src/qemu/qemu_capabilities.c | 11 +++++++ src/qemu/qemu_cgroup.c | 21 +++++++++++- src/qemu/qemu_domain.c | 24 ++++++++++++++ src/qemu/test_libvirtd_qemu.aug.in | 1 - src/security/security_dac.c | 51 ++++++++++++++++++++++++++++++ src/util/virutil.c | 31 ++++++++++++++++-- 8 files changed, 137 insertions(+), 6 deletions(-) -- 2.20.1

2 12

[libvirt] [PATCH v2] qemu: Rework setting process affinity
by Michal Privoznik 01 Feb '19

01 Feb '19

https://bugzilla.redhat.com/show_bug.cgi?id=1503284 The way we currently start qemu from CPU affinity POV is as follows: 1) the child process is set affinity to all online CPUs (unless some vcpu pinning was given in the domain XML) 2) Once qemu is running, cpuset cgroup is configured taking memory pinning into account Problem is that we let qemu allocate its memory just anywhere in 1) and then rely in 2) to be able to move the memory to configured NUMA nodes. This might not be always possible (e.g. qemu might lock some parts of its memory) and is very suboptimal (copying large memory between NUMA nodes takes significant amount of time). The solution is to set affinity to one of (in priority order): - The CPUs associated with NUMA memory affinity mask - The CPUs associated with emulator pinning - All online host CPUs Later (once QEMU has allocated its memory) we then change this again to (again in priority order): - The CPUs associated with emulator pinning - The CPUs returned by numad - The CPUs associated with vCPU pinning - All online host CPUs Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- diff to v1 (both points suggested by Dan): - Expanded the commit message - fixed qemuProcessGetAllCpuAffinity so that it returns online CPU map only src/qemu/qemu_process.c | 132 +++++++++++++++++++--------------------- 1 file changed, 63 insertions(+), 69 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 7592c98b74..dace5aaca1 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -2435,6 +2435,21 @@ qemuProcessDetectIOThreadPIDs(virQEMUDriverPtr driver, } +static int +qemuProcessGetAllCpuAffinity(virBitmapPtr *cpumapRet) +{ + *cpumapRet = NULL; + + if (!virHostCPUHasBitmap()) + return 0; + + if (!(*cpumapRet = virHostCPUGetOnlineBitmap())) + return -1; + + return 0; +} + + /* * To be run between fork/exec of QEMU only */ @@ -2443,9 +2458,9 @@ static int qemuProcessInitCpuAffinity(virDomainObjPtr vm) { int ret = -1; - virBitmapPtr cpumap = NULL; virBitmapPtr cpumapToSet = NULL; - virBitmapPtr hostcpumap = NULL; + VIR_AUTOPTR(virBitmap) hostcpumap = NULL; + virDomainNumatuneMemMode mem_mode; qemuDomainObjPrivatePtr priv = vm->privateData; if (!vm->pid) { @@ -2454,59 +2469,39 @@ qemuProcessInitCpuAffinity(virDomainObjPtr vm) return -1; } - if (vm->def->placement_mode == VIR_DOMAIN_CPU_PLACEMENT_MODE_AUTO) { - VIR_DEBUG("Set CPU affinity with advisory nodeset from numad"); - cpumapToSet = priv->autoCpuset; + /* Here is the deal, we can't set cpuset.mems before qemu is + * started as it clashes with KVM allocation. Therefore, we + * used to let qemu allocate its memory anywhere as we would + * then move the memory to desired NUMA node via CGroups. + * However, that might not be always possible because qemu + * might lock some parts of its memory (e.g. due to VFIO). + * Even if it possible, memory has to be copied between NUMA + * nodes which is suboptimal. + * Solution is to set affinity that matches the best what we + * would have set in CGroups and then fix it later, once qemu + * is already running. */ + if (virDomainNumaGetNodeCount(vm->def->numa) <= 1 && + virDomainNumatuneGetMode(vm->def->numa, -1, &mem_mode) == 0 && + mem_mode == VIR_DOMAIN_NUMATUNE_MEM_STRICT) { + if (virDomainNumatuneMaybeGetNodeset(vm->def->numa, + priv->autoNodeset, + &cpumapToSet, + -1) < 0) + goto cleanup; + } else if (vm->def->cputune.emulatorpin) { + cpumapToSet = vm->def->cputune.emulatorpin; } else { - VIR_DEBUG("Set CPU affinity with specified cpuset"); - if (vm->def->cpumask) { - cpumapToSet = vm->def->cpumask; - } else { - /* You may think this is redundant, but we can't assume libvirtd - * itself is running on all pCPUs, so we need to explicitly set - * the spawned QEMU instance to all pCPUs if no map is given in - * its config file */ - int hostcpus; - - if (virHostCPUHasBitmap()) { - hostcpumap = virHostCPUGetOnlineBitmap(); - cpumap = virProcessGetAffinity(vm->pid); - } - - if (hostcpumap && cpumap && virBitmapEqual(hostcpumap, cpumap)) { - /* we're using all available CPUs, no reason to set - * mask. If libvirtd is running without explicit - * affinity, we can use hotplugged CPUs for this VM */ - ret = 0; - goto cleanup; - } else { - /* setaffinity fails if you set bits for CPUs which - * aren't present, so we have to limit ourselves */ - if ((hostcpus = virHostCPUGetCount()) < 0) - goto cleanup; - - if (hostcpus > QEMUD_CPUMASK_LEN) - hostcpus = QEMUD_CPUMASK_LEN; - - virBitmapFree(cpumap); - if (!(cpumap = virBitmapNew(hostcpus))) - goto cleanup; - - virBitmapSetAll(cpumap); - - cpumapToSet = cpumap; - } - } + if (qemuProcessGetAllCpuAffinity(&hostcpumap) < 0) + goto cleanup; + cpumapToSet = hostcpumap; } - if (virProcessSetAffinity(vm->pid, cpumapToSet) < 0) + if (cpumapToSet && + virProcessSetAffinity(vm->pid, cpumapToSet) < 0) goto cleanup; ret = 0; - cleanup: - virBitmapFree(cpumap); - virBitmapFree(hostcpumap); return ret; } #else /* !defined(HAVE_SCHED_GETAFFINITY) && !defined(HAVE_BSD_CPU_AFFINITY) */ @@ -2586,7 +2581,8 @@ qemuProcessSetupPid(virDomainObjPtr vm, qemuDomainObjPrivatePtr priv = vm->privateData; virDomainNumatuneMemMode mem_mode; virCgroupPtr cgroup = NULL; - virBitmapPtr use_cpumask; + virBitmapPtr use_cpumask = NULL; + VIR_AUTOPTR(virBitmap) hostcpumap = NULL; char *mem_mask = NULL; int ret = -1; @@ -2598,12 +2594,21 @@ qemuProcessSetupPid(virDomainObjPtr vm, } /* Infer which cpumask shall be used. */ - if (cpumask) + if (cpumask) { use_cpumask = cpumask; - else if (vm->def->placement_mode == VIR_DOMAIN_CPU_PLACEMENT_MODE_AUTO) + } else if (vm->def->placement_mode == VIR_DOMAIN_CPU_PLACEMENT_MODE_AUTO) { use_cpumask = priv->autoCpuset; - else + } else if (vm->def->cpumask) { use_cpumask = vm->def->cpumask; + } else { + /* You may think this is redundant, but we can't assume libvirtd + * itself is running on all pCPUs, so we need to explicitly set + * the spawned QEMU instance to all pCPUs if no map is given in + * its config file */ + if (qemuProcessGetAllCpuAffinity(&hostcpumap) < 0) + goto cleanup; + use_cpumask = hostcpumap; + } /* * If CPU cgroup controller is not initialized here, then we need @@ -2628,13 +2633,7 @@ qemuProcessSetupPid(virDomainObjPtr vm, qemuSetupCgroupCpusetCpus(cgroup, use_cpumask) < 0) goto cleanup; - /* - * Don't setup cpuset.mems for the emulator, they need to - * be set up after initialization in order for kvm - * allocations to succeed. - */ - if (nameval != VIR_CGROUP_THREAD_EMULATOR && - mem_mask && virCgroupSetCpusetMems(cgroup, mem_mask) < 0) + if (mem_mask && virCgroupSetCpusetMems(cgroup, mem_mask) < 0) goto cleanup; } @@ -6634,12 +6633,7 @@ qemuProcessLaunch(virConnectPtr conn, /* This must be done after cgroup placement to avoid resetting CPU * affinity */ - if (!vm->def->cputune.emulatorpin && - qemuProcessInitCpuAffinity(vm) < 0) - goto cleanup; - - VIR_DEBUG("Setting emulator tuning/settings"); - if (qemuProcessSetupEmulator(vm) < 0) + if (qemuProcessInitCpuAffinity(vm) < 0) goto cleanup; VIR_DEBUG("Setting cgroup for external devices (if required)"); @@ -6708,10 +6702,6 @@ qemuProcessLaunch(virConnectPtr conn, if (qemuProcessUpdateAndVerifyCPU(driver, vm, asyncJob) < 0) goto cleanup; - VIR_DEBUG("Setting up post-init cgroup restrictions"); - if (qemuSetupCpusetMems(vm) < 0) - goto cleanup; - VIR_DEBUG("setting up hotpluggable cpus"); if (qemuDomainHasHotpluggableStartupVcpus(vm->def)) { if (qemuDomainRefreshVcpuInfo(driver, vm, asyncJob, false) < 0) @@ -6737,6 +6727,10 @@ qemuProcessLaunch(virConnectPtr conn, if (qemuProcessDetectIOThreadPIDs(driver, vm, asyncJob) < 0) goto cleanup; + VIR_DEBUG("Setting emulator tuning/settings"); + if (qemuProcessSetupEmulator(vm) < 0) + goto cleanup; + VIR_DEBUG("Setting global CPU cgroup (if required)"); if (qemuSetupGlobalCpuCgroup(vm) < 0) goto cleanup; -- 2.19.2

2 1

[libvirt] [PATCH 0/4] qemu: Add PCI support for RISC-V guests
by Andrea Bolognani 01 Feb '19

01 Feb '19

Now that the QEMU part has been merged, it's time to make the feature available to libvirt users as well. Andrea Bolognani (4): tests: Add capabilities data for QEMU 4.0.0 on RISC-V qemu: Add PCI support for RISC-V guests tests: Add test for PCI usage on RISC-V news: Update for PCI support on RISC-V docs/news.xml | 10 + src/qemu/qemu_capabilities.c | 4 +- src/qemu/qemu_domain.c | 2 + src/qemu/qemu_domain_address.c | 3 +- .../caps_4.0.0.riscv32.replies | 17625 ++++++++++++++++ .../caps_4.0.0.riscv32.xml | 180 + .../caps_4.0.0.riscv64.replies | 17625 ++++++++++++++++ .../caps_4.0.0.riscv64.xml | 180 + tests/qemucapabilitiestest.c | 2 + .../caps_4.0.0.riscv32.xml | 25 + .../caps_4.0.0.riscv64.xml | 25 + tests/qemucaps2xmltest.c | 2 + .../riscv64-virt-headless.riscv64-latest.args | 3 +- tests/qemuxml2argvdata/riscv64-virt-pci.args | 27 + tests/qemuxml2argvdata/riscv64-virt-pci.xml | 24 + tests/qemuxml2argvtest.c | 2 + tests/qemuxml2xmloutdata/riscv64-virt-pci.xml | 28 + tests/qemuxml2xmltest.c | 2 + 18 files changed, 35766 insertions(+), 3 deletions(-) create mode 100644 tests/qemucapabilitiesdata/caps_4.0.0.riscv32.replies create mode 100644 tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml create mode 100644 tests/qemucapabilitiesdata/caps_4.0.0.riscv64.replies create mode 100644 tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml create mode 100644 tests/qemucaps2xmloutdata/caps_4.0.0.riscv32.xml create mode 100644 tests/qemucaps2xmloutdata/caps_4.0.0.riscv64.xml create mode 100644 tests/qemuxml2argvdata/riscv64-virt-pci.args create mode 100644 tests/qemuxml2argvdata/riscv64-virt-pci.xml create mode 100644 tests/qemuxml2xmloutdata/riscv64-virt-pci.xml -- 2.20.1

2 10

[libvirt] add ivshmem property master
by 吴雨霖 01 Feb '19

01 Feb '19

[Problem Description] I read qemu-doc.texi in qemu-mster source code, which have a explain of migrating ivshmem below “With device property @option{master=on}, the guest will copy the shared.memory on migration to the destination host. With @option{master=off}, the guest will not be able to migrate with the device attached.” However, libvirt library can not recognize the property “master=on”. When I directly used command "qemu-kvm -device ivshmem-plain,id=shmem0,memdev=shmmem-shmem0,master=on,bus=pci.0,addr=0xa” to launch a guest, qemu support ivshmem property master=on. So, I suggest adding code to support property master=on in libvirt. [Code Review] The below is the part of source code in qemu-master. There's no definition here about ivshmem master. domain_conf.h struct _virDomainShmemDef { char *name; unsigned long long size; int model; /* enum virDomainShmemModel */ struct { bool enabled; virDomainChrSourceDef chr; } server; struct { bool enabled; unsigned vectors; virTristateSwitch ioeventfd; } msi; virDomainDeviceInfo info; }; [changed code] src/conf/domain_conf.c src/conf/domain_conf.h [Detail of Source Code Modification] diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 9f75dc4..b41be37 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -14665,7 +14665,6 @@ virDomainShmemDefParseXML(virDomainXMLOptionPtr xmlopt, xmlNodePtr save = ctxt->node; xmlNodePtr server = NULL; - if (VIR_ALLOC(def) < 0) return NULL; - if (VIR_ALLOC(def) < 0) return NULL; @@ -14685,12 +14684,28 @@ virDomainShmemDefParseXML(virDomainXMLOptionPtr xmlopt, VIR_FREE(tmp); } + if (!(def->name = virXMLPropString(node, "name"))) { virReportError(VIR_ERR_XML_ERROR, "%s", _("shmem element must contain 'name' attribute")); goto cleanup; } + + if ((tmp = virXMLPropString(node, "master"))) { + int val; + + if ((val = virTristateSwitchTypeFromString(tmp)) <= 0) { + virReportError(VIR_ERR_XML_ERROR, + _("invalid ivshmem master setting for shmem: '%s'"), + tmp); + goto cleanup; + } + def->master = val; + VIR_FREE(tmp); + } + + if (virDomainParseScaledValue("./size[1]", NULL, ctxt, &def->size, 1, ULLONG_MAX, false) < 0) goto cleanup; diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index f1e6e4e..615d721 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1727,8 +1727,10 @@ typedef enum { struct _virDomainShmemDef { char *name; + unsigned long long size; int model; /* enum virDomainShmemModel */ + virTristateSwitch master; struct { bool enabled; virDomainChrSourceDef chr; }

2 1

[libvirt] [cim PATCH] Ensure nul termination of hostname
by Daniel P. Berrangé 01 Feb '19

01 Feb '19

Newest GCC warns that the string copying is potentially truncated and thus not nul terminated. In file included from /usr/include/string.h:494, from ../../src/Virt_HostSystem.c:23: In function ‘strncpy’, inlined from ‘resolve_host’ at ../../src/Virt_HostSystem.c:55:28, inlined from ‘get_fqdn’ at ../../src/Virt_HostSystem.c:92:23, inlined from ‘set_host_system_properties’ at ../../src/Virt_HostSystem.c:109:13: /usr/include/bits/string_fortified.h:106:10: error: ‘__builtin_strncpy’ specified bound 256 equals destination size [-Werror=stringop-truncation] 106 | return __builtin___strncpy_chk (__dest, __src, __len, __bos (__dest)); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ In function ‘strncpy’, inlined from ‘resolve_host’ at ../../src/Virt_HostSystem.c:67:17, inlined from ‘get_fqdn’ at ../../src/Virt_HostSystem.c:92:23, inlined from ‘set_host_system_properties’ at ../../src/Virt_HostSystem.c:109:13: /usr/include/bits/string_fortified.h:106:10: error: ‘__builtin_strncpy’ specified bound 256 equals destination size [-Werror=stringop-truncation] 106 | return __builtin___strncpy_chk (__dest, __src, __len, __bos (__dest)); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ cc1: all warnings being treated as errors Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/Virt_HostSystem.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/src/Virt_HostSystem.c b/src/Virt_HostSystem.c index ebe8184..5bc52ca 100644 --- a/src/Virt_HostSystem.c +++ b/src/Virt_HostSystem.c @@ -38,7 +38,7 @@ const static CMPIBroker *_BROKER; -static int resolve_host(char *host, char *buf, int size) +static int resolve_host(char *host, int size) { struct hostent *he; int i; @@ -52,7 +52,8 @@ static int resolve_host(char *host, char *buf, int size) for (i = 0; he->h_aliases[i] != NULL; i++) { if ((strchr(he->h_aliases[i], '.') != NULL) && (strstr(he->h_aliases[i], "localhost") == NULL)) { - strncpy(buf, he->h_aliases[i], size); + strncpy(host, he->h_aliases[i], size - 1); + host[size - 1] = '\0'; return 0; } } @@ -63,12 +64,13 @@ static int resolve_host(char *host, char *buf, int size) // but also be sure the value isn't empty and that it doesn't // contain "localhost" if ((he->h_name != NULL) && (!STREQC(he->h_name, "")) && - (strstr(he->h_name, "localhost") == NULL)) - strncpy(buf, he->h_name, size); - else if ((host != NULL) && (!STREQC(host, "")) && - (strstr(host, "localhost") == NULL)) - strncpy(buf, host, size); - else { + (strstr(he->h_name, "localhost") == NULL)) { + strncpy(host, he->h_name, size - 1); + host[size - 1] = '\0'; + } else if ((host != NULL) && (!STREQC(host, "")) && + (strstr(host, "localhost") == NULL)) { + return 0; + } else { CU_DEBUG("Unable to find valid hostname value."); return -1; } @@ -76,20 +78,18 @@ static int resolve_host(char *host, char *buf, int size) return 0; } -static int get_fqdn(char *buf, int size) +static int get_fqdn(char *host, int size) { - char host[256]; int ret = 0; - if (gethostname(host, sizeof(host)) != 0) { + if (gethostname(host, size) != 0) { CU_DEBUG("gethostname(): %m"); return -1; } - if (strchr(host, '.') != NULL) - strncpy(buf, host, size); - else - ret = resolve_host(host, buf, size); + if (strchr(host, '.') == NULL) { + ret = resolve_host(host, size); + } return ret; } -- 2.20.1

2 1

[libvirt] [cim PATCH] Update description of DMTF schema distribution terms
by Daniel P. Berrangé 01 Feb '19

01 Feb '19

The schema files that we actually download & bundle in the tar.gz dist have removed the clause "for uses consistent with this purpose" which is good because that clause might be considered a distribution restriction which could make it a non-free license. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- base_schema/README.DMTF | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/base_schema/README.DMTF b/base_schema/README.DMTF index 3e6b164..66da62d 100644 --- a/base_schema/README.DMTF +++ b/base_schema/README.DMTF @@ -4,6 +4,5 @@ distribution per the guidelines at the top of the main MOF file: // DMTF is a not-for-profit association of industry members dedicated // to promoting enterprise and systems management and interoperability. -// DMTF specifications and documents may be reproduced for uses -// consistent with this purpose by members and non-members, -// provided that correct attribution is given. +// DMTF specifications and documents may be reproduced by +// members and non-members, provided that correct attribution is given. -- 2.20.1

2 1

[libvirt] add ivshmem property master
by 吴雨霖 01 Feb '19

01 Feb '19

[Problem Description] I read qemu-doc.texi in qemu-mster source code, which have a explain of migrating ivshmem below “With device property @option{master=on}, the guest will copy the shared.memory on migration to the destination host. With @option{master=off}, the guest will not be able to migrate with the device attached.” However, libvirt library can not recognize the property “master=on”. When I directly used command "qemu-kvm -device ivshmem-plain,id=shmem0,memdev=shmmem-shmem0,master=on,bus=pci.0,addr=0xa” to launch a guest, qemu support ivshmem property master=on. So, I suggest adding code to support property master=on in libvirt. [Code Review] The below is the part of source code in qemu-master. There's no definition here about ivshmem master. domain_conf.h struct _virDomainShmemDef { char *name; unsigned long long size; int model; /* enum virDomainShmemModel */ struct { bool enabled; virDomainChrSourceDef chr; } server; struct { bool enabled; unsigned vectors; virTristateSwitch ioeventfd; } msi; virDomainDeviceInfo info; }; [changed code] src/conf/domain_conf.c src/conf/domain_conf.h [Detail of Source Code Modification] src/conf/domain_conf.h [cid:image001.png@01D4BA48.57FBFA10] src/conf/domain_conf.c [cid:image002.png@01D4BA48.5B8017C0]

1 0

[libvirt] [PATCH] network: set mtu as a DHCP option when specified
by Casey Callendrello 31 Jan '19

31 Jan '19

This adds an additional directive to the dnsmasq configuration file that notifies clients via dhcp about the link's MTU. Guests can then choose adjust their link accordingly. Signed-off-by: Casey Callendrello <cdc(a)redhat.com> --- src/network/bridge_driver.c | 7 ++++++ .../networkxml2confdata/nat-network-mtu.conf | 19 +++++++++++++++ tests/networkxml2confdata/nat-network-mtu.xml | 22 +++++++++++++++++ tests/networkxml2conftest.c | 1 + tests/networkxml2xmlin/nat-network-mtu.xml | 22 +++++++++++++++++ tests/networkxml2xmlout/nat-network-mtu.xml | 24 +++++++++++++++++++ tests/networkxml2xmltest.c | 1 + 7 files changed, 96 insertions(+) create mode 100644 tests/networkxml2confdata/nat-network-mtu.conf create mode 100644 tests/networkxml2confdata/nat-network-mtu.xml create mode 100644 tests/networkxml2xmlin/nat-network-mtu.xml create mode 100644 tests/networkxml2xmlout/nat-network-mtu.xml diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 4bbc4f5a6d..81edf72493 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -1506,6 +1506,13 @@ networkDnsmasqConfContents(virNetworkObjPtr obj, dctx->addnhostsfile->path); } + /* Configure DHCP to tell clients about the MTU. + */ + if (def->mtu > 0) { + virBufferAsprintf(&configbuf, "dhcp-option=option:mtu,%d\n", + def->mtu); + } + /* Are we doing RA instead of radvd? */ if (DNSMASQ_RA_SUPPORT(caps)) { if (ipv6def) { diff --git a/tests/networkxml2confdata/nat-network-mtu.conf b/tests/networkxml2confdata/nat-network-mtu.conf new file mode 100644 index 0000000000..91b574b964 --- /dev/null +++ b/tests/networkxml2confdata/nat-network-mtu.conf @@ -0,0 +1,19 @@ +##WARNING: THIS IS AN AUTO-GENERATED FILE. CHANGES TO IT ARE LIKELY TO BE +##OVERWRITTEN AND LOST. Changes to this configuration should be made using: +## virsh net-edit default +## or other application using the libvirt API. +## +## dnsmasq conf file created by libvirt +strict-order +except-interface=lo +bind-dynamic +interface=virbr0 +dhcp-range=192.168.122.2,192.168.122.254 +dhcp-no-override +dhcp-authoritative +dhcp-lease-max=253 +dhcp-hostsfile=/var/lib/libvirt/dnsmasq/default.hostsfile +addn-hosts=/var/lib/libvirt/dnsmasq/default.addnhosts +dhcp-option=option:mtu,7000 +dhcp-range=2001:db8:ac10:fe01::1,ra-only +dhcp-range=2001:db8:ac10:fd01::1,ra-only diff --git a/tests/networkxml2confdata/nat-network-mtu.xml b/tests/networkxml2confdata/nat-network-mtu.xml new file mode 100644 index 0000000000..87b214e95c --- /dev/null +++ b/tests/networkxml2confdata/nat-network-mtu.xml @@ -0,0 +1,22 @@ +<network> + <name>default</name> + <uuid>81ff0d90-c91e-6742-64da-4a736edb9a9b</uuid> + <forward dev='eth1' mode='nat'/> + <bridge name='virbr0' stp='on' delay='0'/> + <mtu size='7000'/> + <ip address='192.168.122.1' netmask='255.255.255.0'> + <dhcp> + <range start='192.168.122.2' end='192.168.122.254'/> + <host mac='00:16:3e:77:e2:ed' name='a.example.com' ip='192.168.122.10'/> + <host mac='00:16:3e:3e:a9:1a' name='b.example.com' ip='192.168.122.11'/> + </dhcp> + </ip> + <ip family='ipv4' address='192.168.123.1' netmask='255.255.255.0'> + </ip> + <ip family='ipv6' address='2001:db8:ac10:fe01::1' prefix='64'> + </ip> + <ip family='ipv6' address='2001:db8:ac10:fd01::1' prefix='64'> + </ip> + <ip family='ipv4' address='10.24.10.1'> + </ip> +</network> diff --git a/tests/networkxml2conftest.c b/tests/networkxml2conftest.c index 367e30b994..f3b4dafc1b 100644 --- a/tests/networkxml2conftest.c +++ b/tests/networkxml2conftest.c @@ -137,6 +137,7 @@ mymain(void) DO_TEST("nat-network-dns-forwarders", full); DO_TEST("nat-network-dns-forwarder-no-resolv", full); DO_TEST("nat-network-dns-local-domain", full); + DO_TEST("nat-network-mtu", dhcpv6); DO_TEST("dhcp6-network", dhcpv6); DO_TEST("dhcp6-nat-network", dhcpv6); DO_TEST("dhcp6host-routed-network", dhcpv6); diff --git a/tests/networkxml2xmlin/nat-network-mtu.xml b/tests/networkxml2xmlin/nat-network-mtu.xml new file mode 100644 index 0000000000..07d0d9f22d --- /dev/null +++ b/tests/networkxml2xmlin/nat-network-mtu.xml @@ -0,0 +1,22 @@ +<network> + <name>default</name> + <uuid>81ff0d90-c91e-6742-64da-4a736edb9a9b</uuid> + <bridge name="virbr0"/> + <mtu size='7000'/> + <forward mode="nat" dev="eth1"/> + <ip address="192.168.122.1" netmask="255.255.255.0"> + <dhcp> + <range start="192.168.122.2" end="192.168.122.254"/> + <host mac="00:16:3e:77:e2:ed" name="a.example.com" ip="192.168.122.10"/> + <host mac="00:16:3e:3e:a9:1a" name="b.example.com" ip="192.168.122.11"/> + </dhcp> + </ip> + <ip family="ipv4" address="192.168.123.1" netmask="255.255.255.0"> + </ip> + <ip family="ipv6" address="2001:db8:ac10:fe01::1" prefix="64"> + </ip> + <ip family="ipv6" address="2001:db8:ac10:fd01::1" prefix="64"> + </ip> + <ip family="ipv4" address="10.24.10.1"> + </ip> +</network> diff --git a/tests/networkxml2xmlout/nat-network-mtu.xml b/tests/networkxml2xmlout/nat-network-mtu.xml new file mode 100644 index 0000000000..715bc1b505 --- /dev/null +++ b/tests/networkxml2xmlout/nat-network-mtu.xml @@ -0,0 +1,24 @@ +<network> + <name>default</name> + <uuid>81ff0d90-c91e-6742-64da-4a736edb9a9b</uuid> + <forward dev='eth1' mode='nat'> + <interface dev='eth1'/> + </forward> + <bridge name='virbr0' stp='on' delay='0'/> + <mtu size='7000'/> + <ip address='192.168.122.1' netmask='255.255.255.0'> + <dhcp> + <range start='192.168.122.2' end='192.168.122.254'/> + <host mac='00:16:3e:77:e2:ed' name='a.example.com' ip='192.168.122.10'/> + <host mac='00:16:3e:3e:a9:1a' name='b.example.com' ip='192.168.122.11'/> + </dhcp> + </ip> + <ip family='ipv4' address='192.168.123.1' netmask='255.255.255.0'> + </ip> + <ip family='ipv6' address='2001:db8:ac10:fe01::1' prefix='64'> + </ip> + <ip family='ipv6' address='2001:db8:ac10:fd01::1' prefix='64'> + </ip> + <ip family='ipv4' address='10.24.10.1'> + </ip> +</network> diff --git a/tests/networkxml2xmltest.c b/tests/networkxml2xmltest.c index 4e4c7d20a6..b19a365ff4 100644 --- a/tests/networkxml2xmltest.c +++ b/tests/networkxml2xmltest.c @@ -141,6 +141,7 @@ mymain(void) DO_TEST("nat-network-dns-forwarder-no-resolv"); DO_TEST("nat-network-forward-nat-address"); DO_TEST("nat-network-forward-nat-no-address"); + DO_TEST("nat-network-mtu"); DO_TEST("8021Qbh-net"); DO_TEST("direct-net"); DO_TEST("host-bridge-net"); -- 2.17.2

2 1

[libvirt] [PATCH 0/3] storagepoolxml2argvtest: delete some lines
by Ján Tomko 31 Jan '19

31 Jan '19

Also fix the build on FreeBSD Ján Tomko (3): storagepoolxml2argvtest: pass the platform suffix as a string storagepoolxml2argvtest: introduce DO_TEST_PLATFORM storagepoolxml2argvtest: run mountopts test conditionally tests/storagepoolxml2argvtest.c | 76 +++++++++++++++-------------------------- 1 file changed, 28 insertions(+), 48 deletions(-) -- 2.16.4

3 5

[libvirt] [PATCH v3 0/4] Restructure firewall rules for virtual networks into private chains
by Daniel P. Berrangé 31 Jan '19

31 Jan '19

v1: https://www.redhat.com/archives/libvir-list/2018-November/msg00018.html v2: https://www.redhat.com/archives/libvir-list/2018-December/msg00198.html The virtual networks in NAT mode are supposed to only allow outbound network access for guests. Unfortunately due to ordering of the firewall rules libvirt creates, when you have multiple virtual networks, guests on the more recently created virtual networks can connect to guests on old virtual networks. This was reported way back in 2008 but we always thought the fix would be very complicated to deal with, so we've been putting it off forever. In parallel with this there's also been a long standing desire since 2009 to move our firewall rules out of the builtin chains, to libvirt private chains. This is to make it easier for admins to use hook scripts to setup rules in the builtin chains that take priority over rules libvirt creates. In implementing the changes to use private chains, I suddenly realized that fixing the network to network traffic blocking problem was trivial if I grouped the forwarding rules into three distinct sets. So this series finally fixes an annoying 10 year old bug, and implements a 9 year old RFE. It may take us a while, but we'll get to your bugs eventually ;-) Changed in v3: - Rebase to git master Changed in v2: - Detect whether chains already exist before creating them - Only try to delete legacy rules from builtin chain during startup Daniel P. Berrangé (4): network: add platform driver callbacks around firewall reload util: pass layer into firewall query callback util: create private chains for virtual network firewall rules util: move virtual network firwall rules into private chains src/libvirt_private.syms | 2 + src/network/bridge_driver.c | 13 +- src/network/bridge_driver_linux.c | 32 +++ src/network/bridge_driver_nop.c | 11 + src/network/bridge_driver_platform.h | 3 + src/nwfilter/nwfilter_ebiptables_driver.c | 17 +- src/util/virfirewall.c | 2 +- src/util/virfirewall.h | 1 + src/util/viriptables.c | 254 +++++++++++++++--- src/util/viriptables.h | 4 + .../nat-default-linux.args | 32 +-- .../nat-ipv6-linux.args | 48 ++-- .../nat-many-ips-linux.args | 60 ++--- .../nat-no-dhcp-linux.args | 46 ++-- .../nat-tftp-linux.args | 34 +-- .../route-default-linux.args | 22 +- tests/virfirewalltest.c | 3 +- 17 files changed, 405 insertions(+), 179 deletions(-) -- 2.20.1

3 7

[libvirt] [PATCH 0/3] SEV: Make /dev/sev available only to domains that need it
by Erik Skultety 31 Jan '19

31 Jan '19

Erik Skultety (3): qemu: conf: Remove /dev/sev from the default cgroup device acl list qemu: cgroup: Expose /dev/sev/ only to domains that require SEV qemu: domain: Add /dev/sev into the domain mount namespace selectively src/qemu/qemu.conf | 2 +- src/qemu/qemu_cgroup.c | 21 ++++++++++++++++++++- src/qemu/qemu_domain.c | 23 +++++++++++++++++++++++ src/qemu/test_libvirtd_qemu.aug.in | 1 - 4 files changed, 44 insertions(+), 3 deletions(-) -- 2.20.1

2 8

[libvirt] [PATCH] docs: Drop /dev/net/tun from the list of shared devices
by Erik Skultety 31 Jan '19

31 Jan '19

This was a left-over that should have been dropped along the change in qemu.conf. Signed-off-by: Erik Skultety <eskultet(a)redhat.com> --- Pushed as trivial. docs/drvqemu.html.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docs/drvqemu.html.in b/docs/drvqemu.html.in index 0d14027646..bf60a9144b 100644 --- a/docs/drvqemu.html.in +++ b/docs/drvqemu.html.in @@ -396,8 +396,7 @@ chmod o+x /path/to/directory /dev/null, /dev/full, /dev/zero, /dev/random, /dev/urandom, /dev/ptmx, /dev/kvm, /dev/kqemu, -/dev/rtc, /dev/hpet, /dev/net/tun, -/dev/sev +/dev/rtc, /dev/hpet, /dev/sev </pre> <p> -- 2.20.1

1 0

[libvirt] [PATCH 00/27] network: refactor to decouple virt drivers from network driver
by Daniel P. Berrangé 31 Jan '19

31 Jan '19

Currently the network driver registers a set of callbacks with the virt driver in order to handle allocating/releasing network ports associated with guest NICs. This series introduces a virNetworkPortPtr object and associated XML that describes a network port. The virt drivers now call public APIs associated with this new object to create/delete ports for guest NICs. There are some parts that are not yet addressed by this series - The live updating of bandwidth limits on network ports - The old code would re-connect VIFs to bridges, and/or change bridges during startup. This code is deleted right now as it doesn't belong in the network driver. It needs to move to the virt drivers in some (to be determined) manner. Daniel P. Berrangé (27): conf: make virPCIDeviceAddressFormat void network: restrict usage of port management APIs network: pass a virNetworkPtr to port management APIs conf: simplify link from hostdev back to network device network: add missing bandwidth limits for bridge forward type network: use 'bridge' as actual type instead of 'network' virt drivers: don't handle type=network after resolving actual network type network: unconditionally merge port profiles conf: introduce virNetworkPortDefPtr struct and XML support network: stop passing virDomainNetDefPtr into bandwidth functions network: make networkLogAllocation independent of domain conf util: add API for copying virtual port profile data conf: add APIs to convert virDomainNetDef to virNetworkPortDef network: convert networkAllocateActualDevice to virNetworkPortDef network: convert networkNotifyActualDevice to virNetworkPortDef network: convert networkReleaseActualDevice to virNetworkPortDef network: convert hook script to take a network port XML network: introduce networkAllocatePort network: introduce networkNotifyPort network: introduce networkReleasePort network: add public APIs for network port object access: add permissions for network port objects remote: add support for new network port APIs virsh: add support for network port APIs conf: support recording ports against virNetworkObjPtr network: add implementation of network port APIs conf: switch over to use network port APIs for virt drivers include/libvirt/libvirt-network.h | 49 + include/libvirt/virterror.h | 3 + src/access/genpolkit.pl | 2 +- src/access/viraccessdriver.h | 6 + src/access/viraccessdrivernop.c | 11 + src/access/viraccessdriverpolkit.c | 26 + src/access/viraccessdriverstack.c | 25 + src/access/viraccessmanager.c | 16 + src/access/viraccessmanager.h | 6 + src/access/viraccessperm.c | 8 +- src/access/viraccessperm.h | 38 + src/conf/Makefile.inc.am | 2 + src/conf/device_conf.c | 3 +- src/conf/device_conf.h | 6 +- src/conf/domain_conf.c | 413 ++++++- src/conf/domain_conf.h | 46 +- src/conf/network_conf.c | 7 +- src/conf/storage_adapter_conf.c | 4 +- src/conf/virnetworkobj.c | 303 +++++ src/conf/virnetworkobj.h | 30 + src/conf/virnetworkportdef.c | 497 ++++++++ src/conf/virnetworkportdef.h | 112 ++ src/datatypes.c | 60 + src/datatypes.h | 41 + src/driver-network.h | 27 + src/libvirt-network.c | 351 ++++++ src/libvirt_private.syms | 21 + src/libvirt_public.syms | 14 + src/libxl/libxl_conf.c | 21 +- src/libxl/libxl_domain.c | 28 +- src/libxl/libxl_driver.c | 27 +- src/lxc/lxc_driver.c | 37 +- src/lxc/lxc_process.c | 21 +- src/network/bridge_driver.c | 1069 +++++++++-------- src/qemu/qemu_command.c | 11 +- src/qemu/qemu_domain_address.c | 4 +- src/qemu/qemu_driver.c | 2 +- src/qemu/qemu_hotplug.c | 84 +- src/qemu/qemu_hotplug.h | 2 +- src/qemu/qemu_interface.c | 12 +- src/qemu/qemu_process.c | 32 +- src/remote/remote_daemon_dispatch.c | 25 + src/remote/remote_driver.c | 28 + src/remote/remote_protocol.x | 89 +- src/remote_protocol-structs | 47 + src/rpc/gendispatch.pl | 18 +- src/util/virerror.c | 9 + src/util/virhook.c | 4 +- src/util/virhook.h | 4 +- src/util/virhostdev.c | 17 +- src/util/virnetdevvportprofile.c | 16 + src/util/virnetdevvportprofile.h | 2 + tests/Makefile.am | 7 + .../plug-bridge-mactbl.xml | 9 + .../virnetworkportxml2xmldata/plug-bridge.xml | 9 + .../virnetworkportxml2xmldata/plug-direct.xml | 12 + .../plug-hostdev-pci.xml | 12 + tests/virnetworkportxml2xmldata/plug-none.xml | 8 + tests/virnetworkportxml2xmltest.c | 104 ++ tools/virsh-completer.c | 51 + tools/virsh-completer.h | 4 + tools/virsh-network.c | 399 +++++- tools/virsh-network.h | 5 + 63 files changed, 3681 insertions(+), 675 deletions(-) create mode 100644 src/conf/virnetworkportdef.c create mode 100644 src/conf/virnetworkportdef.h create mode 100644 tests/virnetworkportxml2xmldata/plug-bridge-mactbl.xml create mode 100644 tests/virnetworkportxml2xmldata/plug-bridge.xml create mode 100644 tests/virnetworkportxml2xmldata/plug-direct.xml create mode 100644 tests/virnetworkportxml2xmldata/plug-hostdev-pci.xml create mode 100644 tests/virnetworkportxml2xmldata/plug-none.xml create mode 100644 tests/virnetworkportxml2xmltest.c -- 2.19.2

3 41

[libvirt] [PATCH 00/32] qemu: add support for 'device_id' of SCSI disks (blockdev-add saga)
by Peter Krempa 31 Jan '19

31 Jan '19

The quest for -blockdev will sidetrack through disk formatter wasteland through hordes of (un)dead(s) [code] while heroicaly slaying the guest ABI regression dragon. Note that the corresponding qemu feature was not pushed yet. Peter Krempa (32): tests: qemucaps: Make fake 'microcodeVersion' depend on filename instead of length qemu: capabilities: Probe caps for 'scsi-hd' instead of 'scsi-disk' qemu: capabilities: Probe caps for 'ide-hd' instead of 'ide-drive' tests: qemuxml: Add a common test file for the 'virtio-scsi' controller tests: qemu: Remove 'disk-scsi-virtio-scsi' test tests: qemuxml: Merge 'num-queues' variant of 'virtio-scsi' test into the common file tests: qemuxml: Merge 'cmd_per_lun' variant of 'virtio-scsi' test into the common file tests: qemuxml: Merge 'max_sectors' variant of 'virtio-scsi' test into the common file tests: qemuxml: Merge 'ioeventfd' variant of 'virtio-scsi' test into the common file tests: qemuxml2argv: Use real caps when auto-generating SCSI controller type tests: qemuxml2argv: Remove testing of post startup change to 'cachemode' for shared disks tests: qemuxml2argv: Remove the 'after startup XML' testing machinery tests: qemuxml2argv: Move cases from 'disk-shared-locking' into 'disk-shared' tests: qemu: Rename 'disk-scsi-device' to 'disk-scsi' tests: qemuxml2argv: Modernize 'disk-scsi' test tests: qemu: Merge 'disk-scsi-megasas' test into 'disk-scsi' tests: qemu: Merge 'disk-scsi-mptsas1068' test into 'disk-scsi' tests: qemu: Merge 'disk-scsi-mptsas1068' test into 'disk-scsi' tests: qemuxml2argv: Use 1.5.3 version for very old state in 'disk-cache' tests: qemuxml2argv: Modernize virtio-scsi iothread tests tests: qemuxml2argv: Remove 'disk-virtio-scsi-ccw' test qemu: caps: Always assume presence of 'scsi-hd' and 'scsi-cd' device qemu: caps: Always assume presence of 'ide-hd' and 'ide-cd' devices qemu: command: Use correct type for switch in qemuBuildDiskDeviceStr tests: qemuxml2argv: Add CDROM disks for all untested buses qemu: Forbid cdroms on virtio bus qemu: command: Drop formatting of 'media=cdrom' from -drive tests: qemuxml2argv: Add a 'serial' value for a SCSI disk DON'T PUSH: test: qemucaps: Update caps with scsi 'device_id' patches qemu: caps: Introduce capability for 'device_id' property of 'scsi-disk' qemu: Use the 'device_id' property of SCSI disks to avoid regressing qemu: caps: Add lockout for -blockdev if QEMU_CAPS_SCSI_DISK_DEVICE_ID is not present src/qemu/qemu_capabilities.c | 13 +- src/qemu/qemu_capabilities.h | 5 +- src/qemu/qemu_command.c | 78 +- src/qemu/qemu_domain.c | 8 + tests/Makefile.am | 1 - .../caps_1.5.3.x86_64.replies | 4 +- .../caps_1.5.3.x86_64.xml | 4 +- .../caps_1.6.0.x86_64.replies | 4 +- .../caps_1.6.0.x86_64.xml | 4 +- .../caps_1.7.0.x86_64.replies | 4 +- .../caps_1.7.0.x86_64.xml | 4 +- .../caps_2.1.1.x86_64.replies | 4 +- .../caps_2.1.1.x86_64.xml | 4 +- .../caps_2.10.0.aarch64.replies | 4 +- .../caps_2.10.0.aarch64.xml | 4 +- .../caps_2.10.0.ppc64.replies | 4 +- .../caps_2.10.0.ppc64.xml | 4 +- .../caps_2.10.0.s390x.replies | 4 +- .../caps_2.10.0.s390x.xml | 3 +- .../caps_2.10.0.x86_64.replies | 4 +- .../caps_2.10.0.x86_64.xml | 4 +- .../caps_2.11.0.s390x.replies | 4 +- .../caps_2.11.0.s390x.xml | 3 +- .../caps_2.11.0.x86_64.replies | 4 +- .../caps_2.11.0.x86_64.xml | 4 +- .../caps_2.12.0.aarch64.replies | 4 +- .../caps_2.12.0.aarch64.xml | 4 +- .../caps_2.12.0.ppc64.replies | 4 +- .../caps_2.12.0.ppc64.xml | 4 +- .../caps_2.12.0.s390x.replies | 4 +- .../caps_2.12.0.s390x.xml | 3 +- .../caps_2.12.0.x86_64.replies | 4 +- .../caps_2.12.0.x86_64.xml | 4 +- .../caps_2.4.0.x86_64.replies | 4 +- .../caps_2.4.0.x86_64.xml | 4 +- .../caps_2.5.0.x86_64.replies | 4 +- .../caps_2.5.0.x86_64.xml | 4 +- .../caps_2.6.0.aarch64.replies | 4 +- .../caps_2.6.0.aarch64.xml | 4 +- .../caps_2.6.0.ppc64.replies | 4 +- .../qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 4 +- .../caps_2.6.0.x86_64.replies | 4 +- .../caps_2.6.0.x86_64.xml | 4 +- .../caps_2.7.0.s390x.replies | 4 +- .../qemucapabilitiesdata/caps_2.7.0.s390x.xml | 3 +- .../caps_2.7.0.x86_64.replies | 4 +- .../caps_2.7.0.x86_64.xml | 4 +- .../caps_2.8.0.s390x.replies | 4 +- .../qemucapabilitiesdata/caps_2.8.0.s390x.xml | 3 +- .../caps_2.8.0.x86_64.replies | 4 +- .../caps_2.8.0.x86_64.xml | 4 +- .../caps_2.9.0.ppc64.replies | 4 +- .../qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 4 +- .../caps_2.9.0.s390x.replies | 4 +- .../qemucapabilitiesdata/caps_2.9.0.s390x.xml | 3 +- .../caps_2.9.0.x86_64.replies | 4 +- .../caps_2.9.0.x86_64.xml | 4 +- .../caps_3.0.0.ppc64.replies | 4 +- .../qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 4 +- .../caps_3.0.0.riscv32.replies | 4 +- .../caps_3.0.0.riscv32.xml | 1 - .../caps_3.0.0.riscv64.replies | 4 +- .../caps_3.0.0.riscv64.xml | 1 - .../caps_3.0.0.s390x.replies | 4 +- .../qemucapabilitiesdata/caps_3.0.0.s390x.xml | 3 +- .../caps_3.0.0.x86_64.replies | 4 +- .../caps_3.0.0.x86_64.xml | 4 +- .../caps_3.1.0.ppc64.replies | 4 +- .../qemucapabilitiesdata/caps_3.1.0.ppc64.xml | 4 +- .../caps_3.1.0.x86_64.replies | 4 +- .../caps_3.1.0.x86_64.xml | 4 +- .../caps_4.0.0.x86_64.replies | 2735 ++++++++--------- .../caps_4.0.0.x86_64.xml | 22 +- tests/qemucapabilitiestest.c | 17 +- .../aarch64-virtio-pci-manual-addresses.args | 4 +- tests/qemuxml2argvdata/autoindex.args | 2 +- .../qemuxml2argvdata/balloon-device-auto.args | 3 +- .../balloon-device-deflate-off.args | 3 +- .../balloon-device-deflate.args | 3 +- .../balloon-device-period.args | 3 +- tests/qemuxml2argvdata/balloon-device.args | 3 +- tests/qemuxml2argvdata/bios-nvram-secure.args | 4 +- tests/qemuxml2argvdata/bios-nvram.args | 3 +- tests/qemuxml2argvdata/bios.args | 3 +- .../blkdeviotune-group-num.args | 5 +- .../blkdeviotune-max-length.args | 5 +- tests/qemuxml2argvdata/blkdeviotune-max.args | 5 +- tests/qemuxml2argvdata/blkiotune-device.args | 3 +- tests/qemuxml2argvdata/blkiotune.args | 3 +- tests/qemuxml2argvdata/boot-cdrom.args | 6 +- tests/qemuxml2argvdata/boot-complex.args | 10 +- tests/qemuxml2argvdata/boot-floppy.args | 2 +- .../boot-menu-disable-drive.args | 6 +- tests/qemuxml2argvdata/boot-menu-disable.args | 6 +- .../boot-menu-enable-with-timeout.args | 6 +- tests/qemuxml2argvdata/boot-menu-enable.args | 6 +- tests/qemuxml2argvdata/boot-multi.args | 6 +- tests/qemuxml2argvdata/boot-network.args | 2 +- tests/qemuxml2argvdata/boot-order.args | 8 +- tests/qemuxml2argvdata/boot-strict.args | 10 +- tests/qemuxml2argvdata/channel-guestfwd.args | 3 +- tests/qemuxml2argvdata/channel-spicevmc.args | 3 +- .../qemuxml2argvdata/channel-virtio-auto.args | 3 +- .../channel-virtio-autoadd.args | 3 +- .../channel-virtio-autoassign.args | 3 +- .../channel-virtio-default.args | 3 +- .../channel-virtio-state.args | 3 +- .../qemuxml2argvdata/channel-virtio-unix.args | 3 +- tests/qemuxml2argvdata/channel-virtio.args | 3 +- tests/qemuxml2argvdata/clock-catchup.args | 3 +- tests/qemuxml2argvdata/clock-france.args | 3 +- tests/qemuxml2argvdata/clock-hpet-off.args | 3 +- .../clock-localtime-basis-localtime.args | 3 +- tests/qemuxml2argvdata/clock-localtime.args | 3 +- tests/qemuxml2argvdata/clock-utc.args | 3 +- tests/qemuxml2argvdata/clock-variable.args | 3 +- .../qemuxml2argvdata/console-compat-auto.args | 3 +- .../console-compat-chardev.args | 3 +- tests/qemuxml2argvdata/console-compat.args | 3 +- .../qemuxml2argvdata/console-virtio-many.args | 3 +- tests/qemuxml2argvdata/console-virtio.args | 3 +- tests/qemuxml2argvdata/controller-order.args | 4 +- .../controller-virtio-scsi.x86_64-latest.args | 50 + .../controller-virtio-scsi.xml | 61 + .../cpu-host-passthrough-features.args | 3 +- .../qemuxml2argvdata/cputune-zero-shares.args | 3 +- tests/qemuxml2argvdata/cputune.args | 3 +- tests/qemuxml2argvdata/debug-threads.args | 3 +- tests/qemuxml2argvdata/disk-aio.args | 7 +- tests/qemuxml2argvdata/disk-boot-cdrom.args | 7 +- tests/qemuxml2argvdata/disk-boot-disk.args | 7 +- ...ache.args => disk-cache.x86_64-1.5.3.args} | 16 +- .../disk-cache.x86_64-latest.args | 4 +- .../disk-cdrom-bus-other.x86_64-latest.args | 37 + .../qemuxml2argvdata/disk-cdrom-bus-other.xml | 47 + .../qemuxml2argvdata/disk-cdrom-network.args | 17 +- tests/qemuxml2argvdata/disk-cdrom-tray.args | 9 +- tests/qemuxml2argvdata/disk-cdrom.args | 16 +- tests/qemuxml2argvdata/disk-copy_on_read.args | 5 +- .../qemuxml2argvdata/disk-detect-zeroes.args | 5 +- tests/qemuxml2argvdata/disk-discard.args | 5 +- tests/qemuxml2argvdata/disk-error-policy.args | 7 +- tests/qemuxml2argvdata/disk-floppy-tray.args | 3 +- tests/qemuxml2argvdata/disk-floppy.args | 3 +- tests/qemuxml2argvdata/disk-fmt-qcow.args | 7 +- tests/qemuxml2argvdata/disk-geometry.args | 4 +- tests/qemuxml2argvdata/disk-ioeventfd.args | 5 +- tests/qemuxml2argvdata/disk-iscsi.args | 3 +- .../disk-network-sheepdog.args | 3 +- tests/qemuxml2argvdata/disk-no-boot.args | 8 +- tests/qemuxml2argvdata/disk-order.args | 7 +- .../qemuxml2argvdata/disk-readonly-disk.args | 8 +- tests/qemuxml2argvdata/disk-sata-device.args | 2 +- ...> disk-scsi-device-auto.x86_64-1.5.3.args} | 11 +- .../disk-scsi-device-auto.x86_64-latest.args | 36 + tests/qemuxml2argvdata/disk-scsi-device.args | 30 - .../disk-scsi-disk-vpd-build-error.xml | 2 +- tests/qemuxml2argvdata/disk-scsi-megasas.args | 31 - tests/qemuxml2argvdata/disk-scsi-megasas.xml | 35 - .../disk-scsi-mptsas1068.args | 31 - .../qemuxml2argvdata/disk-scsi-mptsas1068.xml | 36 - .../disk-scsi-virtio-scsi.args | 31 - .../disk-scsi-virtio-scsi.xml | 35 - tests/qemuxml2argvdata/disk-scsi-vscsi.args | 31 - tests/qemuxml2argvdata/disk-scsi-vscsi.xml | 35 - .../disk-scsi.x86_64-latest.args | 49 + .../{disk-scsi-device.xml => disk-scsi.xml} | 20 + tests/qemuxml2argvdata/disk-serial.args | 6 +- .../qemuxml2argvdata/disk-shared-locking.args | 34 - .../qemuxml2argvdata/disk-shared-locking.xml | 42 - tests/qemuxml2argvdata/disk-shared.args | 31 - .../disk-shared.x86_64-2.12.0.args | 9 +- .../disk-shared.x86_64-latest.args | 10 +- tests/qemuxml2argvdata/disk-shared.xml | 14 + tests/qemuxml2argvdata/disk-snapshot.args | 9 +- .../disk-source-pool-mode.args | 15 +- tests/qemuxml2argvdata/disk-source-pool.args | 12 +- .../disk-usb-device-removable.args | 3 +- tests/qemuxml2argvdata/disk-usb-device.args | 3 +- .../disk-virtio-scsi-ccw.args | 29 - .../qemuxml2argvdata/disk-virtio-scsi-ccw.xml | 31 - .../disk-virtio-scsi-cmd_per_lun.args | 28 - .../disk-virtio-scsi-cmd_per_lun.xml | 31 - .../disk-virtio-scsi-ioeventfd.args | 28 - .../disk-virtio-scsi-ioeventfd.xml | 31 - .../disk-virtio-scsi-max_sectors.args | 28 - .../disk-virtio-scsi-max_sectors.xml | 31 - .../disk-virtio-scsi-num_queues.args | 28 - .../disk-virtio-scsi-num_queues.xml | 31 - tests/qemuxml2argvdata/disk-virtio.args | 7 +- tests/qemuxml2argvdata/event_idx.args | 5 +- tests/qemuxml2argvdata/fips-enabled.args | 3 +- tests/qemuxml2argvdata/fs9p.args | 3 +- .../graphics-egl-headless.args | 3 +- .../graphics-sdl-fullscreen.args | 3 +- tests/qemuxml2argvdata/graphics-sdl.args | 3 +- .../graphics-spice-agent-file-xfer.args | 3 +- .../graphics-spice-agentmouse.args | 3 +- .../graphics-spice-compression.args | 3 +- .../graphics-spice-egl-headless.args | 3 +- .../graphics-spice-qxl-vga.args | 3 +- .../qemuxml2argvdata/graphics-spice-sasl.args | 3 +- .../graphics-spice-timeout.args | 5 +- tests/qemuxml2argvdata/graphics-spice.args | 3 +- .../graphics-vnc-auto-socket-cfg.args | 3 +- .../graphics-vnc-egl-headless.args | 3 +- .../graphics-vnc-no-listen-attr.args | 3 +- .../qemuxml2argvdata/graphics-vnc-policy.args | 3 +- .../graphics-vnc-remove-generated-socket.args | 3 +- tests/qemuxml2argvdata/graphics-vnc-sasl.args | 3 +- tests/qemuxml2argvdata/graphics-vnc.args | 3 +- .../hostdev-pci-address-device.args | 3 +- .../qemuxml2argvdata/hostdev-pci-address.args | 3 +- .../hostdev-scsi-lsi-iscsi-auth.args | 3 +- .../hostdev-scsi-lsi-iscsi.args | 3 +- tests/qemuxml2argvdata/hostdev-scsi-lsi.args | 3 +- .../hostdev-scsi-readonly.args | 3 +- .../hostdev-scsi-vhost-scsi-pci.args | 3 +- .../hostdev-scsi-virtio-iscsi-auth.args | 3 +- .../hostdev-scsi-virtio-iscsi.args | 3 +- .../hostdev-scsi-virtio-scsi.args | 3 +- .../hostdev-usb-address-device-boot.args | 2 +- .../hostdev-usb-address-device.args | 3 +- .../qemuxml2argvdata/hostdev-usb-address.args | 3 +- .../hostdev-vfio-multidomain.args | 3 +- tests/qemuxml2argvdata/hostdev-vfio.args | 3 +- .../qemuxml2argvdata/hugepages-memaccess.args | 3 +- .../hugepages-memaccess2.args | 3 +- tests/qemuxml2argvdata/hugepages-shared.args | 3 +- .../qemuxml2argvdata/input-usbmouse-addr.args | 3 +- tests/qemuxml2argvdata/input-usbmouse.args | 3 +- tests/qemuxml2argvdata/input-usbtablet.args | 3 +- tests/qemuxml2argvdata/iothreads-disk.args | 3 +- .../iothreads-ids-partial.args | 3 +- tests/qemuxml2argvdata/iothreads-ids.args | 3 +- ...threads-virtio-scsi-ccw.s390x-latest.args} | 20 +- ...hreads-virtio-scsi-pci.x86_64-latest.args} | 23 +- tests/qemuxml2argvdata/iothreads.args | 3 +- tests/qemuxml2argvdata/kvm-pit-delay.args | 3 +- tests/qemuxml2argvdata/kvm-pit-discard.args | 3 +- tests/qemuxml2argvdata/machine-aliases1.args | 3 +- tests/qemuxml2argvdata/machine-aliases2.args | 3 +- tests/qemuxml2argvdata/machine-core-off.args | 3 +- tests/qemuxml2argvdata/machine-core-on.args | 3 +- tests/qemuxml2argvdata/machine-smm-opt.args | 4 +- .../qemuxml2argvdata/machine-vmport-opt.args | 3 +- tests/qemuxml2argvdata/master-key.args | 3 +- .../memory-hotplug-dimm-addr.args | 3 +- .../qemuxml2argvdata/memory-hotplug-dimm.args | 3 +- tests/qemuxml2argvdata/memory-hotplug.args | 3 +- tests/qemuxml2argvdata/memtune-unlimited.args | 3 +- tests/qemuxml2argvdata/memtune.args | 3 +- tests/qemuxml2argvdata/migrate.args | 3 +- .../minimal-msg-timestamp.args | 3 +- tests/qemuxml2argvdata/minimal-sandbox.args | 3 +- tests/qemuxml2argvdata/minimal.args | 3 +- tests/qemuxml2argvdata/misc-acpi.args | 3 +- tests/qemuxml2argvdata/misc-disable-s3.args | 3 +- .../misc-disable-suspends.args | 3 +- tests/qemuxml2argvdata/misc-enable-s4.args | 3 +- tests/qemuxml2argvdata/misc-no-reboot.args | 3 +- tests/qemuxml2argvdata/misc-uuid.args | 3 +- tests/qemuxml2argvdata/monitor-json.args | 3 +- .../multifunction-pci-device.args | 2 +- tests/qemuxml2argvdata/name-escape.args | 3 +- tests/qemuxml2argvdata/net-client.args | 3 +- tests/qemuxml2argvdata/net-eth-hostip.args | 3 +- tests/qemuxml2argvdata/net-eth-ifname.args | 3 +- tests/qemuxml2argvdata/net-eth-names.args | 3 +- tests/qemuxml2argvdata/net-eth.args | 3 +- .../net-hostdev-bootorder.args | 3 +- .../net-hostdev-multidomain.args | 3 +- .../net-hostdev-vfio-multidomain.args | 3 +- tests/qemuxml2argvdata/net-hostdev-vfio.args | 3 +- tests/qemuxml2argvdata/net-hostdev.args | 3 +- tests/qemuxml2argvdata/net-mcast.args | 3 +- tests/qemuxml2argvdata/net-server.args | 3 +- tests/qemuxml2argvdata/net-udp.args | 3 +- tests/qemuxml2argvdata/net-user-addr.args | 3 +- tests/qemuxml2argvdata/net-user.args | 3 +- .../net-vhostuser-multiq.args | 3 +- tests/qemuxml2argvdata/net-virtio-device.args | 3 +- .../net-virtio-disable-offloads.args | 3 +- tests/qemuxml2argvdata/net-virtio-netdev.args | 3 +- .../net-virtio-rxtxqueuesize.args | 3 +- tests/qemuxml2argvdata/net-virtio.args | 3 +- tests/qemuxml2argvdata/nosharepages.args | 3 +- .../numad-auto-memory-vcpu-cpuset.args | 3 +- ...o-memory-vcpu-no-cpuset-and-placement.args | 3 +- .../numad-auto-vcpu-static-numatune.args | 3 +- .../numad-static-memory-auto-vcpu.args | 3 +- tests/qemuxml2argvdata/numad.args | 3 +- .../numatune-auto-nodeset-invalid.args | 3 +- tests/qemuxml2argvdata/numatune-memory.args | 3 +- tests/qemuxml2argvdata/panic-no-address.args | 3 +- tests/qemuxml2argvdata/panic.args | 3 +- .../parallel-parport-chardev.args | 3 +- .../parallel-tcp-chardev.args | 3 +- tests/qemuxml2argvdata/pci-autoadd-addr.args | 4 +- tests/qemuxml2argvdata/pci-autoadd-idx.args | 4 +- tests/qemuxml2argvdata/pci-autofill-addr.args | 4 +- tests/qemuxml2argvdata/pci-autofill-addr.xml | 2 +- tests/qemuxml2argvdata/pci-bridge.args | 4 +- tests/qemuxml2argvdata/pci-many.args | 4 +- tests/qemuxml2argvdata/pci-rom.args | 3 +- .../pci-serial-dev-chardev.args | 3 +- tests/qemuxml2argvdata/pcie-expander-bus.args | 2 +- tests/qemuxml2argvdata/pcie-root-port.args | 2 +- .../pcie-switch-downstream-port.args | 2 +- .../pcie-switch-upstream-port.args | 2 +- tests/qemuxml2argvdata/pcihole64-q35.args | 2 +- .../pseries-vio-user-assigned.args | 4 +- tests/qemuxml2argvdata/pseries-vio.args | 4 +- tests/qemuxml2argvdata/q35-usb2-multi.args | 2 +- tests/qemuxml2argvdata/q35-usb2-reorder.args | 2 +- tests/qemuxml2argvdata/q35-usb2.args | 2 +- tests/qemuxml2argvdata/q35.args | 2 +- tests/qemuxml2argvdata/qemu-ns-alt.args | 3 +- .../qemu-ns-commandline-ns0.args | 3 +- .../qemu-ns-commandline-ns1.args | 3 +- .../qemuxml2argvdata/qemu-ns-commandline.args | 3 +- .../qemu-ns-domain-commandline-ns0.args | 3 +- .../qemu-ns-domain-commandline.args | 3 +- .../qemuxml2argvdata/qemu-ns-domain-ns0.args | 3 +- tests/qemuxml2argvdata/qemu-ns-no-env.args | 3 +- tests/qemuxml2argvdata/qemu-ns.args | 3 +- tests/qemuxml2argvdata/restore-v2-fd.args | 3 +- tests/qemuxml2argvdata/restore-v2.args | 3 +- tests/qemuxml2argvdata/seclabel-dac-none.args | 3 +- .../seclabel-dynamic-baselabel.args | 3 +- .../seclabel-dynamic-labelskip.args | 3 +- .../seclabel-dynamic-override.args | 5 +- .../seclabel-dynamic-relabel.args | 3 +- tests/qemuxml2argvdata/seclabel-dynamic.args | 3 +- tests/qemuxml2argvdata/seclabel-none.args | 3 +- .../seclabel-static-labelskip.args | 3 +- .../seclabel-static-relabel.args | 3 +- tests/qemuxml2argvdata/seclabel-static.args | 3 +- .../serial-dev-chardev-iobase.args | 3 +- .../qemuxml2argvdata/serial-dev-chardev.args | 3 +- .../qemuxml2argvdata/serial-file-chardev.args | 3 +- tests/qemuxml2argvdata/serial-file-log.args | 3 +- .../qemuxml2argvdata/serial-many-chardev.args | 3 +- .../qemuxml2argvdata/serial-pty-chardev.args | 3 +- .../serial-spiceport-nospice.args | 3 +- tests/qemuxml2argvdata/serial-spiceport.args | 3 +- .../qemuxml2argvdata/serial-tcp-chardev.args | 3 +- .../serial-tcp-telnet-chardev.args | 3 +- .../serial-tcp-tlsx509-chardev-notls.args | 3 +- .../serial-tcp-tlsx509-chardev-verify.args | 3 +- .../serial-tcp-tlsx509-chardev.args | 3 +- .../serial-tcp-tlsx509-secret-chardev.args | 3 +- .../qemuxml2argvdata/serial-udp-chardev.args | 3 +- tests/qemuxml2argvdata/serial-vc-chardev.args | 3 +- tests/qemuxml2argvdata/smbios.args | 3 +- tests/qemuxml2argvdata/smp.args | 3 +- tests/qemuxml2argvdata/sound-device.args | 3 +- tests/qemuxml2argvdata/sound.args | 3 +- tests/qemuxml2argvdata/user-aliases.args | 4 +- .../video-device-pciaddr-default.args | 3 +- tests/qemuxml2argvdata/video-none-device.args | 3 +- .../video-qxl-device-vgamem.args | 3 +- tests/qemuxml2argvdata/video-qxl-device.args | 3 +- tests/qemuxml2argvdata/video-qxl-heads.args | 3 +- .../qemuxml2argvdata/video-qxl-nodevice.args | 3 +- tests/qemuxml2argvdata/video-qxl-noheads.args | 3 +- .../video-qxl-sec-device-vgamem.args | 3 +- .../video-qxl-sec-device.args | 3 +- .../video-vga-device-vgamem.args | 3 +- tests/qemuxml2argvdata/video-vga-device.args | 3 +- .../qemuxml2argvdata/video-vga-nodevice.args | 3 +- .../qemuxml2argvdata/video-vga-qxl-heads.args | 3 +- .../video-virtio-gpu-device.args | 3 +- .../video-virtio-gpu-sdl-gl.args | 3 +- .../video-virtio-gpu-spice-gl.args | 3 +- .../video-virtio-gpu-virgl.args | 3 +- tests/qemuxml2argvdata/video-virtio-vga.args | 3 +- tests/qemuxml2argvdata/vmcoreinfo.args | 3 +- tests/qemuxml2argvdata/watchdog-device.args | 3 +- tests/qemuxml2argvdata/watchdog-dump.args | 3 +- .../qemuxml2argvdata/watchdog-injectnmi.args | 3 +- tests/qemuxml2argvdata/watchdog.args | 3 +- tests/qemuxml2argvtest.c | 115 +- .../qemuxml2startupxmloutdata/disk-shared.xml | 56 - .../controller-virtio-scsi.xml | 76 + ...rtio-scsi.xml => disk-cdrom-bus-other.xml} | 44 +- .../qemuxml2xmloutdata/disk-scsi-megasas.xml | 45 - .../disk-scsi-mptsas1068.xml | 46 - tests/qemuxml2xmloutdata/disk-scsi-vscsi.xml | 45 - .../{disk-scsi-device.xml => disk-scsi.xml} | 31 +- .../disk-virtio-scsi-cmd_per_lun.xml | 37 - .../disk-virtio-scsi-ioeventfd.xml | 37 - .../disk-virtio-scsi-max_sectors.xml | 37 - .../disk-virtio-scsi-num_queues.xml | 37 - .../qemuxml2xmloutdata/pci-autofill-addr.xml | 2 +- tests/qemuxml2xmltest.c | 28 +- 396 files changed, 2424 insertions(+), 3414 deletions(-) create mode 100644 tests/qemuxml2argvdata/controller-virtio-scsi.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/controller-virtio-scsi.xml rename tests/qemuxml2argvdata/{disk-cache.args => disk-cache.x86_64-1.5.3.args} (72%) create mode 100644 tests/qemuxml2argvdata/disk-cdrom-bus-other.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/disk-cdrom-bus-other.xml rename tests/qemuxml2argvdata/{disk-scsi-device-auto.args => disk-scsi-device-auto.x86_64-1.5.3.args} (69%) create mode 100644 tests/qemuxml2argvdata/disk-scsi-device-auto.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/disk-scsi-device.args delete mode 100644 tests/qemuxml2argvdata/disk-scsi-megasas.args delete mode 100644 tests/qemuxml2argvdata/disk-scsi-megasas.xml delete mode 100644 tests/qemuxml2argvdata/disk-scsi-mptsas1068.args delete mode 100644 tests/qemuxml2argvdata/disk-scsi-mptsas1068.xml delete mode 100644 tests/qemuxml2argvdata/disk-scsi-virtio-scsi.args delete mode 100644 tests/qemuxml2argvdata/disk-scsi-virtio-scsi.xml delete mode 100644 tests/qemuxml2argvdata/disk-scsi-vscsi.args delete mode 100644 tests/qemuxml2argvdata/disk-scsi-vscsi.xml create mode 100644 tests/qemuxml2argvdata/disk-scsi.x86_64-latest.args rename tests/qemuxml2argvdata/{disk-scsi-device.xml => disk-scsi.xml} (58%) delete mode 100644 tests/qemuxml2argvdata/disk-shared-locking.args delete mode 100644 tests/qemuxml2argvdata/disk-shared-locking.xml delete mode 100644 tests/qemuxml2argvdata/disk-shared.args delete mode 100644 tests/qemuxml2argvdata/disk-virtio-scsi-ccw.args delete mode 100644 tests/qemuxml2argvdata/disk-virtio-scsi-ccw.xml delete mode 100644 tests/qemuxml2argvdata/disk-virtio-scsi-cmd_per_lun.args delete mode 100644 tests/qemuxml2argvdata/disk-virtio-scsi-cmd_per_lun.xml delete mode 100644 tests/qemuxml2argvdata/disk-virtio-scsi-ioeventfd.args delete mode 100644 tests/qemuxml2argvdata/disk-virtio-scsi-ioeventfd.xml delete mode 100644 tests/qemuxml2argvdata/disk-virtio-scsi-max_sectors.args delete mode 100644 tests/qemuxml2argvdata/disk-virtio-scsi-max_sectors.xml delete mode 100644 tests/qemuxml2argvdata/disk-virtio-scsi-num_queues.args delete mode 100644 tests/qemuxml2argvdata/disk-virtio-scsi-num_queues.xml rename tests/qemuxml2argvdata/{iothreads-virtio-scsi-ccw.args => iothreads-virtio-scsi-ccw.s390x-latest.args} (58%) rename tests/qemuxml2argvdata/{iothreads-virtio-scsi-pci.args => iothreads-virtio-scsi-pci.x86_64-latest.args} (56%) delete mode 100644 tests/qemuxml2startupxmloutdata/disk-shared.xml create mode 100644 tests/qemuxml2xmloutdata/controller-virtio-scsi.xml rename tests/qemuxml2xmloutdata/{disk-scsi-virtio-scsi.xml => disk-cdrom-bus-other.xml} (54%) delete mode 100644 tests/qemuxml2xmloutdata/disk-scsi-megasas.xml delete mode 100644 tests/qemuxml2xmloutdata/disk-scsi-mptsas1068.xml delete mode 100644 tests/qemuxml2xmloutdata/disk-scsi-vscsi.xml rename tests/qemuxml2xmloutdata/{disk-scsi-device.xml => disk-scsi.xml} (57%) delete mode 100644 tests/qemuxml2xmloutdata/disk-virtio-scsi-cmd_per_lun.xml delete mode 100644 tests/qemuxml2xmloutdata/disk-virtio-scsi-ioeventfd.xml delete mode 100644 tests/qemuxml2xmloutdata/disk-virtio-scsi-max_sectors.xml delete mode 100644 tests/qemuxml2xmloutdata/disk-virtio-scsi-num_queues.xml -- 2.20.1

2 37

[libvirt] [PATCH] qemu: remove check for 'qemu' binary
by Daniel P. Berrangé 31 Jan '19

31 Jan '19

The 'qemu' binary used to provide the i386 emulator until it was renamed to qemu-system-i386 in QEMU 1.0. Since we don't support such old versions we don't need to check for 'qemu' when probing capabilities. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/qemu/qemu_capabilities.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index f504db7d05..5cf4b617c6 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -744,12 +744,6 @@ virQEMUCapsFindBinaryForArch(virArch hostarch, goto out; } - /* Third attempt, i686 only: try 'qemu' */ - if (guestarch == VIR_ARCH_I686) { - if ((ret = virQEMUCapsFindBinary("%s", "qemu")) != NULL) - goto out; - } - out: return ret; } -- 2.20.1

2 1

[libvirt] [cim PATCH] configure: no need to tell us we can run make
by Daniel P. Berrangé 31 Jan '19

31 Jan '19

autogen.sh already tells us we can run make, there's no need for configure.ac to tell us too. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- configure.ac | 2 -- 1 file changed, 2 deletions(-) diff --git a/configure.ac b/configure.ac index 2439dbe..28bfc16 100644 --- a/configure.ac +++ b/configure.ac @@ -195,5 +195,3 @@ echo "----------------------------------------------------------" # Generate configure scripts for the Makefile AC_OUTPUT(libvirt-cim.spec) - -echo "You may now run make" -- 2.20.1

2 3

[libvirt] [go PATCH 0/8] Refactor the way typed parameters are handled
by Daniel P. Berrangé 31 Jan '19

31 Jan '19

Go 1.12 breaks our current typed parameter handling as it appears to be deciding some various are no longer live & free'ing them. Mixing go allocated memory with C API calls often trips with this kind of thing. This series thus changes the code to use C allocated memory for typed parameter arrays and use the libvirt APIs where possible. I'm not sure if anyone on list feels like reviewing this Go code or not. Most of the time I've just pushed Go changes directly, but I figure putting it out for review might help people spread the knowledge of the Go bindings Daniel P. Berrangé (8): Fix GetGuestVcpus to actually return some data Add missing error reporting when setting typed parameters Change typedParamsPackNew to use a C allocated array Switch typedParamsUnpackLen to use accessor methods Use 'cnparams' for virTypedParameters array length variables Simplify setting of typed parameters Switch remaining typed parameter code to use C allocs Rename typedParamsUnpackLen to typedParamsUnpack connect.go | 81 ++++---- domain.go | 429 +++++++++++++++++------------------------ domain_events.go | 20 +- typedparams.go | 295 ++++++++++++---------------- typedparams_test.go | 8 +- typedparams_wrapper.go | 240 +++++++++++++++++++++++ typedparams_wrapper.h | 126 ++++++++++++ 7 files changed, 721 insertions(+), 478 deletions(-) create mode 100644 typedparams_wrapper.go create mode 100644 typedparams_wrapper.h -- 2.20.1

1 9

[libvirt] [PATCH] tests: Fix storagepoolxml2xmltest execution for XML namespaces
by John Ferlan 31 Jan '19

31 Jan '19

Only run the pool-netfs-ns-mountopts if built WITH_STORAGE_FS and only run pool-rbd-ns-configopts if built with WITH_STORAGE_RBD since the namespace support is only enabled if the pool is enabled. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- tests/storagepoolxml2xmltest.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/storagepoolxml2xmltest.c b/tests/storagepoolxml2xmltest.c index 90d00a8d9e..acb15f3a2c 100644 --- a/tests/storagepoolxml2xmltest.c +++ b/tests/storagepoolxml2xmltest.c @@ -91,7 +91,9 @@ mymain(void) DO_TEST("pool-netfs-protocol-ver"); DO_TEST("pool-netfs-gluster"); DO_TEST("pool-netfs-cifs"); +#ifdef WITH_STORAGE_FS DO_TEST("pool-netfs-ns-mountopts"); +#endif DO_TEST("pool-scsi"); DO_TEST("pool-scsi-type-scsi-host"); DO_TEST("pool-scsi-type-fc-host"); @@ -106,7 +108,9 @@ mymain(void) DO_TEST("pool-zfs"); DO_TEST("pool-zfs-sourcedev"); DO_TEST("pool-rbd"); +#ifdef WITH_STORAGE_RBD DO_TEST("pool-rbd-ns-configopts"); +#endif DO_TEST("pool-vstorage"); DO_TEST("pool-iscsi-direct-auth"); DO_TEST("pool-iscsi-direct"); -- 2.20.1

2 1

[libvirt] [PATCH] storage: change custom namespace URIs to drop '/source' component
by Daniel P. Berrangé 31 Jan '19

31 Jan '19

The custom namespaces were originally registered against the storage pool source struct, but during review this was changed to the top level storage pool struct. The namespace URIs were not updated to match, so had a redundant '/source' component. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- docs/formatstorage.html.in | 8 ++++---- docs/schemas/storagepool.rng | 4 ++-- src/storage/storage_backend_fs.c | 2 +- src/storage/storage_backend_rbd.c | 2 +- tests/storagepoolxml2xmlin/pool-netfs-ns-mountopts.xml | 2 +- tests/storagepoolxml2xmlin/pool-rbd-ns-configopts.xml | 2 +- tests/storagepoolxml2xmlout/pool-netfs-ns-mountopts.xml | 2 +- tests/storagepoolxml2xmlout/pool-rbd-ns-configopts.xml | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/docs/formatstorage.html.in b/docs/formatstorage.html.in index d19bc579a4..6ebd23549f 100644 --- a/docs/formatstorage.html.in +++ b/docs/formatstorage.html.in @@ -535,7 +535,7 @@ provide the XML namespace attribute syntax as follows: <p> - xmlns:fs='http://libvirt.org/schemas/storagepool/source/fs/1.0' + xmlns:fs='http://libvirt.org/schemas/storagepool/fs/1.0' </p> <p> @@ -551,7 +551,7 @@ The following XML snippet shows the syntax required in order to utilize for a netfs pool: <pre> -<pool type="netfs" xmlns:fs='http://libvirt.org/schemas/storagepool/source/fs/1.0'> +<pool type="netfs" xmlns:fs='http://libvirt.org/schemas/storagepool/fs/1.0'> <name>nfsimages</name> ... <source> @@ -580,7 +580,7 @@ syntax as follows: <p> - xmlns:rbd='http://libvirt.org/schemas/storagepool/source/rbd/1.0' + xmlns:rbd='http://libvirt.org/schemas/storagepool/rbd/1.0' </p> <p> @@ -598,7 +598,7 @@ The following XML snippet shows the syntax required in order to utilize <pre> -<pool type="rbd" xmlns:rbd='http://libvirt.org/schemas/storagepool/source/rbd/1.0'> +<pool type="rbd" xmlns:rbd='http://libvirt.org/schemas/storagepool/rbd/1.0'> <name>myrbdpool</name> ... <source> diff --git a/docs/schemas/storagepool.rng b/docs/schemas/storagepool.rng index e1944ff8e1..3907f70afe 100644 --- a/docs/schemas/storagepool.rng +++ b/docs/schemas/storagepool.rng @@ -697,7 +697,7 @@ --> <define name="fs_mount_opts"> - <element name="mount_opts" ns="http://libvirt.org/schemas/storagepool/source/fs/1.0"> + <element name="mount_opts" ns="http://libvirt.org/schemas/storagepool/fs/1.0"> <zeroOrMore> <element name="option"> <attribute name='name'> @@ -714,7 +714,7 @@ --> <define name="rbd_config_opts"> - <element name="config_opts" ns="http://libvirt.org/schemas/storagepool/source/rbd/1.0"> + <element name="config_opts" ns="http://libvirt.org/schemas/storagepool/rbd/1.0"> <zeroOrMore> <element name="option"> <attribute name='name'> diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c index 0ec99c60ed..ddb422d874 100644 --- a/src/storage/storage_backend_fs.c +++ b/src/storage/storage_backend_fs.c @@ -562,7 +562,7 @@ virStorageBackendFileSystemBuild(virStoragePoolObjPtr pool, #if WITH_STORAGE_FS -# define STORAGE_POOL_FS_NAMESPACE_HREF "http://libvirt.org/schemas/storagepool/source/fs/1.0" +# define STORAGE_POOL_FS_NAMESPACE_HREF "http://libvirt.org/schemas/storagepool/fs/1.0" /* Backend XML Namespace handling for fs or netfs specific mount options to * be added to the mount -o {options_list} command line that are not otherwise diff --git a/src/storage/storage_backend_rbd.c b/src/storage/storage_backend_rbd.c index 2348f80146..cfbce1ad19 100644 --- a/src/storage/storage_backend_rbd.c +++ b/src/storage/storage_backend_rbd.c @@ -59,7 +59,7 @@ struct _virStoragePoolRBDConfigOptionsDef { char **values; }; -#define STORAGE_POOL_RBD_NAMESPACE_HREF "http://libvirt.org/schemas/storagepool/source/rbd/1.0" +#define STORAGE_POOL_RBD_NAMESPACE_HREF "http://libvirt.org/schemas/storagepool/rbd/1.0" static void virStoragePoolDefRBDNamespaceFree(void *nsdata) diff --git a/tests/storagepoolxml2xmlin/pool-netfs-ns-mountopts.xml b/tests/storagepoolxml2xmlin/pool-netfs-ns-mountopts.xml index 0434b16eb7..c2777ed29d 100644 --- a/tests/storagepoolxml2xmlin/pool-netfs-ns-mountopts.xml +++ b/tests/storagepoolxml2xmlin/pool-netfs-ns-mountopts.xml @@ -1,4 +1,4 @@ -<pool type='netfs' xmlns:fs='http://libvirt.org/schemas/storagepool/source/fs/1.0'> +<pool type='netfs' xmlns:fs='http://libvirt.org/schemas/storagepool/fs/1.0'> <name>nfsimages</name> <uuid>7641d5a8-af11-f730-a34e-0a7dfcede71f</uuid> <capacity>0</capacity> diff --git a/tests/storagepoolxml2xmlin/pool-rbd-ns-configopts.xml b/tests/storagepoolxml2xmlin/pool-rbd-ns-configopts.xml index 6b62aa6f7e..a924fc103d 100644 --- a/tests/storagepoolxml2xmlin/pool-rbd-ns-configopts.xml +++ b/tests/storagepoolxml2xmlin/pool-rbd-ns-configopts.xml @@ -1,4 +1,4 @@ -<pool type='rbd' xmlns:rbd='http://libvirt.org/schemas/storagepool/source/rbd/1.0'> +<pool type='rbd' xmlns:rbd='http://libvirt.org/schemas/storagepool/rbd/1.0'> <name>ceph</name> <uuid>47c1faee-0207-e741-f5ae-d9b019b98fe2</uuid> <source> diff --git a/tests/storagepoolxml2xmlout/pool-netfs-ns-mountopts.xml b/tests/storagepoolxml2xmlout/pool-netfs-ns-mountopts.xml index 4bd164f220..fdc332087f 100644 --- a/tests/storagepoolxml2xmlout/pool-netfs-ns-mountopts.xml +++ b/tests/storagepoolxml2xmlout/pool-netfs-ns-mountopts.xml @@ -1,4 +1,4 @@ -<pool type='netfs' xmlns:fs='http://libvirt.org/schemas/storagepool/source/fs/1.0'> +<pool type='netfs' xmlns:fs='http://libvirt.org/schemas/storagepool/fs/1.0'> <name>nfsimages</name> <uuid>7641d5a8-af11-f730-a34e-0a7dfcede71f</uuid> <capacity unit='bytes'>0</capacity> diff --git a/tests/storagepoolxml2xmlout/pool-rbd-ns-configopts.xml b/tests/storagepoolxml2xmlout/pool-rbd-ns-configopts.xml index 342a0ff74a..7fbcc3e0bc 100644 --- a/tests/storagepoolxml2xmlout/pool-rbd-ns-configopts.xml +++ b/tests/storagepoolxml2xmlout/pool-rbd-ns-configopts.xml @@ -1,4 +1,4 @@ -<pool type='rbd' xmlns:rbd='http://libvirt.org/schemas/storagepool/source/rbd/1.0'> +<pool type='rbd' xmlns:rbd='http://libvirt.org/schemas/storagepool/rbd/1.0'> <name>ceph</name> <uuid>47c1faee-0207-e741-f5ae-d9b019b98fe2</uuid> <capacity unit='bytes'>0</capacity> -- 2.20.1

2 1

[libvirt] [PATCH] qemu: blockjob: Don't report block job progress at 100% if job isn't ready
by Peter Krempa 31 Jan '19

31 Jan '19

Some clients take the advice to poll virDomainGetBlockJobInfo rather than wait for the ready event. In some cases qemu can get to 100% and still not reach the synchronised phase. Since we are dealing with a computer interacting, the error that the job can't be finalized yet is not handled very well by those specific implementations. Our docs now correctly state to use the event. We already munge the output for the start of the job, so we can do it even here. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/qemu/qemu_driver.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 26edbf799f..cf500507da 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -17477,6 +17477,14 @@ qemuBlockJobInfoTranslate(qemuMonitorBlockJobInfoPtr rawInfo, } } + /* If qemu reports that it's not ready yet don't make the job go to + * cur == end as some apps wrote code polling this instead of waiting for + * the ready event */ + if (rawInfo->ready == 0 && + info->cur == info->end && + info->cur > 0) + info->cur -= 1; + info->type = rawInfo->type; if (info->type == VIR_DOMAIN_BLOCK_JOB_TYPE_COMMIT && disk->mirrorJob == VIR_DOMAIN_BLOCK_JOB_TYPE_ACTIVE_COMMIT) -- 2.20.1

3 4

[libvirt] [PATCH 0/6] A few misc fixes from LGTM static analysis
by Daniel P. Berrangé 31 Jan '19

31 Jan '19

There is an online service call LGTM (Looks Good To Me) which does static analysis of open source projects and I happened to learn that they include coverage of libvirt https://lgtm.com/projects/g/libvirt/libvirt I looked at the alerts they reported. Currently no errors, 41 warnings and 90 recommendations (79 of which are FIXME comments :-). There's nothing particularly important they identify right now, but I felt like addressing a few of them anyway, hence this series. Daniel P. Berrangé (6): conf: remove pointless check on enum value remote: remove variable whose value is a constant storage: pass struct _virStorageBackendQemuImgInfo by reference qemu: pass virDomainDeviceInfo by reference hyperv: remove unused 'total' variable hyperv: use "is None" not "== None" for PEP-8 compliance src/conf/domain_conf.c | 20 ++++++++--------- src/hyperv/hyperv_wmi_generator.py | 3 +-- src/qemu/qemu_command.c | 4 ++-- src/qemu/qemu_domain.c | 10 ++++----- src/qemu/qemu_domain.h | 9 ++++---- src/qemu/qemu_domain_address.c | 2 +- src/remote/remote_daemon_dispatch.c | 8 ++----- src/storage/storage_util.c | 35 ++++++++++++++--------------- 8 files changed, 42 insertions(+), 49 deletions(-) -- 2.20.1

2 13

[libvirt] [PATCH v2 0/2] Enum formating changes
by Peter Krempa 31 Jan '19

31 Jan '19

v2 contains a tweak to the CSS to widen the page slightly and keep borders on narrow screen. Peter Krempa (2): docs: Format bit shift and hex notation for bitwise flag enums docs: css: Make docs page wider while still accomodating narrow screens docs/apibuild.py | 10 ++++++++++ docs/libvirt.css | 9 +++++++-- docs/newapi.xsl | 22 ++++++++++++++++++++-- 3 files changed, 37 insertions(+), 4 deletions(-) -- 2.20.1

3 7

[libvirt] [PATCH 0/7] Add support to list Storage Driver backend capabilities
by John Ferlan 31 Jan '19

31 Jan '19

Although I suppose this could have been an RFC - I just went with a v1. I would think at least the first 4 patches are non controversial. Beyond that it depends on what is "expected" as output for the capabilities output for the storage driver. John Ferlan (7): conf: Extract host XML formatting from virCapabilitiesFormatXML conf: Alter virCapabilitiesFormatHostXML to take virCapsHostPtr conf: Extract guest XML formatting from virCapabilitiesFormatXML conf: Alter virCapabilitiesFormatGuestXML to take virCapsGuestPtr conf: Introduce storage pool functions into capabilities storage: Process storage pool capabilities storage: Add storage backend pool/vol API's to capability output src/conf/capabilities.c | 449 ++++++++++++++++++++++------------ src/conf/capabilities.h | 19 ++ src/conf/virstorageobj.h | 4 + src/libvirt_private.syms | 1 + src/storage/storage_backend.c | 65 +++++ src/storage/storage_backend.h | 3 + src/storage/storage_driver.c | 17 ++ 7 files changed, 400 insertions(+), 158 deletions(-) -- 2.20.1

4 19

[libvirt] list vsock cids allocated to VMs?
by Brian Kroth 30 Jan '19

30 Jan '19

Other than dumping and parsing the config for all running VMs, is there a way to get the current map of vsock cids allocated to their VM domains? Thanks, Brian

2 3

[libvirt] [PATCH 00/11] qemu: Labelling cleanup and fix labelling for block copy pivot (blockdev-add saga)
by Peter Krempa 30 Jan '19

30 Jan '19

Refactor some labelling code and then move out the backing chain labelling from the block copy pivot operation into starting of the job. Peter Krempa (11): qemu: domain: Clarify temp variable scope in qemuDomainDetermineDiskChain qemu: domain: Allow overriding disk source in qemuDomainDetermineDiskChain qemu: cgroup: Change qemu[Setup|Teardown]DiskCgroup to take virStorageSource security: Remove security driver internals for disk labelling qemu: security: Add 'backingChain' flag to qemuSecurity[Set|Restore]ImageLabel qemu: security: Replace and remove qemuSecurity[Set|Restore]DiskLabel security: Remove disk labelling functions and fix callers qemu: driver: Remove disk source munging in qemuDomainBlockPivot locking: Use virDomainLockImage[Attach|Detach] instead of *Disk qemu: hotplug: Refactor qemuHotplugPrepareDiskAccess to work on virStorageSource qemu: Label backing chain of user-provided target of blockCopy when starting the job src/libvirt_private.syms | 4 -- src/libxl/libxl_driver.c | 14 +++--- src/locking/domain_lock.c | 17 ------- src/locking/domain_lock.h | 8 ---- src/lxc/lxc_controller.c | 3 +- src/lxc/lxc_driver.c | 4 +- src/qemu/qemu_blockjob.c | 2 +- src/qemu/qemu_cgroup.c | 14 +++--- src/qemu/qemu_cgroup.h | 8 ++-- src/qemu/qemu_domain.c | 60 +++++++++++++++--------- src/qemu/qemu_domain.h | 1 + src/qemu/qemu_driver.c | 53 +++++++++------------ src/qemu/qemu_hotplug.c | 79 +++++++++++++------------------- src/qemu/qemu_process.c | 26 ++++++++++- src/qemu/qemu_security.c | 74 +++--------------------------- src/qemu/qemu_security.h | 14 ++---- src/security/security_apparmor.c | 24 ++-------- src/security/security_dac.c | 40 +++++----------- src/security/security_driver.h | 15 ++---- src/security/security_manager.c | 70 ++++------------------------ src/security/security_manager.h | 12 ++--- src/security/security_nop.c | 25 ++-------- src/security/security_selinux.c | 42 +++++------------ src/security/security_stack.c | 50 +++----------------- 24 files changed, 202 insertions(+), 457 deletions(-) -- 2.20.1

3 26

[libvirt] [PATCH 0/2] Fix a couple build issues
by John Ferlan 30 Jan '19

30 Jan '19

Recent adjustment to add XML namespace processing for storage pool XML processing broke the mingw* builds: CC storagevolxml2xmltest.o gmake[2]: *** No rule to make target '../src/libvirt_driver_storage_impl.la', needed by 'storagepoolxml2xmltest.exe'. Stop. gmake[2]: *** Waiting for unfinished jobs.... CC storagepoolxml2xmltest.o So looking at things again, I see that other options that include ../src/libvirt_driver_storage_impl.la would be inside a WITH_STORAGE conditional. So move the build to that and alter the ! WITH_STORAGE as well. Seeing this, I also see that I didn't add storagepoolxml2argv.c to the ! WITH_STORAGE either, so that's the second patch. Build works for me, but I have no idea if it'll work for mingw* - I am assuming so based on other examples. Another alternative is to not test the XML namespace processing for storagepoolxml2xml - although given that it seems mingw* doesn't build/support storage anyway, perhaps not the correct alternative. John Ferlan (2): tests: Fix build issue with storagevolxml2xmltest tests: Add storagepoolxml2argvtest source to EXTRA_DIST tests/Makefile.am | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) -- 2.20.1

2 3

[libvirt] [PATCH] tests: Build and run storagevolxml2xmltest iff WITH_STORAGE
by Michal Privoznik 30 Jan '19

30 Jan '19

Commit 7a227688a83880 assumes that libvirt_driver_storage_impl.la is always available. Well it is not. Users have option to turn the storage driver off in which case it isn't build and linking the test with the library then fails. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- And alternative approach might be to move only those test cases that require WITH_STORAGE under #ifdef and link the library again only if WITH_STORAGE is enabled. But this is harder to do properly - I mean for future test cases it will be hard to decide whether to put them inside or outside of WITH_STORAGE section. tests/Makefile.am | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index ab4c716529..c034fe0bf3 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -368,6 +368,7 @@ if WITH_STORAGE test_programs += storagevolxml2argvtest test_programs += storagepoolxml2argvtest test_programs += virstorageutiltest +test_programs += storagepoolxml2xmltest endif WITH_STORAGE if WITH_STORAGE_FS @@ -384,7 +385,7 @@ test_programs += nsstest nssguesttest test_libraries += nssmock.la endif WITH_NSS -test_programs += storagevolxml2xmltest storagepoolxml2xmltest +test_programs += storagevolxml2xmltest test_programs += nodedevxml2xmltest @@ -924,9 +925,17 @@ storagepoolxml2argvtest_LDADD = \ ../src/libvirt_util.la \ $(LDADDS) +storagepoolxml2xmltest_SOURCES = \ + storagepoolxml2xmltest.c \ + testutils.c testutils.h +storagepoolxml2xmltest_LDADD = $(LDADDS) \ + ../src/libvirt_driver_storage_impl.la \ + $(GNULIB_LIBS) + else ! WITH_STORAGE EXTRA_DIST += storagevolxml2argvtest.c EXTRA_DIST += virstorageutiltest.c +EXTRA_DIST += storagepoolxml2xmltest.c endif ! WITH_STORAGE storagevolxml2xmltest_SOURCES = \ @@ -934,13 +943,6 @@ storagevolxml2xmltest_SOURCES = \ testutils.c testutils.h storagevolxml2xmltest_LDADD = $(LDADDS) -storagepoolxml2xmltest_SOURCES = \ - storagepoolxml2xmltest.c \ - testutils.c testutils.h -storagepoolxml2xmltest_LDADD = $(LDADDS) \ - ../src/libvirt_driver_storage_impl.la \ - $(GNULIB_LIBS) - nodedevxml2xmltest_SOURCES = \ nodedevxml2xmltest.c \ testutils.c testutils.h -- 2.19.2

2 1

[libvirt] [nicsysco.com] Weird Libvirt Behavior
by nico 30 Jan '19

30 Jan '19

Hi folks, First time contributor, but I felt that what I discovered was (probably) a very rare situation. I'm running a Centos server (my only Linux deployment) to which customers all over the U.S. connect to process their micro-lender businesses. There are several VM's, among other one which runs the fortress system, called a2. In the beginning the .raw file was about 10GB, which was a 5X overkill in terms of capacity, at the time. For years we had no problems and the CentOS box would tick over day after day without as much as a hiccup. About three months ago a2 started to slow down, almost to the point of timing out when applications and users log on. The band-aid was to copy an earlier a2.raw backup over the current one on a regular basis, and it would rectify the problem. At first applying this band-aid on Sunday nights, would suffice. But, later we had to increase it to twice a week and these last couple of weeks we had to do it almost every night. The system also sent alerts that a "Degraded Array event had been detected on md device /dev/md1". Inspecting the drives showed no crisis. Today it folded completely and brought the system down, with clients' "our computers are down" response to their customers walking into their stores. Restarting the box just brought a2 to a paused state, never recovering. We had to killall to get rid of it. Having nowhere else to go with it, I decided to rebuild a2 in another, separate drive to at least address the degraded array alerts. As I edited the .xml file, I saw the following: <source file='/var/lib/libvirt/:machines/a2/a2-disk1.raw'/> What the hell was that colon doing there? I checked the size of the .raw file. It has grown to over 96GB. Just to check the sanity-box, I checked the other VM's .xml files and they didn't have a colon, as I expected. I removed the colon and virsh-started a2, which fired up immediately, with the rest of the system following suit. No doubt that ":" was the culprit! My question is: Would that colon cause an append-action to the .raw file? We have no idea when it got in there or how. We haven't worked on that xml file for a long time. Why would a2 even fire up at all? It would be great to hear what the guru's think about that. Thanks Nico van Niekerk Agoura Hills, CA 91301

2 1

[libvirt] [PATCH] qemu: Rework setting process affinity
by Michal Privoznik 30 Jan '19

30 Jan '19

https://bugzilla.redhat.com/show_bug.cgi?id=1503284 The way we currently start qemu from CPU affinity POV is as follows: 1) the child process is set affinity to all online CPUs (unless some vcpu pinning was given in the domain XML) 2) Once qemu is running, cpuset cgroup is configured taking memory pinning into account Problem is that we let qemu allocate its memory just anywhere in 1) and then rely in 2) to be able to move the memory to configured NUMA nodes. This might not be always possible (e.g. qemu might lock some parts of its memory) and is very suboptimal (copying large memory between NUMA nodes takes significant amount of time). The solution is to set the affinity correctly from the beginning and then possibly refine it later via cgroups. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_process.c | 152 ++++++++++++++++++++++------------------ 1 file changed, 83 insertions(+), 69 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 9ccc3601a2..a4668f6773 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -2435,6 +2435,44 @@ qemuProcessDetectIOThreadPIDs(virQEMUDriverPtr driver, } +static int +qemuProcessGetAllCpuAffinity(pid_t pid, + virBitmapPtr *cpumapRet) +{ + VIR_AUTOPTR(virBitmap) cpumap = NULL; + VIR_AUTOPTR(virBitmap) hostcpumap = NULL; + int hostcpus; + + *cpumapRet = NULL; + + if (!virHostCPUHasBitmap()) + return 0; + + if (!(hostcpumap = virHostCPUGetOnlineBitmap()) || + !(cpumap = virProcessGetAffinity(pid))) + return -1; + + if (!virBitmapEqual(hostcpumap, cpumap)) { + /* setaffinity fails if you set bits for CPUs which + * aren't present, so we have to limit ourselves */ + if ((hostcpus = virHostCPUGetCount()) < 0) + return -1; + + if (hostcpus > QEMUD_CPUMASK_LEN) + hostcpus = QEMUD_CPUMASK_LEN; + + virBitmapFree(cpumap); + if (!(cpumap = virBitmapNew(hostcpus))) + return -1; + + virBitmapSetAll(cpumap); + } + + VIR_STEAL_PTR(*cpumapRet, cpumap); + return 0; +} + + /* * To be run between fork/exec of QEMU only */ @@ -2443,9 +2481,9 @@ static int qemuProcessInitCpuAffinity(virDomainObjPtr vm) { int ret = -1; - virBitmapPtr cpumap = NULL; virBitmapPtr cpumapToSet = NULL; - virBitmapPtr hostcpumap = NULL; + VIR_AUTOPTR(virBitmap) hostcpumap = NULL; + virDomainNumatuneMemMode mem_mode; qemuDomainObjPrivatePtr priv = vm->privateData; if (!vm->pid) { @@ -2454,59 +2492,36 @@ qemuProcessInitCpuAffinity(virDomainObjPtr vm) return -1; } - if (vm->def->placement_mode == VIR_DOMAIN_CPU_PLACEMENT_MODE_AUTO) { - VIR_DEBUG("Set CPU affinity with advisory nodeset from numad"); - cpumapToSet = priv->autoCpuset; + /* Here is the deal, we can't set cpuset.mems before qemu is + * started as it clashes with KVM allocation. Therefore we + * used to let qemu allocate its memory anywhere as we would + * then move the memory to desired NUMA node via CGroups. + * However, that might not be always possible because qemu + * might lock some parts of its memory (e.g. due to VFIO). + * Solution is to set some temporary affinity now and then + * fix it later, once qemu is already running. */ + if (virDomainNumaGetNodeCount(vm->def->numa) <= 1 && + virDomainNumatuneGetMode(vm->def->numa, -1, &mem_mode) == 0 && + mem_mode == VIR_DOMAIN_NUMATUNE_MEM_STRICT) { + if (virDomainNumatuneMaybeGetNodeset(vm->def->numa, + priv->autoNodeset, + &cpumapToSet, + -1) < 0) + goto cleanup; + } else if (vm->def->cputune.emulatorpin) { + cpumapToSet = vm->def->cputune.emulatorpin; } else { - VIR_DEBUG("Set CPU affinity with specified cpuset"); - if (vm->def->cpumask) { - cpumapToSet = vm->def->cpumask; - } else { - /* You may think this is redundant, but we can't assume libvirtd - * itself is running on all pCPUs, so we need to explicitly set - * the spawned QEMU instance to all pCPUs if no map is given in - * its config file */ - int hostcpus; - - if (virHostCPUHasBitmap()) { - hostcpumap = virHostCPUGetOnlineBitmap(); - cpumap = virProcessGetAffinity(vm->pid); - } - - if (hostcpumap && cpumap && virBitmapEqual(hostcpumap, cpumap)) { - /* we're using all available CPUs, no reason to set - * mask. If libvirtd is running without explicit - * affinity, we can use hotplugged CPUs for this VM */ - ret = 0; - goto cleanup; - } else { - /* setaffinity fails if you set bits for CPUs which - * aren't present, so we have to limit ourselves */ - if ((hostcpus = virHostCPUGetCount()) < 0) - goto cleanup; - - if (hostcpus > QEMUD_CPUMASK_LEN) - hostcpus = QEMUD_CPUMASK_LEN; - - virBitmapFree(cpumap); - if (!(cpumap = virBitmapNew(hostcpus))) - goto cleanup; - - virBitmapSetAll(cpumap); - - cpumapToSet = cpumap; - } - } + if (qemuProcessGetAllCpuAffinity(vm->pid, &hostcpumap) < 0) + goto cleanup; + cpumapToSet = hostcpumap; } - if (virProcessSetAffinity(vm->pid, cpumapToSet) < 0) + if (cpumapToSet && + virProcessSetAffinity(vm->pid, cpumapToSet) < 0) goto cleanup; ret = 0; - cleanup: - virBitmapFree(cpumap); - virBitmapFree(hostcpumap); return ret; } #else /* !defined(HAVE_SCHED_GETAFFINITY) && !defined(HAVE_BSD_CPU_AFFINITY) */ @@ -2586,7 +2601,8 @@ qemuProcessSetupPid(virDomainObjPtr vm, qemuDomainObjPrivatePtr priv = vm->privateData; virDomainNumatuneMemMode mem_mode; virCgroupPtr cgroup = NULL; - virBitmapPtr use_cpumask; + virBitmapPtr use_cpumask = NULL; + VIR_AUTOPTR(virBitmap) hostcpumap = NULL; char *mem_mask = NULL; int ret = -1; @@ -2598,12 +2614,21 @@ qemuProcessSetupPid(virDomainObjPtr vm, } /* Infer which cpumask shall be used. */ - if (cpumask) + if (cpumask) { use_cpumask = cpumask; - else if (vm->def->placement_mode == VIR_DOMAIN_CPU_PLACEMENT_MODE_AUTO) + } else if (vm->def->placement_mode == VIR_DOMAIN_CPU_PLACEMENT_MODE_AUTO) { use_cpumask = priv->autoCpuset; - else + } else if (vm->def->cpumask) { use_cpumask = vm->def->cpumask; + } else if (virHostCPUHasBitmap()) { + /* You may think this is redundant, but we can't assume libvirtd + * itself is running on all pCPUs, so we need to explicitly set + * the spawned QEMU instance to all pCPUs if no map is given in + * its config file */ + if (qemuProcessGetAllCpuAffinity(pid, &hostcpumap) < 0) + goto cleanup; + use_cpumask = hostcpumap; + } /* * If CPU cgroup controller is not initialized here, then we need @@ -2628,13 +2653,7 @@ qemuProcessSetupPid(virDomainObjPtr vm, qemuSetupCgroupCpusetCpus(cgroup, use_cpumask) < 0) goto cleanup; - /* - * Don't setup cpuset.mems for the emulator, they need to - * be set up after initialization in order for kvm - * allocations to succeed. - */ - if (nameval != VIR_CGROUP_THREAD_EMULATOR && - mem_mask && virCgroupSetCpusetMems(cgroup, mem_mask) < 0) + if (mem_mask && virCgroupSetCpusetMems(cgroup, mem_mask) < 0) goto cleanup; } @@ -6634,12 +6653,7 @@ qemuProcessLaunch(virConnectPtr conn, /* This must be done after cgroup placement to avoid resetting CPU * affinity */ - if (!vm->def->cputune.emulatorpin && - qemuProcessInitCpuAffinity(vm) < 0) - goto cleanup; - - VIR_DEBUG("Setting emulator tuning/settings"); - if (qemuProcessSetupEmulator(vm) < 0) + if (qemuProcessInitCpuAffinity(vm) < 0) goto cleanup; VIR_DEBUG("Setting cgroup for external devices (if required)"); @@ -6708,10 +6722,6 @@ qemuProcessLaunch(virConnectPtr conn, if (qemuProcessUpdateAndVerifyCPU(driver, vm, asyncJob) < 0) goto cleanup; - VIR_DEBUG("Setting up post-init cgroup restrictions"); - if (qemuSetupCpusetMems(vm) < 0) - goto cleanup; - VIR_DEBUG("setting up hotpluggable cpus"); if (qemuDomainHasHotpluggableStartupVcpus(vm->def)) { if (qemuDomainRefreshVcpuInfo(driver, vm, asyncJob, false) < 0) @@ -6737,6 +6747,10 @@ qemuProcessLaunch(virConnectPtr conn, if (qemuProcessDetectIOThreadPIDs(driver, vm, asyncJob) < 0) goto cleanup; + VIR_DEBUG("Setting emulator tuning/settings"); + if (qemuProcessSetupEmulator(vm) < 0) + goto cleanup; + VIR_DEBUG("Setting global CPU cgroup (if required)"); if (qemuSetupGlobalCpuCgroup(vm) < 0) goto cleanup; -- 2.19.2

2 1

[libvirt] [PATCH v5 0/9] Allow adding mountOpts to the storage pool mount command
by John Ferlan 29 Jan '19

29 Jan '19

v4: https://www.redhat.com/archives/libvir-list/2019-January/msg00614.html NB: Still keeping same subject for cover to keep the same context even though the contents are very different from the original. Changes since v4: * Alter patch1 to make the addition of mount options more generic to "fs" and "netfs" pools. Tested/generated the output for all the various pools by modifying the sources, using VIR_TEST_REGENERATE_OUTPUT and having specific "linux" or "freebsd" output. * Alter patch2 to rephrase the news article and add the R-by * Alter patch3 to add the R-by * Alter patch4 to account for changes in patch1 and to only add the nfsvers=%u to/for NETFS type pools passing that argument along to the called methods. Left off the R-by since I changed things. * Alter patch5 and patch6 to add the R-by * Combine patch7 and patch8 into one larger patch accounting for review comments mostly from the former patch8. Modify the docs to indicate lack of support guarantees, changed the "netfs:" to be just "fs:", fixed the comments in storage_pool_fs, and changed methods/structs to use FS and not NetFS. Left off the R-by since I changed things. * Modify patch9 to use the new struct names and add a taint VIR_WARN message. Theoretically this could be combined with the previous too if we really desired to make one large patch. Left off the R-by since I changed things. * Modify patch10 to add the taint message and fix the poorly cut-n-paste'd code that neglected to rename the new struct to use "Config" instead of "Mount". Left off the R-by since I changed things. John Ferlan (9): storage: Add default mount options for fs/netfs storage pools docs: Add news mention of default fs/netfs storage pool mount options conf: Add optional NFS Source Pool <protocol ver='n'/> option storage: Add the nfsvers to the command line virsh: Add source-protocol-ver for pool commands conf: Introduce virStoragePoolXMLNamespace storage: Add infrastructure to manage XML namespace options storage: Add storage pool namespace options to fs and netfs command lines rbd: Utilize storage pool namespace to manage config options docs/formatstorage.html.in | 129 +++++++++++++ docs/news.xml | 11 ++ docs/schemas/storagepool.rng | 53 ++++++ src/conf/storage_conf.c | 73 +++++++- src/conf/storage_conf.h | 27 +++ src/libvirt_private.syms | 1 + src/storage/storage_backend_fs.c | 132 ++++++++++++++ src/storage/storage_backend_rbd.c | 169 +++++++++++++++++- src/storage/storage_util.c | 81 ++++++++- src/storage/storage_util.h | 14 ++ tests/Makefile.am | 4 +- .../pool-fs-freebsd.argv | 1 + .../pool-fs-linux.argv | 1 + .../pool-netfs-auto-freebsd.argv | 1 + .../pool-netfs-auto-linux.argv | 1 + .../pool-netfs-cifs-freebsd.argv | 1 + .../pool-netfs-cifs-linux.argv | 1 + .../pool-netfs-freebsd.argv | 1 + .../pool-netfs-gluster-freebsd.argv | 2 + .../pool-netfs-gluster-linux.argv | 2 + .../pool-netfs-linux.argv | 1 + .../pool-netfs-ns-mountopts-freebsd.argv | 2 + .../pool-netfs-ns-mountopts-linux.argv | 2 + .../pool-netfs-ns-mountopts.argv | 1 + .../pool-netfs-protocol-ver-freebsd.argv | 1 + .../pool-netfs-protocol-ver-linux.argv | 2 + .../pool-netfs-protocol-ver.argv | 1 + tests/storagepoolxml2argvtest.c | 57 +++++- .../pool-netfs-ns-mountopts.xml | 25 +++ .../pool-netfs-protocol-ver.xml | 21 +++ .../pool-rbd-ns-configopts.xml | 17 ++ .../pool-netfs-ns-mountopts.xml | 25 +++ .../pool-netfs-protocol-ver.xml | 21 +++ .../pool-rbd-ns-configopts.xml | 20 +++ tests/storagepoolxml2xmltest.c | 8 + tools/virsh-pool.c | 12 +- tools/virsh.pod | 5 + 37 files changed, 903 insertions(+), 23 deletions(-) create mode 100644 tests/storagepoolxml2argvdata/pool-fs-freebsd.argv create mode 100644 tests/storagepoolxml2argvdata/pool-fs-linux.argv create mode 100644 tests/storagepoolxml2argvdata/pool-netfs-auto-freebsd.argv create mode 100644 tests/storagepoolxml2argvdata/pool-netfs-auto-linux.argv create mode 100644 tests/storagepoolxml2argvdata/pool-netfs-cifs-freebsd.argv create mode 100644 tests/storagepoolxml2argvdata/pool-netfs-cifs-linux.argv create mode 100644 tests/storagepoolxml2argvdata/pool-netfs-freebsd.argv create mode 100644 tests/storagepoolxml2argvdata/pool-netfs-gluster-freebsd.argv create mode 100644 tests/storagepoolxml2argvdata/pool-netfs-gluster-linux.argv create mode 100644 tests/storagepoolxml2argvdata/pool-netfs-linux.argv create mode 100644 tests/storagepoolxml2argvdata/pool-netfs-ns-mountopts-freebsd.argv create mode 100644 tests/storagepoolxml2argvdata/pool-netfs-ns-mountopts-linux.argv create mode 100644 tests/storagepoolxml2argvdata/pool-netfs-ns-mountopts.argv create mode 100644 tests/storagepoolxml2argvdata/pool-netfs-protocol-ver-freebsd.argv create mode 100644 tests/storagepoolxml2argvdata/pool-netfs-protocol-ver-linux.argv create mode 100644 tests/storagepoolxml2argvdata/pool-netfs-protocol-ver.argv create mode 100644 tests/storagepoolxml2xmlin/pool-netfs-ns-mountopts.xml create mode 100644 tests/storagepoolxml2xmlin/pool-netfs-protocol-ver.xml create mode 100644 tests/storagepoolxml2xmlin/pool-rbd-ns-configopts.xml create mode 100644 tests/storagepoolxml2xmlout/pool-netfs-ns-mountopts.xml create mode 100644 tests/storagepoolxml2xmlout/pool-netfs-protocol-ver.xml create mode 100644 tests/storagepoolxml2xmlout/pool-rbd-ns-configopts.xml -- 2.20.1

2 14

[libvirt] [PATCH 0/3] bhyve: implement support for commandline args
by Roman Bogorodskiy 29 Jan '19

29 Jan '19

Roman Bogorodskiy (3): bhyve: implement support for commandline args docs: bhyve: document commandline element news: document bhyve custom commandline support docs/drvbhyve.html.in | 20 ++++ docs/news.xml | 11 ++ docs/schemas/domaincommon.rng | 17 +++ src/bhyve/bhyve_command.c | 9 ++ src/bhyve/bhyve_conf.c | 15 +++ src/bhyve/bhyve_conf.h | 9 ++ src/bhyve/bhyve_domain.c | 107 +++++++++++++++++- src/bhyve/bhyve_domain.h | 1 + .../bhyvexml2argv-commandline.args | 9 ++ .../bhyvexml2argv-commandline.ldargs | 3 + .../bhyvexml2argv-commandline.xml | 27 +++++ tests/bhyvexml2argvtest.c | 1 + .../bhyvexml2xmlout-commandline.xml | 37 ++++++ tests/bhyvexml2xmltest.c | 1 + 14 files changed, 266 insertions(+), 1 deletion(-) create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-commandline.args create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-commandline.ldargs create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-commandline.xml create mode 100644 tests/bhyvexml2xmloutdata/bhyvexml2xmlout-commandline.xml -- 2.20.1

4 12

[libvirt] [PATCH 0/2] A couple of GCC 9 fixes.
by Richard W.M. Jones 29 Jan '19

29 Jan '19

I'm not 100% confident about either of these patches, so please take care with them. I also think the second patch is probaby best fixed by disabling the warning, or else a much more fundamental rewrite of the test. Rich.

4 11

[libvirt] [PATCH v4 00/10] Allow adding mountOpts to the storage pool mount command
by John Ferlan 29 Jan '19

29 Jan '19

v3: https://www.redhat.com/archives/libvir-list/2019-January/msg00467.html NB: Kept same subject for cover to keep the same context; however, it's now more of a series of a few things... Add default NFS Server options, add nfsvers, and add support for XML namespaces in storage pools which are used by NFS and RBD storage pools. Changes since v3: Remove patch 1 and 3. Rework patch 2 to make the nodev, nosuid, and noexec be the "default options" for the NFS Storage Pool. Created a virStorageBackendFileSystemMountNFSAddOptions in order to add those options for NFS pools using format NFS (and not 'cifs' or 'gluster'). Everything else just gets adjusted/merged based on how the first patch works. John Ferlan (10): storage: Add default mount options for NFS Storage Pools docs: Add news mention of NFS Storage Pool mount options conf: Add optional NFS Source Pool <protocol ver='n'/> option storage: Add the nfsvers to the command line virsh: Add source-protocol-ver for pool commands conf: Introduce virStoragePoolXMLNamespace nfs: Add infrastructure to manage XML namespace options docs,tests: Add schema, description, and tests for NFS namespace storage: Add NFS storage pool namespace options to command line rbd: Utilize storage pool namespace to manage config options docs/formatstorage.html.in | 123 +++++++++++++ docs/news.xml | 11 ++ docs/schemas/storagepool.rng | 50 ++++++ src/conf/storage_conf.c | 73 +++++++- src/conf/storage_conf.h | 27 +++ src/libvirt_private.syms | 1 + src/storage/storage_backend_fs.c | 128 ++++++++++++++ src/storage/storage_backend_rbd.c | 166 +++++++++++++++++- src/storage/storage_util.c | 52 ++++++ src/storage/storage_util.h | 14 ++ tests/Makefile.am | 4 +- .../pool-netfs-auto-freebsd.argv | 1 + .../pool-netfs-auto-linux.argv | 1 + .../pool-netfs-freebsd.argv | 1 + .../pool-netfs-linux.argv | 1 + .../pool-netfs-ns-mountopts-freebsd.argv | 2 + .../pool-netfs-ns-mountopts-linux.argv | 2 + .../pool-netfs-ns-mountopts.argv | 1 + .../pool-netfs-protocol-ver-freebsd.argv | 1 + .../pool-netfs-protocol-ver-linux.argv | 2 + .../pool-netfs-protocol-ver.argv | 1 + tests/storagepoolxml2argvtest.c | 49 +++++- .../pool-netfs-ns-mountopts.xml | 25 +++ .../pool-netfs-protocol-ver.xml | 21 +++ .../pool-rbd-ns-configopts.xml | 17 ++ .../pool-netfs-ns-mountopts.xml | 25 +++ .../pool-netfs-protocol-ver.xml | 21 +++ .../pool-rbd-ns-configopts.xml | 20 +++ tests/storagepoolxml2xmltest.c | 8 + tools/virsh-pool.c | 12 +- tools/virsh.pod | 5 + 31 files changed, 851 insertions(+), 14 deletions(-) create mode 100644 tests/storagepoolxml2argvdata/pool-netfs-auto-freebsd.argv create mode 100644 tests/storagepoolxml2argvdata/pool-netfs-auto-linux.argv create mode 100644 tests/storagepoolxml2argvdata/pool-netfs-freebsd.argv create mode 100644 tests/storagepoolxml2argvdata/pool-netfs-linux.argv create mode 100644 tests/storagepoolxml2argvdata/pool-netfs-ns-mountopts-freebsd.argv create mode 100644 tests/storagepoolxml2argvdata/pool-netfs-ns-mountopts-linux.argv create mode 100644 tests/storagepoolxml2argvdata/pool-netfs-ns-mountopts.argv create mode 100644 tests/storagepoolxml2argvdata/pool-netfs-protocol-ver-freebsd.argv create mode 100644 tests/storagepoolxml2argvdata/pool-netfs-protocol-ver-linux.argv create mode 100644 tests/storagepoolxml2argvdata/pool-netfs-protocol-ver.argv create mode 100644 tests/storagepoolxml2xmlin/pool-netfs-ns-mountopts.xml create mode 100644 tests/storagepoolxml2xmlin/pool-netfs-protocol-ver.xml create mode 100644 tests/storagepoolxml2xmlin/pool-rbd-ns-configopts.xml create mode 100644 tests/storagepoolxml2xmlout/pool-netfs-ns-mountopts.xml create mode 100644 tests/storagepoolxml2xmlout/pool-netfs-protocol-ver.xml create mode 100644 tests/storagepoolxml2xmlout/pool-rbd-ns-configopts.xml -- 2.20.1

2 25

[libvirt] [PATCH] docs: Format bit shift notation for bitwise flag enums
by Peter Krempa 29 Jan '19

29 Jan '19

Big number itself does not make much sense in some cases. Format the bitshift format as well. Changes our web page docs from: VIR_MIGRATE_POSTCOPY = 32768 : Setting the VIR_MIGRATE_POSTCOPY... VIR_MIGRATE_TLS = 65536 : Setting the VIR_MIGRATE_TLS flag... to: VIR_MIGRATE_POSTCOPY = 32768 (1<<15) : Setting the VIR_MIGRATE_POSTCOPY... VIR_MIGRATE_TLS = 65536 (1<<16) : Setting the VIR_MIGRATE_TLS flag... Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- docs/apibuild.py | 4 ++++ docs/libvirt.css | 4 ++++ docs/newapi.xsl | 15 +++++++++++++-- 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/docs/apibuild.py b/docs/apibuild.py index 3ef5d0f554..a57f995189 100755 --- a/docs/apibuild.py +++ b/docs/apibuild.py @@ -2123,6 +2123,10 @@ class docBuilder: except: val = info[0] output.write(" value='%s'" % (val)) + valuestr = re.sub("<", "<", info[0]) + valuestr = re.sub("[]", "", valuestr) + output.write(" valuestr='%s'" % valuestr) + if info[2] is not None and info[2] != '': output.write(" type='%s'" % info[2]) if info[1] is not None and info[1] != '': diff --git a/docs/libvirt.css b/docs/libvirt.css index e590b33cfb..c5fe27fa3f 100644 --- a/docs/libvirt.css +++ b/docs/libvirt.css @@ -537,3 +537,7 @@ dl.mail dt a:hover { color: rgb(255, 230, 0); text-decoration: none; } + +td.enumvalue { + white-space: nowrap; +} diff --git a/docs/newapi.xsl b/docs/newapi.xsl index 8d4c032c03..0a3658c9a5 100644 --- a/docs/newapi.xsl +++ b/docs/newapi.xsl @@ -288,6 +288,17 @@ </xsl:choose> </xsl:template> + <xsl:template name="enumvalue"> + <xsl:param name="value" select="@value"/> + <xsl:param name="valuestr" select="@valuestr"/> + <xsl:value-of select="@value"/> + <xsl:if test="$value != $valuestr"> + <xsl:text> (</xsl:text> + <xsl:value-of select="@valuestr"/> + <xsl:text>)</xsl:text> + </xsl:if> + </xsl:template> + <xsl:template match="typedef[@type = 'enum']"> <xsl:variable name="name" select="string(@name)"/> <h3><a name="{$name}"><code><xsl:value-of select="$name"/></code></a></h3> @@ -306,7 +317,7 @@ <td><xsl:text> = </xsl:text></td> <xsl:choose> <xsl:when test="@info != ''"> - <td><xsl:value-of select="@value"/></td> + <td class="enumvalue"><xsl:call-template name="enumvalue"/></td> <td> <div class="comment"> <xsl:call-template name="dumptext"> @@ -316,7 +327,7 @@ </td> </xsl:when> <xsl:otherwise> - <td colspan="2"><xsl:value-of select="@value"/></td> + <td colspan="2" class="enumvalue"><xsl:call-template name="enumvalue"/></td> </xsl:otherwise> </xsl:choose> </tr> -- 2.20.1

3 4

[libvirt] question: about iothreads count restrict in virDomainDefCheckABIStabilityFlags
by WangJie (Pluto) 29 Jan '19

29 Jan '19

Hi, Migrate feature have a restrict: target domain iothreads count must match source The relevant code as follows: ------------------------------------ if (src->niothreadids != dst->niothreadids) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Target domain iothreads count %zu does not " "match source %zu"), dst->niothreadids, src->niothreadids); goto error; } ------------------------------------ I tried to remove the restrict, and perform migrate in that case: "target domain iothreads count does not match source" , Anything is normal! So, can we remove the restrict to support this case?

2 1

Re: [libvirt] [Qemu-devel] [PATCH v4 03/14] audio: -audiodev command line option: documentation
by Thomas Huth 29 Jan '19

29 Jan '19

On 2019-01-28 23:43, Kővágó, Zoltán wrote: > This patch adds documentation of an -audiodev command line option, that > deprecates the old QEMU_* environment variables for audio backend > configuration. It's syntax is similar to existing options (-netdev, > -device, etc): > > -audiodev driver_name,property=value,... > > Although now it's possible to specify multiple -audiodev options on > command line, multiple audio backends are not supported yet. > > Signed-off-by: Kővágó, Zoltán <DirtY.iCE.hu(a)gmail.com> > --- > qemu-options.hx | 222 +++++++++++++++++++++++++++++++++++++++++++++++- > 1 file changed, 219 insertions(+), 3 deletions(-) > > diff --git a/qemu-options.hx b/qemu-options.hx > index 521511ec13..a12931899b 100644 > --- a/qemu-options.hx > +++ b/qemu-options.hx > @@ -416,14 +416,230 @@ The default is @code{en-us}. > ETEXI > > > +HXCOMM Deprecated by -audiodev > DEF("audio-help", 0, QEMU_OPTION_audio_help, > - "-audio-help print list of audio drivers and their options\n", > + "-audio-help show -audiodev equivalent of the currently specified audio settings\n", > QEMU_ARCH_ALL) Note that if you want to deprecate a parameter "officially" (in the sense that it could be removed in a future release), you also have to add an entry to qemu-deprecated.texi. But that could also be done in an additional patch later, so no need to respin just because of this. Thomas

1 0

[libvirt] [PATCH 0/5] Block job handling related fixes (blockdev-add saga)
by Peter Krempa 28 Jan '19

28 Jan '19

Fix the generated documentation and clean up a few corner cases in qemu's block job handling. Peter Krempa (5): lib: Fix docs generated for enum virDomainBlockJobType qemu: blockjob: Make sure that internal states are not reported as event qemu: blockjob: Mark job as started only when it's new qemu: Clear block copy mirror state explicitly qemu: Don't double-free disk->mirror if block commit initialization fails include/libvirt/libvirt-domain.h | 3 ++- src/qemu/qemu_blockjob.c | 7 ++++++- src/qemu/qemu_driver.c | 34 ++++++++++++++------------------ 3 files changed, 23 insertions(+), 21 deletions(-) -- 2.20.1

2 6

[libvirt] [PATCH] qmp: Deprecate query-nodes option of query-blockstats
by Anton Kuchin 28 Jan '19

28 Jan '19

This option is broken since a6baa60807 in v2.9 and returns mostly zeroes instead of real stats because actual querring of BlockStats that resides in blk is missing. And it makes no sense because with this option BlockDriverState-s are iterated but BlockAcctStats belong to BlockBackend and not BDS since 7f0e9da6f13 in v2.5 Signed-off-by: Anton Kuchin <antonkuchin(a)yandex-team.ru> --- block/qapi.c | 26 +++++++------------------- qapi/block-core.json | 8 +------- qemu-deprecated.texi | 5 +++++ 3 files changed, 13 insertions(+), 26 deletions(-) diff --git a/block/qapi.c b/block/qapi.c index c66f949db8..19d4b4ee42 100644 --- a/block/qapi.c +++ b/block/qapi.c @@ -502,8 +502,7 @@ static void bdrv_query_blk_stats(BlockDeviceStats *ds, BlockBackend *blk) &ds->x_flush_latency_histogram); } -static BlockStats *bdrv_query_bds_stats(BlockDriverState *bs, - bool blk_level) +static BlockStats *bdrv_query_bds_stats(BlockDriverState *bs) { BlockStats *s = NULL; @@ -517,7 +516,7 @@ static BlockStats *bdrv_query_bds_stats(BlockDriverState *bs, /* Skip automatically inserted nodes that the user isn't aware of in * a BlockBackend-level command. Stay at the exact node for a node-level * command. */ - while (blk_level && bs->drv && bs->implicit) { + while (bs->drv && bs->implicit) { bs = backing_bs(bs); assert(bs); } @@ -531,12 +530,12 @@ static BlockStats *bdrv_query_bds_stats(BlockDriverState *bs, if (bs->file) { s->has_parent = true; - s->parent = bdrv_query_bds_stats(bs->file->bs, blk_level); + s->parent = bdrv_query_bds_stats(bs->file->bs); } - if (blk_level && bs->backing) { + if (bs->backing) { s->has_backing = true; - s->backing = bdrv_query_bds_stats(bs->backing->bs, blk_level); + s->backing = bdrv_query_bds_stats(bs->backing->bs); } return s; @@ -577,21 +576,10 @@ BlockStatsList *qmp_query_blockstats(bool has_query_nodes, { BlockStatsList *head = NULL, **p_next = &head; BlockBackend *blk; - BlockDriverState *bs; /* Just to be safe if query_nodes is not always initialized */ if (has_query_nodes && query_nodes) { - for (bs = bdrv_next_node(NULL); bs; bs = bdrv_next_node(bs)) { - BlockStatsList *info = g_malloc0(sizeof(*info)); - AioContext *ctx = bdrv_get_aio_context(bs); - - aio_context_acquire(ctx); - info->value = bdrv_query_bds_stats(bs, false); - aio_context_release(ctx); - - *p_next = info; - p_next = &info->next; - } + error_setg(errp, "Option query_nodes is deprecated"); } else { for (blk = blk_all_next(NULL); blk; blk = blk_all_next(blk)) { BlockStatsList *info; @@ -604,7 +592,7 @@ BlockStatsList *qmp_query_blockstats(bool has_query_nodes, } aio_context_acquire(ctx); - s = bdrv_query_bds_stats(blk_bs(blk), true); + s = bdrv_query_bds_stats(blk_bs(blk)); s->has_device = true; s->device = g_strdup(blk_name(blk)); diff --git a/qapi/block-core.json b/qapi/block-core.json index 91685be6c2..2dd5f6032c 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -892,13 +892,7 @@ # # Query the @BlockStats for all virtual block devices. # -# @query-nodes: If true, the command will query all the block nodes -# that have a node name, in a list which will include "parent" -# information, but not "backing". -# If false or omitted, the behavior is as before - query all the -# device backends, recursively including their "parent" and -# "backing". Filter nodes that were created implicitly are -# skipped over in this mode. (Since 2.3) +# @query-nodes: deprecated since 3.2 # # Returns: A list of @BlockStats for each virtual block devices. # diff --git a/qemu-deprecated.texi b/qemu-deprecated.texi index 219206a836..e1e04ced7d 100644 --- a/qemu-deprecated.texi +++ b/qemu-deprecated.texi @@ -112,6 +112,11 @@ Use ``device_add'' for hotplugging vCPUs instead of ``cpu-add''. See documentation of ``query-hotpluggable-cpus'' for additional details. +@subsection query-blockstats (since 3.2) + +"query-nodes" parameter is not supported anymore because blockstats +are not a prorerty of node. + @section Human Monitor Protocol (HMP) commands @subsection The hub_id parameter of 'hostfwd_add' / 'hostfwd_remove' (since 3.1) -- 2.19.1

5 7

[libvirt] [PATCH] conf: Add check to avoid a NULL compare for SysfsPath
by Cheng Lin 28 Jan '19

28 Jan '19

If the two sysfs_path are both NULL, there may be an incorrect object returned for virNodeDeviceObjListFindBySysfsPath(). This check exists in old interface virNodeDeviceFindBySysfsPath(). e.g. virNodeDeviceFindBySysfsPath(virNodeDeviceObjListPtr devs, const char *sysfs_path) { ... if ((devs->objs[i]->def->sysfs_path != NULL) && (STREQ(devs->objs[i]->def->sysfs_path, sysfs_path))) { ... } Signed-off-by: Cheng Lin <cheng.lin130(a)zte.com.cn> --- src/conf/virnodedeviceobj.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/conf/virnodedeviceobj.c b/src/conf/virnodedeviceobj.c index c8ad131..2e40de5 100644 --- a/src/conf/virnodedeviceobj.c +++ b/src/conf/virnodedeviceobj.c @@ -207,7 +207,8 @@ virNodeDeviceObjListFindBySysfsPathCallback(const void *payload, int want = 0; virObjectLock(obj); - if (STREQ_NULLABLE(obj->def->sysfs_path, sysfs_path)) + if ((obj->def->sysfs_path != NULL) && + (STREQ_NULLABLE(obj->def->sysfs_path, sysfs_path))) want = 1; virObjectUnlock(obj); return want; -- 1.8.3.1

3 2

[libvirt] [PATCH] qemu: Assume migration with iscsi migration is safe
by Michal Privoznik 28 Jan '19

28 Jan '19

If a domain has a disk that is type='network' and protocol='iscsi' then there is no need to require @cache or UNSAFE migration flag. iscsi is a block device not a filesystem after all. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_migration.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 52aa665640..9a7077f710 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -1249,7 +1249,8 @@ qemuMigrationSrcIsSafe(virDomainDefPtr def, else if (rc == 1) continue; } else if (disk->src->type == VIR_STORAGE_TYPE_NETWORK && - disk->src->protocol == VIR_STORAGE_NET_PROTOCOL_RBD) { + (disk->src->protocol == VIR_STORAGE_NET_PROTOCOL_RBD || + disk->src->protocol == VIR_STORAGE_NET_PROTOCOL_ISCSI)) { continue; } -- 2.19.2

2 1

[libvirt] [PATCH] lib: Use more of VIR_STEAL_PTR()
by Michal Privoznik 28 Jan '19

28 Jan '19

From: Your Name <you(a)example.com> We have this very handy macro called VIR_STEAL_PTR() which steals one pointer into the other and sets the other to NULL. The following coccinelle patch was used to create this commit: @ rule1 @ identifier a, b; @@ - b = a; ... - a = NULL; + VIR_STEAL_PTR(b, a); Some places were clean up afterwards to make syntax-check happy (e.g. some curly braces were removed where the body become a one liner). Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/conf/domain_addr.c | 6 ++---- src/conf/domain_conf.c | 21 +++++++-------------- src/conf/secret_conf.c | 3 +-- src/conf/storage_conf.c | 3 +-- src/conf/virnetworkobj.c | 3 +-- src/conf/virsecretobj.c | 3 +-- src/libvirt-domain.c | 12 ++++-------- src/phyp/phyp_driver.c | 3 +-- src/qemu/qemu_domain.c | 6 ++---- src/qemu/qemu_driver.c | 12 ++++-------- src/qemu/qemu_migration.c | 12 ++++-------- src/security/virt-aa-helper.c | 3 +-- src/storage/storage_driver.c | 6 ++---- src/test/test_driver.c | 3 +-- src/util/virdbus.c | 18 ++++++------------ src/util/virrotatingfile.c | 3 +-- src/util/virstoragefile.c | 6 ++---- src/vz/vz_driver.c | 14 ++++---------- src/vz/vz_sdk.c | 6 ++---- tests/networkxml2conftest.c | 3 +-- tools/virsh-domain.c | 3 +-- tools/virsh-snapshot.c | 3 +-- 22 files changed, 50 insertions(+), 102 deletions(-) diff --git a/src/conf/domain_addr.c b/src/conf/domain_addr.c index 618fce44f0..04c4e6d7e1 100644 --- a/src/conf/domain_addr.c +++ b/src/conf/domain_addr.c @@ -1757,8 +1757,7 @@ virDomainVirtioSerialAddrSetCreateFromDomain(virDomainDefPtr def) addrs) < 0) goto cleanup; - ret = addrs; - addrs = NULL; + VIR_STEAL_PTR(ret, addrs); cleanup: virDomainVirtioSerialAddrSetFree(addrs); return ret; @@ -2095,8 +2094,7 @@ virDomainUSBAddressHubNew(size_t nports) goto cleanup; hub->nports = nports; - ret = hub; - hub = NULL; + VIR_STEAL_PTR(ret, hub); cleanup: virDomainUSBAddressHubFree(hub); return ret; diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 22979e6c4e..9409d93c23 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -7900,8 +7900,7 @@ virDomainNetIPParseXML(xmlNodePtr node) goto cleanup; } - ret = ip; - ip = NULL; + VIR_STEAL_PTR(ret, ip); cleanup: VIR_FREE(prefixStr); @@ -13482,10 +13481,8 @@ virDomainGraphicsListenDefParseXML(virDomainGraphicsListenDefPtr def, goto error; } - if (!address) { - address = addressCompat; - addressCompat = NULL; - } + if (!address) + VIR_STEAL_PTR(address, addressCompat); } if (def->type == VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_SOCKET) { @@ -13497,10 +13494,8 @@ virDomainGraphicsListenDefParseXML(virDomainGraphicsListenDefPtr def, goto error; } - if (!socketPath) { - socketPath = socketCompat; - socketCompat = NULL; - } + if (!socketPath) + VIR_STEAL_PTR(socketPath, socketCompat); } if (address && address[0] && @@ -14747,8 +14742,7 @@ virDomainShmemDefParseXML(virDomainXMLOptionPtr xmlopt, goto cleanup; - ret = def; - def = NULL; + VIR_STEAL_PTR(ret, def); cleanup: ctxt->node = save; VIR_FREE(tmp); @@ -16187,8 +16181,7 @@ virDomainIOMMUDefParseXML(xmlNodePtr node, } } - ret = iommu; - iommu = NULL; + VIR_STEAL_PTR(ret, iommu); cleanup: ctxt->node = save; diff --git a/src/conf/secret_conf.c b/src/conf/secret_conf.c index 3a5aa72563..ca6cc194a2 100644 --- a/src/conf/secret_conf.c +++ b/src/conf/secret_conf.c @@ -193,8 +193,7 @@ secretXMLParseNode(xmlDocPtr xml, xmlNodePtr root) if (virXPathNode("./usage", ctxt) != NULL && virSecretDefParseUsage(ctxt, def) < 0) goto cleanup; - ret = def; - def = NULL; + VIR_STEAL_PTR(ret, def); cleanup: VIR_FREE(prop); diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index 55db7a96f5..ba5b1f1783 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -587,8 +587,7 @@ virStoragePoolDefParseSourceString(const char *srcSpec, node) < 0) goto cleanup; - ret = def; - def = NULL; + VIR_STEAL_PTR(ret, def); cleanup: virStoragePoolSourceFree(def); xmlFreeDoc(doc); diff --git a/src/conf/virnetworkobj.c b/src/conf/virnetworkobj.c index e6b01388f5..3749dda751 100644 --- a/src/conf/virnetworkobj.c +++ b/src/conf/virnetworkobj.c @@ -602,8 +602,7 @@ virNetworkObjAssignDefLocked(virNetworkObjListPtr nets, obj->persistent = !(flags & VIR_NETWORK_OBJ_LIST_ADD_LIVE); } - ret = obj; - obj = NULL; + VIR_STEAL_PTR(ret, obj); cleanup: virNetworkObjEndAPI(&obj); diff --git a/src/conf/virsecretobj.c b/src/conf/virsecretobj.c index 78911c0908..c4e7b06eca 100644 --- a/src/conf/virsecretobj.c +++ b/src/conf/virsecretobj.c @@ -394,8 +394,7 @@ virSecretObjListAdd(virSecretObjListPtr secrets, virObjectRef(obj); } - ret = obj; - obj = NULL; + VIR_STEAL_PTR(ret, obj); cleanup: virSecretObjEndAPI(&obj); diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index 75c9014c0e..d919a44803 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -3046,9 +3046,8 @@ virDomainMigrateVersion3Full(virDomainPtr domain, VIR_MIGRATE_AUTO_CONVERGE); VIR_DEBUG("Prepare3 %p flags=0x%x", dconn, destflags); - cookiein = cookieout; cookieinlen = cookieoutlen; - cookieout = NULL; + VIR_STEAL_PTR(cookiein, cookieout); cookieoutlen = 0; if (useParams) { if (virTypedParamsReplaceString(&params, &nparams, @@ -3111,9 +3110,8 @@ virDomainMigrateVersion3Full(virDomainPtr domain, */ VIR_DEBUG("Perform3 %p uri=%s", domain->conn, uri); VIR_FREE(cookiein); - cookiein = cookieout; cookieinlen = cookieoutlen; - cookieout = NULL; + VIR_STEAL_PTR(cookiein, cookieout); cookieoutlen = 0; /* dconnuri not relevant in non-P2P modes, so left NULL here */ if (useParams) { @@ -3150,9 +3148,8 @@ virDomainMigrateVersion3Full(virDomainPtr domain, */ VIR_DEBUG("Finish3 %p ret=%d", dconn, ret); VIR_FREE(cookiein); - cookiein = cookieout; cookieinlen = cookieoutlen; - cookieout = NULL; + VIR_STEAL_PTR(cookiein, cookieout); cookieoutlen = 0; if (useParams) { if (virTypedParamsGetString(params, nparams, @@ -3227,9 +3224,8 @@ virDomainMigrateVersion3Full(virDomainPtr domain, if (notify_source) { VIR_DEBUG("Confirm3 %p ret=%d domain=%p", domain->conn, ret, domain); VIR_FREE(cookiein); - cookiein = cookieout; cookieinlen = cookieoutlen; - cookieout = NULL; + VIR_STEAL_PTR(cookiein, cookieout); cookieoutlen = 0; if (useParams) { ret = domain->conn->driver->domainMigrateConfirm3Params diff --git a/src/phyp/phyp_driver.c b/src/phyp/phyp_driver.c index 4acc6ce734..4ffa08ff43 100644 --- a/src/phyp/phyp_driver.c +++ b/src/phyp/phyp_driver.c @@ -1468,8 +1468,7 @@ phypGetBackingDevice(virConnectPtr conn, const char *managed_system, if (VIR_STRDUP(backing_device, char_ptr) < 0) goto cleanup; } else { - backing_device = ret; - ret = NULL; + VIR_STEAL_PTR(backing_device, ret); } char_ptr = strchr(backing_device, '\n'); diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index f42903a343..6eeabe0df1 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -11645,8 +11645,7 @@ qemuDomainCreateDeviceRecursive(const char *device, } VIR_FREE(devTmp); VIR_FREE(target); - target = tmp; - tmp = NULL; + VIR_STEAL_PTR(target, tmp); } if (qemuDomainCreateDeviceRecursive(target, data, @@ -12601,8 +12600,7 @@ qemuDomainAttachDeviceMknodRecursive(virQEMUDriverPtr driver, } VIR_FREE(fileTmp); VIR_FREE(target); - target = tmp; - tmp = NULL; + VIR_STEAL_PTR(target, tmp); } data.target = target; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 2d8e4618bd..5387150bbd 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -6655,11 +6655,9 @@ qemuDomainSaveImageUpdateDef(virQEMUDriverPtr driver, virFreeError(err); /* use the user provided XML */ - ret = newdef; - newdef = NULL; + VIR_STEAL_PTR(ret, newdef); } else { - ret = newdef_migr; - newdef_migr = NULL; + VIR_STEAL_PTR(ret, newdef_migr); } cleanup: @@ -12705,10 +12703,8 @@ qemuDomainMigratePerform(virDomainPtr dom, goto cleanup; } - if (flags & VIR_MIGRATE_PEER2PEER) { - dconnuri = uri; - uri = NULL; - } + if (flags & VIR_MIGRATE_PEER2PEER) + VIR_STEAL_PTR(dconnuri, uri); /* Do not output cookies in v2 protocol, since the cookie * length was not sufficiently large, causing failures diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 950d9cd615..6c66ff6648 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -4170,9 +4170,8 @@ qemuMigrationSrcPerformPeer2Peer3(virQEMUDriverPtr driver, VIR_MIGRATE_AUTO_CONVERGE); VIR_DEBUG("Prepare3 %p", dconn); - cookiein = cookieout; cookieinlen = cookieoutlen; - cookieout = NULL; + VIR_STEAL_PTR(cookiein, cookieout); cookieoutlen = 0; if (flags & VIR_MIGRATE_TUNNELLED) { if (!(st = virStreamNew(dconn, 0))) @@ -4239,9 +4238,8 @@ qemuMigrationSrcPerformPeer2Peer3(virQEMUDriverPtr driver, VIR_DEBUG("Perform3 %p uri=%s", sconn, NULLSTR(uri)); qemuMigrationJobSetPhase(driver, vm, QEMU_MIGRATION_PHASE_PERFORM3); VIR_FREE(cookiein); - cookiein = cookieout; cookieinlen = cookieoutlen; - cookieout = NULL; + VIR_STEAL_PTR(cookiein, cookieout); cookieoutlen = 0; if (flags & VIR_MIGRATE_TUNNELLED) { ret = qemuMigrationSrcPerformTunnel(driver, vm, st, persist_xml, @@ -4281,9 +4279,8 @@ qemuMigrationSrcPerformPeer2Peer3(virQEMUDriverPtr driver, */ VIR_DEBUG("Finish3 %p ret=%d", dconn, ret); VIR_FREE(cookiein); - cookiein = cookieout; cookieinlen = cookieoutlen; - cookieout = NULL; + VIR_STEAL_PTR(cookiein, cookieout); cookieoutlen = 0; if (useParams) { @@ -4362,9 +4359,8 @@ qemuMigrationSrcPerformPeer2Peer3(virQEMUDriverPtr driver, */ VIR_DEBUG("Confirm3 %p cancelled=%d vm=%p", sconn, cancelled, vm); VIR_FREE(cookiein); - cookiein = cookieout; cookieinlen = cookieoutlen; - cookieout = NULL; + VIR_STEAL_PTR(cookiein, cookieout); cookieoutlen = 0; ret = qemuMigrationSrcConfirmPhase(driver, vm, cookiein, cookieinlen, diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c index 56d7cfadf1..8e22e9978a 100644 --- a/src/security/virt-aa-helper.c +++ b/src/security/virt-aa-helper.c @@ -355,8 +355,7 @@ create_profile(const char *profile, const char *profile_name, if (!(tmp = virStringReplace(pcontent, template_end, replace_files))) goto clean_all; VIR_FREE(pcontent); - pcontent = tmp; - tmp = NULL; + VIR_STEAL_PTR(pcontent, tmp); } /* write the file */ diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index 4a13e90481..878a40cac5 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -1936,8 +1936,7 @@ storageVolCreateXML(virStoragePoolPtr pool, VIR_INFO("Creating volume '%s' in storage pool '%s'", newvol->name, def->name); - vol = newvol; - newvol = NULL; + VIR_STEAL_PTR(vol, newvol); voldef = NULL; cleanup: @@ -2130,8 +2129,7 @@ storageVolCreateXMLFrom(virStoragePoolPtr pool, VIR_INFO("Creating volume '%s' in storage pool '%s'", newvol->name, def->name); - vol = newvol; - newvol = NULL; + VIR_STEAL_PTR(vol, newvol); voldef = NULL; cleanup: diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 1d81772a46..568c52aa28 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -5595,8 +5595,7 @@ testNodeDeviceCreateXML(virConnectPtr conn, if (VIR_STRDUP(dev->parentName, def->parent) < 0) goto cleanup; - ret = dev; - dev = NULL; + VIR_STEAL_PTR(ret, dev); cleanup: virNodeDeviceObjEndAPI(&obj); diff --git a/src/util/virdbus.c b/src/util/virdbus.c index 691f182387..6725e0edb0 100644 --- a/src/util/virdbus.c +++ b/src/util/virdbus.c @@ -762,8 +762,7 @@ virDBusMessageIterEncode(DBusMessageIter *rootiter, goto cleanup; } VIR_FREE(contsig); - iter = newiter; - newiter = NULL; + VIR_STEAL_PTR(iter, newiter); types = t + 1; nstruct = skiplen; narray = (size_t)va_arg(args, int); @@ -789,8 +788,7 @@ virDBusMessageIterEncode(DBusMessageIter *rootiter, VIR_FREE(newiter); goto cleanup; } - iter = newiter; - newiter = NULL; + VIR_STEAL_PTR(iter, newiter); types = vsig; nstruct = strlen(types); narray = (size_t)-1; @@ -821,8 +819,7 @@ virDBusMessageIterEncode(DBusMessageIter *rootiter, goto cleanup; } VIR_FREE(contsig); - iter = newiter; - newiter = NULL; + VIR_STEAL_PTR(iter, newiter); types = t + 1; nstruct = skiplen - 2; narray = (size_t)-1; @@ -1059,8 +1056,7 @@ virDBusMessageIterDecode(DBusMessageIter *rootiter, nstruct, narray) < 0) goto cleanup; VIR_FREE(contsig); - iter = newiter; - newiter = NULL; + VIR_STEAL_PTR(iter, newiter); types = t + 1; nstruct = skiplen; if (arrayref) { @@ -1090,8 +1086,7 @@ virDBusMessageIterDecode(DBusMessageIter *rootiter, VIR_DEBUG("Push failed"); goto cleanup; } - iter = newiter; - newiter = NULL; + VIR_STEAL_PTR(iter, newiter); types = vsig; nstruct = strlen(types); narray = (size_t)-1; @@ -1118,8 +1113,7 @@ virDBusMessageIterDecode(DBusMessageIter *rootiter, nstruct, narray) < 0) goto cleanup; VIR_FREE(contsig); - iter = newiter; - newiter = NULL; + VIR_STEAL_PTR(iter, newiter); types = t + 1; nstruct = skiplen - 2; narray = (size_t)-1; diff --git a/src/util/virrotatingfile.c b/src/util/virrotatingfile.c index d7dc3bd1ce..7a268319a6 100644 --- a/src/util/virrotatingfile.c +++ b/src/util/virrotatingfile.c @@ -406,8 +406,7 @@ virRotatingFileWriterRollover(virRotatingFileWriterPtr file) } VIR_FREE(nextpath); - nextpath = thispath; - thispath = NULL; + VIR_STEAL_PTR(nextpath, thispath); } } diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index bd4b0274df..70fe551e5f 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -1233,8 +1233,7 @@ virStorageFileGetMetadataFromFD(const char *path, * update the metadata.*/ meta->type = VIR_STORAGE_TYPE_DIR; meta->format = VIR_STORAGE_FILE_DIR; - ret = meta; - meta = NULL; + VIR_STEAL_PTR(ret, meta); goto cleanup; } @@ -1256,8 +1255,7 @@ virStorageFileGetMetadataFromFD(const char *path, else if (S_ISBLK(sb.st_mode)) meta->type = VIR_STORAGE_TYPE_BLOCK; - ret = meta; - meta = NULL; + VIR_STEAL_PTR(ret, meta); cleanup: virStorageSourceFree(meta); diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c index 7e9ef932dc..e86a788b09 100644 --- a/src/vz/vz_driver.c +++ b/src/vz/vz_driver.c @@ -182,12 +182,8 @@ vzDestroyDriverConnection(void) vzConnPtr privconn_list; virMutexLock(&vz_driver_lock); - driver = vz_driver; - vz_driver = NULL; - - privconn_list = vz_conn_list; - vz_conn_list = NULL; - + VIR_STEAL_PTR(driver, vz_driver); + VIR_STEAL_PTR(privconn_list, vz_conn_list); virMutexUnlock(&vz_driver_lock); while (privconn_list) { @@ -3203,9 +3199,8 @@ vzDomainMigratePerformP2P(virDomainObjPtr dom, VIR_MIGRATE_PARAM_DEST_XML, dom_xml) < 0) goto done; - cookiein = cookieout; cookieinlen = cookieoutlen; - cookieout = NULL; + VIR_STEAL_PTR(cookiein, cookieout); cookieoutlen = 0; virObjectUnlock(dom); ret = dconn->driver->domainMigratePrepare3Params @@ -3226,9 +3221,8 @@ vzDomainMigratePerformP2P(virDomainObjPtr dom, } VIR_FREE(cookiein); - cookiein = cookieout; cookieinlen = cookieoutlen; - cookieout = NULL; + VIR_STEAL_PTR(cookiein, cookieout); cookieoutlen = 0; if (vzDomainMigratePerformStep(dom, driver, params, nparams, cookiein, cookieinlen, flags) < 0) { diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c index 63d013deac..b9fd03c0d2 100644 --- a/src/vz/vz_sdk.c +++ b/src/vz/vz_sdk.c @@ -928,8 +928,7 @@ prlsdkParseNetAddress(char *addr) goto cleanup; ip->prefix = nbits; - ret = ip; - ip = NULL; + VIR_STEAL_PTR(ret, ip); cleanup: if (!ret) @@ -4768,8 +4767,7 @@ prlsdkParseSnapshotTree(const char *treexml) goto cleanup; } - ret = snapshots; - snapshots = NULL; + VIR_STEAL_PTR(ret, snapshots); cleanup: virDomainSnapshotObjListFree(snapshots); diff --git a/tests/networkxml2conftest.c b/tests/networkxml2conftest.c index 367e30b994..c362149c29 100644 --- a/tests/networkxml2conftest.c +++ b/tests/networkxml2conftest.c @@ -51,8 +51,7 @@ testCompareXMLToConfFiles(const char *inxml, const char *outconf, dnsmasqCapsPtr "except-interface=lo\n"))) goto fail; VIR_FREE(actual); - actual = tmp; - tmp = NULL; + VIR_STEAL_PTR(actual, tmp); #endif if (virTestCompareToFile(actual, outconf) < 0) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index e63fc028b9..34f9e6b5c6 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -8423,8 +8423,7 @@ cmdDesc(vshControl *ctl, const vshCmd *cmd) } VIR_FREE(desc); - desc = desc_edited; - desc_edited = NULL; + VIR_STEAL_PTR(desc, desc_edited); } if (virDomainSetMetadata(dom, type, desc, NULL, NULL, flags) < 0) { diff --git a/tools/virsh-snapshot.c b/tools/virsh-snapshot.c index e3d4cda0fc..6d8e2b299b 100644 --- a/tools/virsh-snapshot.c +++ b/tools/virsh-snapshot.c @@ -1356,8 +1356,7 @@ virshSnapshotListCollect(vshControl *ctl, virDomainPtr dom, virshSnapSorter); snaplist->nsnaps -= deleted; - ret = snaplist; - snaplist = NULL; + VIR_STEAL_PTR(ret, snaplist); cleanup: virshSnapshotListFree(snaplist); -- 2.19.2

3 3

[libvirt] [PATCH] virfile: Detect ceph as shared FS
by Michal Privoznik 28 Jan '19

28 Jan '19

https://bugzilla.redhat.com/show_bug.cgi?id=1665553 Ceph can be mounted just like any other filesystem and in fact is a shared and cluster filesystem. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/util/virfile.c | 9 ++++++++- src/util/virfile.h | 1 + src/util/virstoragefile.c | 3 ++- tests/virfiledata/mounts3.txt | 2 ++ tests/virfilemock.c | 5 +++++ tests/virfiletest.c | 1 + 6 files changed, 19 insertions(+), 2 deletions(-) diff --git a/src/util/virfile.c b/src/util/virfile.c index 263c92667c..271bf5e796 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -3465,6 +3465,9 @@ int virFilePrintf(FILE *fp, const char *msg, ...) # ifndef FUSE_SUPER_MAGIC # define FUSE_SUPER_MAGIC 0x65735546 # endif +# ifndef CEPH_SUPER_MAGIC +# define CEPH_SUPER_MAGIC 0x00C36400 +# endif # define PROC_MOUNTS "/proc/mounts" @@ -3607,6 +3610,9 @@ virFileIsSharedFSType(const char *path, if ((fstypes & VIR_FILE_SHFS_CIFS) && (f_type == CIFS_SUPER_MAGIC)) return 1; + if ((fstypes & VIR_FILE_SHFS_CEPH) && + (f_type == CEPH_SUPER_MAGIC)) + return 1; return 0; } @@ -3769,7 +3775,8 @@ int virFileIsSharedFS(const char *path) VIR_FILE_SHFS_OCFS | VIR_FILE_SHFS_AFS | VIR_FILE_SHFS_SMB | - VIR_FILE_SHFS_CIFS); + VIR_FILE_SHFS_CIFS | + VIR_FILE_SHFS_CEPH); } diff --git a/src/util/virfile.h b/src/util/virfile.h index 93484e5444..65432da13a 100644 --- a/src/util/virfile.h +++ b/src/util/virfile.h @@ -220,6 +220,7 @@ enum { VIR_FILE_SHFS_AFS = (1 << 3), VIR_FILE_SHFS_SMB = (1 << 4), VIR_FILE_SHFS_CIFS = (1 << 5), + VIR_FILE_SHFS_CEPH = (1 << 6), }; int virFileIsSharedFSType(const char *path, int fstypes) ATTRIBUTE_NONNULL(1); diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index bd4b0274df..895c8f90de 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -1359,7 +1359,8 @@ int virStorageFileIsClusterFS(const char *path) */ return virFileIsSharedFSType(path, VIR_FILE_SHFS_GFS2 | - VIR_FILE_SHFS_OCFS); + VIR_FILE_SHFS_OCFS | + VIR_FILE_SHFS_CEPH); } #ifdef LVS diff --git a/tests/virfiledata/mounts3.txt b/tests/virfiledata/mounts3.txt index 134c6e8f81..68eded048c 100644 --- a/tests/virfiledata/mounts3.txt +++ b/tests/virfiledata/mounts3.txt @@ -33,3 +33,5 @@ host:/nfs /nfs nfs4 rw,relatime,vers=4.1,rsize=1048576,wsize=1048576,namlen=255, dev /nfs/blah devtmpfs rw,nosuid,relatime,size=10240k,nr_inodes=4093060,mode=755 0 0 host:/gv0 /gluster fuse.glusterfs rw 0 0 root@host:/tmp/mkdir /gluster/sshfs fuse.sshfs rw 0 0 +192.168.0.1:/ceph/data /ceph ceph rw,noatime,name=cephfs,secret=<hidden>,acl,wsize=16777216 0 0 +192.168.0.1,192.168.0.2,192.168.0.3:/ceph/data2 /ceph/multi ceph rw,noatime,name=cephfs,secret=<hidden>,acl,wsize=16777216 0 0 diff --git a/tests/virfilemock.c b/tests/virfilemock.c index fb6bd5e699..499135d773 100644 --- a/tests/virfilemock.c +++ b/tests/virfilemock.c @@ -86,6 +86,9 @@ setmntent(const char *filename, const char *type) #ifndef FUSE_SUPER_MAGIC # define FUSE_SUPER_MAGIC 0x65735546 #endif +#ifndef CEPH_SUPER_MAGIC +# define CEPH_SUPER_MAGIC 0x00c36400 +#endif static int @@ -132,6 +135,8 @@ statfs_mock(const char *mtab, ftype = CIFS_SUPER_MAGIC; } else if (STRPREFIX(mb.mnt_type, "fuse")) { ftype = FUSE_SUPER_MAGIC; + } else if (STRPREFIX(mb.mnt_type, "ceph")) { + ftype = CEPH_SUPER_MAGIC; } else { /* Everything else is EXT4. We don't care really for other paths. */ ftype = EXT4_SUPER_MAGIC; diff --git a/tests/virfiletest.c b/tests/virfiletest.c index b1cb831bfd..6cc599a81b 100644 --- a/tests/virfiletest.c +++ b/tests/virfiletest.c @@ -455,6 +455,7 @@ mymain(void) DO_TEST_FILE_IS_SHARED_FS_TYPE("mounts3.txt", "/gluster/file", true); DO_TEST_FILE_IS_SHARED_FS_TYPE("mounts3.txt", "/gluster/sshfs/file", false); DO_TEST_FILE_IS_SHARED_FS_TYPE("mounts3.txt", "/some/symlink/file", true); + DO_TEST_FILE_IS_SHARED_FS_TYPE("mounts3.txt", "/ceph/file", true); return ret != 0 ? EXIT_FAILURE : EXIT_SUCCESS; } -- 2.19.2

2 2

[libvirt] [PATCH 0/2] add debugcon-isa chardev guest interface
by Nikolay Shirokovskiy 28 Jan '19

28 Jan '19

It corresponds to QEMU's isa-debugcon device. It can be used to output debug info by firmware at least. I do not introduce capability to test for the device because it was supported long before current minimal 1.5.0 version. Nikolay Shirokovskiy (2): conf: add debugcon-isa chardev guest interface qemu: implement debugcon-isa chardev docs/formatdomain.html.in | 11 ++++++ docs/schemas/domaincommon.rng | 8 +++++ src/conf/domain_conf.c | 6 +++- src/conf/domain_conf.h | 1 + src/libvirt_private.syms | 2 ++ src/qemu/qemu_command.c | 13 +++++++ src/qemu/qemu_domain.c | 20 +++++++++++ tests/qemuxml2argvdata/channel-debugcon-isa.args | 29 ++++++++++++++++ tests/qemuxml2argvdata/channel-debugcon-isa.xml | 34 +++++++++++++++++++ tests/qemuxml2argvtest.c | 1 + tests/qemuxml2xmloutdata/channel-debugcon-isa.xml | 41 +++++++++++++++++++++++ tests/qemuxml2xmltest.c | 1 + 12 files changed, 166 insertions(+), 1 deletion(-) create mode 100644 tests/qemuxml2argvdata/channel-debugcon-isa.args create mode 100644 tests/qemuxml2argvdata/channel-debugcon-isa.xml create mode 100644 tests/qemuxml2xmloutdata/channel-debugcon-isa.xml -- 1.8.3.1

6 13

[libvirt] [PATCH 0/3] Facilitate running libvirt builds via docker including cross-compilation
by Daniel P. Berrangé 28 Jan '19

28 Jan '19

For a while QEMU has provided simple make rules for building QEMU inside standard docker container environments. This provides an equivalent mechanism for libvirt inspired by QEMU's. This series depends on the cross compiler images defined by: https://www.redhat.com/archives/libvir-list/2019-January/msg01039.html QEMU actually builds the container images on developer's machines locally. Libvirt already hosts pre-built images on quay.io, so that is used directly as it is quicker to download these than build them locally each time. Daniel P. Berrangé (3): tests: add targets for building libvirt inside docker containers tests: add cross compiler images to CI test help output tests: perform cross compiler builds on GitLab CI .gitignore | 1 + .gitlab-ci.yml | 38 ++++++++++++ Makefile.am | 2 + tests/Makefile.ci.inc | 134 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 175 insertions(+) create mode 100644 .gitlab-ci.yml create mode 100644 tests/Makefile.ci.inc -- 2.20.1

1 4

[libvirt] [PATCH v2 0/1] qemu_hotplug.c: check address before hotplug
by Daniel Henrique Barboza 26 Jan '19

26 Jan '19

Changes in v2: - removed the function to check for alias - added a new function to check for address in the VM definition Daniel Henrique Barboza (1): qemu_hotplug.c: check disk address before hotplug src/qemu/qemu_hotplug.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) -- 2.20.1

2 5

[libvirt] [PATCH 0/3] Fixes for GPL / LGPL statements
by Thomas Huth 25 Jan '19

25 Jan '19

Here are some fixes for files in libvirt where the GPL or LGPL statements are slightly wrong. Thomas Huth (3): bootstrap.conf: Fix LGPL information tools/virt-xml-validate: Fix GPL information docs/governance: Clarify the version number of the LGPL bootstrap.conf | 2 +- docs/governance.html.in | 2 +- tools/virt-xml-validate.in | 5 ++--- 3 files changed, 4 insertions(+), 5 deletions(-) -- 1.8.3.1

2 4

[libvirt] [PATCH 0/2] virjson improvements [incremental backup saga]
by Eric Blake 25 Jan '19

25 Jan '19

Upstream qemu stabilized the QMP command block-dirty-bitmap-merge to take an array of strings as the sources to merge into a destination bitmap; this is a lot nicer for libvirt, compared to the alternative where qemu 3.1 x-block-dirty-bitmap-merge had to be called multiple times with the potential for some odd cleanup after partial failure scenarios. This series prepares virjson for use in my incremental backup work. Eric Blake (2): virjson: always raise vir error on append failures virjson: add convenience wrapper for appending string to array src/util/virjson.h | 2 ++ src/libvirt_private.syms | 1 + src/util/virjson.c | 28 +++++++++++++++++++++++++--- 3 files changed, 28 insertions(+), 3 deletions(-) -- 2.20.1

2 3

[libvirt] [PATCH] tools: Document completer callback
by Michal Privoznik 24 Jan '19

24 Jan '19

Strictly speaking, this should go near vshCompleter typedef declaration. However, I find it more useful near actual completer implementations. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- tools/virsh-completer.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/tools/virsh-completer.c b/tools/virsh-completer.c index cfbfeae328..7a637a0cfa 100644 --- a/tools/virsh-completer.c +++ b/tools/virsh-completer.c @@ -35,6 +35,38 @@ #include "virxml.h" +/** + * A completer callback is a function that accepts three arguments: + * + * @ctl: virsh control structure + * @cmd: parsed input + * @flags: optional flags to alter completer's behaviour + * + * The @ctl contains connection to the daemon (should completer + * need it). Any completer that requires connection must check + * whether connection is still alive. + * + * The @cmd then holds parsed user input which might be missing + * some arguments (user is still typing the command), but may + * already contain important data. For instance if completer + * needs domain XML it may inspect @cmd to find --domain. Using + * existing wrappers is advised. If @cmd does not contain all + * necessary bits, completer might return sensible defaults (i.e. + * generic values not tailored to specific use case) or return + * NULL (i.e. no strings are offered to the user for completion). + * + * The @flags then contain .completer_flags value defined for + * each use or 0 if no .completer_flags were specified. If a + * completer is generic enough @flags can be used to alter it's + * behaviour. For instance, a completer to fetch names of domains + * can use @flags to return names of only domains in particular + * state that the command accepts. + * + * Under no circumstances a completer can output anything. Nor to + * stdout nor to stderr. This would harm the user experience. + */ + + char ** virshDomainNameCompleter(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED, -- 2.19.2

2 1

[libvirt] [PATCH v2 0/3] Rebase LXC network definition to support version 3.0
by Julio Faracco 24 Jan '19

24 Jan '19

The series propose a new way to define NICs inside LXC native. It is needed because LXC version 3.X uses indexes to define NICs and the current algorithm is not able to support them. At least, if you consider settings defined using a random logic. v1-v2: Includes Michal's suggestions. Julio Faracco (3): lxc: refactoring LXC network definition with a sparse array. tests: Change legacy network configs to version 3.0 with indexes. tests: Include a random network testcase to test indexes. src/lxc/lxc_native.c | 195 ++++++++++++------ .../lxcconf2xml-ethernet-v3.config | 16 +- .../lxcconf2xml-fstab-v3.config | 10 +- .../lxcconf2xml-macvlannetwork-v3.config | 10 +- .../lxcconf2xml-miscnetwork-v3.config | 38 ++-- .../lxcconf2xml-physnetwork-v3.config | 14 +- .../lxcconf2xml-simple-v3.config | 18 +- .../lxcconf2xml-vlannetwork-v3.config | 10 +- tests/lxcconf2xmltest.c | 1 + 9 files changed, 187 insertions(+), 125 deletions(-) -- 2.19.1

3 6

[libvirt] [PATCH] virPortAllocatorSetUsed: ignore port 0
by Ján Tomko 24 Jan '19

24 Jan '19

Similar to what commit 86dba8f3 did for virPortAllocatorRelease, ignore port 0 in virPortAllocatorSetUsed. For all the reasonable use cases the callers already check that the port is non-zero, however if the port from the XML overflows unsigned short and turns into 0, it can be set as used by virPortAllocatorSetUsed but not released by virPortAllocatorRelease. Also skip port '0' in virPortAllocatorSetUsed to make this behavior symmetric. The serenity was disturbed by commit 5dbda5e9 which started using virPortAllocatorRelease instead of virPortAllocatorSetUsed (false). https://bugzilla.redhat.com/show_bug.cgi?id=1591645 Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- src/util/virportallocator.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/util/virportallocator.c b/src/util/virportallocator.c index db95a601c7..d48963c1ff 100644 --- a/src/util/virportallocator.c +++ b/src/util/virportallocator.c @@ -294,6 +294,9 @@ virPortAllocatorSetUsed(unsigned short port) if (!pa) return -1; + if (!port) + return 0; + virObjectLock(pa); if (virBitmapIsBitSet(pa->bitmap, port) || -- 2.16.4

2 1

[libvirt] [PATCH] docs: Add more iscsi-direct references to storage pages
by John Ferlan 24 Jan '19

24 Jan '19

Found that it was missing in formatstorage and had a few typos in the storage driver page. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- noted while working on other stuff... Also although <initiator> is supported by the "iscsi" pool as well, it's not something ever documented since commit 6aabcb5bd (0.7.5). I could add a note that it's optional to use with the "iscsi" pool if desired. docs/formatstorage.html.in | 20 ++++++++++++++++---- docs/storage.html.in | 8 ++++---- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/docs/formatstorage.html.in b/docs/formatstorage.html.in index b6bf3edbd2..979e170c08 100644 --- a/docs/formatstorage.html.in +++ b/docs/formatstorage.html.in @@ -18,7 +18,9 @@ The top level tag for a storage pool document is 'pool'. It has a single attribute <code>type</code>, which is one of <code>dir</code>, <code>fs</code>, <code>netfs</code>, <code>disk</code>, - <code>iscsi</code>, <code>logical</code>, <code>scsi</code> + <code>iscsi</code>, + <code>iscsi-direct</code>(<span class="since">since 4.7.0</span>), + <code>logical</code>, <code>scsi</code> (all <span class="since">since 0.4.1</span>), <code>mpath</code> (<span class="since">since 0.7.1</span>), <code>rbd</code> (<span class="since">since 0.9.13</span>), <code>sheepdog</code> @@ -125,11 +127,12 @@ <dt><code>device</code></dt> <dd>Provides the source for pools backed by physical devices (pool types <code>fs</code>, <code>logical</code>, <code>disk</code>, - <code>iscsi</code>, <code>zfs</code>, <code>vstorage</code>). + <code>iscsi</code>, <code>iscsi-direct</code>, <code>zfs</code>, + <code>vstorage</code>). May be repeated multiple times depending on backend driver. Contains a required attribute <code>path</code> which is either the fully qualified path to the block device node or for <code>iscsi</code> - the iSCSI Qualified Name (IQN). + or <code>iscsi-direct</code> the iSCSI Qualified Name (IQN). <span class="since">Since 0.4.1</span> <p>An optional attribute <code>part_separator</code> for each <code>path</code> may be supplied. Valid values for the attribute @@ -334,6 +337,7 @@ <dt><code>host</code></dt> <dd>Provides the source for pools backed by storage from a remote server (pool types <code>netfs</code>, <code>iscsi</code>, + <code>iscsi-direct</code>, <code>rbd</code>, <code>sheepdog</code>, <code>gluster</code>). Will be used in combination with a <code>directory</code> or <code>device</code> element. Contains an attribute <code>name</code> @@ -348,11 +352,19 @@ server. See the <a href="storage.html">storage driver page</a> for any restrictions for specific storage backends. <span class="since">Since 0.4.1</span></dd> + <dt><code>initiator</code></dt> + <dd>Required by the <code>iscsi-direct</code> pool in order to provide + the iSCSI Qualified Name (IQN) to communicate with the pool's + <code>device</code> target IQN. There is one sub-element + <code>iqn</code> with the <code>name</code> attribute to describe + the IQN for the initiator. + <span class="since">Since 4.7.0</span></dd> <dt><code>auth</code></dt> <dd>If present, the <code>auth</code> element provides the authentication credentials needed to access the source by the setting of the <code>type</code> attribute (pool - types <code>iscsi</code>, <code>rbd</code>). The <code>type</code> + types <code>iscsi</code>, <code>iscsi-direct</code>, <code>rbd</code>). + The <code>type</code> must be either "chap" or "ceph". Use "ceph" for Ceph RBD (Rados Block Device) network sources and use "iscsi" for CHAP (Challenge-Handshake Authentication Protocol) iSCSI diff --git a/docs/storage.html.in b/docs/storage.html.in index 9adcc2a87f..c8617aace5 100644 --- a/docs/storage.html.in +++ b/docs/storage.html.in @@ -437,9 +437,9 @@ <h2><a id="StorageBackendISCSIDirect">iSCSI direct pool</a></h2> <p> - This is a variant of the iSCSI pool. Instead of unsing iscsiadm, it uses + This is a variant of the iSCSI pool. Instead of using iscsiadm, it uses libiscsi. - It require a host, a path which is the target iqn and an initiator iqn. + It requires a host, a path which is the target IQN, and an initiator IQN. </p> <h3>Example pool input</h3> @@ -457,12 +457,12 @@ <h3>Valid pool format types</h3> <p> - The iSCSI volume pool does not use the pool format type element. + The iSCSI direct volume pool does not use the pool format type element. </p> <h3>Valid volume format types</h3> <p> - The iSCSI volume pool does not use the volume format type element. + The iSCSI direct volume pool does not use the volume format type element. </p> <h2><a id="StorageBackendSCSI">SCSI pool</a></h2> -- 2.20.1

2 1

[libvirt] [PATCH v3 00/11] Allow adding mountOpts to the storage pool mount command
by John Ferlan 24 Jan '19

24 Jan '19

v2: https://www.redhat.com/archives/libvir-list/2019-January/msg00164.html Changes since v2: * Split out the noexec, nodev, nosuid, and (new) ro into the first 3 patches as "known" or "supported" mount options that can be added. I avoided just adding them noexec, nodev, and nosuid by default. * Add patches 4-6 to essentially support the nfsvers option * The rest of the patches are reworked to add support for namespace at the pool level (as opposed to the v2 at the source level). John Ferlan (11): conf: Add some defined NFS Storage Pool mount options storage: Add mountOpts to the storage pool mount command line virsh: Add source-mount-opts for pool commands conf: Add optional NFS Source Pool <protocol ver='n'/> option storage: Add the nfsvers to the command line virsh: Add source-protocol-ver for pool commands conf: Introduce virStoragePoolXMLNamespace nfs: Add infrastructure to manage XML namespace options docs,tests: Add schema, description, and tests for NFS namespace storage: Add NFS storage pool namespace options to command line rbd: Utilize storage pool namespace to manage config options docs/formatstorage.html.in | 137 +++++++++++++++ docs/schemas/storagepool.rng | 70 ++++++++ src/conf/storage_conf.c | 120 ++++++++++++- src/conf/storage_conf.h | 40 +++++ src/libvirt_private.syms | 1 + src/storage/storage_backend_fs.c | 128 ++++++++++++++ src/storage/storage_backend_rbd.c | 166 +++++++++++++++++- src/storage/storage_util.c | 47 +++++ src/storage/storage_util.h | 14 ++ tests/Makefile.am | 4 +- .../pool-netfs-mountopts.argv | 1 + .../pool-netfs-ns-mountopts.argv | 2 + .../pool-netfs-protocol-ver.argv | 1 + tests/storagepoolxml2argvtest.c | 6 + .../pool-netfs-mountopts.xml | 24 +++ .../pool-netfs-ns-mountopts.xml | 29 +++ .../pool-netfs-protocol-ver.xml | 21 +++ .../pool-rbd-ns-configopts.xml | 17 ++ .../pool-netfs-mountopts.xml | 24 +++ .../pool-netfs-ns-mountopts.xml | 29 +++ .../pool-netfs-protocol-ver.xml | 21 +++ .../pool-rbd-ns-configopts.xml | 20 +++ tests/storagepoolxml2xmltest.c | 9 + tools/virsh-pool.c | 44 ++++- tools/virsh.pod | 10 ++ 25 files changed, 977 insertions(+), 8 deletions(-) create mode 100644 tests/storagepoolxml2argvdata/pool-netfs-mountopts.argv create mode 100644 tests/storagepoolxml2argvdata/pool-netfs-ns-mountopts.argv create mode 100644 tests/storagepoolxml2argvdata/pool-netfs-protocol-ver.argv create mode 100644 tests/storagepoolxml2xmlin/pool-netfs-mountopts.xml create mode 100644 tests/storagepoolxml2xmlin/pool-netfs-ns-mountopts.xml create mode 100644 tests/storagepoolxml2xmlin/pool-netfs-protocol-ver.xml create mode 100644 tests/storagepoolxml2xmlin/pool-rbd-ns-configopts.xml create mode 100644 tests/storagepoolxml2xmlout/pool-netfs-mountopts.xml create mode 100644 tests/storagepoolxml2xmlout/pool-netfs-ns-mountopts.xml create mode 100644 tests/storagepoolxml2xmlout/pool-netfs-protocol-ver.xml create mode 100644 tests/storagepoolxml2xmlout/pool-rbd-ns-configopts.xml -- 2.20.1

3 15

[libvirt] [PATCH 00/11] qemu: format CCID controllers after USB hubs
by Ján Tomko 24 Jan '19

24 Jan '19

https://bugzilla.redhat.com/show_bug.cgi?id=1599971 Ján Tomko (11): qemu: move out legacy USB controller formatting qemu: exit early if USB_CONTROLLER_MODEL_NONE is present Add qemuBuildDomainForbidLegacyUSBController qemu: separate counting of legacy USB controllers qemu: separate counting of USB controllers qemuBuildControllerDevStr: remove nusbcontroller argument qemu: Introduce qemuBuildControllersByTypeCommandLine qemu: format CCID controllers after USB hubs qemuBuildControllersByTypeCommandLine: free devstr in the cleanup section rename qemuBuildControllerDevCommandLine qemuBuildControllersCommandLine: use i instead of j as the counter src/qemu/qemu_command.c | 222 +++++++++++------- src/qemu/qemu_command.h | 3 +- src/qemu/qemu_hotplug.c | 2 +- tests/qemuxml2argvdata/chardev-reconnect.args | 2 +- tests/qemuxml2argvdata/controller-order.args | 2 +- tests/qemuxml2argvdata/name-escape.args | 2 +- .../smartcard-controller.args | 2 +- .../smartcard-host-certificates-database.args | 2 +- .../smartcard-host-certificates.args | 2 +- tests/qemuxml2argvdata/smartcard-host.args | 2 +- .../smartcard-passthrough-spicevmc.args | 2 +- .../smartcard-passthrough-tcp.args | 2 +- tests/qemuxml2argvdata/user-aliases.args | 2 +- 13 files changed, 150 insertions(+), 97 deletions(-) -- 2.20.1

2 13

[libvirt] [python PATCH 0/3] travis: misc fixes to build
by Daniel P. Berrangé 24 Jan '19

24 Jan '19

Fix the travis build which has been broken for a while Daniel P. Berrangé (3): travis: remove python 2.6 and 3.6 from build matrix travis: switch from trusty to xenial dist travis: add testing of 5.0.0 release .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.20.1

2 4

[libvirt] [PATCH v2 00/17] implement cgroups v2 devices support
by Pavel Hrdina 24 Jan '19

24 Jan '19

In cgroups v2 there is no devices controller, BPF should be used instead. Changes in v2: - fixed build on bsd and older kernels without cgroup BPF - cgroup bpf devices code moved to separate file Documentation for eBPF: <http://man7.org/linux/man-pages/man2/bpf.2.html> <https://www.kernel.org/doc/Documentation/networking/filter.txt> <https://docs.cilium.io/en/v1.3/bpf/> Pavel Hrdina (17): util: introduce virbpf helpers vircgroup: introduce virCgroupV2DevicesAvailable vircgroup: introduce virCgroupV2DevicesAttachProg vircgroup: introduce virCgroupV2DevicesDetectProg vircgroup: introduce virCgroupV2DevicesCreateProg vircgroup: introduce virCgroupV2DevicesPrepareProg vircgroup: introduce virCgroupV2DevicesRemoveProg vircgroup: introduce virCgroupV2DeviceGetPerms vircgroup: introduce virCgroupV2DevicesGetKey vircgroup: introduce virCgroupV2AllowDevice vircgroup: introduce virCgroupV2DenyDevice vircgroup: introduce virCgroupV2AllowAllDevices vircgroup: introduce virCgroupV2DenyAllDevices vircgroup: workaround devices in hybrid mode vircgroupv2: detech BPF program before removing cgroup vircgroupv2: use dummy process to workaround kernel bug with systemd vircgroupmock: mock virCgroupV2DevicesAvailable configure.ac | 6 + include/libvirt/virterror.h | 1 + src/Makefile.am | 2 + src/libvirt_private.syms | 27 ++ src/lxc/lxc_cgroup.c | 1 + src/qemu/qemu_cgroup.c | 6 +- src/util/Makefile.inc.am | 4 + src/util/virbpf.c | 437 +++++++++++++++++++++ src/util/virbpf.h | 271 +++++++++++++ src/util/vircgroup.c | 19 +- src/util/vircgroup.h | 1 + src/util/vircgroupbackend.h | 3 +- src/util/vircgrouppriv.h | 12 + src/util/vircgroupv1.c | 9 +- src/util/vircgroupv2.c | 119 +++++- src/util/vircgroupv2devices.c | 625 ++++++++++++++++++++++++++++++ src/util/vircgroupv2devices.h | 57 +++ src/util/virerror.c | 1 + src/util/virsystemd.c | 2 +- src/util/virsystemd.h | 2 + tests/vircgroupdata/hybrid.parsed | 2 +- tests/vircgroupmock.c | 7 + tests/vircgrouptest.c | 4 +- 23 files changed, 1608 insertions(+), 10 deletions(-) create mode 100644 src/util/virbpf.c create mode 100644 src/util/virbpf.h create mode 100644 src/util/vircgroupv2devices.c create mode 100644 src/util/vircgroupv2devices.h -- 2.20.1

3 25

[libvirt] [PATCH 0/3] Improve block job handling docs
by Peter Krempa 24 Jan '19

24 Jan '19

Modernize documentation for our APIs and clean up some old cruft. Some of those may be slightly controversial. Peter Krempa (3): qemu: Don't reject making domain persistent if block copy is running lib: Clarify that any block job may block VM save or device detach lib: domain: Emphasise that users should wait for block job READY state via events src/libvirt-domain.c | 33 +++++++++++++-------------------- src/qemu/qemu_driver.c | 6 ------ 2 files changed, 13 insertions(+), 26 deletions(-) -- 2.20.1

2 5

[libvirt] [PATCH v2 0/4] Restructure firewall rules for virtual networks into private chains
by Daniel P. Berrangé 24 Jan '19

24 Jan '19

v1: https://www.redhat.com/archives/libvir-list/2018-November/msg00018.html The virtual networks in NAT mode are supposed to only allow outbound network access for guests. Unfortunately due to ordering of the firewall rules libvirt creates, when you have multiple virtual networks, guests on the more recently created virtual networks can connect to guests on old virtual networks. This was reported way back in 2008 but we always thought the fix would be very complicated to deal with, so we've been putting it off forever. In parallel with this there's also been a long standing desire since 2009 to move our firewall rules out of the builtin chains, to libvirt private chains. This is to make it easier for admins to use hook scripts to setup rules in the builtin chains that take priority over rules libvirt creates. In implementing the changes to use private chains, I suddenly realized that fixing the network to network traffic blocking problem was trivial if I grouped the forwarding rules into three distinct sets. So this series finally fixes an annoying 10 year old bug, and implements a 9 year old RFE. It may take us a while, but we'll get to your bugs eventually ;-) Changed in v2: - Detect whether chains already exist before creating them - Only try to delete legacy rules from builtin chain during startup Daniel P. Berrangé (4): network: add platform driver callbacks around firewall reload util: pass layer into firewall query callback util: create private chains for virtual network firewall rules util: move virtual network firwall rules into private chains src/libvirt_private.syms | 2 + src/network/bridge_driver.c | 13 +- src/network/bridge_driver_linux.c | 32 +++ src/network/bridge_driver_nop.c | 11 + src/network/bridge_driver_platform.h | 3 + src/nwfilter/nwfilter_ebiptables_driver.c | 17 +- src/util/virfirewall.c | 2 +- src/util/virfirewall.h | 1 + src/util/viriptables.c | 254 +++++++++++++++--- src/util/viriptables.h | 4 + .../nat-default-linux.args | 32 +-- .../nat-ipv6-linux.args | 48 ++-- .../nat-many-ips-linux.args | 60 ++--- .../nat-no-dhcp-linux.args | 46 ++-- .../nat-tftp-linux.args | 34 +-- .../route-default-linux.args | 22 +- tests/virfirewalltest.c | 3 +- 17 files changed, 405 insertions(+), 179 deletions(-) -- 2.19.2

3 9

[libvirt] [PATCH 0/3] Some random fixes
by Michal Privoznik 24 Jan '19

24 Jan '19

*** BLURB HERE *** Michal Prívozník (3): virPCIGetNetName: Initialize @netname to NULL virpci: Fix memleak in virPCIDeviceIterDevices domain_conf: Free egl render node in virDomainGraphicsDefFree src/conf/domain_conf.c | 3 +++ src/util/virnetdev.c | 2 -- src/util/virpci.c | 4 ++++ 3 files changed, 7 insertions(+), 2 deletions(-) -- 2.19.2

2 8

[libvirt] [PATCH] qemu-nbd: Deprecate qemu-nbd --partition
by Eric Blake 24 Jan '19

24 Jan '19

The existing qemu-nbd --partition code claims to handle logical partitions up to 8, since its introduction in 2008 (commit 7a5ca86). However, the implementation is bogus (actual MBR logical partitions form a sort of linked list, with one partition per extended table entry, rather than four logical partitions in a single extended table), making the code unlikely to work for anything beyond -P5 on actual guest images. What's more, the code does not support GPT partitions, which are becoming more popular, and maintaining device subsetting in both NBD and the raw device is unnecessary maintenance burden. And nbdkit has just added code to properly handle an arbitrary number of MBR partitions, along with its existing code for handling GPT partitions. Note that obtaining the offsets of a partition can be learned by using 'qemu-nbd -c /dev/nbd0 file.qcow2 && sfdisk --dump /dev/nbd0', but by the time you've done that, you might as well just mount /dev/nbd0p1 that the kernel creates for you. Start the clock on the deprecation cycle, with an example of how to write device subsetting without using -P. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- qemu-deprecated.texi | 27 +++++++++++++++++++++++++++ qemu-nbd.texi | 6 ++++-- qemu-nbd.c | 2 ++ 3 files changed, 33 insertions(+), 2 deletions(-) diff --git a/qemu-deprecated.texi b/qemu-deprecated.texi index 219206a836f..12f8b30943f 100644 --- a/qemu-deprecated.texi +++ b/qemu-deprecated.texi @@ -175,3 +175,30 @@ The above, converted to the current supported format: @subsubsection "irq": "" (since 3.0.0) The ``irq'' property is obsoleted. + +@section Related binaries + +@subsection qemu-nbd --partition (since 4.0.0) + +The ``qemu-nbd --partition $digit'' code (also spelled @option{-P}) +can only handle MBR partitions, and does not correctly handle logical +partitions beyond partition 5. If you know the relative position of +the partition (perhaps by using @code{sfdisk} or similar, either in +the guest or when mapping the entire device through /dev/nbd0 in the +host), you can achieve the effect of exporting just that subset of the +disk by use of the @option{--image-opts} option with a raw blockdev +using the @code{offset} and @code{size} parameters layered on top of +any other existing blockdev. + +For example, if partition 1 is 100MiB starting at 1MiB, the old command + +@example{qemu-nbd -P 1 -f qcow2 file.qcow2} + +can be rewritten as: + +@example{qemu-nbd --image-opts driver=raw,offset=1M,size=100M,file.driver=qcow2,file.backing.driver=file,file.backing.filename=file.qcow2} + +Alternatively, the @code{nbdkit} project provides a more powerful +partition filter on top of its nbd plugin, which can be used to select +an arbitrary MBR or GPT partition on top of any other full-image NBD +export. diff --git a/qemu-nbd.texi b/qemu-nbd.texi index 386bece4680..d0c51828149 100644 --- a/qemu-nbd.texi +++ b/qemu-nbd.texi @@ -56,8 +56,10 @@ auto-detecting. @item -r, --read-only Export the disk as read-only. @item -P, --partition=@var{num} -Only expose MBR partition @var{num}. Understands physical partitions -1-4 and logical partitions 5-8. +Deprecated: Only expose MBR partition @var{num}. Understands physical +partitions 1-4 and logical partition 5. New code should instead use +@option{--image-opts} with the raw driver wrapping a subset of the +original image. @item -B, --bitmap=@var{name} If @var{filename} has a qcow2 persistent bitmap @var{name}, expose that bitmap via the ``qemu:dirty-bitmap:@var{name}'' context diff --git a/qemu-nbd.c b/qemu-nbd.c index 1f7b2a03f5d..00c07fd27ea 100644 --- a/qemu-nbd.c +++ b/qemu-nbd.c @@ -787,6 +787,8 @@ int main(int argc, char **argv) flags &= ~BDRV_O_RDWR; break; case 'P': + warn_report("The '-P' option is deprecated; use --image-opts with " + "a raw device wrapper for subset exports instead"); if (qemu_strtoi(optarg, NULL, 0, &partition) < 0 || partition < 1 || partition > 8) { error_report("Invalid partition '%s'", optarg); -- 2.20.1

3 4

[libvirt] [PATCH] qemu: improve compile-time check of qemuBlockjobState mapping
by Eric Blake 23 Jan '19

23 Jan '19

Asserting the value we set four lines earlier in qemuBlockjobState doesn't buy us any safety (if the public header adds a value, we end up skipping that value without the compiler warning us of our gap); what we really want is to assert that the value auto-assigned by the compiler matches the actual last value in the public headers (as was done below for qemuBlockJobType). Add useful comments while at it. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- The spelling VIR_DOMAIN_BLOCK_JOB_LAST vs. VIR_DOMAIN_BLOCK_JOB_TYPE_LAST took me on a wild goose chase; the least I can do is make the code nicer for the next reader. src/qemu/qemu_blockjob.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_blockjob.h b/src/qemu/qemu_blockjob.h index ed63f2c709..c7325c6daf 100644 --- a/src/qemu/qemu_blockjob.h +++ b/src/qemu/qemu_blockjob.h @@ -29,15 +29,17 @@ * This enum has to map all known block job states from enum virDomainBlockJobType * to the same values. All internal blockjobs can be mapped after and don't * need to have stable values. */ typedef enum { + /* Mapped to public enum */ QEMU_BLOCKJOB_STATE_COMPLETED = VIR_DOMAIN_BLOCK_JOB_COMPLETED, QEMU_BLOCKJOB_STATE_FAILED = VIR_DOMAIN_BLOCK_JOB_FAILED, QEMU_BLOCKJOB_STATE_CANCELLED = VIR_DOMAIN_BLOCK_JOB_CANCELED, QEMU_BLOCKJOB_STATE_READY = VIR_DOMAIN_BLOCK_JOB_READY, - QEMU_BLOCKJOB_STATE_NEW = VIR_DOMAIN_BLOCK_JOB_LAST, + /* Additional enum values local to qemu */ + QEMU_BLOCKJOB_STATE_NEW, QEMU_BLOCKJOB_STATE_RUNNING, QEMU_BLOCKJOB_STATE_LAST } qemuBlockjobState; verify((int)QEMU_BLOCKJOB_STATE_NEW == VIR_DOMAIN_BLOCK_JOB_LAST); @@ -45,15 +47,17 @@ verify((int)QEMU_BLOCKJOB_STATE_NEW == VIR_DOMAIN_BLOCK_JOB_LAST); * This enum has to map all known block job types from enum virDomainBlockJobType * to the same values. All internal blockjobs can be mapped after and don't * need to have stable values. */ typedef enum { + /* Mapped to public enum */ QEMU_BLOCKJOB_TYPE_NONE = VIR_DOMAIN_BLOCK_JOB_TYPE_UNKNOWN, QEMU_BLOCKJOB_TYPE_PULL = VIR_DOMAIN_BLOCK_JOB_TYPE_PULL, QEMU_BLOCKJOB_TYPE_COPY = VIR_DOMAIN_BLOCK_JOB_TYPE_COPY, QEMU_BLOCKJOB_TYPE_COMMIT = VIR_DOMAIN_BLOCK_JOB_TYPE_COMMIT, QEMU_BLOCKJOB_TYPE_ACTIVE_COMMIT = VIR_DOMAIN_BLOCK_JOB_TYPE_ACTIVE_COMMIT, + /* Additional enum values local to qemu */ QEMU_BLOCKJOB_TYPE_INTERNAL, QEMU_BLOCKJOB_TYPE_LAST } qemuBlockJobType; verify((int)QEMU_BLOCKJOB_TYPE_INTERNAL == VIR_DOMAIN_BLOCK_JOB_TYPE_LAST); -- 2.20.1

2 1

[libvirt] [PATCH v3 0/4] util: Fixing libvirt errors on cavium/thunder-nicvf
by dann frazier 23 Jan '19

23 Jan '19

Following up on my offer to take the baton[*], here's a v3 of this series that should address the provided feedback provided for Radoslaw's v2. ThunderX is Cavium SoC. This platform contain SRIOV NIC. Unlike other commonly known network devices it does not have VF functionality duplicated in its PF. PF is purely management device (on HW level). This creates several problems with existing libvirt code as in many places libvirt assumes that each VF netdev has PF netdev assigned. This patch series trying to address issues which can be easily fixed. (mostly bug fixes found while working on full featured solution) First patch in series is most important as it allows to unblock the netdev detection and use <hostdev> on this platform.i <interface type="hostdev" still does not work as it requires bigger changes both on netdev driver and in libvirt itself. More details about those issues can be found at: https://bugs.linaro.org/show_bug.cgi?id=3778 https://bugs.launchpad.net/charm-nova-compute/+bug/1771662 v3: - Reinstated error path in virNetDevGetPhysicalFunction() - Add missing free of *pfname in error path - Use proper < 0 comparisons when checking for errors v2: - error reporting taken out of virNetDevGetPhysicalFunction() and moved to calling function virNetDevGetVirtualFunctionInfo() - curly braces removed from single line - net-> model check removed as STREQ_NULLABLE() follows [*] https://www.redhat.com/archives/libvir-list/2019-January/msg00201.html Radoslaw Biernacki (4): util: fixing wrong assumption that PF has to have netdev assigned util: Code simplification util: Fix for NULL dereference util: Fixing invalid error checking from virPCIGetNetname() src/qemu/qemu_domain_address.c | 13 ++++---- src/util/virhostdev.c | 2 +- src/util/virnetdev.c | 55 ++++++++++++---------------------- 3 files changed, 25 insertions(+), 45 deletions(-) -- 2.20.1

3 9

[libvirt] [PATCH 0/2] apparmor: support named profiles
by Jim Fehlig 23 Jan '19

23 Jan '19

Upstream apparmor is switching to named profiles. Many profiles have already made the switch. Patch 1 changes the libvirtd profile to account for dnsmasq's switch to a named profile. Patch 2 is optional and changes the libvirtd profile to a named profile. It will need a bit of coorindation with upstream apparmor since the dnsmasq profile currently has 'peer=/usr/sbin/libvirtd'. Jim Fehlig (2): apparmor: Add support for named profiles apparmor: convert libvirtd profile to a named profile src/security/apparmor/usr.sbin.libvirtd | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) -- 2.19.2

2 5

[libvirt] [PATCH 0/3] Update some recent/previous x86_64 qemu capabilities
by John Ferlan 23 Jan '19

23 Jan '19

The existing 2.12 and 3.1 caps are based on a pre-release RC, so update to at least the release version. The 3.0 caps were missing the sev-guest (as were the 3.1 caps), so hand massage the .replies output to make sure they're added. There really "should be" some way to do these automagically... With these in place review of Nikolay's upstream posting related to using l2 cache will be "cleaner"... John Ferlan (3): qemu: Update x86_64 QEMU 2.12.0 capabilities qemu: Update x86_64 QEMU 3.0.0 capabilities qemu: Update x86_64 QEMU 3.1.0 capabilities .../qemu_2.12.0.x86_64.xml | 37 +- .../caps_2.12.0.x86_64.replies | 513 +++++++++--------- .../caps_2.12.0.x86_64.xml | 182 ++----- .../caps_3.0.0.x86_64.replies | 73 +-- .../caps_3.0.0.x86_64.xml | 19 +- .../caps_3.1.0.x86_64.replies | 93 ++-- .../caps_3.1.0.x86_64.xml | 28 +- 7 files changed, 412 insertions(+), 533 deletions(-) -- 2.20.1

4 8

[libvirt] [PATCH] libxl: Set current memory value after successful balloon
by Jim Fehlig 23 Jan '19

23 Jan '19

The libxl driver does not set the new memory value in the active domain def after a successful balloon. This results in the old memory value in <currentMemory>. E.g. virsh dumpxml test | grep currentMemory <currentMemory unit='KiB'>20971520</currentMemory> virsh setmem test 16777216 --live virsh dumpxml test | grep currentMemory <currentMemory unit='KiB'>20971520</currentMemory> Set the new memory value in active domain def after a successful call to libxl_set_memory_target(). Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- src/libxl/libxl_driver.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index e30c9891d2..f11597b0d7 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -1676,6 +1676,7 @@ libxlDomainSetMemoryFlags(virDomainPtr dom, unsigned long newmem, " with libxenlight"), vm->def->id); goto endjob; } + vm->def->mem.cur_balloon = newmem; } if (flags & VIR_DOMAIN_MEM_CONFIG) { -- 2.19.2

2 1

[libvirt] [PATCH] qemu-options: Remove deprecated "-virtioconsole" option
by Thomas Huth 23 Jan '19

23 Jan '19

It's been deprecated since QEMU 3.0, and nobody complained so far, so it is time to remove this option now. Signed-off-by: Thomas Huth <thuth(a)redhat.com> --- docs/qdev-device-use.txt | 4 ---- include/hw/boards.h | 1 - qemu-deprecated.texi | 5 ---- qemu-options.hx | 10 -------- vl.c | 61 +----------------------------------------------- 5 files changed, 1 insertion(+), 80 deletions(-) diff --git a/docs/qdev-device-use.txt b/docs/qdev-device-use.txt index 98229b3..cc53e97 100644 --- a/docs/qdev-device-use.txt +++ b/docs/qdev-device-use.txt @@ -190,10 +190,6 @@ The appropriate DEVNAME depends on the machine type. For type "pc": -device usb-braille,chardev=braille -chardev braille,id=braille -* -virtioconsole becomes - -device virtio-serial-pci,class=C,vectors=V,ioeventfd=IOEVENTFD,max_ports=N - -device virtconsole,is_console=NUM,nr=NR,name=NAME - LEGACY-CHARDEV translates to -chardev HOST-OPTS... as follows: * null becomes -chardev null diff --git a/include/hw/boards.h b/include/hw/boards.h index f82f284..5df67d2 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -181,7 +181,6 @@ struct MachineClass { int default_cpus; unsigned int no_serial:1, no_parallel:1, - use_virtcon:1, no_floppy:1, no_cdrom:1, no_sdcard:1, diff --git a/qemu-deprecated.texi b/qemu-deprecated.texi index 72b8191..5cc18b4 100644 --- a/qemu-deprecated.texi +++ b/qemu-deprecated.texi @@ -60,11 +60,6 @@ The @code{--no-frame} argument works with SDL 1.2 only. The other user interfaces never implemented this in the first place. So this will be removed together with SDL 1.2 support. -@subsection -virtioconsole (since 3.0.0) - -Option @option{-virtioconsole} has been replaced by -@option{-device virtconsole}. - @subsection -clock (since 3.0.0) The @code{-clock} option is ignored since QEMU version 1.7.0. There is no diff --git a/qemu-options.hx b/qemu-options.hx index 269eda7..5330603 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -3635,16 +3635,6 @@ character to Control-t. @end table ETEXI -DEF("virtioconsole", HAS_ARG, QEMU_OPTION_virtiocon, \ - "-virtioconsole c\n" \ - " set virtio console\n", QEMU_ARCH_ALL) -STEXI -@item -virtioconsole @var{c} -@findex -virtioconsole -Set virtio console. -This option is deprecated, please use @option{-device virtconsole} instead. -ETEXI - DEF("show-cursor", 0, QEMU_OPTION_show_cursor, \ "-show-cursor show cursor\n", QEMU_ARCH_ALL) STEXI diff --git a/vl.c b/vl.c index a5ae5f2..595d610 100644 --- a/vl.c +++ b/vl.c @@ -164,7 +164,6 @@ int no_frame; static int num_serial_hds; static Chardev **serial_hds; Chardev *parallel_hds[MAX_PARALLEL_PORTS]; -Chardev *virtcon_hds[MAX_VIRTIO_CONSOLES]; int win2k_install_hack = 0; int singlestep = 0; int smp_cpus; @@ -215,7 +214,6 @@ bool xen_domid_restrict; static int has_defaults = 1; static int default_serial = 1; static int default_parallel = 1; -static int default_virtcon = 1; static int default_monitor = 1; static int default_floppy = 1; static int default_cdrom = 1; @@ -236,8 +234,6 @@ static struct { { .driver = "ide-drive", .flag = &default_cdrom }, { .driver = "scsi-cd", .flag = &default_cdrom }, { .driver = "scsi-hd", .flag = &default_cdrom }, - { .driver = "virtio-serial-pci", .flag = &default_virtcon }, - { .driver = "virtio-serial", .flag = &default_virtcon }, { .driver = "VGA", .flag = &default_vga }, { .driver = "isa-vga", .flag = &default_vga }, { .driver = "cirrus-vga", .flag = &default_vga }, @@ -2374,7 +2370,6 @@ struct device_config { DEV_BT, /* -bt */ DEV_SERIAL, /* -serial */ DEV_PARALLEL, /* -parallel */ - DEV_VIRTCON, /* -virtioconsole */ DEV_DEBUGCON, /* -debugcon */ DEV_GDB, /* -gdb, -s */ DEV_SCLP, /* s390 sclp */ @@ -2472,39 +2467,6 @@ static int parallel_parse(const char *devname) return 0; } -static int virtcon_parse(const char *devname) -{ - QemuOptsList *device = qemu_find_opts("device"); - static int index = 0; - char label[32]; - QemuOpts *bus_opts, *dev_opts; - - if (strcmp(devname, "none") == 0) - return 0; - if (index == MAX_VIRTIO_CONSOLES) { - error_report("too many virtio consoles"); - exit(1); - } - - bus_opts = qemu_opts_create(device, NULL, 0, &error_abort); - qemu_opt_set(bus_opts, "driver", "virtio-serial", &error_abort); - - dev_opts = qemu_opts_create(device, NULL, 0, &error_abort); - qemu_opt_set(dev_opts, "driver", "virtconsole", &error_abort); - - snprintf(label, sizeof(label), "virtcon%d", index); - virtcon_hds[index] = qemu_chr_new_mux_mon(label, devname); - if (!virtcon_hds[index]) { - error_report("could not connect virtio console" - " to character backend '%s'", devname); - return -1; - } - qemu_opt_set(dev_opts, "chardev", label, &error_abort); - - index++; - return 0; -} - static int debugcon_parse(const char *devname) { QemuOpts *opts; @@ -3546,15 +3508,6 @@ int main(int argc, char **argv, char **envp) exit(1); } break; - case QEMU_OPTION_virtiocon: - warn_report("This option is deprecated, " - "use '-device virtconsole' instead"); - add_device_config(DEV_VIRTCON, optarg); - default_virtcon = 0; - if (strncmp(optarg, "mon:", 4) == 0) { - default_monitor = 0; - } - break; case QEMU_OPTION_parallel: add_device_config(DEV_PARALLEL, optarg); default_parallel = 0; @@ -4171,9 +4124,6 @@ int main(int argc, char **argv, char **envp) if (!has_defaults || machine_class->no_parallel) { default_parallel = 0; } - if (!has_defaults || !machine_class->use_virtcon) { - default_virtcon = 0; - } if (!has_defaults || machine_class->no_floppy) { default_floppy = 0; } @@ -4206,8 +4156,7 @@ int main(int argc, char **argv, char **envp) * usage, -nographic is just a no-op in this case. */ if (nographic - && (default_parallel || default_serial - || default_monitor || default_virtcon)) { + && (default_parallel || default_serial || default_monitor)) { error_report("-nographic cannot be used with -daemonize"); exit(1); } @@ -4224,13 +4173,9 @@ int main(int argc, char **argv, char **envp) add_device_config(DEV_PARALLEL, "null"); if (default_serial && default_monitor) { add_device_config(DEV_SERIAL, "mon:stdio"); - } else if (default_virtcon && default_monitor) { - add_device_config(DEV_VIRTCON, "mon:stdio"); } else { if (default_serial) add_device_config(DEV_SERIAL, "stdio"); - if (default_virtcon) - add_device_config(DEV_VIRTCON, "stdio"); if (default_monitor) monitor_parse("stdio", "readline", false); } @@ -4241,8 +4186,6 @@ int main(int argc, char **argv, char **envp) add_device_config(DEV_PARALLEL, "vc:80Cx24C"); if (default_monitor) monitor_parse("vc:80Cx24C", "readline", false); - if (default_virtcon) - add_device_config(DEV_VIRTCON, "vc:80Cx24C"); } #if defined(CONFIG_VNC) @@ -4473,8 +4416,6 @@ int main(int argc, char **argv, char **envp) exit(1); if (foreach_device_config(DEV_PARALLEL, parallel_parse) < 0) exit(1); - if (foreach_device_config(DEV_VIRTCON, virtcon_parse) < 0) - exit(1); if (foreach_device_config(DEV_DEBUGCON, debugcon_parse) < 0) exit(1); -- 1.8.3.1

2 3

[libvirt] [PATCH v3 0/5] add disk driver metadata_cache_size option
by Nikolay Shirokovskiy 23 Jan '19

23 Jan '19

As this patch series only works with -blockdev configurations it is better to be pushed only after -blockdev is supported. Then 'news' and 'xml' patch need to be updated to have correct libvirt version. Diff from v2 [1]: ================= - move caps patch to top - add news patch - add _CAPPED to capabilitity name to distinguish from correspondent qemu capabilitiy - better option explanation in formatdomain.html - misc tests/english fixes as suggested We have come to agreement with John in mailing list to support QEMU versions which do not let use INT64_MAX as "maximum" value. But this will require changing qemuBlockStorageSourceGetFormatQcow2Props and a lot of other functions signature (which was not noticed during conversation). Thus I don't add such a functionality. Anyway the patch requires -blockdev from QEMU so we could only support single QEMU 3.0 version. [1] https://www.redhat.com/archives/libvir-list/2018-November/msg00313.html Nikolay Shirokovskiy (5): qemu: caps: add QEMU_CAPS_QCOW2_L2_CACHE_SIZE_CAPPED xml: add disk driver metadata_cache_size option qemu: support metadata-cache-size for blockdev news: add notice for new metadata cache size policy option DO NOT APPLY: add xml2argv test for metadata_cache_size docs/formatdomain.html.in | 11 ++++++ docs/news.xml | 11 ++++++ docs/schemas/domaincommon.rng | 11 ++++++ src/conf/domain_conf.c | 17 +++++++++ src/conf/domain_conf.h | 9 +++++ src/qemu/qemu_block.c | 5 ++- src/qemu/qemu_capabilities.c | 5 +++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 23 ++++++++++++ src/qemu/qemu_domain.c | 2 ++ src/util/virstoragefile.c | 1 + src/util/virstoragefile.h | 1 + .../qemuxml2argvdata/disk-metadata_cache_size.args | 39 ++++++++++++++++++++ .../qemuxml2argvdata/disk-metadata_cache_size.xml | 35 ++++++++++++++++++ tests/qemuxml2argvtest.c | 2 ++ .../disk-metadata_cache_size.xml | 41 ++++++++++++++++++++++ tests/qemuxml2xmltest.c | 2 ++ 17 files changed, 215 insertions(+), 1 deletion(-) create mode 100644 tests/qemuxml2argvdata/disk-metadata_cache_size.args create mode 100644 tests/qemuxml2argvdata/disk-metadata_cache_size.xml create mode 100644 tests/qemuxml2xmloutdata/disk-metadata_cache_size.xml -- 1.8.3.1

2 12

[libvirt] [PATCH v2] virt-aa-helper: generate rules for gl enabled graphics devices
by Christian Ehrhardt 23 Jan '19

23 Jan '19

This adds the virt-aa-helper support for gl enabled graphics devices to generate rules for the needed rendernode paths. Example in domain xml: <graphics type='spice'> <gl enable='yes' rendernode='/dev/dri/bar'/> </graphics> results in: "/dev/dri/bar" rw, Special cases are: - multiple devices with rendernodes -> all are added - non explicit rendernodes -> follow recently added virHostGetDRMRenderNode - rendernode without opengl (in egl-headless for example) -> still add the node Updates in V2: - avoid leaking rendernode - logically group patch hunks - drop base /dev/dri access - simplify detection of the need for a default rendernode - add tests in tests/virt-aa-helper-test - rebased to recent master Fixes: https://bugs.launchpad.net/ubuntu/+source/libvirt/+bug/1757085 Signed-off-by: Christian Ehrhardt <christian.ehrhardt(a)canonical.com> --- src/security/virt-aa-helper.c | 12 ++++++++++++ tests/virt-aa-helper-test | 6 ++++++ 2 files changed, 18 insertions(+) diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c index 64a425671d..a84dd5a8c9 100644 --- a/src/security/virt-aa-helper.c +++ b/src/security/virt-aa-helper.c @@ -1062,6 +1062,18 @@ get_files(vahControl * ctl) for (i = 0; i < ctl->def->ngraphics; i++) { virDomainGraphicsDefPtr graphics = ctl->def->graphics[i]; size_t n; + const char *rendernode = virDomainGraphicsGetRenderNode(graphics); + + if (rendernode) + vah_add_file(&buf, rendernode, "rw"); + else + if (virDomainGraphicsNeedsAutoRenderNode(graphics)) { + char * defaultRenderNode = virHostGetDRMRenderNode(); + if (defaultRenderNode) { + vah_add_file(&buf, defaultRenderNode, "rw"); + VIR_FREE(defaultRenderNode); + } + } for (n = 0; n < graphics->nListens; n++) { virDomainGraphicsListenDef listenObj = graphics->listens[n]; diff --git a/tests/virt-aa-helper-test b/tests/virt-aa-helper-test index fb400574dc..6e674bfe5c 100755 --- a/tests/virt-aa-helper-test +++ b/tests/virt-aa-helper-test @@ -378,6 +378,12 @@ testme "0" "input dev passthrough" "-r -u $valid_uuid" "$test_xml" "$disk2.*rw,$ sed -e "s,###UUID###,$uuid,g" -e "s,###DISK###,$disk1,g" -e "s,<memory>524288</memory>,<memory>1048576</memory>,g" -e "s,</devices>,<memory model='nvdimm'><source><path>$disk2</path></source><target><size unit='KiB'>524288</size><node>0</node></target></memory></devices>,g" "$template_xml" > "$test_xml" testme "0" "nvdimm" "-r -u $valid_uuid" "$test_xml" "$disk2.*rw,$" +sed -e "s,###UUID###,$uuid,g" -e "s,###DISK###,$disk1,g" -e "s,</devices>,<graphics type='egl-headless'><gl rendernode='/dev/dri/testegl1'/></graphics></devices>,g" "$template_xml" > "$test_xml" +testme "0" "dri egl" "-r -u $valid_uuid" "$test_xml" "/dev/dri/testegl1.*rw,$" + +sed -e "s,###UUID###,$uuid,g" -e "s,###DISK###,$disk1,g" -e "s,</devices>,<graphics type='spice'><gl enable='yes' rendernode='/dev/dri/testegl2'/></graphics></devices>,g" "$template_xml" > "$test_xml" +testme "0" "dri spice" "-r -u $valid_uuid" "$test_xml" "/dev/dri/testegl2.*rw,$" + testme "0" "help" "-h" echo "" >$output -- 2.17.1

3 4

[libvirt] [PATCH python] rpm spec: remove %{extra_release} from spec
by Daniel P. Berrangé 22 Jan '19

22 Jan '19

The %{extra_release} field was previously populated by data from the old autobuild.sh file but is no longer used. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- Pushed as a trivial patch libvirt-python.spec.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libvirt-python.spec.in b/libvirt-python.spec.in index 21dc713..5bcf1eb 100644 --- a/libvirt-python.spec.in +++ b/libvirt-python.spec.in @@ -34,7 +34,7 @@ Summary: The libvirt virtualization API python2 binding Name: libvirt-python Version: @PY_VERSION@ -Release: 1%{?dist}%{?extra_release} +Release: 1%{?dist} Source0: http://libvirt.org/sources/python/%{name}-%{version}.tar.gz Url: http://libvirt.org License: LGPLv2+ -- 2.20.1

2 1

[libvirt] [PATCH 0/4] Couple of apparmor related fixes
by Michal Privoznik 22 Jan '19

22 Jan '19

Firstly, the virt-aa-helper was never installed under /usr/lib or /usr/lib64. Since it's introduction it lives under /usr/libexec and therefore the profile name should reflect that. Secondly, the profile misses some binaries we use. And lastly, some other internal binaries are misplaced in the profile. Michal Prívozník (4): apparmor: Fix parthelper, iohelper and virt-aa-helper paths in profiles apparmor: Allow libvirt to spawn virt-aa-helper and libvirt_lxc docs: Fix virt-aa-helper location apparmor: Rename virt-aa-helper profile docs/drvqemu.html.in | 2 +- src/security/Makefile.inc.am | 10 +++++----- ...bvirt.virt-aa-helper => usr.libexec.virt-aa-helper} | 6 +++--- src/security/apparmor/usr.sbin.libvirtd | 6 ++++-- 4 files changed, 13 insertions(+), 11 deletions(-) rename src/security/apparmor/{usr.lib.libvirt.virt-aa-helper => usr.libexec.virt-aa-helper} (90%) -- 2.19.2

3 11

[libvirt] [PATCH 00/10] RFC: conf: partially net model enum conversion
by Cole Robinson 22 Jan '19

22 Jan '19

This series is base on my virtio-transitional work, since it touches a lot of the same code: https://www.redhat.com/archives/libvir-list/2019-January/msg00593.html This series partially converts the net->model value from a string to an enum. We wrap the existing ->model string in accessor functions, rename it to ->modelstr, add a ->model enum, and convert internal driver usage bit by bit. At the end, all driver code that is acting on specific network model values is comparing against an enum, not a string. This is only partial because of xen/libxl/xm and qemu drivers, which if they don't know anything particular about the model string will just place it on the qemu command line/xen config and see what happens. So basically if I were to pass in <model type='idontexist'/> qemu would turn that into -device idontexist,... That behavior is untouched by this series. Unwinding it will take some thought. For starters would be populating the enum with any qemu/xen network model that a user could realistically have a working config with. Then maybe tainting the VM if modelstr is used. Then after some time the final round could be causing domains to fail to start, but not fail to parse, so they don't disappear on upgrade but still break in an obvious way that will generate complaints/bugreports. But we should agree on a plan for it. Other caveats: * vz and bhyve drivers are not compile tested * vmx and virtualbox drivers previously would do a case insensitive compare on the model value passed in via the user XML. Current patches don't preserve that. I don't know how much it matters for these drivers for reading fresh XML vs roundtrip XML from converted native formats (which _will_ correct the case issue). If we want to fix this we will need to tolower() the modelstr value in the XML parser. I think there's a gnulib function for it but I haven't explored it deeply Cole Robinson (10): tests: Add several net model passthrough tests conf: net: Add wrapper functions for <model> value conf: net: Rename 'model' to 'modelstr' conf: net: Add model enum, and netfront value vz: convert to net model enum bhyve: convert to net model enum qemu: Partially convert to net model enum vmx: convert to net model enum vbox: Convert to net enum model conf: Add VIR_DOMAIN_DEF_FEATURE_NET_MODEL_STRING src/bhyve/bhyve_command.c | 15 +-- src/bhyve/bhyve_parse_command.c | 10 +- src/conf/domain_conf.c | 105 ++++++++++++++---- src/conf/domain_conf.h | 35 +++++- src/libvirt_private.syms | 4 + src/libxl/libxl_conf.c | 8 +- src/libxl/libxl_domain.c | 1 + src/qemu/qemu_command.c | 33 +++--- src/qemu/qemu_domain.c | 32 +++--- src/qemu/qemu_domain_address.c | 14 +-- src/qemu/qemu_driver.c | 14 ++- src/qemu/qemu_hotplug.c | 15 ++- src/qemu/qemu_parse_command.c | 5 +- src/security/virt-aa-helper.c | 3 +- src/vbox/vbox_common.c | 29 +++-- src/vmx/vmx.c | 55 ++++----- src/vz/vz_driver.c | 7 +- src/vz/vz_sdk.c | 17 ++- src/xenconfig/xen_common.c | 31 +++--- src/xenconfig/xen_sxpr.c | 30 ++--- tests/qemuxml2argvdata/net-many-models.args | 39 +++++++ tests/qemuxml2argvdata/net-many-models.xml | 37 ++++++ tests/qemuxml2argvtest.c | 1 + tests/xlconfigdata/test-net-fakemodel.cfg | 24 ++++ tests/xlconfigdata/test-net-fakemodel.xml | 39 +++++++ tests/xlconfigtest.c | 1 + .../test-paravirt-net-fakemodel.cfg | 13 +++ .../test-paravirt-net-fakemodel.xml | 40 +++++++ .../test-paravirt-net-modelstr.cfg | 13 +++ tests/xmconfigtest.c | 1 + .../xml2sexpr-fv-net-many-models.sexpr | 1 + .../xml2sexpr-fv-net-many-models.xml | 43 +++++++ tests/xml2sexprtest.c | 1 + 33 files changed, 534 insertions(+), 182 deletions(-) create mode 100644 tests/qemuxml2argvdata/net-many-models.args create mode 100644 tests/qemuxml2argvdata/net-many-models.xml create mode 100644 tests/xlconfigdata/test-net-fakemodel.cfg create mode 100644 tests/xlconfigdata/test-net-fakemodel.xml create mode 100644 tests/xmconfigdata/test-paravirt-net-fakemodel.cfg create mode 100644 tests/xmconfigdata/test-paravirt-net-fakemodel.xml create mode 100644 tests/xmconfigdata/test-paravirt-net-modelstr.cfg create mode 100644 tests/xml2sexprdata/xml2sexpr-fv-net-many-models.sexpr create mode 100644 tests/xml2sexprdata/xml2sexpr-fv-net-many-models.xml -- 2.20.1

2 13

[libvirt] [PATCH 0/2] qemu: Improve and document states handled in qemuProcessHandleAcpiOstInfo
by Peter Krempa 22 Jan '19

22 Jan '19

We did not handle all the possible error states of memory unplug. Add more ACPI table documentation and fix the code to conform to it. Peter Krempa (2): qemu: process: Improve documentation of values handled by qemuProcessHandleAcpiOstInfo qemu: process: Handle all failure values for dimms in qemuProcessHandleAcpiOstInfo src/qemu/qemu_process.c | 44 +++++++++++++++++++++++++++++++++-------- 1 file changed, 36 insertions(+), 8 deletions(-) -- 2.20.1

3 4

[libvirt] [PATCH] rpm spec: remove %{extra_release} from spec
by Daniel P. Berrangé 22 Jan '19

22 Jan '19

The %{extra_release} field was previously populated by data from the old autobuild.sh file but is no longer used. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- libvirt.spec.in | 2 +- mingw-libvirt.spec.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 567721f424..2e572e2a01 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -214,7 +214,7 @@ Summary: Library providing a simple virtualization API Name: libvirt Version: @VERSION@ -Release: 1%{?dist}%{?extra_release} +Release: 1%{?dist} License: LGPLv2+ URL: https://libvirt.org/ diff --git a/mingw-libvirt.spec.in b/mingw-libvirt.spec.in index 7c7ab4146d..249abb8475 100644 --- a/mingw-libvirt.spec.in +++ b/mingw-libvirt.spec.in @@ -35,7 +35,7 @@ Name: mingw-libvirt Version: @VERSION@ -Release: 1%{?dist}%{?extra_release} +Release: 1%{?dist} Summary: MinGW Windows libvirt virtualization library License: LGPLv2+ -- 2.20.1

2 3

[libvirt] [PATCH] virt-aa-helper: generate rules for gl enabled graphics devices
by Christian Ehrhardt 22 Jan '19

22 Jan '19

This adds the virt-aa-helper support for gl enabled graphics devices to generate rules for the needed rendernode paths. Example in domain xml: <graphics type='spice'> <gl enable='yes' rendernode='/dev/dri/bar'/> </graphics> results in: "/dev/dri" r, "/dev/dri/bar" rw, Special cases are: - multiple devices with rendernodes -> all are added - non explicit rendernodes -> follow recently added virHostGetDRMRenderNode - rendernode without opengl (in egl-headless for example) -> still add the node Fixes: https://bugs.launchpad.net/ubuntu/+source/libvirt/+bug/1757085 Signed-off-by: Christian Ehrhardt <christian.ehrhardt(a)canonical.com> --- src/security/virt-aa-helper.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c index 64a425671d..327a8a0202 100644 --- a/src/security/virt-aa-helper.c +++ b/src/security/virt-aa-helper.c @@ -938,7 +938,7 @@ get_files(vahControl * ctl) size_t i; char *uuid; char uuidstr[VIR_UUID_STRING_BUFLEN]; - bool needsVfio = false, needsvhost = false; + bool needsVfio = false, needsvhost = false, needDefaultRenderNode = false; /* verify uuid is same as what we were given on the command line */ virUUIDFormat(ctl->def->uuid, uuidstr); @@ -1062,6 +1062,10 @@ get_files(vahControl * ctl) for (i = 0; i < ctl->def->ngraphics; i++) { virDomainGraphicsDefPtr graphics = ctl->def->graphics[i]; size_t n; + const char *rendernode = virDomainGraphicsGetRenderNode(graphics); + + if (rendernode) + vah_add_file(&buf, rendernode, "rw"); for (n = 0; n < graphics->nListens; n++) { virDomainGraphicsListenDef listenObj = graphics->listens[n]; @@ -1071,6 +1075,20 @@ get_files(vahControl * ctl) vah_add_file(&buf, listenObj.socket, "rw")) goto cleanup; } + + if (graphics->data.spice.gl == VIR_TRISTATE_BOOL_YES) { + if (!rendernode) + needDefaultRenderNode = true; + } + } + + if (virDomainGraphicsDefHasOpenGL(ctl->def)) + vah_add_file(&buf, "/dev/dri", "r"); + + if (needDefaultRenderNode) { + const char *rendernode = virHostGetDRMRenderNode(); + if (rendernode) + vah_add_file(&buf, virHostGetDRMRenderNode(), "rw"); } if (ctl->def->ngraphics == 1 && -- 2.17.1

3 4

[libvirt] [PATCHv2 0/8]
by Ján Tomko 21 Jan '19

21 Jan '19

For: https://bugzilla.redhat.com/show_bug.cgi?id=1602418 v1: https://www.redhat.com/archives/libvir-list/2019-January/msg00490.html v2: * fixed memory leaks pointed out by John in v1 Patches without R-b: [4/8] cowardly refused to unref the private data in Secret.*Destroy [8/8] fixed the logic to include checking whether the domain actually has a VNC graphics and amended the commit message Ján Tomko (8): conf: introduce virDomainGraphicsNew conf: add privateData to virDomainGraphicsDef qemu: add qemuDomainGraphicsPrivate data with a tlsAlias qemu: prepare secret for the graphics upfront qemu_process: fix debug message qemu.conf: add vnc_tls_x509_secret_uuid qemu: add support for encrypted VNC TLS keys qemu: error out when vnc vncTLSx509secretUUID is unsupported src/conf/domain_conf.c | 30 ++++- src/conf/domain_conf.h | 5 + src/qemu/libvirtd_qemu.aug | 1 + src/qemu/qemu.conf | 6 + src/qemu/qemu_command.c | 19 +++- src/qemu/qemu_conf.c | 4 + src/qemu/qemu_conf.h | 1 + src/qemu/qemu_domain.c | 107 ++++++++++++++++++ src/qemu/qemu_domain.h | 13 +++ src/qemu/qemu_process.c | 2 +- src/qemu/test_libvirtd_qemu.aug.in | 1 + ...graphics-vnc-tls-secret.x86_64-latest.args | 36 ++++++ .../graphics-vnc-tls-secret.xml | 30 +++++ tests/qemuxml2argvtest.c | 5 + 14 files changed, 250 insertions(+), 10 deletions(-) create mode 100644 tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/graphics-vnc-tls-secret.xml -- 2.20.1

2 10

[libvirt] [PATCH] docs: use JavaScript based PolicyKit .rules files
by Mark McLoughlin 21 Jan '19

21 Jan '19

PolicyKit authentication rules have switched to a JavaScript based format quite some time ago. See: http://davidz25.blogspot.com/2012/06/authorization-rules-in-polkit.html While backwards compat for the old .pkla format is still available, it makes sense to point people first at the new format. The SSHPolicyKitSetup wiki page seems pretty stale, so remove the reference to it. Signed-off-by: Mark McLoughlin <markmc(a)redhat.com> --- docs/auth.html.in | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/docs/auth.html.in b/docs/auth.html.in index afd6cd7f9b..33afe0a8ad 100644 --- a/docs/auth.html.in +++ b/docs/auth.html.in @@ -184,15 +184,29 @@ Default policy will still allow any application to connect to the RO socket. </p> <p> The default policy can be overridden by creating a new policy file in the -local override directory <code>/etc/polkit-1/localauthority/50-local.d/</code>. -Policy files should have a unique name ending with .pkla. Using reverse DNS -naming works well. Information on the options available can be found by -reading the pklocalauthority man page. The two libvirt daemon actions -available are named <code>org.libvirt.unix.manage</code> for full management -access, and <code>org.libvirt.unix.monitor</code> for read-only access. +<code>/etc/polkit-1/rules.d</code> directory. Information on the options +available can be found by reading the <code>polkit(8)</code> man page. The +two libvirt actions are named <code>org.libvirt.unix.manage</code> for full +management access, and <code>org.libvirt.unix.monitor</code> for read-only +access. +</p> + <p> +As an example, creating <code>/etc/polkit-1/rules.d/80-libvirt-manage.rules</code> +with the following gives the user <code>fred</code> full management access +when accessing from an active local session: </p> +<pre>polkit.addRule(function(action, subject) { + if (action.id == "org.libvirt.unix.manage" && + subject.local && subject.active && subject.user == "fred") { + return polkit.Result.YES; + } +});</pre> <p> -As an example, this gives the user <code>fred</code> full management access: +Older versions of PolicyKit used policy files ending with .pkla in the +local override directory <code>/etc/polkit-1/localauthority/50-local.d/</code>. +Compatibility with this older format is provided by <a +href="https://pagure.io/polkit-pkla-compat">polkit-pkla-compat</a>. As an +example, this gives the user <code>fred</code> full management access: </p> <pre>[Allow fred libvirt management permissions] Identity=unix-user:fred @@ -200,10 +214,6 @@ Action=org.libvirt.unix.manage ResultAny=yes ResultInactive=yes ResultActive=yes</pre> - <p> -Further examples of PolicyKit setup can be found on the -<a href="http://wiki.libvirt.org/page/SSHPolicyKitSetup">wiki page</a>. - </p> <h2><a id="ACL_server_sasl">SASL pluggable authentication</a></h2> <p> -- 2.20.1

2 1

[libvirt] [PATCH 0/2] qemu: Don't format 'cache' for empty cdroms
by Peter Krempa 21 Jan '19

21 Jan '19

See patch 2/2 for explanation. Peter Krempa (2): tests: qemuxml2argv: Add test case for empty CDROM with cache mode qemu: command: Don't format image properties for empty -drive src/qemu/qemu_command.c | 47 ++++++++++--------- tests/qemuxml2argvdata/disk-cdrom.args | 6 ++- .../disk-cdrom.x86_64-2.12.0.args | 9 ++-- .../disk-cdrom.x86_64-latest.args | 9 ++-- tests/qemuxml2argvdata/disk-cdrom.xml | 6 +++ tests/qemuxml2xmloutdata/disk-cdrom.xml | 6 +++ 6 files changed, 52 insertions(+), 31 deletions(-) -- 2.20.1

3 9