- Devel - libvirt List Archives

[PATCH] docs: Convert 404 page to rST
by Martin Kletzander 21 Feb '23

21 Feb '23

There is no markup equivalent for any of the <s/> or <del/> HTML tags, so this is the only thing I came up with and it looks like it works. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- Sorry if I'm trampling on someone else's patches, I just figured out how to keep the strike-through text Peter mentioned, so I'm sending it to "share the knowledge" ;) docs/404.html.in | 19 ------------------- docs/404.rst | 16 ++++++++++++++++ docs/css/libvirt.css | 4 ++++ docs/meson.build | 7 +------ 4 files changed, 21 insertions(+), 25 deletions(-) delete mode 100644 docs/404.html.in create mode 100644 docs/404.rst diff --git a/docs/404.html.in b/docs/404.html.in deleted file mode 100644 index 0ac76f125af6..000000000000 --- a/docs/404.html.in +++ /dev/null @@ -1,19 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE html> -<html xmlns="http://www.w3.org/1999/xhtml"> - <body> - <h1>404 page not found</h1> - - <p> - Someone appears to have eaten the <del>penguin</del> - page you were looking for. You might want to try - </p> - <ul> - <li>going back to the <a href="https://libvirt.org/">home page</a> to find - a collection of links to interesting pages on this site</li> - <li>using the search box at the top right corner of the screen to - locate the content on this site or mailing list archives</li> - </ul> - - </body> -</html> diff --git a/docs/404.rst b/docs/404.rst new file mode 100644 index 000000000000..927a3e618b59 --- /dev/null +++ b/docs/404.rst @@ -0,0 +1,16 @@ +================== +404 page not found +================== + +.. role:: del + :class: del + +.. contents:: + +Someone appears to have eaten the :del:`penguin` page you were looking +for. You might want to try + +* going back to the `home page <https://libvirt.org/>`_ to find a collection + of links to interesting pages on this site +* using the search box at the top right corner of the screen to + locate the content on this site or mailing list archives diff --git a/docs/css/libvirt.css b/docs/css/libvirt.css index 097dfcbe8e51..82f95d4a6808 100644 --- a/docs/css/libvirt.css +++ b/docs/css/libvirt.css @@ -636,3 +636,7 @@ th p, td p { #contents p.topic-title { display: none; } + +span.del { + text-decoration: line-through; +} diff --git a/docs/meson.build b/docs/meson.build index a90c59866a71..96ca21509047 100644 --- a/docs/meson.build +++ b/docs/meson.build @@ -22,6 +22,7 @@ docs_html_in_files = [ ] docs_rst_files = [ + '404', 'aclpolkit', 'advanced-tests', 'api', @@ -251,12 +252,6 @@ html_xslt_gen += { 'depends': aclperms_gen, } -html_xslt_gen += { - 'name': '404', - 'source': 'docs' / '404.html.in', - 'href_base': '/', -} - hvsupport_html_in = custom_target( 'hvsupport.html.in', output: 'hvsupport.html.in', -- 2.39.1

2 1

Summary on new backup interfaces in QEMU
by Vladimir Sementsov-Ogievskiy 21 Feb '23

21 Feb '23

Hi all! Here I want to summarize new interfaces and use cases for backup in QEMU. TODO for me: convert this into good rst documentation in docs/. OK, let's begin. First, note that drive-backup qmp command is deprecated. Next, some terminology: push backup: the whole process is inside QEMU process, also may be called "internal backup" pull backup: QEMU only exports a kind of snapshot (for example by NBD), and third party software reads this export and stores it somehow, also called "external backup" copy-before-write operations: We usually do backup of active disk, guest is running and may write to the disk during the process of backup. When guest wants to rewrite data region which is not backed up yet, we must stop this guest write, and copy original data to somewhere before continuing guest write. That's a copy-before-write operation. image-fleecing: the technique that allows to export a "snapshotted" state of the active disk with help of copy-before-write operations. We create a temporary image - target for copy-before-write operations, and provide an interface to the user to read the "snapshotted" state. And for read, we do read from temporary image the data which is already changed in original active disk, and we read unchanged data directly from active disk. The temporary image itself is also called "reverse delta" or "reversed delta". == Simple push backup == Just use blockdev-backup, nothing new here. I just note some technical details, that are relatively new: 1. First, backup job inserts copy-before-write filter above source disk, to do copy-before-write operation. 2. Created copy-before-write filter shares internal block-copy state with backup job, so they work in collaboration, to not copy same things twice. == Full pull backup == Assume, we are going to do incremental backup in future, so we also need to create a dirty bitmap, to track dirtiness of active disk since full backup. 1. Create empty temporary image for fleecing. It must be of the same size as active disk. It's not necessary to be qcow2, and if it's a qcow2, you shouldn't make the original active disk a backing file for the new temporary qcow2 image (it was necessary in old fleecing scheme). Example: qemu-img create -f qcow2 temp.qcow2 64G 2. Initialize fleecing scheme and create dirty bitmap for future incremental backup. Assume, disk0 is an active disk, attached to qdev-id sda, to be backed up. qmp: transaction [ block-dirty-bitmap-add {node: disk0, name: bitmap0, persistent: true} blockdev-add* {node-name: tmp-protocol, driver: file, filename: temp.qcow2} blockdev-add {node-name: tmp, driver: qcow2, file: tmp-protocol} blockdev-add {node-name: cbw, driver: copy-before-write, file: disk0, target: tmp} blockdev-replace** {parent-type: qdev, qdev-id: sda, new-child: cbw} blockdev-add {node-name: acc, driver: snapshot-access, file: cbw} ] qmp: nbd-server-start {...} qmp: nbd-server-add {device: acc, ...} This way we create the following block-graph: [guest] [NBD export] | | | root | root v file v [copy-before-write]<------[snapshot-access] | | | file | target v v [active-disk] [temp.qcow2] * "[PATCH 0/2] blockdev-add transaction" series needed for this ** "[PATCH v3 00/11] blockdev-replace" series needed for this Note additional useful options for copy-before-write filter: "[PATCH 0/3] block: copy-before-write: on-cbw-error behavior" provides possibility of option on-cbw-error=break-snapshot, which means that on failure of CBW operation we will not break guest write, but instead all further reads by NBD client will fail, which formally means: break the backup process, not guest write. "[PATCH 0/4] block: copy-before-write: cbw-timeout" provides an option cbw-timeout, to set a timeout for CBW operations. That's very useful to avoid guest stuck. 3. Now third party backup tool can read data from NBD export NBD_CMD_TRIM (discard) operation is supported on the export, it has the following effects: 1. discard this data from temp image, if it is stored here 2. avoid further copy-before-write operation (guest is free to rewrite corresponding data with no extra latency) 3. all further read requests from discarded areas by NBD client will fail So, NBD client may discard regions that are already backed up to avoid extra latency for guest writes and to free disk space on the host. Possible TODO here is to implement NBD protocol extension, that allows to READ & DISCARD in command. In this case we avoid extra command in the wire, but lose possibility of retrying the READ operation if it failed. 4. After backup is complete, we should destroy the fleecing scheme: qmp: nbd-server-stop qmp: blockdev-del {node-name: acc} qmp: blockdev-replace {parent-type: qdev, qdev-id: sda, new-child: disk0} qmp: blockdev-del {node-name: cbw} qmp: blockdev-del {node-name: tmp} qmp: blockdev-del {node-name: tmp-protocol} 5. If backup failed, we should remove created dirty bitmap: qmp: block-dirty-bitmap-remove {node: disk0, name: bitmap0} == Incremental pull backup == OK, now we have a bitmap called bitmap0, and want to do incremental backup, accordingly to that bitmap. In short, we want: - create a new bitmap to continue dirty tracking for next incremental backup - export "snapshotted" state of disk0 through NBD - export "frozen" bitmap, so that external tool know what to copy Mostly, all points remains the same, let's go through: 1. Create empty temporary image for fleecing -- same as for full backup, no difference 2. Initialize fleecing scheme and create dirty bitmap for future incremental backup. qmp: transaction [ block-dirty-bitmap-add {node: disk0, name: bitmap1, persistent: true} block-dirty-bitmap-disable {node: disk0, name: bitmap0} blockdev-add {node-name: tmp-protocol, driver: file, filename: temp.qcow2} blockdev-add {node-name: tmp, driver: qcow2, file: tmp-protocol} blockdev-add {node-name: cbw, driver: copy-before-write, file: disk0, target: tmp, bitmap: {node: disk0, name: bitmap0}} blockdev-replace {parent-type: qdev, qdev-id: sda, new-child: cbw} blockdev-add {node-name: acc, driver: snapshot-access, file: cbw} ] qmp: nbd-server-start {...} qmp: block-export-add {type: nbd, node-name: acc, bitmaps: [{node: disk0, name: bitmap0}]} 3. Now third party backup tool can read data from NBD export - Client may negotiate meta contexts, to query exported dirty bitmap by NBD_BLOCK_STATUS commend - If client reads "not-dirty" (by bitmap0) areas, it gets an error. - NBD_CMD_TRIM (discard) works as for full backup, no difference 4. After backup is complete, we should destroy the fleecing scheme: - Same as for full backup 5. Next, we should handle dirty bitmaps: 5.1 Failure path Merge-back bitmap1 to bitmap0 and continue tracking in bitmap0: qmp: transaction [ block-dirty-bitmap-enable {node: disk0, name: bitmap0} block-dirty-bitmap-merge {node: disk0, target: bitmap0, bitmaps: ['bitmap1']} block-dirty-bitmap-remove {node: disk0, name: bitmap1} ] 5.2 Success path We have two possible user scenarios on success: 5.2.1 Continue tracking for next incremental backup in bitmap1 In this case, just remove bitmap0: qmp: block-dirty-bitmap-remove {node: disk0, name: bitmap0} Or you may not delete bitmap0 and keep it disabled, to be reused in future for differential backup (see below). 5.2.2 Continue tracking for next incremental backup in bitmap0 (assume, we always work with one bitmap and don't want any kind of differential backups, and don't associate bitmap name with stored backups) In this case, enable and clear bitmap0, merge bitmap1 to bitmap0 and remove bitmap1: qmp: transaction [ block-dirty-bitmap-enable {node: disk0, name: bitmap0} block-dirty-bitmap-clear {node: disk0, name: bitmap0} block-dirty-bitmap-merge {node: disk0, target: bitmap0, bitmaps: ['bitmap1']} block-dirty-bitmap-remove {node: disk0, name: bitmap1} ] == Push backup with fleecing full/incremental == Reasoning: the main problem of simple push backup is that guest writes may be seriously affected by copy-on-write operations, when backup target is slow. To solve this problem, we'll use the scheme like for pull backup: we create local temporary image, which is a target for copy-before-write operations, and instead of exporting the "snapshot-access" node we start internal backup from it to the target. So, the scheme and commands looks exactly the same as for full and incremental pull backup. The only difference is that we don't need to start nbd export, but instead we should add target node to qemu and start internal backup. And good thing is that it may be done in same transaction with initializing fleecing scheme: qmp: transaction [ ... initialize fleecing scheme for full or incremental backup ... # Add target node. Here is qcow2 added, but it may be nbd node or something else blockdev-add {node-name: target-protocol, driver: file, filename: target.qcow2} blockdev-add {node-name: target, driver: qcow2, file: target-protocol} # Start backup blockdev-backup {device: acc, target: target, ...} ] If it is an incremental backup, pass also bitmap parameter: blockdev-backup {..., bitmap: bitmap0, sync: incremental, bitmap-mode: never} Note bitmap-mode=never: this means that backup will do nothing with bitmap0, so we have same scheme like for pull backups (handle bitmaps by hand after backup). Still, push-backup scheme may be adopted to use other bitmap modes. What we lack here is discarding in 'acc' node after successful copying of the block to the target, to safe disk space and avoid extra copy-before-write operations. It's a TODO, should be implemented like discard-source parameter for blockdev-backup. == Differential backups == I'm not fan of this idea, but I think it should be described. Assume we have already a chain of incremental backups (represented as qcow2 chain on backup storage server, for example). They corresponds to some points in time: T0, T1, T2, T3. Assume T3 is the last backup. If we want to create usual incremental backup, it would be diff between T3 and current time (which becomes T4). Differential backup say: I want to make backup starting from T1 to current time. What's for? Maybe T2 and T3 was removed or somehow damaged.. How to do that in Qemu: on each incremental backup you start a new bitmap, and _keep_ old one as disabled. This way we have bitmap0 (which presents diff between T0 and T1), bitmap1 (diff T1 T2), bitmap2 (diff T2 T3), and bitmap3 which shows diff from T3 up to current time. bitmap3 is the only enabled bitmap and others are disabled. So, to make differential backup, use block-dirty-bitmap-merge command, to merge all bitmaps you need into one, and than use it in any backup scheme. The drawback is that all these disabled bitmaps eat RAM. Possible solution is to not keep them in RAM, it's OK to keep them in qcow2, and load only on demand. That's not realized now and that's a TODO for thous who want differential backups. -- Best regards, Vladimir

3 2

[PATCH 0/6] ACL documentation fixes
by Peter Krempa 20 Feb '23

20 Feb '23

This series fixes multiple problems with our ACL documentation. Results of the changes should be browsable once pipeline finishes: https://gitlab.com/pipo.sk/libvirt/-/jobs/3799680208 Peter Krempa (6): docs: Fix generated names for ACL objects docs: ACL: Mention the ACL object name along with the corresponding libvirt object name gendispatch: Add proper XML header to ACL permissions XML file docs/html: Properly generate ACL permissions into API reference docs: Distribute the XMLs with ACL permission flags for APIs examples: polkit: Grant 'domain.read-secure' for the example cases docs/html/meson.build | 32 ++++++++++++++++++++++++++++++- docs/meson.build | 27 ++++++++++++++++++++++++++ docs/newapi.xsl | 12 +++++------- examples/polkit/libvirt-acl.rules | 1 + libvirt.spec.in | 3 +++ scripts/genaclperms.py | 8 ++++---- src/access/meson.build | 13 ------------- src/rpc/gendispatch.pl | 14 ++++++++++++-- 8 files changed, 83 insertions(+), 27 deletions(-) -- 2.39.2

3 17

[libvirt PATCH 0/2] syntax-check: Ensure Python is called via env(1)
by Andrea Bolognani 20 Feb '23

20 Feb '23

As suggested in [1]. [1] https://listman.redhat.com/archives/libvir-list/2022-December/236211.html *** BLURB HERE *** Andrea Bolognani (2): docs: Recommend better python3 shebang syntax-check: Ensure Python is called via env(1) build-aux/syntax-check.mk | 5 +++++ docs/hooks.rst | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) -- 2.39.2

2 7

Proposal: renaming 'master' branch to 'main'
by Daniel P. Berrangé 20 Feb '23

20 Feb '23

I don't recall exactly when it first came up, but it has been a few years now since the idea of moving away from 'master' as the git default branch name became a topic in OSS communities. Far from the first mention: https://sfconservancy.org/news/2020/jun/23/gitbranchname/ Both gitlab.com and github.com now default to 'main' as the default branch when creating new repositories: https://about.gitlab.com/blog/2021/03/10/new-git-default-branch-name/ https://github.blog/changelog/2020-10-01-the-default-branch-for-newly-creat… Some notable large open source projects have done, (or at least started) to rename the default branch in their existing projects too. eg GNOME: https://gitlab.gnome.org/GNOME/glib/-/issues/2348 Fedora: https://fedoraproject.org/wiki/Changes/GitRepos-master-to-main For libosinfo we did a rename last year. There was a little disruption but nothing too terrible, IIRC, missing weblate translation branch update was our main mistake. I'd suggest it is time to libvirt to get on this train and rename our default branch to 'main' in all repositories. There are essentially two options * Rename 'master' to 'main' With this, anyone pulling from an existing checkout will get an error telling them that 'master' does not exist. It won't tell them about 'main', but at least it gives them a sign that something in their checkout probably needs changing. Downside is that any URLs pointing to source files / commits with a branch name in the URL will become 404s. * Clone 'master' to 'main' With this, anyone pulling from an existing checkout will get no updates. It is very easy for people to not realize that they are tracking a branch which is no longer used Downside is also that the undesirable term 'master' remains present in the repo, even if unused. We might also miss places which still refer to 'master' which will end up outdated Ideally, we would rename 'master' to 'main', while the git server adds 'symbolic-ref' to effectively create a symlink to 'main'. This would mean anyone pulling from 'master' would get content from 'main'. AFAICT, this is not supported by gitlab.com though. I had held off suggesting the rename, hoping such support might arrive, but I'm doubting it will happen on a timescale to be useful, if at all. In terms of impact * Developers need to checkout 'main' and delete their now stale 'master' branch * Any open merge requests need updating, hitting 'Edit' and choose the new 'main' as the target * User repo forks may wish to delete their 'master' and push 'main', but that's entirely optional, since many people never touch/look at the default branch in their forks. * CI mostly shouldn't be impacted since we use CI_DEFAULT_BRANCH most places instead of hardcoding 'master'. A few exceptions - Links to artifacts include a branch name - integration tests mention branch name - References to check-doc/cirrus-run jobs use 'master' as the docker tag * GitHub mirroring won't track the rename, it'll just add 'main' without removing 'master', so needs manual fixup. * Need to update 'protected branch' and 'default branch' fields in gitlab repo settings for each repo * Weblate needs updating to translate from 'main' instead of 'master' So the rename isn't free of cost, but it should all be one-time only costs, which I think is something we can live with. Given our never ceasing development stream there's not really any 'right' time todo such a change. Just after a release is probably as good as it gets, and January is marginally better since we skip Feb and have a 6 week gap until the March 1st release. With regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|

5 6

[PATCH v2 0/5] qemu_passt: Fix issues with PID file
by Michal Privoznik 20 Feb '23

20 Feb '23

This is a v2 of: https://listman.redhat.com/archives/libvir-list/2023-February/237731.html diff to v1: - Merged patches that were ACKed in v1, - Dropped 4/4 from the original series (the one that sets --foreground), and implemented a different approach Michal Prívozník (5): qemu_passt: Avoid double daemonizing passt qemu_passt: Report passt's error on failed start qemu_passt: Make passt report errors to stderr whenever possible qemu_passt: Deduplicate passt killing code qemu_passt: Let passt write the PID file src/qemu/qemu_passt.c | 61 +++++++++++++++++++++++++++++-------------- 1 file changed, 41 insertions(+), 20 deletions(-) -- 2.39.1

7 26

[PATCH 1/1] WIP: allow update more disk properties
by jshen28 20 Feb '23

20 Feb '23

From: ushen <yshxxsjt715(a)gmail.com> --- src/qemu/qemu_block.c | 2 +- src/qemu/qemu_block.h | 5 +++++ src/qemu/qemu_domain.c | 2 -- src/qemu/qemu_driver.c | 17 +++++++++++++++++ 4 files changed, 23 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c index 5e700eff99..778aeebb8f 100644 --- a/src/qemu/qemu_block.c +++ b/src/qemu/qemu_block.c @@ -2981,7 +2981,7 @@ qemuBlockReopenFormatMon(qemuMonitor *mon, * that @src must be already properly configured for the desired outcome. The * nodenames of @src are used to identify the specific image in qemu. */ -static int +int qemuBlockReopenFormat(virDomainObj *vm, virStorageSource *src, virDomainAsyncJob asyncJob) diff --git a/src/qemu/qemu_block.h b/src/qemu/qemu_block.h index 5a61a19da2..9ef692278d 100644 --- a/src/qemu/qemu_block.h +++ b/src/qemu/qemu_block.h @@ -245,6 +245,11 @@ int qemuBlockReopenFormatMon(qemuMonitor *mon, virStorageSource *src); +int +qemuBlockReopenFormat(virDomainObj *vm, + virStorageSource *src, + virDomainAsyncJob asyncJob); + int qemuBlockReopenReadWrite(virDomainObj *vm, virStorageSource *src, diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index e9bc0f375d..e5b5fef87e 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -8239,7 +8239,6 @@ qemuDomainDiskChangeSupported(virDomainDiskDef *disk, CHECK_STREQ_NULLABLE(product, "product"); - CHECK_EQ(cachemode, "cache", true); CHECK_EQ(error_policy, "error_policy", true); CHECK_EQ(rerror_policy, "rerror_policy", true); CHECK_EQ(iomode, "io", true); @@ -8267,7 +8266,6 @@ qemuDomainDiskChangeSupported(virDomainDiskDef *disk, CHECK_EQ(info.bootIndex, "boot order", true); CHECK_EQ(rawio, "rawio", true); CHECK_EQ(sgio, "sgio", true); - CHECK_EQ(discard, "discard", true); CHECK_EQ(iothread, "iothread", true); CHECK_STREQ_NULLABLE(domain_name, diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 6154fe9bfe..bcb68d6c66 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -6802,6 +6802,7 @@ qemuDomainChangeDiskLive(virDomainObj *vm, virDomainDiskDef *orig_disk = NULL; virDomainStartupPolicy origStartupPolicy; virDomainDeviceDef oldDev = { .type = dev->type }; + int ret; if (!(orig_disk = virDomainDiskByTarget(vm->def, disk->dst))) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -6840,6 +6841,22 @@ qemuDomainChangeDiskLive(virDomainObj *vm, } dev->data.disk->src = NULL; + } else { + // reopen disk device with more parameters + disk->src->backingStore = orig_disk->src->backingStore; + ret = qemuBlockReopenFormat(vm, disk->src, false); + disk->src->backingStore = NULL; + if (!ret) { + orig_disk->cachemode = disk->cachemode; + orig_disk->src->cachemode = disk->src->cachemode; + orig_disk->detect_zeroes = disk->detect_zeroes; + orig_disk->src->detect_zeroes = disk->src->detect_zeroes; + orig_disk->discard = disk->discard; + orig_disk->src->discard = disk->src->discard; + disk->src->backingStore = NULL; + } else { + return ret; + } } /* in case when we aren't updating disk source we update startup policy here */ -- 2.17.1

1 0

[PATCH v2 0/2] selinux: Don't ignore ENOENT in Permissive mode
by Michal Privoznik 19 Feb '23

19 Feb '23

This is just a resend of the following series: https://listman.redhat.com/archives/libvir-list/2021-October/msg00738.html Michal Prívozník (2): selinux: Swap two blocks handling setfilecon_raw() failure selinux: Don't ignore ENOENT in Permissive mode src/security/security_selinux.c | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) -- 2.39.1

2 3

[PATCH] docs: ACL: Mention the ACL object name along with the corresponding libvirt object name
by Peter Krempa 19 Feb '23

19 Feb '23

It's not trivial to figure out the ACL object name from our documentation. Add it above the table outlining existing permissions. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- scripts/genaclperms.py | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/genaclperms.py b/scripts/genaclperms.py index e228b3ef60..e635dae50b 100755 --- a/scripts/genaclperms.py +++ b/scripts/genaclperms.py @@ -91,6 +91,7 @@ for obj in sorted(perms.keys()): olink = "object_" + obj.lower() print(' <h3><a id="%s">%s</a></h3>' % (olink, klass)) + print(' <p>The <b>%s</b> libvirt object is represented as <code>%s</code>.</p>' % (klass, obj.lower())) print(' <table>') print(' <thead>') print(' <tr>') -- 2.39.1

2 1

[PATCH] docs: ACL: Show which permissions are allowed for unauthenticated connections
by Peter Krempa 17 Feb '23

17 Feb '23

Certain APIs are allowed also without authentication but the ACL page didn't outline which. Generate a new column with the information. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- docs/acl.html.in | 3 ++- scripts/genaclperms.py | 7 +++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/docs/acl.html.in b/docs/acl.html.in index 3d0f651864..268d3aebd3 100644 --- a/docs/acl.html.in +++ b/docs/acl.html.in @@ -20,7 +20,8 @@ state, where the only API operations allowed are those required to complete authentication. After successful authentication, a connection either has full, unrestricted access to all libvirt - API calls, or is locked down to only "read only" operations, + API calls, or is locked down to only "read only" (see 'Anonymous' + in the table below) operations, according to what socket a client connection originated on. </p> diff --git a/scripts/genaclperms.py b/scripts/genaclperms.py index e228b3ef60..43616dad04 100755 --- a/scripts/genaclperms.py +++ b/scripts/genaclperms.py @@ -96,6 +96,7 @@ for obj in sorted(perms.keys()): print(' <tr>') print(' <th>Permission</th>') print(' <th>Description</th>') + print(' <th>Anonymous</th>') print(' </tr>') print(' </thead>') print(' <tbody>') @@ -103,6 +104,11 @@ for obj in sorted(perms.keys()): for perm in sorted(perms[obj].keys()): description = perms[obj][perm]["desc"] + if perms[obj][perm]["anonymous"]: + anonymous = 'yes' + else: + anonymous = '' + if description is None: raise Exception("missing description for %s.%s" % (obj, perm)) @@ -112,6 +118,7 @@ for obj in sorted(perms.keys()): print(' <tr>') print(' <td><a id="%s">%s</a></td>' % (plink, perm)) print(' <td>%s</td>' % description) + print(' <td>%s</td>' % anonymous) print(' </tr>') print(' </tbody>') -- 2.39.1

2 1

[PATCH 0/2] Read-only access to node devices
by Peter Krempa 17 Feb '23

17 Feb '23

See individual patches. Peter Krempa (2): access: Allow 'node-device.read' permission for anonymous users libvirt-nodedev: Allow read-only access to virNodeDeviceGetAutostart src/access/viraccessperm.h | 1 + src/libvirt-nodedev.c | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) -- 2.39.1

2 4

[libvirt PATCH] docs: introduce a more interesting 404 error page
by Daniel P. Berrangé 16 Feb '23

16 Feb '23

Our 404 error page is a little bit too boring. The solution is to add more penguins ! This relies on MIT licensed javascript code imported from https://github.com/VincentGarreau/particles.js The image is extracted from the existing libvirt logo SVG file. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- docs/404.html.in | 7 +- docs/css/libvirt.css | 12 + docs/js/app.js | 108 +++ docs/js/meson.build | 2 + docs/js/particles.js | 1541 ++++++++++++++++++++++++++++++++++++++++ docs/logos/meson.build | 2 + docs/logos/penguin.png | Bin 0 -> 4236 bytes docs/logos/penguin.svg | 358 ++++++++++ docs/page.xsl | 8 + 9 files changed, 2035 insertions(+), 3 deletions(-) create mode 100644 docs/js/app.js create mode 100644 docs/js/particles.js create mode 100644 docs/logos/penguin.png create mode 100644 docs/logos/penguin.svg Yes, this could easily be considered an April Fools' joke, but at the same time it is common to have a bit of fun with 404 error pages, so it is also a real suggestion :-) Live example rendering is at: https://berrange.gitlab.io/-/libvirt/-/jobs/3749944370/artifacts/website/40… The main "cost" of the fun is a few 10's of KB more in the dist from the JS/SVG/PNG diff --git a/docs/404.html.in b/docs/404.html.in index 0ac76f125a..39cded58f6 100644 --- a/docs/404.html.in +++ b/docs/404.html.in @@ -5,15 +5,16 @@ <h1>404 page not found</h1> <p> - Someone appears to have eaten the <del>penguin</del> - page you were looking for. You might want to try + We can't figure out which <del>penguin</del> page you were + looking for. You might want to try </p> <ul> <li>going back to the <a href="https://libvirt.org/">home page</a> to find a collection of links to interesting pages on this site</li> <li>using the search box at the top right corner of the screen to locate the content on this site or mailing list archives</li> + <li>selecting the right penguin swimming in the pool below</li> </ul> - + <div id="particles-js"></div> </body> </html> diff --git a/docs/css/libvirt.css b/docs/css/libvirt.css index 097dfcbe8e..fbd193da74 100644 --- a/docs/css/libvirt.css +++ b/docs/css/libvirt.css @@ -636,3 +636,15 @@ th p, td p { #contents p.topic-title { display: none; } + +canvas { + display: block; + vertical-align: bottom; +} + +#particles-js { + background-color: rgb(230,250,255); + border: 2px solid rgb(150,180,255); + width: 100%; + height: 100%; +} diff --git a/docs/js/app.js b/docs/js/app.js new file mode 100644 index 0000000000..79fae27c2e --- /dev/null +++ b/docs/js/app.js @@ -0,0 +1,108 @@ +particlesJS('particles-js', + { + "particles": { + "number": { + "value": 20, + "density": { + "enable": true, + "value_area": 800 + } + }, + "color": { + "value": "#ff0000" + }, + "shape": { + "type": "image", + "image": { + "src": "logos/penguin.png", + "width": 73, + "height": 138 + } + }, + "opacity": { + "value": 0.5, + "random": true, + "anim": { + "enable": true, + "speed": 1, + "opacity_min": 0.1, + "sync": false + } + }, + "size": { + "value": 50, + "random": true, + "anim": { + "enable": false, + "speed": 40, + "size_min": 0.1, + "sync": false + } + }, + "line_linked": { + "enable": false, + }, + "move": { + "enable": true, + "speed": 6, + "direction": "none", + "random": false, + "straight": false, + "out_mode": "bounce", + "attract": { + "enable": true, + "rotateX": 600, + "rotateY": 1200 + } + } + }, + "interactivity": { + "detect_on": "canvas", + "events": { + "onhover": { + "enable": true, + "mode": "repulse" + }, + "onclick": { + "enable": true, + "mode": "push" + }, + "resize": true + }, + "modes": { + "grab": { + "distance": 400, + "line_linked": { + "opacity": 1 + } + }, + "bubble": { + "distance": 400, + "size": 40, + "duration": 2, + "opacity": 8, + "speed": 3 + }, + "repulse": { + "distance": 200 + }, + "push": { + "particles_nb": 4 + }, + "remove": { + "particles_nb": 2 + } + } + }, + "retina_detect": true, + "config_demo": { + "hide_card": false, + "background_color": "#b61924", + "background_image": "", + "background_position": "50% 50%", + "background_repeat": "no-repeat", + "background_size": "cover" + } + } + +); diff --git a/docs/js/meson.build b/docs/js/meson.build index cbf2dc2633..4e3e05bf89 100644 --- a/docs/js/meson.build +++ b/docs/js/meson.build @@ -1,5 +1,7 @@ docs_js_files = [ 'main.js', + 'particles.js', + 'app.js' ] install_data(docs_js_files, install_dir: docs_html_dir / 'js') diff --git a/docs/js/particles.js b/docs/js/particles.js new file mode 100644 index 0000000000..ef3917fab7 --- /dev/null +++ b/docs/js/particles.js @@ -0,0 +1,1541 @@ +/* ----------------------------------------------- +/* Author : Vincent Garreau - vincentgarreau.com +/* MIT license: https://opensource.org/licenses/MIT +/* Demo / Generator : vincentgarreau.com/particles.js +/* GitHub : github.com/VincentGarreau/particles.js +/* How to use? : Check the GitHub README +/* v2.0.0 +/* ----------------------------------------------- */ + +var pJS = function(tag_id, params){ + + var canvas_el = document.querySelector('#'+tag_id+' > .particles-js-canvas-el'); + + /* particles.js variables with default values */ + this.pJS = { + canvas: { + el: canvas_el, + w: canvas_el.offsetWidth, + h: canvas_el.offsetHeight + }, + particles: { + number: { + value: 400, + density: { + enable: true, + value_area: 800 + } + }, + color: { + value: '#fff' + }, + shape: { + type: 'circle', + stroke: { + width: 0, + color: '#ff0000' + }, + polygon: { + nb_sides: 5 + }, + image: { + src: '', + width: 100, + height: 100 + } + }, + opacity: { + value: 1, + random: false, + anim: { + enable: false, + speed: 2, + opacity_min: 0, + sync: false + } + }, + size: { + value: 20, + random: false, + anim: { + enable: false, + speed: 20, + size_min: 0, + sync: false + } + }, + line_linked: { + enable: true, + distance: 100, + color: '#fff', + opacity: 1, + width: 1 + }, + move: { + enable: true, + speed: 2, + direction: 'none', + random: false, + straight: false, + out_mode: 'out', + bounce: false, + attract: { + enable: false, + rotateX: 3000, + rotateY: 3000 + } + }, + array: [] + }, + interactivity: { + detect_on: 'canvas', + events: { + onhover: { + enable: true, + mode: 'grab' + }, + onclick: { + enable: true, + mode: 'push' + }, + resize: true + }, + modes: { + grab:{ + distance: 100, + line_linked:{ + opacity: 1 + } + }, + bubble:{ + distance: 200, + size: 80, + duration: 0.4 + }, + repulse:{ + distance: 200, + duration: 0.4 + }, + push:{ + particles_nb: 4 + }, + remove:{ + particles_nb: 2 + } + }, + mouse:{} + }, + retina_detect: false, + fn: { + interact: {}, + modes: {}, + vendors:{} + }, + tmp: {} + }; + + var pJS = this.pJS; + + /* params settings */ + if(params){ + Object.deepExtend(pJS, params); + } + + pJS.tmp.obj = { + size_value: pJS.particles.size.value, + size_anim_speed: pJS.particles.size.anim.speed, + move_speed: pJS.particles.move.speed, + line_linked_distance: pJS.particles.line_linked.distance, + line_linked_width: pJS.particles.line_linked.width, + mode_grab_distance: pJS.interactivity.modes.grab.distance, + mode_bubble_distance: pJS.interactivity.modes.bubble.distance, + mode_bubble_size: pJS.interactivity.modes.bubble.size, + mode_repulse_distance: pJS.interactivity.modes.repulse.distance + }; + + + pJS.fn.retinaInit = function(){ + + if(pJS.retina_detect && window.devicePixelRatio > 1){ + pJS.canvas.pxratio = window.devicePixelRatio; + pJS.tmp.retina = true; + } + else{ + pJS.canvas.pxratio = 1; + pJS.tmp.retina = false; + } + + pJS.canvas.w = pJS.canvas.el.offsetWidth * pJS.canvas.pxratio; + pJS.canvas.h = pJS.canvas.el.offsetHeight * pJS.canvas.pxratio; + + pJS.particles.size.value = pJS.tmp.obj.size_value * pJS.canvas.pxratio; + pJS.particles.size.anim.speed = pJS.tmp.obj.size_anim_speed * pJS.canvas.pxratio; + pJS.particles.move.speed = pJS.tmp.obj.move_speed * pJS.canvas.pxratio; + pJS.particles.line_linked.distance = pJS.tmp.obj.line_linked_distance * pJS.canvas.pxratio; + pJS.interactivity.modes.grab.distance = pJS.tmp.obj.mode_grab_distance * pJS.canvas.pxratio; + pJS.interactivity.modes.bubble.distance = pJS.tmp.obj.mode_bubble_distance * pJS.canvas.pxratio; + pJS.particles.line_linked.width = pJS.tmp.obj.line_linked_width * pJS.canvas.pxratio; + pJS.interactivity.modes.bubble.size = pJS.tmp.obj.mode_bubble_size * pJS.canvas.pxratio; + pJS.interactivity.modes.repulse.distance = pJS.tmp.obj.mode_repulse_distance * pJS.canvas.pxratio; + + }; + + + + /* ---------- pJS functions - canvas ------------ */ + + pJS.fn.canvasInit = function(){ + pJS.canvas.ctx = pJS.canvas.el.getContext('2d'); + }; + + pJS.fn.canvasSize = function(){ + + pJS.canvas.el.width = pJS.canvas.w; + pJS.canvas.el.height = pJS.canvas.h; + + if(pJS && pJS.interactivity.events.resize){ + + window.addEventListener('resize', function(){ + + pJS.canvas.w = pJS.canvas.el.offsetWidth; + pJS.canvas.h = pJS.canvas.el.offsetHeight; + + /* resize canvas */ + if(pJS.tmp.retina){ + pJS.canvas.w *= pJS.canvas.pxratio; + pJS.canvas.h *= pJS.canvas.pxratio; + } + + pJS.canvas.el.width = pJS.canvas.w; + pJS.canvas.el.height = pJS.canvas.h; + + /* repaint canvas on anim disabled */ + if(!pJS.particles.move.enable){ + pJS.fn.particlesEmpty(); + pJS.fn.particlesCreate(); + pJS.fn.particlesDraw(); + pJS.fn.vendors.densityAutoParticles(); + } + + /* density particles enabled */ + pJS.fn.vendors.densityAutoParticles(); + + }); + + } + + }; + + + pJS.fn.canvasPaint = function(){ + pJS.canvas.ctx.fillRect(0, 0, pJS.canvas.w, pJS.canvas.h); + }; + + pJS.fn.canvasClear = function(){ + pJS.canvas.ctx.clearRect(0, 0, pJS.canvas.w, pJS.canvas.h); + }; + + + /* --------- pJS functions - particles ----------- */ + + pJS.fn.particle = function(color, opacity, position){ + + /* size */ + this.radius = (pJS.particles.size.random ? Math.random() : 1) * pJS.particles.size.value; + if(pJS.particles.size.anim.enable){ + this.size_status = false; + this.vs = pJS.particles.size.anim.speed / 100; + if(!pJS.particles.size.anim.sync){ + this.vs = this.vs * Math.random(); + } + } + + /* position */ + this.x = position ? position.x : Math.random() * pJS.canvas.w; + this.y = position ? position.y : Math.random() * pJS.canvas.h; + + /* check position - into the canvas */ + if(this.x > pJS.canvas.w - this.radius*2) this.x = this.x - this.radius; + else if(this.x < this.radius*2) this.x = this.x + this.radius; + if(this.y > pJS.canvas.h - this.radius*2) this.y = this.y - this.radius; + else if(this.y < this.radius*2) this.y = this.y + this.radius; + + /* check position - avoid overlap */ + if(pJS.particles.move.bounce){ + pJS.fn.vendors.checkOverlap(this, position); + } + + /* color */ + this.color = {}; + if(typeof(color.value) == 'object'){ + + if(color.value instanceof Array){ + var color_selected = color.value[Math.floor(Math.random() * pJS.particles.color.value.length)]; + this.color.rgb = hexToRgb(color_selected); + }else{ + if(color.value.r != undefined && color.value.g != undefined && color.value.b != undefined){ + this.color.rgb = { + r: color.value.r, + g: color.value.g, + b: color.value.b + } + } + if(color.value.h != undefined && color.value.s != undefined && color.value.l != undefined){ + this.color.hsl = { + h: color.value.h, + s: color.value.s, + l: color.value.l + } + } + } + + } + else if(color.value == 'random'){ + this.color.rgb = { + r: (Math.floor(Math.random() * (255 - 0 + 1)) + 0), + g: (Math.floor(Math.random() * (255 - 0 + 1)) + 0), + b: (Math.floor(Math.random() * (255 - 0 + 1)) + 0) + } + } + else if(typeof(color.value) == 'string'){ + this.color = color; + this.color.rgb = hexToRgb(this.color.value); + } + + /* opacity */ + this.opacity = (pJS.particles.opacity.random ? Math.random() : 1) * pJS.particles.opacity.value; + if(pJS.particles.opacity.anim.enable){ + this.opacity_status = false; + this.vo = pJS.particles.opacity.anim.speed / 100; + if(!pJS.particles.opacity.anim.sync){ + this.vo = this.vo * Math.random(); + } + } + + /* animation - velocity for speed */ + var velbase = {} + switch(pJS.particles.move.direction){ + case 'top': + velbase = { x:0, y:-1 }; + break; + case 'top-right': + velbase = { x:0.5, y:-0.5 }; + break; + case 'right': + velbase = { x:1, y:-0 }; + break; + case 'bottom-right': + velbase = { x:0.5, y:0.5 }; + break; + case 'bottom': + velbase = { x:0, y:1 }; + break; + case 'bottom-left': + velbase = { x:-0.5, y:1 }; + break; + case 'left': + velbase = { x:-1, y:0 }; + break; + case 'top-left': + velbase = { x:-0.5, y:-0.5 }; + break; + default: + velbase = { x:0, y:0 }; + break; + } + + if(pJS.particles.move.straight){ + this.vx = velbase.x; + this.vy = velbase.y; + if(pJS.particles.move.random){ + this.vx = this.vx * (Math.random()); + this.vy = this.vy * (Math.random()); + } + }else{ + this.vx = velbase.x + Math.random()-0.5; + this.vy = velbase.y + Math.random()-0.5; + } + + // var theta = 2.0 * Math.PI * Math.random(); + // this.vx = Math.cos(theta); + // this.vy = Math.sin(theta); + + this.vx_i = this.vx; + this.vy_i = this.vy; + + + + /* if shape is image */ + + var shape_type = pJS.particles.shape.type; + if(typeof(shape_type) == 'object'){ + if(shape_type instanceof Array){ + var shape_selected = shape_type[Math.floor(Math.random() * shape_type.length)]; + this.shape = shape_selected; + } + }else{ + this.shape = shape_type; + } + + if(this.shape == 'image'){ + var sh = pJS.particles.shape; + this.img = { + src: sh.image.src, + ratio: sh.image.width / sh.image.height + } + if(!this.img.ratio) this.img.ratio = 1; + if(pJS.tmp.img_type == 'svg' && pJS.tmp.source_svg != undefined){ + pJS.fn.vendors.createSvgImg(this); + if(pJS.tmp.pushing){ + this.img.loaded = false; + } + } + } + + + + }; + + + pJS.fn.particle.prototype.draw = function() { + + var p = this; + + if(p.radius_bubble != undefined){ + var radius = p.radius_bubble; + }else{ + var radius = p.radius; + } + + if(p.opacity_bubble != undefined){ + var opacity = p.opacity_bubble; + }else{ + var opacity = p.opacity; + } + + if(p.color.rgb){ + var color_value = 'rgba('+p.color.rgb.r+','+p.color.rgb.g+','+p.color.rgb.b+','+opacity+')'; + }else{ + var color_value = 'hsla('+p.color.hsl.h+','+p.color.hsl.s+'%,'+p.color.hsl.l+'%,'+opacity+')'; + } + + pJS.canvas.ctx.fillStyle = color_value; + pJS.canvas.ctx.beginPath(); + + switch(p.shape){ + + case 'circle': + pJS.canvas.ctx.arc(p.x, p.y, radius, 0, Math.PI * 2, false); + break; + + case 'edge': + pJS.canvas.ctx.rect(p.x-radius, p.y-radius, radius*2, radius*2); + break; + + case 'triangle': + pJS.fn.vendors.drawShape(pJS.canvas.ctx, p.x-radius, p.y+radius / 1.66, radius*2, 3, 2); + break; + + case 'polygon': + pJS.fn.vendors.drawShape( + pJS.canvas.ctx, + p.x - radius / (pJS.particles.shape.polygon.nb_sides/3.5), // startX + p.y - radius / (2.66/3.5), // startY + radius*2.66 / (pJS.particles.shape.polygon.nb_sides/3), // sideLength + pJS.particles.shape.polygon.nb_sides, // sideCountNumerator + 1 // sideCountDenominator + ); + break; + + case 'star': + pJS.fn.vendors.drawShape( + pJS.canvas.ctx, + p.x - radius*2 / (pJS.particles.shape.polygon.nb_sides/4), // startX + p.y - radius / (2*2.66/3.5), // startY + radius*2*2.66 / (pJS.particles.shape.polygon.nb_sides/3), // sideLength + pJS.particles.shape.polygon.nb_sides, // sideCountNumerator + 2 // sideCountDenominator + ); + break; + + case 'image': + + function draw(){ + pJS.canvas.ctx.drawImage( + img_obj, + p.x-radius, + p.y-radius, + radius*2, + radius*2 / p.img.ratio + ); + } + + if(pJS.tmp.img_type == 'svg'){ + var img_obj = p.img.obj; + }else{ + var img_obj = pJS.tmp.img_obj; + } + + if(img_obj){ + draw(); + } + + break; + + } + + pJS.canvas.ctx.closePath(); + + if(pJS.particles.shape.stroke.width > 0){ + pJS.canvas.ctx.strokeStyle = pJS.particles.shape.stroke.color; + pJS.canvas.ctx.lineWidth = pJS.particles.shape.stroke.width; + pJS.canvas.ctx.stroke(); + } + + pJS.canvas.ctx.fill(); + + }; + + + pJS.fn.particlesCreate = function(){ + for(var i = 0; i < pJS.particles.number.value; i++) { + pJS.particles.array.push(new pJS.fn.particle(pJS.particles.color, pJS.particles.opacity.value)); + } + }; + + pJS.fn.particlesUpdate = function(){ + + for(var i = 0; i < pJS.particles.array.length; i++){ + + /* the particle */ + var p = pJS.particles.array[i]; + + // var d = ( dx = pJS.interactivity.mouse.click_pos_x - p.x ) * dx + ( dy = pJS.interactivity.mouse.click_pos_y - p.y ) * dy; + // var f = -BANG_SIZE / d; + // if ( d < BANG_SIZE ) { + // var t = Math.atan2( dy, dx ); + // p.vx = f * Math.cos(t); + // p.vy = f * Math.sin(t); + // } + + /* move the particle */ + if(pJS.particles.move.enable){ + var ms = pJS.particles.move.speed/2; + p.x += p.vx * ms; + p.y += p.vy * ms; + } + + /* change opacity status */ + if(pJS.particles.opacity.anim.enable) { + if(p.opacity_status == true) { + if(p.opacity >= pJS.particles.opacity.value) p.opacity_status = false; + p.opacity += p.vo; + }else { + if(p.opacity <= pJS.particles.opacity.anim.opacity_min) p.opacity_status = true; + p.opacity -= p.vo; + } + if(p.opacity < 0) p.opacity = 0; + } + + /* change size */ + if(pJS.particles.size.anim.enable){ + if(p.size_status == true){ + if(p.radius >= pJS.particles.size.value) p.size_status = false; + p.radius += p.vs; + }else{ + if(p.radius <= pJS.particles.size.anim.size_min) p.size_status = true; + p.radius -= p.vs; + } + if(p.radius < 0) p.radius = 0; + } + + /* change particle position if it is out of canvas */ + if(pJS.particles.move.out_mode == 'bounce'){ + var new_pos = { + x_left: p.radius, + x_right: pJS.canvas.w, + y_top: p.radius, + y_bottom: pJS.canvas.h + } + }else{ + var new_pos = { + x_left: -p.radius, + x_right: pJS.canvas.w + p.radius, + y_top: -p.radius, + y_bottom: pJS.canvas.h + p.radius + } + } + + if(p.x - p.radius > pJS.canvas.w){ + p.x = new_pos.x_left; + p.y = Math.random() * pJS.canvas.h; + } + else if(p.x + p.radius < 0){ + p.x = new_pos.x_right; + p.y = Math.random() * pJS.canvas.h; + } + if(p.y - p.radius > pJS.canvas.h){ + p.y = new_pos.y_top; + p.x = Math.random() * pJS.canvas.w; + } + else if(p.y + p.radius < 0){ + p.y = new_pos.y_bottom; + p.x = Math.random() * pJS.canvas.w; + } + + /* out of canvas modes */ + switch(pJS.particles.move.out_mode){ + case 'bounce': + if (p.x + p.radius > pJS.canvas.w) p.vx = -p.vx; + else if (p.x - p.radius < 0) p.vx = -p.vx; + if (p.y + p.radius > pJS.canvas.h) p.vy = -p.vy; + else if (p.y - p.radius < 0) p.vy = -p.vy; + break; + } + + /* events */ + if(isInArray('grab', pJS.interactivity.events.onhover.mode)){ + pJS.fn.modes.grabParticle(p); + } + + if(isInArray('bubble', pJS.interactivity.events.onhover.mode) || isInArray('bubble', pJS.interactivity.events.onclick.mode)){ + pJS.fn.modes.bubbleParticle(p); + } + + if(isInArray('repulse', pJS.interactivity.events.onhover.mode) || isInArray('repulse', pJS.interactivity.events.onclick.mode)){ + pJS.fn.modes.repulseParticle(p); + } + + /* interaction auto between particles */ + if(pJS.particles.line_linked.enable || pJS.particles.move.attract.enable){ + for(var j = i + 1; j < pJS.particles.array.length; j++){ + var p2 = pJS.particles.array[j]; + + /* link particles */ + if(pJS.particles.line_linked.enable){ + pJS.fn.interact.linkParticles(p,p2); + } + + /* attract particles */ + if(pJS.particles.move.attract.enable){ + pJS.fn.interact.attractParticles(p,p2); + } + + /* bounce particles */ + if(pJS.particles.move.bounce){ + pJS.fn.interact.bounceParticles(p,p2); + } + + } + } + + + } + + }; + + pJS.fn.particlesDraw = function(){ + + /* clear canvas */ + pJS.canvas.ctx.clearRect(0, 0, pJS.canvas.w, pJS.canvas.h); + + /* update each particles param */ + pJS.fn.particlesUpdate(); + + /* draw each particle */ + for(var i = 0; i < pJS.particles.array.length; i++){ + var p = pJS.particles.array[i]; + p.draw(); + } + + }; + + pJS.fn.particlesEmpty = function(){ + pJS.particles.array = []; + }; + + pJS.fn.particlesRefresh = function(){ + + /* init all */ + cancelRequestAnimFrame(pJS.fn.checkAnimFrame); + cancelRequestAnimFrame(pJS.fn.drawAnimFrame); + pJS.tmp.source_svg = undefined; + pJS.tmp.img_obj = undefined; + pJS.tmp.count_svg = 0; + pJS.fn.particlesEmpty(); + pJS.fn.canvasClear(); + + /* restart */ + pJS.fn.vendors.start(); + + }; + + + /* ---------- pJS functions - particles interaction ------------ */ + + pJS.fn.interact.linkParticles = function(p1, p2){ + + var dx = p1.x - p2.x, + dy = p1.y - p2.y, + dist = Math.sqrt(dx*dx + dy*dy); + + /* draw a line between p1 and p2 if the distance between them is under the config distance */ + if(dist <= pJS.particles.line_linked.distance){ + + var opacity_line = pJS.particles.line_linked.opacity - (dist / (1/pJS.particles.line_linked.opacity)) / pJS.particles.line_linked.distance; + + if(opacity_line > 0){ + + /* style */ + var color_line = pJS.particles.line_linked.color_rgb_line; + pJS.canvas.ctx.strokeStyle = 'rgba('+color_line.r+','+color_line.g+','+color_line.b+','+opacity_line+')'; + pJS.canvas.ctx.lineWidth = pJS.particles.line_linked.width; + //pJS.canvas.ctx.lineCap = 'round'; /* performance issue */ + + /* path */ + pJS.canvas.ctx.beginPath(); + pJS.canvas.ctx.moveTo(p1.x, p1.y); + pJS.canvas.ctx.lineTo(p2.x, p2.y); + pJS.canvas.ctx.stroke(); + pJS.canvas.ctx.closePath(); + + } + + } + + }; + + + pJS.fn.interact.attractParticles = function(p1, p2){ + + /* condensed particles */ + var dx = p1.x - p2.x, + dy = p1.y - p2.y, + dist = Math.sqrt(dx*dx + dy*dy); + + if(dist <= pJS.particles.line_linked.distance){ + + var ax = dx/(pJS.particles.move.attract.rotateX*1000), + ay = dy/(pJS.particles.move.attract.rotateY*1000); + + p1.vx -= ax; + p1.vy -= ay; + + p2.vx += ax; + p2.vy += ay; + + } + + + } + + + pJS.fn.interact.bounceParticles = function(p1, p2){ + + var dx = p1.x - p2.x, + dy = p1.y - p2.y, + dist = Math.sqrt(dx*dx + dy*dy), + dist_p = p1.radius+p2.radius; + + if(dist <= dist_p){ + p1.vx = -p1.vx; + p1.vy = -p1.vy; + + p2.vx = -p2.vx; + p2.vy = -p2.vy; + } + + } + + + /* ---------- pJS functions - modes events ------------ */ + + pJS.fn.modes.pushParticles = function(nb, pos){ + + pJS.tmp.pushing = true; + + for(var i = 0; i < nb; i++){ + pJS.particles.array.push( + new pJS.fn.particle( + pJS.particles.color, + pJS.particles.opacity.value, + { + 'x': pos ? pos.pos_x : Math.random() * pJS.canvas.w, + 'y': pos ? pos.pos_y : Math.random() * pJS.canvas.h + } + ) + ) + if(i == nb-1){ + if(!pJS.particles.move.enable){ + pJS.fn.particlesDraw(); + } + pJS.tmp.pushing = false; + } + } + + }; + + + pJS.fn.modes.removeParticles = function(nb){ + + pJS.particles.array.splice(0, nb); + if(!pJS.particles.move.enable){ + pJS.fn.particlesDraw(); + } + + }; + + + pJS.fn.modes.bubbleParticle = function(p){ + + /* on hover event */ + if(pJS.interactivity.events.onhover.enable && isInArray('bubble', pJS.interactivity.events.onhover.mode)){ + + var dx_mouse = p.x - pJS.interactivity.mouse.pos_x, + dy_mouse = p.y - pJS.interactivity.mouse.pos_y, + dist_mouse = Math.sqrt(dx_mouse*dx_mouse + dy_mouse*dy_mouse), + ratio = 1 - dist_mouse / pJS.interactivity.modes.bubble.distance; + + function init(){ + p.opacity_bubble = p.opacity; + p.radius_bubble = p.radius; + } + + /* mousemove - check ratio */ + if(dist_mouse <= pJS.interactivity.modes.bubble.distance){ + + if(ratio >= 0 && pJS.interactivity.status == 'mousemove'){ + + /* size */ + if(pJS.interactivity.modes.bubble.size != pJS.particles.size.value){ + + if(pJS.interactivity.modes.bubble.size > pJS.particles.size.value){ + var size = p.radius + (pJS.interactivity.modes.bubble.size*ratio); + if(size >= 0){ + p.radius_bubble = size; + } + }else{ + var dif = p.radius - pJS.interactivity.modes.bubble.size, + size = p.radius - (dif*ratio); + if(size > 0){ + p.radius_bubble = size; + }else{ + p.radius_bubble = 0; + } + } + + } + + /* opacity */ + if(pJS.interactivity.modes.bubble.opacity != pJS.particles.opacity.value){ + + if(pJS.interactivity.modes.bubble.opacity > pJS.particles.opacity.value){ + var opacity = pJS.interactivity.modes.bubble.opacity*ratio; + if(opacity > p.opacity && opacity <= pJS.interactivity.modes.bubble.opacity){ + p.opacity_bubble = opacity; + } + }else{ + var opacity = p.opacity - (pJS.particles.opacity.value-pJS.interactivity.modes.bubble.opacity)*ratio; + if(opacity < p.opacity && opacity >= pJS.interactivity.modes.bubble.opacity){ + p.opacity_bubble = opacity; + } + } + + } + + } + + }else{ + init(); + } + + + /* mouseleave */ + if(pJS.interactivity.status == 'mouseleave'){ + init(); + } + + } + + /* on click event */ + else if(pJS.interactivity.events.onclick.enable && isInArray('bubble', pJS.interactivity.events.onclick.mode)){ + + + if(pJS.tmp.bubble_clicking){ + var dx_mouse = p.x - pJS.interactivity.mouse.click_pos_x, + dy_mouse = p.y - pJS.interactivity.mouse.click_pos_y, + dist_mouse = Math.sqrt(dx_mouse*dx_mouse + dy_mouse*dy_mouse), + time_spent = (new Date().getTime() - pJS.interactivity.mouse.click_time)/1000; + + if(time_spent > pJS.interactivity.modes.bubble.duration){ + pJS.tmp.bubble_duration_end = true; + } + + if(time_spent > pJS.interactivity.modes.bubble.duration*2){ + pJS.tmp.bubble_clicking = false; + pJS.tmp.bubble_duration_end = false; + } + } + + + function process(bubble_param, particles_param, p_obj_bubble, p_obj, id){ + + if(bubble_param != particles_param){ + + if(!pJS.tmp.bubble_duration_end){ + if(dist_mouse <= pJS.interactivity.modes.bubble.distance){ + if(p_obj_bubble != undefined) var obj = p_obj_bubble; + else var obj = p_obj; + if(obj != bubble_param){ + var value = p_obj - (time_spent * (p_obj - bubble_param) / pJS.interactivity.modes.bubble.duration); + if(id == 'size') p.radius_bubble = value; + if(id == 'opacity') p.opacity_bubble = value; + } + }else{ + if(id == 'size') p.radius_bubble = undefined; + if(id == 'opacity') p.opacity_bubble = undefined; + } + }else{ + if(p_obj_bubble != undefined){ + var value_tmp = p_obj - (time_spent * (p_obj - bubble_param) / pJS.interactivity.modes.bubble.duration), + dif = bubble_param - value_tmp; + value = bubble_param + dif; + if(id == 'size') p.radius_bubble = value; + if(id == 'opacity') p.opacity_bubble = value; + } + } + + } + + } + + if(pJS.tmp.bubble_clicking){ + /* size */ + process(pJS.interactivity.modes.bubble.size, pJS.particles.size.value, p.radius_bubble, p.radius, 'size'); + /* opacity */ + process(pJS.interactivity.modes.bubble.opacity, pJS.particles.opacity.value, p.opacity_bubble, p.opacity, 'opacity'); + } + + } + + }; + + + pJS.fn.modes.repulseParticle = function(p){ + + if(pJS.interactivity.events.onhover.enable && isInArray('repulse', pJS.interactivity.events.onhover.mode) && pJS.interactivity.status == 'mousemove') { + + var dx_mouse = p.x - pJS.interactivity.mouse.pos_x, + dy_mouse = p.y - pJS.interactivity.mouse.pos_y, + dist_mouse = Math.sqrt(dx_mouse*dx_mouse + dy_mouse*dy_mouse); + + var normVec = {x: dx_mouse/dist_mouse, y: dy_mouse/dist_mouse}, + repulseRadius = pJS.interactivity.modes.repulse.distance, + velocity = 100, + repulseFactor = clamp((1/repulseRadius)*(-1*Math.pow(dist_mouse/repulseRadius,2)+1)*repulseRadius*velocity, 0, 50); + + var pos = { + x: p.x + normVec.x * repulseFactor, + y: p.y + normVec.y * repulseFactor + } + + if(pJS.particles.move.out_mode == 'bounce'){ + if(pos.x - p.radius > 0 && pos.x + p.radius < pJS.canvas.w) p.x = pos.x; + if(pos.y - p.radius > 0 && pos.y + p.radius < pJS.canvas.h) p.y = pos.y; + }else{ + p.x = pos.x; + p.y = pos.y; + } + + } + + + else if(pJS.interactivity.events.onclick.enable && isInArray('repulse', pJS.interactivity.events.onclick.mode)) { + + if(!pJS.tmp.repulse_finish){ + pJS.tmp.repulse_count++; + if(pJS.tmp.repulse_count == pJS.particles.array.length){ + pJS.tmp.repulse_finish = true; + } + } + + if(pJS.tmp.repulse_clicking){ + + var repulseRadius = Math.pow(pJS.interactivity.modes.repulse.distance/6, 3); + + var dx = pJS.interactivity.mouse.click_pos_x - p.x, + dy = pJS.interactivity.mouse.click_pos_y - p.y, + d = dx*dx + dy*dy; + + var force = -repulseRadius / d * 1; + + function process(){ + + var f = Math.atan2(dy,dx); + p.vx = force * Math.cos(f); + p.vy = force * Math.sin(f); + + if(pJS.particles.move.out_mode == 'bounce'){ + var pos = { + x: p.x + p.vx, + y: p.y + p.vy + } + if (pos.x + p.radius > pJS.canvas.w) p.vx = -p.vx; + else if (pos.x - p.radius < 0) p.vx = -p.vx; + if (pos.y + p.radius > pJS.canvas.h) p.vy = -p.vy; + else if (pos.y - p.radius < 0) p.vy = -p.vy; + } + + } + + // default + if(d <= repulseRadius){ + process(); + } + + // bang - slow motion mode + // if(!pJS.tmp.repulse_finish){ + // if(d <= repulseRadius){ + // process(); + // } + // }else{ + // process(); + // } + + + }else{ + + if(pJS.tmp.repulse_clicking == false){ + + p.vx = p.vx_i; + p.vy = p.vy_i; + + } + + } + + } + + } + + + pJS.fn.modes.grabParticle = function(p){ + + if(pJS.interactivity.events.onhover.enable && pJS.interactivity.status == 'mousemove'){ + + var dx_mouse = p.x - pJS.interactivity.mouse.pos_x, + dy_mouse = p.y - pJS.interactivity.mouse.pos_y, + dist_mouse = Math.sqrt(dx_mouse*dx_mouse + dy_mouse*dy_mouse); + + /* draw a line between the cursor and the particle if the distance between them is under the config distance */ + if(dist_mouse <= pJS.interactivity.modes.grab.distance){ + + var opacity_line = pJS.interactivity.modes.grab.line_linked.opacity - (dist_mouse / (1/pJS.interactivity.modes.grab.line_linked.opacity)) / pJS.interactivity.modes.grab.distance; + + if(opacity_line > 0){ + + /* style */ + var color_line = pJS.particles.line_linked.color_rgb_line; + pJS.canvas.ctx.strokeStyle = 'rgba('+color_line.r+','+color_line.g+','+color_line.b+','+opacity_line+')'; + pJS.canvas.ctx.lineWidth = pJS.particles.line_linked.width; + //pJS.canvas.ctx.lineCap = 'round'; /* performance issue */ + + /* path */ + pJS.canvas.ctx.beginPath(); + pJS.canvas.ctx.moveTo(p.x, p.y); + pJS.canvas.ctx.lineTo(pJS.interactivity.mouse.pos_x, pJS.interactivity.mouse.pos_y); + pJS.canvas.ctx.stroke(); + pJS.canvas.ctx.closePath(); + + } + + } + + } + + }; + + + + /* ---------- pJS functions - vendors ------------ */ + + pJS.fn.vendors.eventsListeners = function(){ + + /* events target element */ + if(pJS.interactivity.detect_on == 'window'){ + pJS.interactivity.el = window; + }else{ + pJS.interactivity.el = pJS.canvas.el; + } + + + /* detect mouse pos - on hover / click event */ + if(pJS.interactivity.events.onhover.enable || pJS.interactivity.events.onclick.enable){ + + /* el on mousemove */ + pJS.interactivity.el.addEventListener('mousemove', function(e){ + + if(pJS.interactivity.el == window){ + var pos_x = e.clientX, + pos_y = e.clientY; + } + else{ + var pos_x = e.offsetX || e.clientX, + pos_y = e.offsetY || e.clientY; + } + + pJS.interactivity.mouse.pos_x = pos_x; + pJS.interactivity.mouse.pos_y = pos_y; + + if(pJS.tmp.retina){ + pJS.interactivity.mouse.pos_x *= pJS.canvas.pxratio; + pJS.interactivity.mouse.pos_y *= pJS.canvas.pxratio; + } + + pJS.interactivity.status = 'mousemove'; + + }); + + /* el on onmouseleave */ + pJS.interactivity.el.addEventListener('mouseleave', function(e){ + + pJS.interactivity.mouse.pos_x = null; + pJS.interactivity.mouse.pos_y = null; + pJS.interactivity.status = 'mouseleave'; + + }); + + } + + /* on click event */ + if(pJS.interactivity.events.onclick.enable){ + + pJS.interactivity.el.addEventListener('click', function(){ + + pJS.interactivity.mouse.click_pos_x = pJS.interactivity.mouse.pos_x; + pJS.interactivity.mouse.click_pos_y = pJS.interactivity.mouse.pos_y; + pJS.interactivity.mouse.click_time = new Date().getTime(); + + if(pJS.interactivity.events.onclick.enable){ + + switch(pJS.interactivity.events.onclick.mode){ + + case 'push': + if(pJS.particles.move.enable){ + pJS.fn.modes.pushParticles(pJS.interactivity.modes.push.particles_nb, pJS.interactivity.mouse); + }else{ + if(pJS.interactivity.modes.push.particles_nb == 1){ + pJS.fn.modes.pushParticles(pJS.interactivity.modes.push.particles_nb, pJS.interactivity.mouse); + } + else if(pJS.interactivity.modes.push.particles_nb > 1){ + pJS.fn.modes.pushParticles(pJS.interactivity.modes.push.particles_nb); + } + } + break; + + case 'remove': + pJS.fn.modes.removeParticles(pJS.interactivity.modes.remove.particles_nb); + break; + + case 'bubble': + pJS.tmp.bubble_clicking = true; + break; + + case 'repulse': + pJS.tmp.repulse_clicking = true; + pJS.tmp.repulse_count = 0; + pJS.tmp.repulse_finish = false; + setTimeout(function(){ + pJS.tmp.repulse_clicking = false; + }, pJS.interactivity.modes.repulse.duration*1000) + break; + + } + + } + + }); + + } + + + }; + + pJS.fn.vendors.densityAutoParticles = function(){ + + if(pJS.particles.number.density.enable){ + + /* calc area */ + var area = pJS.canvas.el.width * pJS.canvas.el.height / 1000; + if(pJS.tmp.retina){ + area = area/(pJS.canvas.pxratio*2); + } + + /* calc number of particles based on density area */ + var nb_particles = area * pJS.particles.number.value / pJS.particles.number.density.value_area; + + /* add or remove X particles */ + var missing_particles = pJS.particles.array.length - nb_particles; + if(missing_particles < 0) pJS.fn.modes.pushParticles(Math.abs(missing_particles)); + else pJS.fn.modes.removeParticles(missing_particles); + + } + + }; + + + pJS.fn.vendors.checkOverlap = function(p1, position){ + for(var i = 0; i < pJS.particles.array.length; i++){ + var p2 = pJS.particles.array[i]; + + var dx = p1.x - p2.x, + dy = p1.y - p2.y, + dist = Math.sqrt(dx*dx + dy*dy); + + if(dist <= p1.radius + p2.radius){ + p1.x = position ? position.x : Math.random() * pJS.canvas.w; + p1.y = position ? position.y : Math.random() * pJS.canvas.h; + pJS.fn.vendors.checkOverlap(p1); + } + } + }; + + + pJS.fn.vendors.createSvgImg = function(p){ + + /* set color to svg element */ + var svgXml = pJS.tmp.source_svg, + rgbHex = /#([0-9A-F]{3,6})/gi, + coloredSvgXml = svgXml.replace(rgbHex, function (m, r, g, b) { + if(p.color.rgb){ + var color_value = 'rgba('+p.color.rgb.r+','+p.color.rgb.g+','+p.color.rgb.b+','+p.opacity+')'; + }else{ + var color_value = 'hsla('+p.color.hsl.h+','+p.color.hsl.s+'%,'+p.color.hsl.l+'%,'+p.opacity+')'; + } + return color_value; + }); + + /* prepare to create img with colored svg */ + var svg = new Blob([coloredSvgXml], {type: 'image/svg+xml;charset=utf-8'}), + DOMURL = window.URL || window.webkitURL || window, + url = DOMURL.createObjectURL(svg); + + /* create particle img obj */ + var img = new Image(); + img.addEventListener('load', function(){ + p.img.obj = img; + p.img.loaded = true; + DOMURL.revokeObjectURL(url); + pJS.tmp.count_svg++; + }); + img.src = url; + + }; + + + pJS.fn.vendors.destroypJS = function(){ + cancelAnimationFrame(pJS.fn.drawAnimFrame); + canvas_el.remove(); + pJSDom = null; + }; + + + pJS.fn.vendors.drawShape = function(c, startX, startY, sideLength, sideCountNumerator, sideCountDenominator){ + + // By Programming Thomas - https://programmingthomas.wordpress.com/2013/04/03/n-sided-shapes/ + var sideCount = sideCountNumerator * sideCountDenominator; + var decimalSides = sideCountNumerator / sideCountDenominator; + var interiorAngleDegrees = (180 * (decimalSides - 2)) / decimalSides; + var interiorAngle = Math.PI - Math.PI * interiorAngleDegrees / 180; // convert to radians + c.save(); + c.beginPath(); + c.translate(startX, startY); + c.moveTo(0,0); + for (var i = 0; i < sideCount; i++) { + c.lineTo(sideLength,0); + c.translate(sideLength,0); + c.rotate(interiorAngle); + } + //c.stroke(); + c.fill(); + c.restore(); + + }; + + pJS.fn.vendors.exportImg = function(){ + window.open(pJS.canvas.el.toDataURL('image/png'), '_blank'); + }; + + + pJS.fn.vendors.loadImg = function(type){ + + pJS.tmp.img_error = undefined; + + if(pJS.particles.shape.image.src != ''){ + + if(type == 'svg'){ + + var xhr = new XMLHttpRequest(); + xhr.open('GET', pJS.particles.shape.image.src); + xhr.onreadystatechange = function (data) { + if(xhr.readyState == 4){ + if(xhr.status == 200){ + pJS.tmp.source_svg = data.currentTarget.response; + pJS.fn.vendors.checkBeforeDraw(); + }else{ + console.log('Error pJS - Image not found'); + pJS.tmp.img_error = true; + } + } + } + xhr.send(); + + }else{ + + var img = new Image(); + img.addEventListener('load', function(){ + pJS.tmp.img_obj = img; + pJS.fn.vendors.checkBeforeDraw(); + }); + img.src = pJS.particles.shape.image.src; + + } + + }else{ + console.log('Error pJS - No image.src'); + pJS.tmp.img_error = true; + } + + }; + + + pJS.fn.vendors.draw = function(){ + + if(pJS.particles.shape.type == 'image'){ + + if(pJS.tmp.img_type == 'svg'){ + + if(pJS.tmp.count_svg >= pJS.particles.number.value){ + pJS.fn.particlesDraw(); + if(!pJS.particles.move.enable) cancelRequestAnimFrame(pJS.fn.drawAnimFrame); + else pJS.fn.drawAnimFrame = requestAnimFrame(pJS.fn.vendors.draw); + }else{ + //console.log('still loading...'); + if(!pJS.tmp.img_error) pJS.fn.drawAnimFrame = requestAnimFrame(pJS.fn.vendors.draw); + } + + }else{ + + if(pJS.tmp.img_obj != undefined){ + pJS.fn.particlesDraw(); + if(!pJS.particles.move.enable) cancelRequestAnimFrame(pJS.fn.drawAnimFrame); + else pJS.fn.drawAnimFrame = requestAnimFrame(pJS.fn.vendors.draw); + }else{ + if(!pJS.tmp.img_error) pJS.fn.drawAnimFrame = requestAnimFrame(pJS.fn.vendors.draw); + } + + } + + }else{ + pJS.fn.particlesDraw(); + if(!pJS.particles.move.enable) cancelRequestAnimFrame(pJS.fn.drawAnimFrame); + else pJS.fn.drawAnimFrame = requestAnimFrame(pJS.fn.vendors.draw); + } + + }; + + + pJS.fn.vendors.checkBeforeDraw = function(){ + + // if shape is image + if(pJS.particles.shape.type == 'image'){ + + if(pJS.tmp.img_type == 'svg' && pJS.tmp.source_svg == undefined){ + pJS.tmp.checkAnimFrame = requestAnimFrame(check); + }else{ + //console.log('images loaded! cancel check'); + cancelRequestAnimFrame(pJS.tmp.checkAnimFrame); + if(!pJS.tmp.img_error){ + pJS.fn.vendors.init(); + pJS.fn.vendors.draw(); + } + + } + + }else{ + pJS.fn.vendors.init(); + pJS.fn.vendors.draw(); + } + + }; + + + pJS.fn.vendors.init = function(){ + + /* init canvas + particles */ + pJS.fn.retinaInit(); + pJS.fn.canvasInit(); + pJS.fn.canvasSize(); + pJS.fn.canvasPaint(); + pJS.fn.particlesCreate(); + pJS.fn.vendors.densityAutoParticles(); + + /* particles.line_linked - convert hex colors to rgb */ + pJS.particles.line_linked.color_rgb_line = hexToRgb(pJS.particles.line_linked.color); + + }; + + + pJS.fn.vendors.start = function(){ + + if(isInArray('image', pJS.particles.shape.type)){ + pJS.tmp.img_type = pJS.particles.shape.image.src.substr(pJS.particles.shape.image.src.length - 3); + pJS.fn.vendors.loadImg(pJS.tmp.img_type); + }else{ + pJS.fn.vendors.checkBeforeDraw(); + } + + }; + + + + + /* ---------- pJS - start ------------ */ + + + pJS.fn.vendors.eventsListeners(); + + pJS.fn.vendors.start(); + + + +}; + +/* ---------- global functions - vendors ------------ */ + +Object.deepExtend = function(destination, source) { + for (var property in source) { + if (source[property] && source[property].constructor && + source[property].constructor === Object) { + destination[property] = destination[property] || {}; + arguments.callee(destination[property], source[property]); + } else { + destination[property] = source[property]; + } + } + return destination; +}; + +window.requestAnimFrame = (function(){ + return window.requestAnimationFrame || + window.webkitRequestAnimationFrame || + window.mozRequestAnimationFrame || + window.oRequestAnimationFrame || + window.msRequestAnimationFrame || + function(callback){ + window.setTimeout(callback, 1000 / 60); + }; +})(); + +window.cancelRequestAnimFrame = ( function() { + return window.cancelAnimationFrame || + window.webkitCancelRequestAnimationFrame || + window.mozCancelRequestAnimationFrame || + window.oCancelRequestAnimationFrame || + window.msCancelRequestAnimationFrame || + clearTimeout +} )(); + +function hexToRgb(hex){ + // By Tim Down - https://stackoverflow.com/a/5624139/3493650 + // Expand shorthand form (e.g. "03F") to full form (e.g. "0033FF") + var shorthandRegex = /^#?([a-f\d])([a-f\d])([a-f\d])$/i; + hex = hex.replace(shorthandRegex, function(m, r, g, b) { + return r + r + g + g + b + b; + }); + var result = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(hex); + return result ? { + r: parseInt(result[1], 16), + g: parseInt(result[2], 16), + b: parseInt(result[3], 16) + } : null; +}; + +function clamp(number, min, max) { + return Math.min(Math.max(number, min), max); +}; + +function isInArray(value, array) { + return array.indexOf(value) > -1; +} + + +/* ---------- particles.js functions - start ------------ */ + +window.pJSDom = []; + +window.particlesJS = function(tag_id, params){ + + //console.log(params); + + /* no string id? so it's object params, and set the id with default id */ + if(typeof(tag_id) != 'string'){ + params = tag_id; + tag_id = 'particles-js'; + } + + /* no id? set the id to default id */ + if(!tag_id){ + tag_id = 'particles-js'; + } + + /* pJS elements */ + var pJS_tag = document.getElementById(tag_id), + pJS_canvas_class = 'particles-js-canvas-el', + exist_canvas = pJS_tag.getElementsByClassName(pJS_canvas_class); + + /* remove canvas if exists into the pJS target tag */ + if(exist_canvas.length){ + while(exist_canvas.length > 0){ + pJS_tag.removeChild(exist_canvas[0]); + } + } + + /* create canvas element */ + var canvas_el = document.createElement('canvas'); + canvas_el.className = pJS_canvas_class; + + /* set size canvas */ + canvas_el.style.width = "100%"; + canvas_el.style.height = "100%"; + + /* append canvas */ + var canvas = document.getElementById(tag_id).appendChild(canvas_el); + + /* launch particle.js */ + if(canvas != null){ + pJSDom.push(new pJS(tag_id, params)); + } + +}; + +window.particlesJS.load = function(tag_id, path_config_json, callback){ + + /* load json config */ + var xhr = new XMLHttpRequest(); + xhr.open('GET', path_config_json); + xhr.onreadystatechange = function (data) { + if(xhr.readyState == 4){ + if(xhr.status == 200){ + var params = JSON.parse(data.currentTarget.response); + window.particlesJS(tag_id, params); + if(callback) callback(); + }else{ + console.log('Error pJS - XMLHttpRequest status: '+xhr.status); + console.log('Error pJS - File config not found'); + } + } + }; + xhr.send(); + +}; diff --git a/docs/logos/meson.build b/docs/logos/meson.build index 70ba67d71c..0038d4fa42 100644 --- a/docs/logos/meson.build +++ b/docs/logos/meson.build @@ -18,6 +18,8 @@ docs_logo_files = [ 'logo-square.svg', 'logo-sticker-hexagon.svg', 'logo-sticker-square.svg', + 'penguin.svg', + 'penguin.png', ] install_data(docs_logo_files, install_dir: docs_html_dir / 'logos') diff --git a/docs/logos/penguin.png b/docs/logos/penguin.png new file mode 100644 index 0000000000000000000000000000000000000000..48a481c54b6a71f2d43f5ebdf1d4455202c27d8a GIT binary patch literal 4236 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 literal 0 HcmV?d00001 diff --git a/docs/logos/penguin.svg b/docs/logos/penguin.svg new file mode 100644 index 0000000000..9938dc35ab --- /dev/null +++ b/docs/logos/penguin.svg @@ -0,0 +1,358 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> + + +<svg + width="46.727402" + height="88.205261" + viewBox="0 0 12.363292 23.337642" + version="1.1" + id="svg2754" + inkscape:version="1.2.2 (b0a8486541, 2022-12-01)" + sodipodi:docname="penguin.svg" + inkscape:export-filename="../logo-square.png" + inkscape:export-xdpi="150" + inkscape:export-ydpi="150" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + <defs + id="defs2748"> + <filter + style="color-interpolation-filters:sRGB" + inkscape:label="Drop Shadow" + id="filter5799-3" + x="-0.042427354" + y="-0.049351394" + width="1.1025327" + height="1.1192659"> + <feFlood + flood-opacity="1" + flood-color="rgb(0,0,0)" + result="flood" + id="feFlood5801-7" /> + <feComposite + in="flood" + in2="SourceGraphic" + operator="in" + result="composite1" + id="feComposite5803-4" /> + <feGaussianBlur + in="composite1" + stdDeviation="6" + result="blur" + id="feGaussianBlur5805-3" /> + <feOffset + dx="6" + dy="6" + result="offset" + id="feOffset5807-7" /> + <feComposite + in="SourceGraphic" + in2="offset" + operator="over" + result="composite2" + id="feComposite5809-1" /> + </filter> + <mask + maskUnits="userSpaceOnUse" + id="mask3913-3"> + <path + style="fill:#2f6962" + id="path3915-9" + d="M 95.108,61.776 244.59,10.309 c 15.666,-5.394 32.738,2.933 38.132,18.599 l 39.799,115.58 c 5.394,15.666 -2.932,32.738 -18.598,38.131 l -103.98,35.801 z" + inkscape:connector-curvature="0" /> + </mask> + <mask + maskUnits="userSpaceOnUse" + id="mask4168-6"> + <path + style="fill:#7c858c" + id="path4170-4" + d="m 113.124,36.661 c 17.233,36.62 75.371,131.675 105.366,171.054 -4.069,13.505 -18.428,20.812 -30.299,17.44 L 72.849,58.555 C 72.779,46.208 95.748,31.956 113.124,36.661 Z" + sodipodi:nodetypes="ccccc" + inkscape:connector-curvature="0" /> + </mask> + <filter + inkscape:label="Ridged Border" + inkscape:menu="Bevels" + inkscape:menu-tooltip="Ridged border with inner bevel" + style="color-interpolation-filters:sRGB" + id="filter5576-4" + x="0" + y="0" + width="1" + height="1"> + <feMorphology + radius="4.3" + in="SourceAlpha" + result="result91" + id="feMorphology5578-9" /> + <feComposite + operator="out" + in="SourceGraphic" + in2="result91" + id="feComposite5580-1" /> + <feGaussianBlur + result="result0" + stdDeviation="1.2" + id="feGaussianBlur5582-2" /> + <feDiffuseLighting + diffuseConstant="1" + id="feDiffuseLighting5584-3"> + <feDistantLight + elevation="66" + azimuth="225" + id="feDistantLight5586-1" /> + </feDiffuseLighting> + <feBlend + mode="multiply" + in2="SourceGraphic" + id="feBlend5588-8" /> + <feComposite + operator="in" + in2="SourceAlpha" + id="feComposite5590-1" /> + </filter> + <linearGradient + id="linearGradient3301"> + <stop + id="stop3303" + offset="0" + style="stop-color:#ffffff;stop-opacity:1;" /> + <stop + id="stop3305" + offset="1" + style="stop-color:#868686;stop-opacity:1;" /> + </linearGradient> + <mask + maskUnits="userSpaceOnUse" + id="mask4481-9"> + <path + style="clip-rule:evenodd;fill:#aaaaaa;fill-rule:evenodd" + id="path4483-2" + d="m 213.96734,236.83626 c -1.97572,1.50086 -5.71734,14.75814 -3.57441,17.84065 3.18643,4.58465 22.42412,-12.69851 20.66112,-17.24646 -1.81294,-4.67518 -15.35694,-1.41227 -17.08671,-0.59419 z m -9.6286,-7.34722 2.48938,3.78195 c 0,0 0.69017,1.04372 0.29628,3.40302 -0.6156,3.68976 -3.17495,13.25876 -3.32578,21.12255 -0.0183,0.94976 -0.91914,9.5039 7.21943,7.07006 8.1393,-2.43309 24.96824,-17.85854 28.33195,-24.69252 3.36372,-6.83399 -0.96483,-10.63865 -6.21591,-10.98709 -5.2511,-0.34921 -13.3456,0.21962 -17.06874,0.84795 -3.72313,0.62832 -3.49361,-0.75818 -6.67723,-4.3506 -0.23896,-0.26961 -5.04938,3.80468 -5.04938,3.80468 z" + inkscape:connector-curvature="0" /> + </mask> + <filter + style="color-interpolation-filters:sRGB" + inkscape:label="Drop Shadow" + id="filter6162" + x="-0.23894344" + y="-0.15139444" + width="1.4778869" + height="1.3658699"> + <feFlood + flood-opacity="1" + flood-color="rgb(0,0,0)" + result="flood" + id="feFlood6164" /> + <feComposite + in="flood" + in2="SourceGraphic" + operator="in" + result="composite1" + id="feComposite6166" /> + <feGaussianBlur + in="composite1" + stdDeviation="6" + result="blur" + id="feGaussianBlur6168" /> + <feOffset + dx="6" + dy="6" + result="offset" + id="feOffset6170" /> + <feComposite + in="SourceGraphic" + in2="offset" + operator="over" + result="fbSourceGraphic" + id="feComposite6172" /> + <feColorMatrix + result="fbSourceGraphicAlpha" + in="fbSourceGraphic" + values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0" + id="feColorMatrix6174" /> + <feFlood + id="feFlood6176" + flood-opacity="1" + flood-color="rgb(0,0,0)" + result="flood" + in="fbSourceGraphic" /> + <feComposite + id="feComposite6178" + in2="fbSourceGraphic" + in="flood" + operator="in" + result="composite1" /> + <feGaussianBlur + id="feGaussianBlur6180" + in="composite1" + stdDeviation="6" + result="blur" /> + <feOffset + id="feOffset6182" + dx="-6" + dy="6" + result="offset" /> + <feComposite + id="feComposite6184" + in2="offset" + in="fbSourceGraphic" + operator="over" + result="composite2" /> + </filter> + </defs> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="2.5027778" + inkscape:cx="103.28524" + inkscape:cy="68.324084" + inkscape:document-units="mm" + inkscape:current-layer="g2753-0" + showgrid="false" + fit-margin-top="0" + fit-margin-left="0" + fit-margin-right="0" + fit-margin-bottom="0" + inkscape:window-width="1920" + inkscape:window-height="1131" + inkscape:window-x="0" + inkscape:window-y="0" + inkscape:window-maximized="1" + units="px" + inkscape:showpageshadow="2" + inkscape:pagecheckerboard="0" + inkscape:deskcolor="#d1d1d1" /> + <metadata + id="metadata2751"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + </cc:Work> + </rdf:RDF> + </metadata> + <g + inkscape:label="Layer 1" + inkscape:groupmode="layer" + id="layer1" + transform="translate(15.314622,-233.97731)"> + <g + id="g4944" + transform="matrix(0.24862701,-0.09049283,0.09049283,0.24862701,-92.040544,272.60195)"> + <g + transform="rotate(19,545.20406,769.86173)" + id="g4988-0"> + <g + id="g5736-0"> + <text + xml:space="preserve" + style="font-style:normal;font-weight:normal;font-size:40px;line-height:125%;font-family:Sans;text-align:start;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + x="137.92564" + y="176.00142" + id="text5724-0" + transform="rotate(1.0000002)"><tspan + sodipodi:role="line" + id="tspan5726-6" + x="137.92564" + y="176.00142" + style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:180px;font-family:Overpass;-inkscape-font-specification:'Overpass Bold';letter-spacing:-10px;fill:#e6e6e6;fill-opacity:1" /></text> + <g + id="g2753-0" + transform="translate(-18.749067,-72.815807)"> + <path + d="m 122.88954,229.92364 c 3.341,7.154 7.81,5.77 7.88,5.746 1.371,-0.472 5.829,-2.582 4.696,-5.873 -1.025,-2.977 -8.385,-3.373 -13.437,-1.633 -5.015,1.727 -10.665,6.602 -9.64,9.579 1.133,3.291 5.946,2.208 7.316,1.737 0.069,-0.024 4.799,-0.91 2.672,-9.379 -0.078,-0.312 0.404,-0.412 0.513,-0.177 z" + id="path2755-8" + style="clip-rule:evenodd;fill:#ffe600;fill-rule:evenodd" + inkscape:connector-curvature="0" + inkscape:export-filename="../penguin.png" + inkscape:export-xdpi="150" + inkscape:export-ydpi="150" /> + <path + d="m 93.013543,187.02664 c -4.764,-17.913 -3.791,-32.973 2.812,-35.247 6.601997,-2.273 16.640997,8.995 23.914997,26.044 1.745,2.829 5.157,8.08 7.865,10.513 1.976,1.775 1.993,2.732 -1.079,2.212 -0.927,-0.157 -1.726,-0.358 -2.438,-0.662 5.736,19.254 5.048,35.957 -1.934,38.36 -6.981,2.404 -17.806,-10.334 -25.140997,-29.038 -0.374,0.678 -0.879,1.328 -1.513,2.022 -2.1,2.301 -2.676,1.537 -2.212,-1.079 0.636,-3.584 0.092,-9.822 -0.275,-13.125 z" + id="path2757-1" + style="fill:#000000;fill-opacity:1" + inkscape:connector-curvature="0" /> + <path + d="m 100.36354,200.08264 c -5.497997,-15.966 -5.113997,-30.576 0.857,-32.632 5.971,-2.056 15.268,9.22 20.766,25.187 5.498,15.966 5.114,30.576 -0.857,32.632 -5.971,2.056 -15.268,-9.22 -20.766,-25.187 z m 0.699,-36.784 c -0.536,-1.558 -0.428,-3.008 0.243,-3.239 0.671,-0.231 1.649,0.845 2.186,2.402 0.536,1.558 0.427,3.008 -0.243,3.239 -0.671,0.231 -1.65,-0.845 -2.186,-2.402 z m -4.700997,1.618 c -0.536,-1.558 -0.427,-3.008 0.243,-3.239 0.67,-0.231 1.649,0.845 2.185,2.402 0.536,1.557 0.428,3.008 -0.243,3.239 -0.671,0.231 -1.649,-0.844 -2.185,-2.402 z" + id="path2759-9" + style="clip-rule:evenodd;fill:#ffffff;fill-opacity:1;fill-rule:evenodd" + inkscape:connector-curvature="0" /> + <g + id="g2761-8" + transform="translate(-7.9684573,2.7456446)"> + <ellipse + transform="matrix(-0.9455,0.3255,-0.3255,-0.9455,267.4128,287.6192)" + cx="109.643" + cy="166.18201" + rx="4.428" + ry="2.142" + id="ellipse2763-1" + style="fill:#ffe600" /> + <path + d="" + id="path2765-6" + style="fill:#ffe600" + inkscape:connector-curvature="0" /> + </g> + </g> + </g> + <text + transform="rotate(1.0000002)" + id="text5053-7" + y="53.587437" + x="-408.52026" + style="font-style:normal;font-weight:normal;font-size:40px;line-height:125%;font-family:Sans;text-align:start;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + xml:space="preserve"><tspan + y="53.587437" + x="-408.52026" + id="tspan5055-2" + sodipodi:role="line" /></text> + <text + transform="rotate(1.0000002)" + id="text5057-8" + y="-232.88652" + x="-525.88629" + style="font-style:normal;font-weight:normal;font-size:90px;line-height:125%;font-family:Sans;text-align:start;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + xml:space="preserve"><tspan + y="-232.88652" + x="-525.88629" + id="tspan5059-1" + sodipodi:role="line" /></text> + <text + transform="rotate(1.0000002)" + id="text5069-7" + y="-200.07454" + x="543.02759" + style="font-style:normal;font-weight:normal;font-size:40px;line-height:125%;font-family:Sans;text-align:start;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + xml:space="preserve"><tspan + y="-200.07454" + x="543.02759" + id="tspan5071-7" + sodipodi:role="line" /></text> + </g> + <text + xml:space="preserve" + style="font-style:normal;font-weight:normal;font-size:40px;line-height:25px;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + x="582.63574" + y="-37.070248" + id="text4950"><tspan + sodipodi:role="line" + id="tspan4948" + x="582.63574" + y="-37.070248" /></text> + </g> + </g> +</svg> diff --git a/docs/page.xsl b/docs/page.xsl index 548d5a11c4..7c4f295053 100644 --- a/docs/page.xsl +++ b/docs/page.xsl @@ -116,6 +116,9 @@ <script type="text/javascript" src="{$href_base}js/main.js"> <xsl:comment>// forces non-empty element</xsl:comment> </script> + <script type="text/javascript" src="{$href_base}js/particles.js"> + <xsl:comment>// forces non-empty element</xsl:comment> + </script> </head> <body onload="pageload()"> <div id="body"> @@ -197,6 +200,11 @@ </div> <br class="clear"/> </div> + <xsl:if test="$pagesrc = 'docs/404.html.in'"> + <script src="{$href_base}js/app.js"> + <xsl:comment>// forces non-empty element</xsl:comment> + </script> + </xsl:if> </body> </html> </xsl:template> -- 2.39.1

4 4

[PULL 0/5] Misc next patches
by Daniel P. Berrangé 16 Feb '23

16 Feb '23

The following changes since commit 6a50f64ca01d0a7b97f14f069762bfd88160f31e: Merge tag 'pull-request-2023-02-14' of https://gitlab.com/thuth/qemu into staging (2023-02-14 14:46:10 +0000) are available in the Git repository at: https://gitlab.com/berrange/qemu tags/misc-next-pull-request for you to fetch changes up to 36debafddd788066be10b33c5f11b984a08e5c85: ui: remove deprecated 'password' option for SPICE (2023-02-15 11:14:58 -0500) ---------------------------------------------------------------- * Document 'password-secret' option for -iscsi * Deprecate iSCSI 'password' in favour of 'password-secret' * Remove deprecated 'password' option for SPICE * Fix handling of cached read buffers with TLS ---------------------------------------------------------------- Antoine Damhet (2): crypto: TLS: introduce `check_pending` io/channel-tls: fix handling of bigger read buffers Daniel P. Berrangé (3): block: mention 'password-secret' option for -iscsi block: deprecate iSCSI 'password' in favour of 'password-secret' ui: remove deprecated 'password' option for SPICE block/iscsi.c | 3 ++ crypto/tlssession.c | 14 +++++++ docs/about/deprecated.rst | 16 ++++---- docs/about/removed-features.rst | 7 ++++ include/crypto/tlssession.h | 11 ++++++ io/channel-tls.c | 66 ++++++++++++++++++++++++++++++++- qemu-options.hx | 13 ++----- ui/spice-core.c | 15 -------- 8 files changed, 111 insertions(+), 34 deletions(-) -- 2.39.1

2 6

[PATCH 0/4] qemu_passt: Don't let passt fork off
by Michal Privoznik 16 Feb '23

16 Feb '23

Here are some cleanup, as promised here: https://listman.redhat.com/archives/libvir-list/2023-February/237721.html Now, there are still some patches missing. Firstly, we still don't really capture error from passt. My suggestion was to wait for socket to show up with errfd open. But active wait is viewed as undesirable [1]. Secondly, Laine reported SELinux issues. Yeah, I don't see us setting SELinux label on nor socket that passt and QEMU talk to each other, nor on the log file. Speaking of which - we usually have per domain (or per helper daemon instance even) log file, while for passt we have a global one (/var/log/passt.log). I don't think that will fly if two or more SELinux enabled domains want to use passt. Thirdly, Stefano suggested a graceful shutdown for passt: have libvirt connect to the socket and close it. Since we pass --one-off, this should singal passt to exit. But I haven't implemented that because it's redundant. We can't rely on passt quitting itself and thus use the big gun (virPidFileForceCleanupPath()) at which point, the socket way is just an optimization. I might look into the first two, at some point. But not today. 1: https://listman.redhat.com/archives/libvir-list/2023-February/237663.html Michal Prívozník (4): Revert "qemu: allow passt to self-daemonize" qemu_extdevice: Make qemuExtDevicesHasDevice() check def->nets qemu_passt: Report error when getting passt PID failed qemu_passt: Don't let passt fork off src/qemu/qemu_extdevice.c | 11 +++++++++++ src/qemu/qemu_passt.c | 15 ++++++++++----- 2 files changed, 21 insertions(+), 5 deletions(-) -- 2.39.1

5 18

[PATCH v4 14/16] qapi: deprecate "device" field of DEVICE_* events
by Vladimir Sementsov-Ogievskiy 16 Feb '23

16 Feb '23

The device field is redundant, because QOM path always include device ID when this ID exist. Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov(a)yandex-team.ru> --- docs/about/deprecated.rst | 9 +++++++++ qapi/qdev.json | 12 ++++++++++-- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index da2e6fe63d..b389934691 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -171,6 +171,15 @@ accepted incorrect commands will return an error. Users should make sure that all arguments passed to ``device_add`` are consistent with the documented property types. +QEMU Machine Protocol (QMP) events +---------------------------------- + +``DEVICE_DELETED`` & ``DEVICE_UNPLUG_GUEST_ERROR`` field ``device`` (since 8.0) +''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' + +Devices that has ``ID`` always has QOM path `/machine/peripheral/ID`. So, the +``device`` field is redundant and deprecated. Use the ``path`` field instead. + Host Architectures ------------------ diff --git a/qapi/qdev.json b/qapi/qdev.json index 2708fb4e99..325ef554f9 100644 --- a/qapi/qdev.json +++ b/qapi/qdev.json @@ -124,6 +124,9 @@ # # @path: the device's QOM path # +# Features: +# @deprecated: Member @device is deprecated as redundant. Use @path instead. +# # Since: 1.5 # # Example: @@ -135,7 +138,8 @@ # ## { 'event': 'DEVICE_DELETED', - 'data': { '*device': 'str', 'path': 'str' } } + 'data': { '*device': { 'type': 'str', 'features': [ 'deprecated' ] }, + 'path': 'str' } } ## # @DEVICE_UNPLUG_GUEST_ERROR: @@ -146,6 +150,9 @@ # # @path: the device's QOM path # +# Features: +# @deprecated: Member @device is deprecated as redundant. Use @path instead. +# # Since: 6.2 # # Example: @@ -157,4 +164,5 @@ # ## { 'event': 'DEVICE_UNPLUG_GUEST_ERROR', - 'data': { '*device': 'str', 'path': 'str' } } + 'data': { '*device': { 'type': 'str', 'features': [ 'deprecated' ] }, + 'path': 'str' } } -- 2.34.1

5 17

[PATCH] qemu_extdevice: Add a comment into qemuExtDevicesSetupCgroup()
by Michal Privoznik 15 Feb '23

15 Feb '23

The way setting up CGroups for external helpers work, is: qemuExtDevicesHasDevice() is called first to determine whether there is a helper process running, the CGroup controller is created and then qemuExtDevicesSetupCgroup() is called to place helpers into the CGroup. But when one reads just qemuExtDevicesSetupCgroup() it's easy to miss this hidden logic. Therefore, add a warning at the beginning of the function. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_extdevice.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/qemu/qemu_extdevice.c b/src/qemu/qemu_extdevice.c index 47e97f3565..1c397972e4 100644 --- a/src/qemu/qemu_extdevice.c +++ b/src/qemu/qemu_extdevice.c @@ -331,6 +331,9 @@ qemuExtDevicesSetupCgroup(virQEMUDriver *driver, virDomainDef *def = vm->def; size_t i; + /* Don't forget to adjust qemuExtDevicesHasDevice() accordingly. + * Otherwise, this function might not be called at all. */ + if (qemuDBusSetupCgroup(driver, vm, cgroup) < 0) return -1; -- 2.39.1

2 1

wiki.libvirt.org replacement
by Peter Krempa 15 Feb '23

15 Feb '23

https://gitlab.com/libvirt/libvirt-wiki/-/merge_requests/1 Hi, in order to ease editing of the libvirt wiki, remove the need for registering users and remove the need to run PHP in an openshift instance I've decided to contents of the libvirt wiki into a staticaly generated page using (almost) the same approach we use to generate the libvirt web pages from rST documents in the repo. All articles were converted into rST files [1] and images linked from currently existing articles were dowloaded. Advantages: - same workflow as with editing the libvirt pages - gitlab still provides a web editor - local editing for users who hate web - no need to deal with user registration - no need to run PHP in openshift - we still keep separate space for docs which don't really belong into the main repo - even if we decide to kill-off the wiki eventually the valuable content will be easier to port to the kbase as it'll be in rST - the conversion fixed many orphaned pages Disadvantages: - all links will be broken [2] - changes will need to be reviewed/approved - low quality/obsolete content is forward-ported as I didn't review anything - the build script is in bash (This obviously can be changed if somebody cares more than I do.) The generator is based on a cleaned up page.xsl and other assets from libvirt's repo and the check-html-references script [3] to validate linking. The new wiki can for now be browsed from artifacts of the pipeline job that I've used to test it: https://pipo.sk.gitlab.io/-/libvirt-wiki/-/jobs/3771076975/artifacts/websit… (I know my username is unfortunate to contain a dot which breaks the certificate) If somebody wishes to see the extremely ugly conversion scripts: https://gitlab.com/pipo.sk/libvirt-wiki/-/commit/fe36e37d3580a76ca18e512354… [1] The conversion was done using a collection of ugly scripts and pandoc. Unfortunately markdown-eque formats have the issue of not really having strict rules and in certain cases the tools used to process them not implementing them correctly. This meant that the least painful was actually the coversion from HTML!!! and not the internal mediawiki format. [2] If we really want to preserve links I can modify the script to generate a list of redirects for the webserver, but I really doubt that preserving links has value. Additionally some content was moved to the knowledge base, so I really want to just delete it from the wiki, so breaking links is a feature. [3] It uses the version after the last patchset: https://listman.redhat.com/archives/libvir-list/2023-February/237785.html

2 4

[PATCH 0/9] Improve docs web reference checker
by Peter Krempa 15 Feb '23

15 Feb '23

Improve the checker tool to also track orphaned pages and check presence and usage of images. In addition to that this series fixes handful of instances of the problems that the script caught. This series adds two documents: - docs/logos/README.rst (converted into docs/logos/index.html) The page shows all logos which libvirt has. It's now linked from the docs page. https://pipo.sk.gitlab.io/-/libvirt/-/jobs/3770134533/artifacts/website/log… - docs/golang.rst The page ties together the 4 go module pages we have which were not linked and is linked from docs.html https://pipo.sk.gitlab.io/-/libvirt/-/jobs/3770134533/artifacts/website/gol… Peter Krempa (9): docs: XSL: Add source document name as custom data attribute for <html> scripts: check-html-references: Rename --prefix to --webroot and make it mandatory scripts: check-html-references: Improve error messages and don't mess with relative paths docs: manpages: Add missing manpages to index docs: Add sub-page for all golang modules scripts: check-html-references: Detect pages that are not linked to kbase: eventloop: Fix path to referenced images docs: logos: Turn 'README' into rST, generate an index and link to images scripts: check-html-refernces: Add checking for image file usage docs/docs.rst | 5 +- docs/golang.rst | 21 +++ docs/kbase/internals/eventloop.rst | 4 +- docs/logos/README | 98 -------------- docs/logos/README.rst | 166 ++++++++++++++++++++++++ docs/logos/meson.build | 47 +++++++ docs/manpages/index.rst | 3 + docs/meson.build | 3 +- docs/page.xsl | 2 +- scripts/check-html-references.py | 198 +++++++++++++++++++++++------ 10 files changed, 406 insertions(+), 141 deletions(-) create mode 100644 docs/golang.rst delete mode 100644 docs/logos/README create mode 100644 docs/logos/README.rst -- 2.39.1

2 18

[PATCH 0/3] Virtlogd fixes
by Peter Krempa 15 Feb '23

15 Feb '23

Please see individual patches for justification. Peter Krempa (3): rpc: client: Don't check return value of virNetMessageNew rpc: Don't warn about "max_client_requests" in single-threaded daemons virLogCleanerShutdown: Don't call g_regex_unref on NULL regex src/logging/log_cleaner.c | 3 +-- src/remote/libvirtd.conf.in | 1 + src/rpc/virnetserverclient.c | 14 ++++++-------- 3 files changed, 8 insertions(+), 10 deletions(-) -- 2.39.1

2 6

there is no PCIe device after command "virsh nodedev-list"
by Martin Bayern 14 Feb '23

14 Feb '23

Hello, I don't know if this is the right email list for this question, let me try. I experienced a problem when I want to assign PCIe VF to my VMs, I can use "lspci" to list the VF PCIe, even PF PCIe, but the command " virsh nodedev-list" doesn't print any PCIe bus device. I tried using "virsh edit --domain " command and added the PCIe bus to the XML file, but when I start the VM, the error message shows an internal error, there is an invalid link to the device. Meanwhile, I use virt-manager to see if I can add a PCIe host device, but the host device shows "no device available". my system is ARM64 based Nvidia platform, I have enabled IOMMU in the kernel. do you know how can I figure out the root cause? is this the ARM64 kernel issue or something else?? I posted this issue also in Nvidia forum: https://forums.developer.nvidia.com/t/nvidia-orin-pcie-device-there-is-no-p… thanks so much for your suggestions. Martin

1 0

[libvirt PATCH] qemu: allow passt to self-daemonize
by Laine Stump 14 Feb '23

14 Feb '23

I initially had the passt process being started in an identical fashion to the slirp-helper - libvirt was daemonizing the new process and recording its pid in a pidfile. The problem with this is that, since it is daemonized immediately, any startup error in passt happens after the daemonization, and thus isn't seen by libvirt - libvirt believes that the process has started successfully and continues on its merry way. The result was that sometimes a guest would be started, but there would be no passt process for qemu to use for network traffic. Instead, we should be starting passt in the same manner we start dnsmasq - we just exec it as normal (along with a request that passt create the pidfile, which is just another option on the passt commandline) and wait for the child process to exit; passt then has a chance to parse its commandline and complete all the setup prior to daemonizing itself; if it encounters an error and exits with a non-0 code, libvirt will see the code and know about the failure. We can then grab the output from stderr, log that so the "user" has some idea of what went wrong, and then fail the guest startup. Signed-off-by: Laine Stump <laine(a)redhat.com> --- src/qemu/qemu_passt.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_passt.c b/src/qemu/qemu_passt.c index 0f09bf3db8..f640a69c00 100644 --- a/src/qemu/qemu_passt.c +++ b/src/qemu/qemu_passt.c @@ -141,24 +141,23 @@ qemuPasstStart(virDomainObj *vm, g_autofree char *passtSocketName = qemuPasstCreateSocketPath(vm, net); g_autoptr(virCommand) cmd = NULL; g_autofree char *pidfile = qemuPasstCreatePidFilename(vm, net); + g_autofree char *errbuf = NULL; char macaddr[VIR_MAC_STRING_BUFLEN]; size_t i; pid_t pid = (pid_t) -1; int exitstatus = 0; int cmdret = 0; - VIR_AUTOCLOSE errfd = -1; cmd = virCommandNew(PASST); virCommandClearCaps(cmd); - virCommandSetPidFile(cmd, pidfile); - virCommandSetErrorFD(cmd, &errfd); - virCommandDaemonize(cmd); + virCommandSetErrorBuffer(cmd, &errbuf); virCommandAddArgList(cmd, "--one-off", "--socket", passtSocketName, "--mac-addr", virMacAddrFormat(&net->mac, macaddr), + "--pid", pidfile, NULL); if (net->mtu) { @@ -264,7 +263,7 @@ qemuPasstStart(virDomainObj *vm, if (cmdret < 0 || exitstatus != 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not start 'passt'. exitstatus: %d"), exitstatus); + _("Could not start 'passt': %s"), errbuf); goto error; } -- 2.39.1

6 14

Plans for the next release
by Jiri Denemark 14 Feb '23

14 Feb '23

We are getting close to the next release of libvirt. To aim for the release on Mar 01 I suggest entering the freeze on Wednesday Feb 22 and tagging RC2 on Monday Feb 27. I hope this works for everyone. Jirka

1 0

[PATCH] feature: Ceph rbd create with data pool attributes set support.
by Guozhonghua 14 Feb '23

14 Feb '23

In some cases, we may use another pool to store the data and one pool to store the meta data of the rbd vol, so it is to use another interface to create the rbd vol, rbd_create4, required. This patch add the feature with xml configure is like as below: <source> <host name='xxx.xxx.xxx.xxx' port='6789'/> <host name='xxx.xxx.xxx.xxx' port='6789'/> <name>rbd_pool</name> <auth type='ceph' username='user_name'> <secret uuid='972327af-360b-4a68-9b0f-99dec10a05dc'/> </auth> <rbdimageoption format='x' feature='x' order='x' stripeunit='x' stripecount='x' journalorder='x' journalpool='x' featureset='x' featureclear='x' datapool='x' flatten='x' cloneformat=' mirrorimagemode=''/> </source> Here we add one item rbdimageoption to set the attributions used when create rbd vol. If the option is not set, then the origin interface rbd_create is called as before. Signed-off-by: Guozhonghua <guozh88(a)chinatelecom.cn> --- src/conf/storage_conf.c | 205 ++++++++++++++++++++++++++++++ src/conf/storage_conf.h | 33 +++++ src/storage/storage_backend_rbd.c | 123 +++++++++++++++++- 3 files changed, 358 insertions(+), 3 deletions(-) diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index f5a9636ce2..ac6c700ac1 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -461,6 +461,14 @@ virStoragePoolSourceDeviceClear(virStoragePoolSourceDevice *dev) } +void +virRbdImageOptionClear(virRbdImageOptionsPtr rbd_image_option) +{ + VIR_FREE(rbd_image_option->journal_pool); + VIR_FREE(rbd_image_option->data_pool); +} + + void virStoragePoolSourceClear(virStoragePoolSource *source) { @@ -484,6 +492,7 @@ virStoragePoolSourceClear(virStoragePoolSource *source) VIR_FREE(source->vendor); VIR_FREE(source->product); VIR_FREE(source->protocolVer); + virRbdImageOptionClear(&source->rbdImageOptions); } @@ -514,6 +523,131 @@ virStoragePoolDefFree(virStoragePoolDef *def) } +int +virRbdImageOptionParseXML(virRbdImageOptionsPtr rbd_image_option, + xmlNodePtr node, + xmlXPathContextPtr ctxt) +{ + VIR_XPATH_NODE_AUTORESTORE(ctxt) + char *val = NULL; + + ctxt->node = node; + + rbd_image_option->format = -1; + if ((val = virXMLPropString(node, "format"))) { + if (virStrToLong_l(val, NULL, 10, &rbd_image_option->format) < 0) + goto cleanup; + VIR_FREE(val); + } + + rbd_image_option->feature = -1; + if ((val = virXMLPropString(node, "feature"))) { + if (virStrToLong_l(val, NULL, 10, &rbd_image_option->feature) < 0) + goto cleanup; + VIR_FREE(val); + } + + rbd_image_option->order = -1; + if ((val = virXMLPropString(node, "order"))) { + if (virStrToLong_l(val, NULL, 10, &rbd_image_option->order) < 0) + goto cleanup; + VIR_FREE(val); + } + + rbd_image_option->stripe_unit = -1; + if ((val = virXMLPropString(node, "stripeunit"))) { + if (virStrToLong_l(val, NULL, 10, &rbd_image_option->stripe_unit) < 0) + goto cleanup; + VIR_FREE(val); + } + + rbd_image_option->stripe_count = -1; + if ((val = virXMLPropString(node, "stripecount"))) { + if (virStrToLong_l(val, NULL, 10, &rbd_image_option->stripe_count) < 0) + goto cleanup; + VIR_FREE(val); + } + + rbd_image_option->journal_order = -1; + if ((val = virXMLPropString(node, "journalorder"))) { + if (virStrToLong_l(val, NULL, 10, &rbd_image_option->journal_order) < 0) + goto cleanup; + VIR_FREE(val); + } + + rbd_image_option->journal_splay_width = -1; + if ((val = virXMLPropString(node, "journalsplaywidth"))) { + if (virStrToLong_l(val, NULL, 10, &rbd_image_option->journal_splay_width) < 0) + goto cleanup; + VIR_FREE(val); + } + + rbd_image_option->journal_pool = virXMLPropString(node, "journalpool"); + + rbd_image_option->feature_set = -1; + if ((val = virXMLPropString(node, "featureset"))) { + if (virStrToLong_l(val, NULL, 10, &rbd_image_option->feature_set) < 0) + goto cleanup; + VIR_FREE(val); + } + + rbd_image_option->feature_clear = -1; + if ((val = virXMLPropString(node, "featureclear"))) { + if (virStrToLong_l(val, NULL, 10, &rbd_image_option->feature_clear) < 0) + goto cleanup; + VIR_FREE(val); + } + + rbd_image_option->data_pool = virXMLPropString(node, "datapool"); + + rbd_image_option->flatten = -1; + if ((val = virXMLPropString(node, "flatten"))) { + if (virStrToLong_l(val, NULL, 10, &rbd_image_option->flatten) < 0) + goto cleanup; + VIR_FREE(val); + } + + rbd_image_option->clone_format = -1; + if ((val = virXMLPropString(node, "cloneformat"))) { + if (virStrToLong_l(val, NULL, 10, &rbd_image_option->clone_format) < 0) + goto cleanup; + VIR_FREE(val); + } + + rbd_image_option->mirror_image_mode = -1; + if ((val = virXMLPropString(node, "mirrorimagemode"))) { + if (virStrToLong_l(val, NULL, 10, &rbd_image_option->mirror_image_mode) < 0) + goto cleanup; + VIR_FREE(val); + } + + return 0; +cleanup: + VIR_FREE(val); + return -1; +} + + + void + virRbdImageOptionDefaultSet(virRbdImageOptionsPtr rbd_image_option) + { + rbd_image_option->format = -1; + rbd_image_option->feature = -1; + rbd_image_option->order = -1; + rbd_image_option->stripe_unit = -1; + rbd_image_option->stripe_count = -1; + rbd_image_option->journal_order = -1; + rbd_image_option->journal_splay_width = -1; + rbd_image_option->journal_pool = NULL; + rbd_image_option->feature_set = -1; + rbd_image_option->feature_clear = -1; + rbd_image_option->data_pool = NULL; + rbd_image_option->flatten = -1; + rbd_image_option->clone_format = -1; + rbd_image_option->mirror_image_mode = -1; + } + + static int virStoragePoolDefParseSource(xmlXPathContextPtr ctxt, virStoragePoolSource *source, @@ -522,6 +656,7 @@ virStoragePoolDefParseSource(xmlXPathContextPtr ctxt, { xmlNodePtr authnode; xmlNodePtr adapternode; + xmlNodePtr rbdimageoption; int nsource; size_t i; virStoragePoolOptions *options; @@ -633,6 +768,13 @@ virStoragePoolDefParseSource(xmlXPathContextPtr ctxt, source->auth = g_steal_pointer(&authdef); } + if ((rbdimageoption = virXPathNode("./rbdimageoption", ctxt))) { + if (virRbdImageOptionParseXML(&source->rbdImageOptions, rbdimageoption, ctxt) < 0) + goto cleanup; + } else { + virRbdImageOptionDefaultSet(&source->rbdImageOptions); + } + /* Option protocol version string (NFSvN) */ if ((source->protocolVer = virXPathString("string(./protocol/@ver)", ctxt))) { if ((source->format != VIR_STORAGE_POOL_NETFS_NFS) && @@ -988,6 +1130,67 @@ virStoragePoolDefParse(const char *xmlStr, } +static void +virRbdImageOptionFormat(virBufferPtr buf, + virRbdImageOptionsPtr rbdImageOptions) +{ + // not set the rbd image options. + if (rbdImageOptions->format < 0 && rbdImageOptions->feature < 0 && rbdImageOptions->order < 0 + && rbdImageOptions->stripe_unit < 0 && rbdImageOptions->stripe_count < 0 && rbdImageOptions->journal_order < 0 + && rbdImageOptions->journal_splay_width < 0 && (rbdImageOptions->journal_pool != NULL) && rbdImageOptions->feature_set < 0 + && rbdImageOptions->feature_clear < 0 && (rbdImageOptions->data_pool != NULL) && rbdImageOptions->flatten < 0 + && rbdImageOptions->clone_format < 0 && rbdImageOptions->mirror_image_mode < 0) + return; + + virBufferAsprintf(buf, "<rbdimageoption"); + + if (rbdImageOptions->format >= 0) + virBufferAsprintf(buf, " format='%ld'", rbdImageOptions->format); + + if (rbdImageOptions->feature >= 0) + virBufferAsprintf(buf, " feature='%ld'", rbdImageOptions->feature); + + if (rbdImageOptions->order >= 0) + virBufferAsprintf(buf, " order='%ld'", rbdImageOptions->order); + + if (rbdImageOptions->stripe_unit >= 0) + virBufferAsprintf(buf, " stripeunit='%ld'", rbdImageOptions->stripe_unit); + + if (rbdImageOptions->stripe_count >= 0) + virBufferAsprintf(buf, " stripecount='%ld'", rbdImageOptions->stripe_count); + + if (rbdImageOptions->journal_order >= 0) + virBufferAsprintf(buf, " journalorder='%ld'", rbdImageOptions->journal_order); + + if (rbdImageOptions->journal_splay_width >= 0) + virBufferAsprintf(buf, " journalsplaywidth='%ld'", rbdImageOptions->journal_splay_width); + + if (rbdImageOptions->journal_pool) + virBufferAsprintf(buf, " journalpool='%s'", rbdImageOptions->journal_pool); + + if (rbdImageOptions->feature_set >= 0) + virBufferAsprintf(buf, " featureset='%ld'", rbdImageOptions->feature_set); + + if (rbdImageOptions->feature_clear >= 0) + virBufferAsprintf(buf, " featureclear='%ld'", rbdImageOptions->feature_clear); + + if (rbdImageOptions->data_pool) + virBufferAsprintf(buf, " datapool='%s'", rbdImageOptions->data_pool); + + if (rbdImageOptions->flatten >= 0) + virBufferAsprintf(buf, " flatten='%ld'", rbdImageOptions->flatten); + + if (rbdImageOptions->clone_format >= 0) + virBufferAsprintf(buf, " cloneformat='%ld'", rbdImageOptions->clone_format); + + if (rbdImageOptions->mirror_image_mode >= 0) + virBufferAsprintf(buf, " mirrorimagemode='%ld'", rbdImageOptions->mirror_image_mode); + + virBufferAsprintf(buf, "/>\n"); +} + + + static int virStoragePoolSourceFormat(virBuffer *buf, virStoragePoolOptions *options, @@ -1066,6 +1269,8 @@ virStoragePoolSourceFormat(virBuffer *buf, virBufferEscapeString(buf, "<vendor name='%s'/>\n", src->vendor); virBufferEscapeString(buf, "<product name='%s'/>\n", src->product); + virRbdImageOptionFormat(buf, &src->rbdImageOptions); + virBufferAdjustIndent(buf, -2); virBufferAddLit(buf, "</source>\n"); return 0; diff --git a/src/conf/storage_conf.h b/src/conf/storage_conf.h index fc67957cfe..377ea1cfe2 100644 --- a/src/conf/storage_conf.h +++ b/src/conf/storage_conf.h @@ -175,6 +175,25 @@ struct _virStoragePoolFeatures { virTristateBool cow; }; +typedef struct _virRbdImageOptions virRbdImageOptions; +typedef virRbdImageOptions *virRbdImageOptionsPtr; +struct _virRbdImageOptions { + int64_t format; + int64_t feature; + int64_t order; + int64_t stripe_unit; + int64_t stripe_count; + int64_t journal_order; + int64_t journal_splay_width; + char *journal_pool; + int64_t feature_set; + int64_t feature_clear; + char *data_pool; + int64_t flatten; + int64_t clone_format; + int64_t mirror_image_mode; +}; + typedef struct _virStoragePoolSource virStoragePoolSource; struct _virStoragePoolSource { @@ -214,6 +233,9 @@ struct _virStoragePoolSource { /* Protocol version value for netfs */ char *protocolVer; + + /* RBD Image Options definition. */ + virRbdImageOptions rbdImageOptions; }; typedef struct _virStoragePoolTarget virStoragePoolTarget; @@ -314,6 +336,9 @@ virStoragePoolSaveConfig(const char *configFile, void virStorageVolDefFree(virStorageVolDef *def); +void +virRbdImageOptionClear(virRbdImageOptionsPtr rbd_image_option); + void virStoragePoolSourceClear(virStoragePoolSource *source); @@ -326,6 +351,14 @@ virStoragePoolSourceFree(virStoragePoolSource *source); void virStoragePoolDefFree(virStoragePoolDef *def); +int +virRbdImageOptionParseXML(virRbdImageOptionsPtr rbd_image_option, + xmlNodePtr node, + xmlXPathContextPtr ctxt); + +void +virRbdImageOptionDefaultSet(virRbdImageOptionsPtr rbd_image_option); + virStoragePoolSource * virStoragePoolDefParseSourceString(const char *srcSpec, int pool_type); diff --git a/src/storage/storage_backend_rbd.c b/src/storage/storage_backend_rbd.c index 05b2c43f79..29c651cbcd 100644 --- a/src/storage/storage_backend_rbd.c +++ b/src/storage/storage_backend_rbd.c @@ -878,10 +878,127 @@ virStorageBackendRBDCreateVol(virStoragePoolObj *pool, } static int virStorageBackendRBDCreateImage(rados_ioctx_t io, - char *name, long capacity) + char *name, long capacity, virStoragePoolDefPtr def) { int order = 0; - return rbd_create(io, name, capacity, &order); + int ret = -1; + rbd_image_options_t image_options; + + if (def->source.rbdImageOptions.format < 0 && def->source.rbdImageOptions.feature < 0 + && def->source.rbdImageOptions.order < 0 && def->source.rbdImageOptions.stripe_unit < 0 + && def->source.rbdImageOptions.stripe_count < 0 && def->source.rbdImageOptions.journal_order < 0 + && def->source.rbdImageOptions.journal_splay_width < 0 && (def->source.rbdImageOptions.journal_pool != NULL) + && def->source.rbdImageOptions.feature_set < 0 && def->source.rbdImageOptions.feature_clear < 0 + && (def->source.rbdImageOptions.data_pool != NULL) && def->source.rbdImageOptions.flatten < 0 + && def->source.rbdImageOptions.clone_format < 0 && def->source.rbdImageOptions.mirror_image_mode < 0) { + VIR_DEBUG("Creating RBD image %s, without data pool, with size %lu", name, capacity); + return rbd_create(io, name, capacity, &order); + } + + rbd_image_options_create(&image_options); + + if (def->source.rbdImageOptions.format >= 0) { + VIR_DEBUG("Set rbd image option format:%d, %lu", RBD_IMAGE_OPTION_FORMAT, def->source.rbdImageOptions.format); + rbd_image_options_set_uint64(image_options, + RBD_IMAGE_OPTION_FORMAT, + (uint64_t)def->source.rbdImageOptions.format); + } + + if (def->source.rbdImageOptions.feature >= 0) { + VIR_DEBUG("Set rbd image option features:%d, %lu", RBD_IMAGE_OPTION_FEATURES, def->source.rbdImageOptions.feature); + rbd_image_options_set_uint64(image_options, + RBD_IMAGE_OPTION_FEATURES, + (uint64_t)def->source.rbdImageOptions.feature); + } + + if (def->source.rbdImageOptions.order >= 0) { + VIR_DEBUG("Set rbd image option order:%d, %lu", RBD_IMAGE_OPTION_ORDER, def->source.rbdImageOptions.order); + rbd_image_options_set_uint64(image_options, + RBD_IMAGE_OPTION_ORDER, + (uint64_t)def->source.rbdImageOptions.order); + } + + if (def->source.rbdImageOptions.stripe_unit >= 0) { + VIR_DEBUG("Set rbd image option stripe_unit:%d, %lu", RBD_IMAGE_OPTION_STRIPE_UNIT, def->source.rbdImageOptions.stripe_unit); + rbd_image_options_set_uint64(image_options, + RBD_IMAGE_OPTION_STRIPE_UNIT, + (uint64_t)def->source.rbdImageOptions.stripe_unit); + } + + if (def->source.rbdImageOptions.stripe_count >= 0) { + VIR_DEBUG("Set rbd image option stipe_count:%d, %lu", RBD_IMAGE_OPTION_STRIPE_COUNT, def->source.rbdImageOptions.stripe_count); + rbd_image_options_set_uint64(image_options, + RBD_IMAGE_OPTION_STRIPE_COUNT, + (uint64_t)def->source.rbdImageOptions.stripe_count); + } + + if (def->source.rbdImageOptions.journal_order >= 0) { + VIR_DEBUG("Set rbd image option journal_order:%d, %lu", RBD_IMAGE_OPTION_JOURNAL_ORDER, def->source.rbdImageOptions.journal_order); + rbd_image_options_set_uint64(image_options, + RBD_IMAGE_OPTION_JOURNAL_ORDER, + (uint64_t)def->source.rbdImageOptions.journal_order); + } + + if (def->source.rbdImageOptions.journal_splay_width >= 0) { + VIR_DEBUG("Set rbd image option journal_splay_width:%d, %lu", RBD_IMAGE_OPTION_JOURNAL_SPLAY_WIDTH, def->source.rbdImageOptions.journal_splay_width); + rbd_image_options_set_uint64(image_options, + RBD_IMAGE_OPTION_JOURNAL_SPLAY_WIDTH, + (uint64_t)def->source.rbdImageOptions.journal_splay_width); + } + + if (def->source.rbdImageOptions.journal_pool != NULL) { + VIR_DEBUG("Set rbd image option journal_pool:%d, %s", RBD_IMAGE_OPTION_JOURNAL_POOL, def->source.rbdImageOptions.journal_pool); + rbd_image_options_set_string(image_options, + RBD_IMAGE_OPTION_JOURNAL_POOL, + def->source.rbdImageOptions.journal_pool); + } + + if (def->source.rbdImageOptions.feature_set >= 0) { + VIR_DEBUG("Set rbd image option feature_set:%d, %lu", RBD_IMAGE_OPTION_FEATURES_SET, def->source.rbdImageOptions.feature_set); + rbd_image_options_set_uint64(image_options, + RBD_IMAGE_OPTION_FEATURES_SET, + (uint64_t)def->source.rbdImageOptions.feature_set); + } + + if (def->source.rbdImageOptions.feature_clear >= 0) { + VIR_DEBUG("Set rbd image option feature_clear:%d, %lu", RBD_IMAGE_OPTION_FEATURES_CLEAR, def->source.rbdImageOptions.feature_clear); + rbd_image_options_set_uint64(image_options, + RBD_IMAGE_OPTION_FEATURES_CLEAR, + (uint64_t)def->source.rbdImageOptions.feature_clear); + } + + if (def->source.rbdImageOptions.data_pool != NULL) { + VIR_DEBUG("Set rbd image option data_pool:%d, %s", RBD_IMAGE_OPTION_DATA_POOL, def->source.rbdImageOptions.data_pool); + rbd_image_options_set_string(image_options, + RBD_IMAGE_OPTION_DATA_POOL, + def->source.rbdImageOptions.data_pool); + } + + if (def->source.rbdImageOptions.flatten >= 0) { + VIR_DEBUG("Set rbd image option flatten:%d, %lu", RBD_IMAGE_OPTION_FLATTEN, def->source.rbdImageOptions.flatten); + rbd_image_options_set_uint64(image_options, + RBD_IMAGE_OPTION_FLATTEN, + (uint64_t)def->source.rbdImageOptions.flatten); + } + + if (def->source.rbdImageOptions.clone_format >= 0) { + VIR_DEBUG("Set rbd image option clone_format:%d, %lu", RBD_IMAGE_OPTION_CLONE_FORMAT, def->source.rbdImageOptions.clone_format); + rbd_image_options_set_uint64(image_options, + RBD_IMAGE_OPTION_CLONE_FORMAT, + (uint64_t)def->source.rbdImageOptions.clone_format); + } + + if (def->source.rbdImageOptions.mirror_image_mode >= 0) { + VIR_DEBUG("Set rbd image option mirror_image_mode:%d, %lu", RBD_IMAGE_OPTION_MIRROR_IMAGE_MODE, def->source.rbdImageOptions.mirror_image_mode); + rbd_image_options_set_uint64(image_options, + RBD_IMAGE_OPTION_MIRROR_IMAGE_MODE, + (uint64_t)def->source.rbdImageOptions.mirror_image_mode); + } + + ret = rbd_create4(io, name, capacity, image_options); + VIR_DEBUG("Creating RBD image %s, with size:%lu, ret:%d", name, capacity, ret); + rbd_image_options_destroy(image_options); + return ret; } static int @@ -920,7 +1037,7 @@ virStorageBackendRBDBuildVol(virStoragePoolObj *pool, goto cleanup; if (virStorageBackendRBDCreateImage(ptr->ioctx, vol->name, - vol->target.capacity) < 0) { + vol->target.capacity, def) < 0) { virReportSystemError(errno, _("failed to create volume '%s/%s'"), def->source.name, vol->name); goto cleanup; -- 2.29.1.windows.1

1 0

Re: [PATCH 1/2] log: Add separate debug option for logging invalid memory accesses
by Philippe Mathieu-Daudé 13 Feb '23

13 Feb '23

On 13/2/23 18:17, Peter Xu wrote: > On Mon, Feb 13, 2023 at 05:34:04PM +0100, BALATON Zoltan wrote: >> On Mon, 13 Feb 2023, Peter Xu wrote: >>> On Mon, Feb 13, 2023 at 03:47:42PM +0100, BALATON Zoltan wrote: >>>> On Mon, 13 Feb 2023, Peter Xu wrote: >>>>> On Mon, Feb 13, 2023 at 12:41:29PM +0100, Thomas Huth wrote: >>>>>> On 07/02/2023 17.33, BALATON Zoltan wrote: >>>>>>> On Tue, 31 Jan 2023, BALATON Zoltan wrote: >>>>>>>> On Thu, 19 Jan 2023, BALATON Zoltan wrote: >>>>>>>>> Currently -d guest_errors enables logging of different invalid actions >>>>>>>>> by the guest such as misusing hardware, accessing missing features or >>>>>>>>> invalid memory areas. The memory access logging can be quite verbose >>>>>>>>> which obscures the other messages enabled by this debug switch so >>>>>>>>> separate it by adding a new -d memaccess option to make it possible to >>>>>>>>> control it independently of other guest error logs. >>>>>>>>> >>>>>>>>> Signed-off-by: BALATON Zoltan <balaton(a)eik.bme.hu> >>>>>>>> >>>>>>>> Ping? Could somebody review and pick it up please? >>>>>>> >>>>>>> Ping? >>>>>> >>>>>> Patch makes sense to me and looks fine, so: >>>>>> >>>>>> Reviewed-by: Thomas Huth <thuth(a)redhat.com> >>>>>> >>>>>> ... I think this should go via one of the "Memory API" maintainers branches? >>>>>> Paolo? Peter? David? >>>>> >>>>> Paolo normally does the pull, I assume that'll still be the case. The >>>>> patch looks good to me if Phil's comment will be addressed on merging with >>>>> the old mask, which makes sense to me: >>>> >>>> Keeping the old mask kind of defies the purpose. I've tried to explain that >>>> in the commit message but now that two of you did not get it maybe that >>>> message needs to be clarified instead? >>> >>> I think it's clear enough. My fault to not read carefully into the >>> message, sorry. >>> >>> However, could you explain why a memory_region_access_valid() failure >>> shouldn't belong to LOG_GUEST_ERROR? >>> >>> commit e54eba1986f6c4bac2951e7f90a849cd842e25e4 >>> Author: Peter Maydell <peter.maydell(a)linaro.org> >>> Date: Thu Oct 18 14:11:35 2012 +0100 >>> >>> qemu-log: Add new log category for guest bugs >>> >>> Add a new category for device models to log guest behaviour >>> which is likely to be a guest bug of some kind (accessing >>> nonexistent registers, reading 32 bit wide registers with >>> a byte access, etc). Making this its own log category allows >>> those who care (mostly guest OS authors) to see the complaints >>> without bothering most users. >>> >>> Such an illegal memory access is definitely a suitable candidate of guest >>> misbehave to me. >> >> Problem is that a lot of machines have unimplemented hardware that are valid >> on real machine but we don't model them so running guests which access these >> generate constant flow of unassigned memory access log which obscures the >> actual guest_errors when an modelled device is accessed in unexpected ways. >> For an example you can try booting MorphOS on mac99,via=pmu as described >> here: http://zero.eik.bme.hu/~balaton/qemu/amiga/#morphos >> (or the pegasos2 command too). We could add dummy registers to silence these >> but I think it's better to either implement it correctly or leave it >> unimplemented so we don't hide errors by the dummy implementation. >> >>> Not to mention Phil always have a good point that you may be violating >>> others using guest_error already so what they wanted to capture can >>> misterious going away without noticing, even if it may service your goal. >>> IOW it's a slight ABI and I think we ned justification to break it. >> >> Probably this should be documented in changelog or do we need depracation >> for a debug option meant for developers mostly? I did not think so. Also I >> can't think of other way to solve this without changing what guest_erorrs do >> unless we change the name of that flag as well. Also not that when this was >> originally added it did not contain mem access logs as those were controlled >> by a define in memory.c until Philippe changed it and added them to >> guest_errors. So in a way I want the previous functionality back. > > I see, thanks. > > Indeed it's only a debug option, so I don't know whether the abi needs the > attention here. > > I quickly looked at all the masks and afaict this is really a special and > very useful one that if I'm a cloud provider I can run some script trying > to capture those violations using this bit to identify suspecious guests. > > So I think it would still be great to not break it if possible, IMHO. > > Since currently I don't see an immediate limitation of having qemu log mask > being a single bit for each of the entry, one way to satisfy your need (and > also keep the old behavior, iiuc), is to make guest_errors a sugar syntax > to cover 2 bits. It shouldn't be complicated at all, I assume: > > +/* This covers the generic guest errors besides memory violations */ > #define LOG_GUEST_ERROR (1 << 11) > > +/* > + * This covers the guest errors on memory violations; see LOG_GUEST_ERROR > + * for generic guest errors. > + */ > +#define LOG_GUEST_ERROR_MEM (1 << 21) > +#define LOG_GUEST_ERROR_ALL (LOG_GUEST_ERROR | LOG_GUEST_ERROR_MEM) > > - { LOG_GUEST_ERROR, "guest_errors", > + { LOG_GUEST_ERROR_ALL, "guest_errors", > > Then somehow squashed with your changes. It'll make "guest_errors" not > exactly matching the name of LOG_* but I think it may not be a big concern. Thanks Peter for having a look. Cc'ing libvir-list@ to see if this change could have an impact. If no one else object I'm OK to take the patch as is, except if you (Peter) want the description to be reworded. Regards, Phil.

1 0

[PATCH] test: Introduce chxml2xmltest
by Michal Privoznik 13 Feb '23

13 Feb '23

Whilst reviewing a patch upstream (that ended up as v9.0.0-200-g092176e5ec), I realized we don't have a single xml2xml test for CH driver. Well, introduce the test with one simple test case for now. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- We could also benefit from xml2arg test, but I'll leave that for future ourselves. tests/chxml2xmlin/basic.xml | 30 ++++++++++++++ tests/chxml2xmlout/basic.xml | 1 + tests/chxml2xmltest.c | 77 ++++++++++++++++++++++++++++++++++++ tests/meson.build | 6 +++ 4 files changed, 114 insertions(+) create mode 100644 tests/chxml2xmlin/basic.xml create mode 120000 tests/chxml2xmlout/basic.xml create mode 100644 tests/chxml2xmltest.c diff --git a/tests/chxml2xmlin/basic.xml b/tests/chxml2xmlin/basic.xml new file mode 100644 index 0000000000..911aa7c621 --- /dev/null +++ b/tests/chxml2xmlin/basic.xml @@ -0,0 +1,30 @@ +<domain type='kvm'> + <name>cloudhypervisor</name> + <uuid>4dea22b3-1d52-d8f3-2516-782e98ab3fa0</uuid> + <memory unit='KiB'>2097152</memory> + <currentMemory unit='KiB'>2097152</currentMemory> + <vcpu placement='static'>2</vcpu> + <os> + <type arch='x86_64'>hvm</type> + <kernel>hypervisor-fw</kernel> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/local/bin/cloud-hypervisor</emulator> + <disk type='file' device='disk'> + <source file='disk.raw'/> + <target dev='vda' bus='virtio'/> + </disk> + <interface type='ethernet'> + <mac address='52:54:00:5c:e4:84'/> + <model type='virtio'/> + </interface> + <console type='pty'> + <target type='serial' port='0'/> + </console> + </devices> +</domain> diff --git a/tests/chxml2xmlout/basic.xml b/tests/chxml2xmlout/basic.xml new file mode 120000 index 0000000000..eb8df546aa --- /dev/null +++ b/tests/chxml2xmlout/basic.xml @@ -0,0 +1 @@ +../chxml2xmlin/basic.xml \ No newline at end of file diff --git a/tests/chxml2xmltest.c b/tests/chxml2xmltest.c new file mode 100644 index 0000000000..97b485dc4a --- /dev/null +++ b/tests/chxml2xmltest.c @@ -0,0 +1,77 @@ +#include <config.h> + +#include <testutils.h> + +#include "ch/ch_conf.h" + +struct testInfo { + const char *name; + virCHDriver *driver; + testCompareDomXML2XMLResult expectResult; +}; + +typedef enum { + FLAG_IS_DIFFERENT = 1 << 0, + FLAG_EXPECT_FAILURE = 1 << 1, +} virBhyveXMLToXMLTestFlags; + +static int +testCompareXMLToXMLHelper(const void *data) +{ + const struct testInfo *info = data; + g_autofree char *xml_in = NULL; + g_autofree char *xml_out = NULL; + + xml_in = g_strdup_printf("%s/chxml2xmlin/%s.xml", + abs_srcdir, info->name); + xml_out = g_strdup_printf("%s/chxml2xmlout/%s.xml", + abs_srcdir, info->name); + + return testCompareDomXML2XMLFiles(NULL, info->driver->xmlopt, + xml_in, xml_out, false, 0, + info->expectResult); +} + +static int +mymain(void) +{ + int ret = 0; + virCHDriver *driver = NULL; + + driver = g_new0(virCHDriver, 1); + + if (!(driver->caps = virCHDriverCapsInit())) { + fprintf(stderr, "unable to initialize driver capabilities\n"); + goto cleanup; + } + + if (!(driver->xmlopt = chDomainXMLConfInit(driver))) { + fprintf(stderr, "unable to initialize driver XMLOPT\n"); + goto cleanup; + } + +#define DO_TEST_FULL(name, expectResult) \ + do { \ + const struct testInfo info = {name, driver, expectResult}; \ + if (virTestRun("CH XML-2-XML " name, \ + testCompareXMLToXMLHelper, &info) < 0) \ + ret = -1; \ + } while (0) + +#define DO_TEST(name) \ + DO_TEST_FULL(name, TEST_COMPARE_DOM_XML2XML_RESULT_SUCCESS) + +#define DO_TEST_FAIL_PARSE(name) \ + DO_TEST_FULL(name, TEST_COMPARE_DOM_XML2XML_RESULT_FAIL_PARSE) + + DO_TEST("basic"); + + cleanup: + virObjectUnref(driver->xmlopt); + virObjectUnref(driver->caps); + g_free(driver); + + return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; +} + +VIR_TEST_MAIN(mymain) diff --git a/tests/meson.build b/tests/meson.build index 3365dce307..15b049c6ac 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -347,6 +347,12 @@ if conf.has('WITH_BHYVE') ] endif +if conf.has('WITH_CH') + tests += [ + { 'name': 'chxml2xmltest', 'link_with': [ ch_driver_impl ] }, + ] +endif + if conf.has('WITH_ESX') tests += [ { 'name': 'esxutilstest', 'deps': [ esx_dep ] }, -- 2.39.1

2 1

[PATCH] qemu: blockjob: Handle 'pending' blockjob state only when we need it
by Peter Krempa 13 Feb '23

13 Feb '23

The 'pending' state needs to be handled by the blockjob code only when the snapshot code requests a block-commit without auto-finalization. If we always handle it we fail to properly remove the blockjob data for the 'blockdev-create' job as that also transitions trhough 'pending' but we'd never update it once it reaches 'concluded' as the code already thinks that the job has finished and is no longer watching it. Introduce a 'processPending' property into block job data and set it only when we know that we need to process 'pending'. Fixes: 90d9bc9d74a5157167548b26c00b1a016655e295 Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2168769 Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/qemu/qemu_block.c | 1 + src/qemu/qemu_blockjob.c | 19 ++++++++++--------- src/qemu/qemu_blockjob.h | 4 ++++ 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c index 4c06565e0f..5e700eff99 100644 --- a/src/qemu/qemu_block.c +++ b/src/qemu/qemu_block.c @@ -3373,6 +3373,7 @@ qemuBlockCommit(virDomainObj *vm, if (!(job = qemuBlockJobDiskNewCommit(vm, disk, top_parent, topSource, baseSource, flags & VIR_DOMAIN_BLOCK_COMMIT_DELETE, + autofinalize, flags))) goto cleanup; diff --git a/src/qemu/qemu_blockjob.c b/src/qemu/qemu_blockjob.c index cb2d05d71d..a20cf1db62 100644 --- a/src/qemu/qemu_blockjob.c +++ b/src/qemu/qemu_blockjob.c @@ -274,6 +274,7 @@ qemuBlockJobDiskNewCommit(virDomainObj *vm, virStorageSource *top, virStorageSource *base, bool delete_imgs, + virTristateBool autofinalize, unsigned int jobflags) { g_autoptr(qemuBlockJobData) job = NULL; @@ -290,6 +291,7 @@ qemuBlockJobDiskNewCommit(virDomainObj *vm, job->data.commit.top = top; job->data.commit.base = base; job->data.commit.deleteCommittedImages = delete_imgs; + job->processPending = autofinalize == VIR_TRISTATE_BOOL_NO; job->jobflags = jobflags; if (qemuBlockJobRegister(job, vm, disk, true) < 0) @@ -532,8 +534,6 @@ qemuBlockJobRefreshJobs(virDomainObj *vm) if (job->state == QEMU_BLOCKJOB_STATE_NEW || job->state == QEMU_BLOCKJOB_STATE_RUNNING) job->newstate = newstate; - } else if (newstate == QEMU_BLOCKJOB_STATE_PENDING) { - job->newstate = newstate; } /* don't update the job otherwise */ } @@ -1568,13 +1568,14 @@ qemuBlockJobEventProcess(virQEMUDriver *driver, case QEMU_BLOCKJOB_STATE_PENDING: /* Similarly as for 'ready' state we should handle it only when - * previous state was 'new' or 'running' as there are other cases - * when it can be emitted by QEMU. Currently we need this only when - * deleting non-active external snapshots. */ - if (job->state == QEMU_BLOCKJOB_STATE_NEW || - job->state == QEMU_BLOCKJOB_STATE_RUNNING) { - job->state = job->newstate; - qemuDomainSaveStatus(vm); + * previous state was 'new' or 'running' and only if the blockjob code + * is handling finalization of the job explicitly. */ + if (job->processPending) { + if (job->state == QEMU_BLOCKJOB_STATE_NEW || + job->state == QEMU_BLOCKJOB_STATE_RUNNING) { + job->state = job->newstate; + qemuDomainSaveStatus(vm); + } } job->newstate = -1; break; diff --git a/src/qemu/qemu_blockjob.h b/src/qemu/qemu_blockjob.h index e9b283da20..f1ac43b4c7 100644 --- a/src/qemu/qemu_blockjob.h +++ b/src/qemu/qemu_blockjob.h @@ -138,6 +138,9 @@ struct _qemuBlockJobData { int brokentype; /* the previous type of a broken blockjob qemuBlockJobType */ + bool processPending; /* process the 'pending' state of the job, if the job + should not be auto-finalized */ + bool invalidData; /* the job data (except name) is not valid */ bool reconnected; /* internal field for tracking whether job is live after reconnect to qemu */ }; @@ -175,6 +178,7 @@ qemuBlockJobDiskNewCommit(virDomainObj *vm, virStorageSource *top, virStorageSource *base, bool delete_imgs, + virTristateBool autofinalize, unsigned int jobflags); qemuBlockJobData * -- 2.39.1

2 1

[libvirt PATCH 0/1] Do not add stub console to ch VMs
by Praveen K Paladugu 10 Feb '23

10 Feb '23

This patch resolves https://gitlab.com/libvirt/libvirt/-/issues/344 I tested various versions of cloud-hypervisor between v15 - v29. All of them fail to start a test VM without this patch. Praveen K Paladugu (1): ch: Do not add stub console to ch VMs src/ch/ch_domain.c | 1 + src/conf/domain_conf.c | 7 ++++--- src/conf/domain_conf.h | 1 + 3 files changed, 6 insertions(+), 3 deletions(-) -- 2.34.1

3 3

[libvirt PATCH] conf: Allow conventional PCI devices to be marked as integrated
by Andrea Bolognani 10 Feb '23

10 Feb '23

Integrated PCI devices can be either PCIe (virtio-iommu) or conventional PCI (pvpanic-pci). Right now libvirt will refuse to assign an address on pcie.0 for the latter, but that's an undesirable limitation that we can easily remove. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- src/conf/domain_addr.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/conf/domain_addr.c b/src/conf/domain_addr.c index 76f9c12ca6..b6534f502c 100644 --- a/src/conf/domain_addr.c +++ b/src/conf/domain_addr.c @@ -306,8 +306,11 @@ virDomainPCIAddressFlagsCompatible(virPCIDeviceAddress *addr, if (addr->bus == 0) { /* pcie-root doesn't usually allow endpoint devices to be * plugged directly into it, but for integrated devices - * that's exactly what we want */ - busFlags |= VIR_PCI_CONNECT_AUTOASSIGN; + * that's exactly what we want. It also refuses conventional + * PCI devices by default, but in the case of integrated + * devices both types are fine */ + busFlags |= VIR_PCI_CONNECT_TYPE_PCI_DEVICE | + VIR_PCI_CONNECT_AUTOASSIGN; } else { if (reportError) { virReportError(errType, -- 2.39.1

2 1

[libvirt PATCH] gitlab: Ask users not to attach screenshots to bug reports
by Andrea Bolognani 10 Feb '23

10 Feb '23

Hopefully including this request in ALL CAPITAL LETTERS in the issue template will cut down on the number of screenshots that end up cluttering bug reports by at least a tiny bit. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- .gitlab/issue_templates/bug.md | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab/issue_templates/bug.md b/.gitlab/issue_templates/bug.md index f220671a06..b923be0ca0 100644 --- a/.gitlab/issue_templates/bug.md +++ b/.gitlab/issue_templates/bug.md @@ -17,3 +17,4 @@ ## Additional information   + -- 2.39.1

5 10

[PATCH] qemu_extdevice: Do cleanup host only for VIR_DOMAIN_TPM_TYPE_EMULATOR
by Michal Privoznik 10 Feb '23

10 Feb '23

We only set up host for VIR_DOMAIN_TPM_TYPE_EMULATOR and thus similarly, we should do cleanup for the same type. This also fixes a crasher, in which qemuTPMEmulatorCleanupHost() accesses tpm->data.emulator.storagepath which is NULL for VIR_DOMAIN_TPM_TYPE_EXTERNAL. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2168762 Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_extdevice.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_extdevice.c b/src/qemu/qemu_extdevice.c index f7b2e2e653..fdefe59215 100644 --- a/src/qemu/qemu_extdevice.c +++ b/src/qemu/qemu_extdevice.c @@ -162,7 +162,10 @@ qemuExtDevicesCleanupHost(virQEMUDriver *driver, return; for (i = 0; i < def->ntpms; i++) { - qemuExtTPMCleanupHost(def->tpms[i], flags, outgoingMigration); + virDomainTPMDef *tpm = def->tpms[i]; + + if (tpm->type == VIR_DOMAIN_TPM_TYPE_EMULATOR) + qemuExtTPMCleanupHost(tpm, flags, outgoingMigration); } } -- 2.39.1

2 1

[PATCH] hw/misc/sga: Remove the deprecated "sga" device
by Thomas Huth 10 Feb '23

10 Feb '23

It's been deprecated since QEMU v6.2, so it should be OK to finally remove this now. Signed-off-by: Thomas Huth <thuth(a)redhat.com> --- MAINTAINERS | 1 - docs/about/deprecated.rst | 9 ---- docs/about/removed-features.rst | 10 ++++ hw/misc/sga.c | 71 ---------------------------- .gitmodules | 3 -- hw/i386/Kconfig | 1 - hw/misc/Kconfig | 4 -- hw/misc/meson.build | 1 - pc-bios/README | 6 --- pc-bios/meson.build | 1 - pc-bios/sgabios.bin | Bin 4096 -> 0 bytes roms/Makefile | 9 +--- roms/sgabios | 1 - tests/migration/guestperf/engine.py | 2 +- 14 files changed, 12 insertions(+), 107 deletions(-) delete mode 100644 hw/misc/sga.c delete mode 100644 pc-bios/sgabios.bin delete mode 160000 roms/sgabios diff --git a/MAINTAINERS b/MAINTAINERS index 96e25f62ac..fd54c1f140 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1676,7 +1676,6 @@ F: hw/acpi/piix4.c F: hw/acpi/ich9*.c F: include/hw/acpi/ich9*.h F: include/hw/southbridge/piix.h -F: hw/misc/sga.c F: hw/isa/apm.c F: include/hw/isa/apm.h F: tests/unit/test-x86-cpuid.c diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index da2e6fe63d..641d7d41ec 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -246,15 +246,6 @@ full SCSI support. Use virtio-scsi instead when SCSI passthrough is required. Note this also applies to ``-device virtio-blk-pci,scsi=on|off``, which is an alias. -``-device sga`` (since 6.2) -^^^^^^^^^^^^^^^^^^^^^^^^^^^ - -The ``sga`` device loads an option ROM for x86 targets which enables -SeaBIOS to send messages to the serial console. SeaBIOS 1.11.0 onwards -contains native support for this feature and thus use of the option -ROM approach is obsolete. The native SeaBIOS support can be activated -by using ``-machine graphics=off``. - ``-device nvme-ns,eui64-default=on|off`` (since 7.1) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/docs/about/removed-features.rst b/docs/about/removed-features.rst index a17d0554d6..4a84e6174f 100644 --- a/docs/about/removed-features.rst +++ b/docs/about/removed-features.rst @@ -789,6 +789,16 @@ The 'ide-drive' device has been removed. Users should use 'ide-hd' or The 'scsi-disk' device has been removed. Users should use 'scsi-hd' or 'scsi-cd' as appropriate to get a SCSI hard disk or CD-ROM as needed. +``sga`` (removed in 8.0) +'''''''''''''''''''''''' + +The ``sga`` device loaded an option ROM for x86 targets which enabled +SeaBIOS to send messages to the serial console. SeaBIOS 1.11.0 onwards +contains native support for this feature and thus use of the option +ROM approach was obsolete. The native SeaBIOS support can be activated +by using ``-machine graphics=off``. + + Related binaries ---------------- diff --git a/hw/misc/sga.c b/hw/misc/sga.c deleted file mode 100644 index 1d04672b01..0000000000 --- a/hw/misc/sga.c +++ /dev/null @@ -1,71 +0,0 @@ -/* - * QEMU dummy ISA device for loading sgabios option rom. - * - * Copyright (c) 2011 Glauber Costa, Red Hat Inc. - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - * - * sgabios code originally available at code.google.com/p/sgabios - * - */ - -#include "qemu/osdep.h" -#include "hw/isa/isa.h" -#include "hw/loader.h" -#include "qemu/module.h" -#include "qom/object.h" -#include "qemu/error-report.h" - -#define SGABIOS_FILENAME "sgabios.bin" - -#define TYPE_SGA "sga" -OBJECT_DECLARE_SIMPLE_TYPE(ISASGAState, SGA) - -struct ISASGAState { - ISADevice parent_obj; -}; - -static void sga_realizefn(DeviceState *dev, Error **errp) -{ - warn_report("-device sga is deprecated, use -machine graphics=off"); - rom_add_vga(SGABIOS_FILENAME); -} - -static void sga_class_initfn(ObjectClass *klass, void *data) -{ - DeviceClass *dc = DEVICE_CLASS(klass); - - set_bit(DEVICE_CATEGORY_DISPLAY, dc->categories); - dc->realize = sga_realizefn; - dc->desc = "Serial Graphics Adapter"; -} - -static const TypeInfo sga_info = { - .name = TYPE_SGA, - .parent = TYPE_ISA_DEVICE, - .instance_size = sizeof(ISASGAState), - .class_init = sga_class_initfn, -}; - -static void sga_register_types(void) -{ - type_register_static(&sga_info); -} - -type_init(sga_register_types) diff --git a/.gitmodules b/.gitmodules index 24cffa87d4..6ce5bf49c5 100644 --- a/.gitmodules +++ b/.gitmodules @@ -13,9 +13,6 @@ [submodule "roms/qemu-palcode"] path = roms/qemu-palcode url = https://gitlab.com/qemu-project/qemu-palcode.git -[submodule "roms/sgabios"] - path = roms/sgabios - url = https://gitlab.com/qemu-project/sgabios.git [submodule "dtc"] path = dtc url = https://gitlab.com/qemu-project/dtc.git diff --git a/hw/i386/Kconfig b/hw/i386/Kconfig index 1bf47b0b0b..9fbfe748b5 100644 --- a/hw/i386/Kconfig +++ b/hw/i386/Kconfig @@ -26,7 +26,6 @@ config PC imply QXL imply SEV imply SGX - imply SGA imply TEST_DEVICES imply TPM_CRB imply TPM_TIS_ISA diff --git a/hw/misc/Kconfig b/hw/misc/Kconfig index eaeddca277..2ef5781ef8 100644 --- a/hw/misc/Kconfig +++ b/hw/misc/Kconfig @@ -15,10 +15,6 @@ config ISA_DEBUG bool depends on ISA_BUS -config SGA - bool - depends on ISA_BUS - config ISA_TESTDEV bool default y if TEST_DEVICES diff --git a/hw/misc/meson.build b/hw/misc/meson.build index 448e14b531..fe869b98ca 100644 --- a/hw/misc/meson.build +++ b/hw/misc/meson.build @@ -5,7 +5,6 @@ softmmu_ss.add(when: 'CONFIG_ISA_DEBUG', if_true: files('debugexit.c')) softmmu_ss.add(when: 'CONFIG_ISA_TESTDEV', if_true: files('pc-testdev.c')) softmmu_ss.add(when: 'CONFIG_PCA9552', if_true: files('pca9552.c')) softmmu_ss.add(when: 'CONFIG_PCI_TESTDEV', if_true: files('pci-testdev.c')) -softmmu_ss.add(when: 'CONFIG_SGA', if_true: files('sga.c')) softmmu_ss.add(when: 'CONFIG_UNIMP', if_true: files('unimp.c')) softmmu_ss.add(when: 'CONFIG_EMPTY_SLOT', if_true: files('empty_slot.c')) softmmu_ss.add(when: 'CONFIG_LED', if_true: files('led.c')) diff --git a/pc-bios/README b/pc-bios/README index b94f3fb081..3702ed485c 100644 --- a/pc-bios/README +++ b/pc-bios/README @@ -20,12 +20,6 @@ -machine pseries,x-vof=on. When enabled, the firmware acts as a slim shim and QEMU implements parts of the IEEE 1275 Open Firmware interface. -- sgabios (the Serial Graphics Adapter option ROM) provides a means for - legacy x86 software to communicate with an attached serial console as - if a video card were attached. The master sources reside in a subversion - repository at http://sgabios.googlecode.com/svn/trunk. A git mirror is - available at https://gitlab.com/qemu-project/sgabios.git. - - The PXE roms come from the iPXE project. Built with BANNER_TIME 0. Sources available at http://ipxe.org. Vendor:Device ID -> ROM mapping: diff --git a/pc-bios/meson.build b/pc-bios/meson.build index 388e0db6e4..a7224ef469 100644 --- a/pc-bios/meson.build +++ b/pc-bios/meson.build @@ -28,7 +28,6 @@ blobs = [ 'bios-256k.bin', 'bios-microvm.bin', 'qboot.rom', - 'sgabios.bin', 'vgabios.bin', 'vgabios-cirrus.bin', 'vgabios-stdvga.bin', diff --git a/pc-bios/sgabios.bin b/pc-bios/sgabios.bin deleted file mode 100644 index 6308f2e2d7064b52ff3c2e207b71018710866c05..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4096 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 diff --git a/roms/Makefile b/roms/Makefile index 5e44d97890..955f92286d 100644 --- a/roms/Makefile +++ b/roms/Makefile @@ -57,7 +57,6 @@ default help: @echo "available build targets:" @echo " bios -- update bios.bin (seabios)" @echo " vgabios -- update vgabios binaries (seabios)" - @echo " sgabios -- update sgabios binaries" @echo " pxerom -- update nic roms (bios only)" @echo " efirom -- update nic roms (bios+efi)" @echo " slof -- update slof.bin" @@ -102,11 +101,7 @@ build-seabios-config-%: config.% OUT=$(CURDIR)/seabios/builds/$*/ all -.PHONY: sgabios skiboot qboot -sgabios: - $(MAKE) -C sgabios - cp sgabios/sgabios.bin ../pc-bios - +.PHONY: skiboot qboot pxerom: $(patsubst %,pxe-rom-%,$(pxerom_variants)) @@ -199,8 +194,6 @@ npcm7xx_bootrom: clean: rm -rf seabios/.config seabios/out seabios/builds - $(MAKE) -C sgabios clean - rm -f sgabios/.depend $(MAKE) -C ipxe/src veryclean $(MAKE) -C edk2/BaseTools clean $(MAKE) -C SLOF clean diff --git a/roms/sgabios b/roms/sgabios deleted file mode 160000 index cbaee52287..0000000000 --- a/roms/sgabios +++ /dev/null @@ -1 +0,0 @@ -Subproject commit cbaee52287e5f32373181cff50a00b6c4ac9015a diff --git a/tests/migration/guestperf/engine.py b/tests/migration/guestperf/engine.py index cc06fac592..e69d16a62c 100644 --- a/tests/migration/guestperf/engine.py +++ b/tests/migration/guestperf/engine.py @@ -337,7 +337,7 @@ def _get_common_args(self, hardware, tunnelled=False): argv.extend(self._get_qemu_serial_args()) if self._debug: - argv.extend(["-device", "sga"]) + argv.extend(["-machine", "graphics=off"]) if hardware._prealloc_pages: argv_source += ["-mem-path", "/dev/shm", -- 2.31.1

3 2

[PATCH v3] cpu_s390: Implement getVendorForModel for IBM Z
by Thomas Huth 10 Feb '23

10 Feb '23

When running "virsh domcapabilities" on a s390x host, all the CPU models show up with vendor='unknown' - which sounds kind of weird since the vendor of these mainframe CPUs is well known: IBM. All CPUs starting with either "z" or "gen" match a real mainframe CPU by IBM, so let's return the string "IBM" for those now. The only remaining ones are now the artifical "qemu" and "max" models from QEMU itself, so it should be OK to get an "unknown" vendor for those two. Reviewed-by: Jiri Denemark <jdenemar(a)redhat.com> Signed-off-by: Boris Fiuczynski<fiuczy(a)linux.ibm.com> Signed-off-by: Thomas Huth <thuth(a)redhat.com> --- v3: Use STRPREFIX() for the checks (thanks to Jiri for the hint!) src/cpu/cpu_s390.c | 11 ++ tests/domaincapsdata/qemu_4.2.0.s390x.xml | 144 +++++++++++----------- tests/domaincapsdata/qemu_5.2.0.s390x.xml | 144 +++++++++++----------- tests/domaincapsdata/qemu_6.0.0.s390x.xml | 144 +++++++++++----------- 4 files changed, 227 insertions(+), 216 deletions(-) diff --git a/src/cpu/cpu_s390.c b/src/cpu/cpu_s390.c index d908a83928..81a1513ecb 100644 --- a/src/cpu/cpu_s390.c +++ b/src/cpu/cpu_s390.c @@ -109,6 +109,16 @@ virCPUs390ValidateFeatures(virCPUDef *cpu) } +static const char * +virCPUs390GetVendorForModel(const char *modelName) +{ + if (STRPREFIX(modelName, "z") || STRPREFIX(modelName, "gen")) + return "IBM"; + + return NULL; +} + + struct cpuArchDriver cpuDriverS390 = { .name = "s390", .arch = archs, @@ -119,4 +129,5 @@ struct cpuArchDriver cpuDriverS390 = { .baseline = NULL, .update = virCPUs390Update, .validateFeatures = virCPUs390ValidateFeatures, + .getVendorForModel = virCPUs390GetVendorForModel, }; diff --git a/tests/domaincapsdata/qemu_4.2.0.s390x.xml b/tests/domaincapsdata/qemu_4.2.0.s390x.xml index 4f176e2d37..66841881a1 100644 --- a/tests/domaincapsdata/qemu_4.2.0.s390x.xml +++ b/tests/domaincapsdata/qemu_4.2.0.s390x.xml @@ -83,79 +83,79 @@ <feature policy='require' name='cmm'/> </mode> <mode name='custom' supported='yes'> - <model usable='yes' vendor='unknown'>z800-base</model> - <model usable='yes' vendor='unknown'>z890.2-base</model> - <model usable='yes' vendor='unknown'>z9EC.2</model> - <model usable='yes' vendor='unknown'>z13.2</model> - <model usable='yes' vendor='unknown'>z9BC-base</model> - <model usable='yes' vendor='unknown'>z990.5-base</model> - <model usable='yes' vendor='unknown'>z890.2</model> - <model usable='yes' vendor='unknown'>z890</model> - <model usable='yes' vendor='unknown'>z9BC</model> - <model usable='yes' vendor='unknown'>z13</model> - <model usable='yes' vendor='unknown'>z196</model> - <model usable='yes' vendor='unknown'>z13s</model> - <model usable='yes' vendor='unknown'>z990.3</model> - <model usable='yes' vendor='unknown'>z13s-base</model> - <model usable='yes' vendor='unknown'>z9EC</model> - <model usable='yes' vendor='unknown'>gen15a</model> - <model usable='yes' vendor='unknown'>z14ZR1-base</model> - <model usable='yes' vendor='unknown'>z14.2-base</model> - <model usable='yes' vendor='unknown'>z900.3-base</model> - <model usable='yes' vendor='unknown'>z13.2-base</model> - <model usable='yes' vendor='unknown'>z196.2-base</model> - <model usable='yes' vendor='unknown'>zBC12-base</model> - <model usable='yes' vendor='unknown'>z9BC.2-base</model> - <model usable='yes' vendor='unknown'>z900.2-base</model> - <model usable='yes' vendor='unknown'>z9EC.3</model> - <model usable='yes' vendor='unknown'>zEC12</model> - <model usable='yes' vendor='unknown'>z900</model> - <model usable='yes' vendor='unknown'>z114-base</model> - <model usable='yes' vendor='unknown'>zEC12-base</model> - <model usable='yes' vendor='unknown'>z10EC.2</model> - <model usable='yes' vendor='unknown'>z10EC-base</model> - <model usable='yes' vendor='unknown'>z900.3</model> - <model usable='yes' vendor='unknown'>z14ZR1</model> - <model usable='yes' vendor='unknown'>z10BC</model> - <model usable='yes' vendor='unknown'>z10BC.2-base</model> - <model usable='yes' vendor='unknown'>z990.2</model> - <model usable='yes' vendor='unknown'>z9BC.2</model> - <model usable='yes' vendor='unknown'>z990</model> - <model usable='yes' vendor='unknown'>z14</model> - <model usable='yes' vendor='unknown'>gen15b-base</model> - <model usable='yes' vendor='unknown'>z990.4</model> + <model usable='yes' vendor='IBM'>z800-base</model> + <model usable='yes' vendor='IBM'>z890.2-base</model> + <model usable='yes' vendor='IBM'>z9EC.2</model> + <model usable='yes' vendor='IBM'>z13.2</model> + <model usable='yes' vendor='IBM'>z9BC-base</model> + <model usable='yes' vendor='IBM'>z990.5-base</model> + <model usable='yes' vendor='IBM'>z890.2</model> + <model usable='yes' vendor='IBM'>z890</model> + <model usable='yes' vendor='IBM'>z9BC</model> + <model usable='yes' vendor='IBM'>z13</model> + <model usable='yes' vendor='IBM'>z196</model> + <model usable='yes' vendor='IBM'>z13s</model> + <model usable='yes' vendor='IBM'>z990.3</model> + <model usable='yes' vendor='IBM'>z13s-base</model> + <model usable='yes' vendor='IBM'>z9EC</model> + <model usable='yes' vendor='IBM'>gen15a</model> + <model usable='yes' vendor='IBM'>z14ZR1-base</model> + <model usable='yes' vendor='IBM'>z14.2-base</model> + <model usable='yes' vendor='IBM'>z900.3-base</model> + <model usable='yes' vendor='IBM'>z13.2-base</model> + <model usable='yes' vendor='IBM'>z196.2-base</model> + <model usable='yes' vendor='IBM'>zBC12-base</model> + <model usable='yes' vendor='IBM'>z9BC.2-base</model> + <model usable='yes' vendor='IBM'>z900.2-base</model> + <model usable='yes' vendor='IBM'>z9EC.3</model> + <model usable='yes' vendor='IBM'>zEC12</model> + <model usable='yes' vendor='IBM'>z900</model> + <model usable='yes' vendor='IBM'>z114-base</model> + <model usable='yes' vendor='IBM'>zEC12-base</model> + <model usable='yes' vendor='IBM'>z10EC.2</model> + <model usable='yes' vendor='IBM'>z10EC-base</model> + <model usable='yes' vendor='IBM'>z900.3</model> + <model usable='yes' vendor='IBM'>z14ZR1</model> + <model usable='yes' vendor='IBM'>z10BC</model> + <model usable='yes' vendor='IBM'>z10BC.2-base</model> + <model usable='yes' vendor='IBM'>z990.2</model> + <model usable='yes' vendor='IBM'>z9BC.2</model> + <model usable='yes' vendor='IBM'>z990</model> + <model usable='yes' vendor='IBM'>z14</model> + <model usable='yes' vendor='IBM'>gen15b-base</model> + <model usable='yes' vendor='IBM'>z990.4</model> <model usable='yes' vendor='unknown'>max</model> - <model usable='yes' vendor='unknown'>z10EC.2-base</model> - <model usable='yes' vendor='unknown'>gen15a-base</model> - <model usable='yes' vendor='unknown'>z800</model> - <model usable='yes' vendor='unknown'>zEC12.2</model> - <model usable='yes' vendor='unknown'>z10EC</model> - <model usable='yes' vendor='unknown'>z990.2-base</model> - <model usable='yes' vendor='unknown'>z900-base</model> - <model usable='yes' vendor='unknown'>z10BC.2</model> - <model usable='yes' vendor='unknown'>z9EC-base</model> - <model usable='yes' vendor='unknown'>z9EC.3-base</model> - <model usable='yes' vendor='unknown'>z114</model> - <model usable='yes' vendor='unknown'>z890.3</model> - <model usable='yes' vendor='unknown'>z196-base</model> - <model usable='yes' vendor='unknown'>z9EC.2-base</model> - <model usable='yes' vendor='unknown'>z196.2</model> - <model usable='yes' vendor='unknown'>z14.2</model> - <model usable='yes' vendor='unknown'>z990-base</model> - <model usable='yes' vendor='unknown'>z900.2</model> - <model usable='yes' vendor='unknown'>z890-base</model> - <model usable='yes' vendor='unknown'>z10EC.3</model> - <model usable='yes' vendor='unknown'>z14-base</model> - <model usable='yes' vendor='unknown'>z990.4-base</model> - <model usable='yes' vendor='unknown'>z10EC.3-base</model> - <model usable='yes' vendor='unknown'>z10BC-base</model> - <model usable='yes' vendor='unknown'>z13-base</model> - <model usable='yes' vendor='unknown'>z990.3-base</model> - <model usable='yes' vendor='unknown'>zEC12.2-base</model> - <model usable='yes' vendor='unknown'>zBC12</model> - <model usable='yes' vendor='unknown'>z890.3-base</model> - <model usable='yes' vendor='unknown'>z990.5</model> - <model usable='yes' vendor='unknown'>gen15b</model> + <model usable='yes' vendor='IBM'>z10EC.2-base</model> + <model usable='yes' vendor='IBM'>gen15a-base</model> + <model usable='yes' vendor='IBM'>z800</model> + <model usable='yes' vendor='IBM'>zEC12.2</model> + <model usable='yes' vendor='IBM'>z10EC</model> + <model usable='yes' vendor='IBM'>z990.2-base</model> + <model usable='yes' vendor='IBM'>z900-base</model> + <model usable='yes' vendor='IBM'>z10BC.2</model> + <model usable='yes' vendor='IBM'>z9EC-base</model> + <model usable='yes' vendor='IBM'>z9EC.3-base</model> + <model usable='yes' vendor='IBM'>z114</model> + <model usable='yes' vendor='IBM'>z890.3</model> + <model usable='yes' vendor='IBM'>z196-base</model> + <model usable='yes' vendor='IBM'>z9EC.2-base</model> + <model usable='yes' vendor='IBM'>z196.2</model> + <model usable='yes' vendor='IBM'>z14.2</model> + <model usable='yes' vendor='IBM'>z990-base</model> + <model usable='yes' vendor='IBM'>z900.2</model> + <model usable='yes' vendor='IBM'>z890-base</model> + <model usable='yes' vendor='IBM'>z10EC.3</model> + <model usable='yes' vendor='IBM'>z14-base</model> + <model usable='yes' vendor='IBM'>z990.4-base</model> + <model usable='yes' vendor='IBM'>z10EC.3-base</model> + <model usable='yes' vendor='IBM'>z10BC-base</model> + <model usable='yes' vendor='IBM'>z13-base</model> + <model usable='yes' vendor='IBM'>z990.3-base</model> + <model usable='yes' vendor='IBM'>zEC12.2-base</model> + <model usable='yes' vendor='IBM'>zBC12</model> + <model usable='yes' vendor='IBM'>z890.3-base</model> + <model usable='yes' vendor='IBM'>z990.5</model> + <model usable='yes' vendor='IBM'>gen15b</model> <model usable='no' vendor='unknown'>qemu</model> </mode> </cpu> diff --git a/tests/domaincapsdata/qemu_5.2.0.s390x.xml b/tests/domaincapsdata/qemu_5.2.0.s390x.xml index 760f514d7b..31ddbfbc75 100644 --- a/tests/domaincapsdata/qemu_5.2.0.s390x.xml +++ b/tests/domaincapsdata/qemu_5.2.0.s390x.xml @@ -85,79 +85,79 @@ <feature policy='require' name='cmm'/> </mode> <mode name='custom' supported='yes'> - <model usable='yes' vendor='unknown'>z800-base</model> - <model usable='yes' vendor='unknown'>z890.2-base</model> - <model usable='yes' vendor='unknown'>z9EC.2</model> - <model usable='yes' vendor='unknown'>z13.2</model> - <model usable='yes' vendor='unknown'>z990.5-base</model> - <model usable='yes' vendor='unknown'>z9BC-base</model> - <model usable='yes' vendor='unknown'>z890.2</model> - <model usable='yes' vendor='unknown'>z890</model> - <model usable='yes' vendor='unknown'>z9BC</model> - <model usable='yes' vendor='unknown'>z13</model> - <model usable='yes' vendor='unknown'>z196</model> - <model usable='yes' vendor='unknown'>z13s</model> - <model usable='yes' vendor='unknown'>z990.3</model> - <model usable='yes' vendor='unknown'>z13s-base</model> - <model usable='yes' vendor='unknown'>z9EC</model> - <model usable='yes' vendor='unknown'>gen15a</model> - <model usable='yes' vendor='unknown'>z14ZR1-base</model> - <model usable='yes' vendor='unknown'>z14.2-base</model> - <model usable='yes' vendor='unknown'>z900.3-base</model> - <model usable='yes' vendor='unknown'>z13.2-base</model> - <model usable='yes' vendor='unknown'>z196.2-base</model> - <model usable='yes' vendor='unknown'>zBC12-base</model> - <model usable='yes' vendor='unknown'>z9BC.2-base</model> - <model usable='yes' vendor='unknown'>z900.2-base</model> - <model usable='yes' vendor='unknown'>z9EC.3</model> - <model usable='yes' vendor='unknown'>zEC12</model> - <model usable='yes' vendor='unknown'>z900</model> - <model usable='yes' vendor='unknown'>z114-base</model> - <model usable='yes' vendor='unknown'>zEC12-base</model> - <model usable='yes' vendor='unknown'>z10EC.2</model> - <model usable='yes' vendor='unknown'>z10EC-base</model> - <model usable='yes' vendor='unknown'>z900.3</model> - <model usable='yes' vendor='unknown'>z14ZR1</model> - <model usable='yes' vendor='unknown'>z10BC</model> - <model usable='yes' vendor='unknown'>z10BC.2-base</model> - <model usable='yes' vendor='unknown'>z9BC.2</model> - <model usable='yes' vendor='unknown'>z990</model> - <model usable='yes' vendor='unknown'>z990.2</model> - <model usable='yes' vendor='unknown'>z14</model> - <model usable='yes' vendor='unknown'>gen15b-base</model> - <model usable='yes' vendor='unknown'>z990.4</model> + <model usable='yes' vendor='IBM'>z800-base</model> + <model usable='yes' vendor='IBM'>z890.2-base</model> + <model usable='yes' vendor='IBM'>z9EC.2</model> + <model usable='yes' vendor='IBM'>z13.2</model> + <model usable='yes' vendor='IBM'>z990.5-base</model> + <model usable='yes' vendor='IBM'>z9BC-base</model> + <model usable='yes' vendor='IBM'>z890.2</model> + <model usable='yes' vendor='IBM'>z890</model> + <model usable='yes' vendor='IBM'>z9BC</model> + <model usable='yes' vendor='IBM'>z13</model> + <model usable='yes' vendor='IBM'>z196</model> + <model usable='yes' vendor='IBM'>z13s</model> + <model usable='yes' vendor='IBM'>z990.3</model> + <model usable='yes' vendor='IBM'>z13s-base</model> + <model usable='yes' vendor='IBM'>z9EC</model> + <model usable='yes' vendor='IBM'>gen15a</model> + <model usable='yes' vendor='IBM'>z14ZR1-base</model> + <model usable='yes' vendor='IBM'>z14.2-base</model> + <model usable='yes' vendor='IBM'>z900.3-base</model> + <model usable='yes' vendor='IBM'>z13.2-base</model> + <model usable='yes' vendor='IBM'>z196.2-base</model> + <model usable='yes' vendor='IBM'>zBC12-base</model> + <model usable='yes' vendor='IBM'>z9BC.2-base</model> + <model usable='yes' vendor='IBM'>z900.2-base</model> + <model usable='yes' vendor='IBM'>z9EC.3</model> + <model usable='yes' vendor='IBM'>zEC12</model> + <model usable='yes' vendor='IBM'>z900</model> + <model usable='yes' vendor='IBM'>z114-base</model> + <model usable='yes' vendor='IBM'>zEC12-base</model> + <model usable='yes' vendor='IBM'>z10EC.2</model> + <model usable='yes' vendor='IBM'>z10EC-base</model> + <model usable='yes' vendor='IBM'>z900.3</model> + <model usable='yes' vendor='IBM'>z14ZR1</model> + <model usable='yes' vendor='IBM'>z10BC</model> + <model usable='yes' vendor='IBM'>z10BC.2-base</model> + <model usable='yes' vendor='IBM'>z9BC.2</model> + <model usable='yes' vendor='IBM'>z990</model> + <model usable='yes' vendor='IBM'>z990.2</model> + <model usable='yes' vendor='IBM'>z14</model> + <model usable='yes' vendor='IBM'>gen15b-base</model> + <model usable='yes' vendor='IBM'>z990.4</model> <model usable='yes' vendor='unknown'>max</model> - <model usable='yes' vendor='unknown'>z990.2-base</model> - <model usable='yes' vendor='unknown'>z10EC.2-base</model> - <model usable='yes' vendor='unknown'>gen15a-base</model> - <model usable='yes' vendor='unknown'>z800</model> - <model usable='yes' vendor='unknown'>z10EC</model> - <model usable='yes' vendor='unknown'>zEC12.2</model> - <model usable='yes' vendor='unknown'>z900-base</model> - <model usable='yes' vendor='unknown'>z10BC.2</model> - <model usable='yes' vendor='unknown'>z9EC-base</model> - <model usable='yes' vendor='unknown'>z9EC.3-base</model> - <model usable='yes' vendor='unknown'>z114</model> - <model usable='yes' vendor='unknown'>z890.3</model> - <model usable='yes' vendor='unknown'>z196-base</model> - <model usable='yes' vendor='unknown'>z9EC.2-base</model> - <model usable='yes' vendor='unknown'>z196.2</model> - <model usable='yes' vendor='unknown'>z14.2</model> - <model usable='yes' vendor='unknown'>z990-base</model> - <model usable='yes' vendor='unknown'>z900.2</model> - <model usable='yes' vendor='unknown'>z10EC.3</model> - <model usable='yes' vendor='unknown'>z890-base</model> - <model usable='yes' vendor='unknown'>z14-base</model> - <model usable='yes' vendor='unknown'>z990.4-base</model> - <model usable='yes' vendor='unknown'>z10EC.3-base</model> - <model usable='yes' vendor='unknown'>z10BC-base</model> - <model usable='yes' vendor='unknown'>z13-base</model> - <model usable='yes' vendor='unknown'>z990.3-base</model> - <model usable='yes' vendor='unknown'>zEC12.2-base</model> - <model usable='yes' vendor='unknown'>zBC12</model> - <model usable='yes' vendor='unknown'>z890.3-base</model> - <model usable='yes' vendor='unknown'>z990.5</model> - <model usable='yes' vendor='unknown'>gen15b</model> + <model usable='yes' vendor='IBM'>z990.2-base</model> + <model usable='yes' vendor='IBM'>z10EC.2-base</model> + <model usable='yes' vendor='IBM'>gen15a-base</model> + <model usable='yes' vendor='IBM'>z800</model> + <model usable='yes' vendor='IBM'>z10EC</model> + <model usable='yes' vendor='IBM'>zEC12.2</model> + <model usable='yes' vendor='IBM'>z900-base</model> + <model usable='yes' vendor='IBM'>z10BC.2</model> + <model usable='yes' vendor='IBM'>z9EC-base</model> + <model usable='yes' vendor='IBM'>z9EC.3-base</model> + <model usable='yes' vendor='IBM'>z114</model> + <model usable='yes' vendor='IBM'>z890.3</model> + <model usable='yes' vendor='IBM'>z196-base</model> + <model usable='yes' vendor='IBM'>z9EC.2-base</model> + <model usable='yes' vendor='IBM'>z196.2</model> + <model usable='yes' vendor='IBM'>z14.2</model> + <model usable='yes' vendor='IBM'>z990-base</model> + <model usable='yes' vendor='IBM'>z900.2</model> + <model usable='yes' vendor='IBM'>z10EC.3</model> + <model usable='yes' vendor='IBM'>z890-base</model> + <model usable='yes' vendor='IBM'>z14-base</model> + <model usable='yes' vendor='IBM'>z990.4-base</model> + <model usable='yes' vendor='IBM'>z10EC.3-base</model> + <model usable='yes' vendor='IBM'>z10BC-base</model> + <model usable='yes' vendor='IBM'>z13-base</model> + <model usable='yes' vendor='IBM'>z990.3-base</model> + <model usable='yes' vendor='IBM'>zEC12.2-base</model> + <model usable='yes' vendor='IBM'>zBC12</model> + <model usable='yes' vendor='IBM'>z890.3-base</model> + <model usable='yes' vendor='IBM'>z990.5</model> + <model usable='yes' vendor='IBM'>gen15b</model> <model usable='yes' vendor='unknown'>qemu</model> </mode> </cpu> diff --git a/tests/domaincapsdata/qemu_6.0.0.s390x.xml b/tests/domaincapsdata/qemu_6.0.0.s390x.xml index b1968668db..1cb19e051b 100644 --- a/tests/domaincapsdata/qemu_6.0.0.s390x.xml +++ b/tests/domaincapsdata/qemu_6.0.0.s390x.xml @@ -86,79 +86,79 @@ <feature policy='require' name='cmm'/> </mode> <mode name='custom' supported='yes'> - <model usable='yes' vendor='unknown'>z800-base</model> - <model usable='yes' vendor='unknown'>z890.2-base</model> - <model usable='yes' vendor='unknown'>z9EC.2</model> - <model usable='yes' vendor='unknown'>z13.2</model> - <model usable='yes' vendor='unknown'>z990.5-base</model> - <model usable='yes' vendor='unknown'>z9BC-base</model> - <model usable='yes' vendor='unknown'>z890.2</model> - <model usable='yes' vendor='unknown'>z890</model> - <model usable='yes' vendor='unknown'>z9BC</model> - <model usable='yes' vendor='unknown'>z13</model> - <model usable='yes' vendor='unknown'>z196</model> - <model usable='yes' vendor='unknown'>z13s</model> - <model usable='yes' vendor='unknown'>z990.3</model> - <model usable='yes' vendor='unknown'>z13s-base</model> - <model usable='yes' vendor='unknown'>z9EC</model> - <model usable='yes' vendor='unknown'>gen15a</model> - <model usable='yes' vendor='unknown'>z14ZR1-base</model> - <model usable='yes' vendor='unknown'>z14.2-base</model> - <model usable='yes' vendor='unknown'>z900.3-base</model> - <model usable='yes' vendor='unknown'>z13.2-base</model> - <model usable='yes' vendor='unknown'>z196.2-base</model> - <model usable='yes' vendor='unknown'>zBC12-base</model> - <model usable='yes' vendor='unknown'>z9BC.2-base</model> - <model usable='yes' vendor='unknown'>z900.2-base</model> - <model usable='yes' vendor='unknown'>z9EC.3</model> - <model usable='yes' vendor='unknown'>zEC12</model> - <model usable='yes' vendor='unknown'>z900</model> - <model usable='yes' vendor='unknown'>z114-base</model> - <model usable='yes' vendor='unknown'>zEC12-base</model> - <model usable='yes' vendor='unknown'>z10EC.2</model> - <model usable='yes' vendor='unknown'>z10EC-base</model> - <model usable='yes' vendor='unknown'>z900.3</model> - <model usable='yes' vendor='unknown'>z14ZR1</model> - <model usable='yes' vendor='unknown'>z10BC</model> - <model usable='yes' vendor='unknown'>z10BC.2-base</model> - <model usable='yes' vendor='unknown'>z9BC.2</model> - <model usable='yes' vendor='unknown'>z990</model> - <model usable='yes' vendor='unknown'>z990.2</model> - <model usable='yes' vendor='unknown'>z14</model> - <model usable='yes' vendor='unknown'>gen15b-base</model> - <model usable='yes' vendor='unknown'>z990.4</model> + <model usable='yes' vendor='IBM'>z800-base</model> + <model usable='yes' vendor='IBM'>z890.2-base</model> + <model usable='yes' vendor='IBM'>z9EC.2</model> + <model usable='yes' vendor='IBM'>z13.2</model> + <model usable='yes' vendor='IBM'>z990.5-base</model> + <model usable='yes' vendor='IBM'>z9BC-base</model> + <model usable='yes' vendor='IBM'>z890.2</model> + <model usable='yes' vendor='IBM'>z890</model> + <model usable='yes' vendor='IBM'>z9BC</model> + <model usable='yes' vendor='IBM'>z13</model> + <model usable='yes' vendor='IBM'>z196</model> + <model usable='yes' vendor='IBM'>z13s</model> + <model usable='yes' vendor='IBM'>z990.3</model> + <model usable='yes' vendor='IBM'>z13s-base</model> + <model usable='yes' vendor='IBM'>z9EC</model> + <model usable='yes' vendor='IBM'>gen15a</model> + <model usable='yes' vendor='IBM'>z14ZR1-base</model> + <model usable='yes' vendor='IBM'>z14.2-base</model> + <model usable='yes' vendor='IBM'>z900.3-base</model> + <model usable='yes' vendor='IBM'>z13.2-base</model> + <model usable='yes' vendor='IBM'>z196.2-base</model> + <model usable='yes' vendor='IBM'>zBC12-base</model> + <model usable='yes' vendor='IBM'>z9BC.2-base</model> + <model usable='yes' vendor='IBM'>z900.2-base</model> + <model usable='yes' vendor='IBM'>z9EC.3</model> + <model usable='yes' vendor='IBM'>zEC12</model> + <model usable='yes' vendor='IBM'>z900</model> + <model usable='yes' vendor='IBM'>z114-base</model> + <model usable='yes' vendor='IBM'>zEC12-base</model> + <model usable='yes' vendor='IBM'>z10EC.2</model> + <model usable='yes' vendor='IBM'>z10EC-base</model> + <model usable='yes' vendor='IBM'>z900.3</model> + <model usable='yes' vendor='IBM'>z14ZR1</model> + <model usable='yes' vendor='IBM'>z10BC</model> + <model usable='yes' vendor='IBM'>z10BC.2-base</model> + <model usable='yes' vendor='IBM'>z9BC.2</model> + <model usable='yes' vendor='IBM'>z990</model> + <model usable='yes' vendor='IBM'>z990.2</model> + <model usable='yes' vendor='IBM'>z14</model> + <model usable='yes' vendor='IBM'>gen15b-base</model> + <model usable='yes' vendor='IBM'>z990.4</model> <model usable='yes' vendor='unknown'>max</model> - <model usable='yes' vendor='unknown'>z10EC.2-base</model> - <model usable='yes' vendor='unknown'>gen15a-base</model> - <model usable='yes' vendor='unknown'>z800</model> - <model usable='yes' vendor='unknown'>z10EC</model> - <model usable='yes' vendor='unknown'>zEC12.2</model> - <model usable='yes' vendor='unknown'>z990.2-base</model> - <model usable='yes' vendor='unknown'>z900-base</model> - <model usable='yes' vendor='unknown'>z10BC.2</model> - <model usable='yes' vendor='unknown'>z9EC-base</model> - <model usable='yes' vendor='unknown'>z9EC.3-base</model> - <model usable='yes' vendor='unknown'>z114</model> - <model usable='yes' vendor='unknown'>z890.3</model> - <model usable='yes' vendor='unknown'>z196-base</model> - <model usable='yes' vendor='unknown'>z9EC.2-base</model> - <model usable='yes' vendor='unknown'>z196.2</model> - <model usable='yes' vendor='unknown'>z14.2</model> - <model usable='yes' vendor='unknown'>z990-base</model> - <model usable='yes' vendor='unknown'>z900.2</model> - <model usable='yes' vendor='unknown'>z890-base</model> - <model usable='yes' vendor='unknown'>z10EC.3</model> - <model usable='yes' vendor='unknown'>z14-base</model> - <model usable='yes' vendor='unknown'>z990.4-base</model> - <model usable='yes' vendor='unknown'>z10EC.3-base</model> - <model usable='yes' vendor='unknown'>z10BC-base</model> - <model usable='yes' vendor='unknown'>z13-base</model> - <model usable='yes' vendor='unknown'>z990.3-base</model> - <model usable='yes' vendor='unknown'>zEC12.2-base</model> - <model usable='yes' vendor='unknown'>zBC12</model> - <model usable='yes' vendor='unknown'>z890.3-base</model> - <model usable='yes' vendor='unknown'>z990.5</model> - <model usable='yes' vendor='unknown'>gen15b</model> + <model usable='yes' vendor='IBM'>z10EC.2-base</model> + <model usable='yes' vendor='IBM'>gen15a-base</model> + <model usable='yes' vendor='IBM'>z800</model> + <model usable='yes' vendor='IBM'>z10EC</model> + <model usable='yes' vendor='IBM'>zEC12.2</model> + <model usable='yes' vendor='IBM'>z990.2-base</model> + <model usable='yes' vendor='IBM'>z900-base</model> + <model usable='yes' vendor='IBM'>z10BC.2</model> + <model usable='yes' vendor='IBM'>z9EC-base</model> + <model usable='yes' vendor='IBM'>z9EC.3-base</model> + <model usable='yes' vendor='IBM'>z114</model> + <model usable='yes' vendor='IBM'>z890.3</model> + <model usable='yes' vendor='IBM'>z196-base</model> + <model usable='yes' vendor='IBM'>z9EC.2-base</model> + <model usable='yes' vendor='IBM'>z196.2</model> + <model usable='yes' vendor='IBM'>z14.2</model> + <model usable='yes' vendor='IBM'>z990-base</model> + <model usable='yes' vendor='IBM'>z900.2</model> + <model usable='yes' vendor='IBM'>z890-base</model> + <model usable='yes' vendor='IBM'>z10EC.3</model> + <model usable='yes' vendor='IBM'>z14-base</model> + <model usable='yes' vendor='IBM'>z990.4-base</model> + <model usable='yes' vendor='IBM'>z10EC.3-base</model> + <model usable='yes' vendor='IBM'>z10BC-base</model> + <model usable='yes' vendor='IBM'>z13-base</model> + <model usable='yes' vendor='IBM'>z990.3-base</model> + <model usable='yes' vendor='IBM'>zEC12.2-base</model> + <model usable='yes' vendor='IBM'>zBC12</model> + <model usable='yes' vendor='IBM'>z890.3-base</model> + <model usable='yes' vendor='IBM'>z990.5</model> + <model usable='yes' vendor='IBM'>gen15b</model> <model usable='yes' vendor='unknown'>qemu</model> </mode> </cpu> -- 2.31.1

2 2

[PATCH 1/1] Fix a trivial flake8 warning
by jshen28 10 Feb '23

10 Feb '23

Remove an unused '_' in file Signed-off-by: jshen28 <yshxxsjt715(a)163.com> --- tools/virt-qemu-qmp-proxy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/virt-qemu-qmp-proxy b/tools/virt-qemu-qmp-proxy index dfbaa1ff0c..2d9dd6495d 100755 --- a/tools/virt-qemu-qmp-proxy +++ b/tools/virt-qemu-qmp-proxy @@ -335,7 +335,7 @@ def main(): sock.bind(args.sockpath) sock.listen(1) - _ = QMPProxy(conn, dom, sock, args.verbose) + QMPProxy(conn, dom, sock, args.verbose) while True: libvirt.virEventRunDefaultImpl() -- 2.17.1

5 4

[PATCH 0/6] add support for pvpanic-pci device
by Kristina Hanicova 09 Feb '23

09 Feb '23

*** BLURB HERE *** Kristina Hanicova (6): qemu: introduce QEMU_CAPS_DEVICE_PANIC_PCI conf: add panic model 'pvpanic' tests: add test cases for device pvpanic-pci qemu: assign PCI address to device pvpanic-pci tests: add case for pvpanic-pci without address docs: document panic device 'pvpanic-pci' docs/formatdomain.rst | 1 + src/conf/domain_conf.c | 1 + src/conf/domain_conf.h | 1 + src/conf/schemas/domaincommon.rng | 1 + src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 19 +++++ src/qemu/qemu_domain_address.c | 34 ++++++++- src/qemu/qemu_validate.c | 16 +++++ .../caps_6.0.0.aarch64.xml | 1 + .../caps_6.0.0.x86_64.xml | 1 + .../caps_6.1.0.x86_64.xml | 1 + .../caps_6.2.0.aarch64.xml | 1 + .../qemucapabilitiesdata/caps_6.2.0.ppc64.xml | 1 + .../caps_6.2.0.x86_64.xml | 1 + .../caps_7.0.0.aarch64.xml | 1 + .../qemucapabilitiesdata/caps_7.0.0.ppc64.xml | 1 + .../caps_7.0.0.x86_64.xml | 1 + .../qemucapabilitiesdata/caps_7.1.0.ppc64.xml | 1 + .../caps_7.1.0.x86_64.xml | 1 + .../caps_7.2.0.x86_64.xml | 1 + .../caps_8.0.0.riscv64.xml | 1 + .../caps_8.0.0.x86_64.xml | 1 + .../pvpanic-pci-aarch64.aarch64-latest.args | 43 ++++++++++++ .../qemuxml2argvdata/pvpanic-pci-aarch64.xml | 20 ++++++ ...invalid-address-aarch64.aarch64-latest.err | 1 + .../pvpanic-pci-invalid-address-aarch64.xml | 20 ++++++ ...pci-no-address-aarch64.aarch64-latest.args | 41 +++++++++++ .../pvpanic-pci-no-address-aarch64.xml | 18 +++++ .../pvpanic-pci-x86_64.x86_64-latest.args | 43 ++++++++++++ tests/qemuxml2argvdata/pvpanic-pci-x86_64.xml | 31 +++++++++ tests/qemuxml2argvtest.c | 4 ++ .../pvpanic-pci-aarch64.aarch64-latest.xml | 63 +++++++++++++++++ ...-pci-no-address-aarch64.aarch64-latest.xml | 53 ++++++++++++++ .../pvpanic-pci-x86_64.x86_64-latest.xml | 69 +++++++++++++++++++ tests/qemuxml2xmltest.c | 4 ++ 36 files changed, 499 insertions(+), 1 deletion(-) create mode 100644 tests/qemuxml2argvdata/pvpanic-pci-aarch64.aarch64-latest.args create mode 100644 tests/qemuxml2argvdata/pvpanic-pci-aarch64.xml create mode 100644 tests/qemuxml2argvdata/pvpanic-pci-invalid-address-aarch64.aarch64-latest.err create mode 100644 tests/qemuxml2argvdata/pvpanic-pci-invalid-address-aarch64.xml create mode 100644 tests/qemuxml2argvdata/pvpanic-pci-no-address-aarch64.aarch64-latest.args create mode 100644 tests/qemuxml2argvdata/pvpanic-pci-no-address-aarch64.xml create mode 100644 tests/qemuxml2argvdata/pvpanic-pci-x86_64.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/pvpanic-pci-x86_64.xml create mode 100644 tests/qemuxml2xmloutdata/pvpanic-pci-aarch64.aarch64-latest.xml create mode 100644 tests/qemuxml2xmloutdata/pvpanic-pci-no-address-aarch64.aarch64-latest.xml create mode 100644 tests/qemuxml2xmloutdata/pvpanic-pci-x86_64.x86_64-latest.xml -- 2.39.1

5 21

[PATCH V2 0/4] migration: add qemu parallel migration options
by Jiang Jiacheng 09 Feb '23

09 Feb '23

Add qemu parallel migration options to set multifd-compression multifd-zlib-level and multifd-zstd-level. These parameters has been supported by QEMU since 5.0. v2 of: https://listman.redhat.com/archives/libvir-list/2023-January/237088.html diff to v1: * remove VIR_MIGRATE_PARAM_PARALLEL_COMPRESSION and related message * support to reuse VIR_MIGRATE_PARAM_COMPRESSION to set parallel migration compress method * update commit message Jiang Jiacheng (4): Add public API for parallel compression method qemu: Add qemu parallel migration parameters qemu: support set parallel migration compression method virsh: Add migrate options to set parallel compress level docs/manpages/virsh.rst | 22 ++++--- include/libvirt/libvirt-domain.h | 24 +++++++- src/qemu/qemu_migration.h | 2 + src/qemu/qemu_migration_params.c | 100 ++++++++++++++++++++++++++++++- src/qemu/qemu_migration_params.h | 3 + tools/virsh-domain.c | 26 ++++++++ 6 files changed, 166 insertions(+), 11 deletions(-) -- 2.33.0

3 14

[PATCH] qemuProcessRefreshDisks: Don't skip filling of disk information if tray state didn't change
by Peter Krempa 09 Feb '23

09 Feb '23

Commit 5ef2582646eb98 added emitting of even when refreshign disk state, where it wanted to avoid sending the event if disk state didn't change. This was achieved by using 'continue' in the loop filling the information. Unfortunately this skips extraction of whether the device has a tray which is propagated into internal structures, which in turn broke cdrom media change as the code thought there's no tray for the device. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2166411 Fixes: 5ef2582646eb98af208ce37355f82bdef39931fa Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/qemu/qemu_process.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index e96b7689a3..59aa3f02aa 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -8711,16 +8711,13 @@ qemuProcessRefreshDisks(virDomainObj *vm, continue; if (info->removable) { - virObjectEvent *event = NULL; + bool emitEvent = info->tray_open != disk->tray_status; int reason; if (info->empty) virDomainDiskEmptySource(disk); if (info->tray) { - if (info->tray_open == disk->tray_status) - continue; - if (info->tray_open) { reason = VIR_DOMAIN_EVENT_TRAY_CHANGE_OPEN; disk->tray_status = VIR_DOMAIN_DISK_TRAY_OPEN; @@ -8729,8 +8726,10 @@ qemuProcessRefreshDisks(virDomainObj *vm, disk->tray_status = VIR_DOMAIN_DISK_TRAY_CLOSED; } - event = virDomainEventTrayChangeNewFromObj(vm, disk->info.alias, reason); - virObjectEventStateQueue(driver->domainEventState, event); + if (emitEvent) { + virObjectEvent *event = virDomainEventTrayChangeNewFromObj(vm, disk->info.alias, reason); + virObjectEventStateQueue(driver->domainEventState, event); + } } } -- 2.39.1

3 2

[PATCH] remote_driver: Work around broken clang
by Michal Privoznik 09 Feb '23

09 Feb '23

In recent commit of v9.0.0-191-gc71c159248 I've introduced remoteConnectFormatURI() function and in the function @query variable. Even though, the variable is used, clang-13 fails to see it. Surprisingly, never clang is not affected. Fortunately, swapping the order in which variables are set makes clang happy again. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/remote/remote_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 58cd0abe8c..a4c60be3d7 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -712,7 +712,7 @@ remoteConnectFormatURI(virURI *uri, virURIParamsSetIgnore(uri, false, names); } - query = tmpuri.query = virURIFormatParams(uri); + tmpuri.query = query = virURIFormatParams(uri); ret = virURIFormat(&tmpuri); -- 2.39.1

2 1

[PATCH v2] Revert ".gitignore: Ignore cscope and other *tags files"
by Martin Kletzander 08 Feb '23

08 Feb '23

This reverts commit f2d379e7cb802f922409c35e4831ee52a2162486. Any tool-related ignores should go to user's global ignore file or the user's local exclude file which is per-project. See git-config(1) and gitignore(5) for more details. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- .gitignore | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 61ea7779b02b..469539134280 100644 --- a/.gitignore +++ b/.gitignore @@ -19,17 +19,7 @@ __pycache__/ # libvirt related ignores /build/ /ci/scratch/ - -# *tags and cscope files -/GPATH -/GRTAGS -/GTAGS -/TAGS -/cscope.files -/cscope.in.out -/cscope.out -/cscope.po.out -/tags +tags # clangd related ignores .clangd -- 2.39.1

2 2

[PATCH v2 0/8] remote: Pass 'mode' and 'socket' URI parameters to virt-ssh-helper
by Michal Privoznik 08 Feb '23

08 Feb '23

v2 of: https://listman.redhat.com/archives/libvir-list/2023-February/237540.html diff to v1: - Dropped "remote_driver: Expose EXTRACT_URI_ARG_* macros" patch - Dropped "src: Unify URI params parsing" patch - Reworked couple of patches as a result of that - Reworded couple of commit messages Michal Prívozník (8): viruri: Search params case insensitively Drop checks for virURIFormat() retval doRemoteOpen(): Rename 'failed' label to 'error' virt-ssh-helper: Accept ?mode= in connection URI virt-ssh-helper: Accept ?socket= in connection URI remote_driver: Move URI re-generation into a function viruri: Introduce virURIParamsSetIgnore() remote: Pass 'mode' and 'socket' URI parameters to virt-ssh-helper src/admin/libvirt-admin.c | 6 +- src/libvirt-host.c | 10 +-- src/libvirt_private.syms | 1 + src/qemu/qemu_block.c | 3 +- src/qemu/qemu_migration.c | 3 +- src/remote/remote_driver.c | 114 ++++++++++++++++---------- src/remote/remote_ssh_helper.c | 32 ++++++-- src/storage/storage_backend_gluster.c | 6 +- src/util/viruri.c | 37 ++++++++- src/util/viruri.h | 2 + tests/viruritest.c | 3 +- 11 files changed, 139 insertions(+), 78 deletions(-) -- 2.39.1

2 11

[libvirt PATCH] ci: Test with latest Avocado again
by Erik Skultety 08 Feb '23

08 Feb '23

Test with the following fix: https://github.com/avocado-framework/avocado/pull/5567/commits Signed-off-by: Erik Skultety <eskultet(a)redhat.com> --- The corresponding change in TCK needed for this was already merged: https://gitlab.com/libvirt/libvirt-tck/-/merge_requests/37 Here's a relevant pipeline with the change applied: https://gitlab.com/eskultety/libvirt/-/pipelines/770989394 Worth noting that because the change in TCK about Avocado wasn't backwards compatible, we need to merge this one soon otherwise the next scheduled CI will fail. ci/integration-template.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/integration-template.yml b/ci/integration-template.yml index 9141d5cedf..efd04b76c1 100644 --- a/ci/integration-template.yml +++ b/ci/integration-template.yml @@ -28,7 +28,7 @@ - sudo dnf install -y libvirt-rpms/* libvirt-perl-rpms/* libvirt-python-rpms/* # Avocado >98.0 fails with the nwfilter TCK tests, so stick with 98.0 for now - - sudo pip3 install --prefix=/usr avocado-framework==98.0 + - sudo pip3 install --prefix=/usr avocado-framework .enable-core-dumps: &enable-core-dumps -- 2.39.1

2 1

[PATCH 1/1] qemu: allow changing disk driver parameters while blockcopying
by jshen28 08 Feb '23

08 Feb '23

QEMU blockdev allows to configure cachemode, discard and detect-zeroes for blockdev-add. The benefit of allowing to change cachemode is copying a shared storage (RBD, writeback) to a local device mapping (SAN, none cache) and still allows live migration. Allowing changing detect-zeroes could be beneficial while copying from SAN to RBD without taking too much space. Signed-off-by: jshen28 <yshxxsjt715(a)163.com> --- src/conf/domain_conf.c | 11 +++++++++++ src/conf/storage_source_conf.h | 6 +++--- src/qemu/qemu_blockjob.c | 13 +++++++++++++ src/qemu/qemu_driver.c | 14 ++++++++++++++ 4 files changed, 41 insertions(+), 3 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index ff1c78ecd1..0533a770c3 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -13962,6 +13962,17 @@ virDomainDiskDefParseSource(const char *xmlStr, if ((driverNode = virXPathNode("./driver", ctxt))) { if (virDomainDiskDefDriverSourceParseXML(src, driverNode, ctxt) < 0) return NULL; + if (virXMLPropEnum(driverNode, "cache", virDomainDiskCacheTypeFromString, + VIR_XML_PROP_NONE, &src->cachemode) < 0) + return NULL; + if (virXMLPropEnum(driverNode, "detect_zeroes", + virDomainDiskDetectZeroesTypeFromString, + VIR_XML_PROP_NONE, &src->detect_zeroes) < 0) + return NULL; + if (virXMLPropEnum(driverNode, "discard", + virDomainDiskDiscardTypeFromString, + VIR_XML_PROP_NONE, &src->discard) < 0) + return NULL; } if (virStorageSourceIsEmpty(src)) { diff --git a/src/conf/storage_source_conf.h b/src/conf/storage_source_conf.h index 14a6825d54..bed3b6570d 100644 --- a/src/conf/storage_source_conf.h +++ b/src/conf/storage_source_conf.h @@ -392,9 +392,9 @@ struct _virStorageSource { * These instances are currently just copies from the parent definition and * are not mapped back to the XML */ int iomode; /* enum virDomainDiskIo */ - int cachemode; /* enum virDomainDiskCache */ - int discard; /* enum virDomainDiskDiscard */ - int detect_zeroes; /* enum virDomainDiskDetectZeroes */ + unsigned int cachemode; /* enum virDomainDiskCache */ + unsigned int discard; /* enum virDomainDiskDiscard */ + unsigned int detect_zeroes; /* enum virDomainDiskDetectZeroes */ bool floppyimg; /* set to true if the storage source is going to be used as a source for floppy drive */ diff --git a/src/qemu/qemu_blockjob.c b/src/qemu/qemu_blockjob.c index cb2d05d71d..f6b85772be 100644 --- a/src/qemu/qemu_blockjob.c +++ b/src/qemu/qemu_blockjob.c @@ -1240,6 +1240,19 @@ qemuBlockJobProcessEventConcludedCopyPivot(virQEMUDriver *driver, qemuBlockJobEventProcessConcludedRemoveChain(driver, vm, asyncJob, job->disk->src); virObjectUnref(job->disk->src); job->disk->src = g_steal_pointer(&job->disk->mirror); + + /* reset cachemode, discard, detect_zeroes to reflect the enforced setting */ + if (job->disk->src->cachemode) { + job->disk->cachemode = job->disk->src->cachemode; + } + + if (job->disk->src->discard) { + job->disk->discard = job->disk->src->discard; + } + + if (job->disk->src->detect_zeroes) { + job->disk->detect_zeroes = job->disk->src->detect_zeroes; + } } diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 6154fe9bfe..4058cdfafe 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -14552,6 +14552,7 @@ qemuDomainBlockCopyCommon(virDomainObj *vm, bool existing = mirror_reuse; qemuBlockJobData *job = NULL; g_autoptr(virStorageSource) mirror = mirrorsrc; + g_autoptr(virStorageSource) mirror_cpy = virStorageSourceCopy(mirror, false); bool supports_create = false; bool supports_access = false; bool supports_detect = false; @@ -14725,6 +14726,19 @@ qemuDomainBlockCopyCommon(virDomainObj *vm, * to modify all callers of 'qemuDomainPrepareStorageSourceBlockdev' */ mirror->detect_zeroes = disk->detect_zeroes; + /* respect input disk configuration */ + if (mirror_cpy->detect_zeroes) { + mirror->detect_zeroes = mirror_cpy->detect_zeroes; + } + + if (mirror_cpy->cachemode) { + mirror->cachemode = mirror_cpy->cachemode; + } + + if (mirror_cpy->discard) { + mirror->discard = mirror_cpy->discard; + } + /* If reusing an external image that includes a backing file but the user * did not enumerate the chain in the XML we need to detect the chain */ if (mirror_reuse && -- 2.17.1

1 0

[PATCH] qemu_process: Produce better debug message wrt domain namespaces
by Michal Privoznik 08 Feb '23

08 Feb '23

When going through debug log of a domain startup process, one can meet the following line: debug : qemuProcessLaunch:7668 : Building mount namespace But this is in fact wrong. Firstly, domain namespaces are just enabled in domain's privateData. Secondly, the debug message says nothing about actual state of namespace - whether it was enabled or not. Therefore, move the debug printing into qemuProcessEnableDomainNamespaces() and tweak it so that the actual value is reflected. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_process.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index e96b7689a3..68ced01ab2 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -7378,11 +7378,17 @@ qemuProcessEnableDomainNamespaces(virQEMUDriver *driver, virDomainObj *vm) { g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver); + const char *state = "disabled"; if (virBitmapIsBitSet(cfg->namespaces, QEMU_DOMAIN_NS_MOUNT) && qemuDomainEnableNamespace(vm, QEMU_DOMAIN_NS_MOUNT) < 0) return -1; + if (qemuDomainNamespaceEnabled(vm, QEMU_DOMAIN_NS_MOUNT)) + state = "enabled"; + + VIR_DEBUG("Mount namespace for domain name=%s are %s", + vm->def->name, state); return 0; } @@ -7706,8 +7712,6 @@ qemuProcessLaunch(virConnectPtr conn, qemuDomainLogContextMarkPosition(logCtxt); - VIR_DEBUG("Building mount namespace"); - if (qemuProcessEnableDomainNamespaces(driver, vm) < 0) goto cleanup; -- 2.39.1

3 2

[libvirt PATCH v4 00/31] Use nbdkit for http/ftp/ssh network drives in libvirt
by Jonathon Jongsma 07 Feb '23

07 Feb '23

This is the fourth version of this patch series. See https://bugzilla.redhat.com/show_bug.cgi?id=2016527 for more information about the goal, but the summary is that RHEL does not want to ship the qemu storage plugins for curl and ssh. Handling them outside of the qemu process provides several advantages such as reduced attack surface and stability. See previous series for more info: https://listman.redhat.com/archives/libvir-list/2022-October/235052.html Note that gitlab CI will not work for this series without changes to the ci definitions due to the addition of libnbd dependency. Changes in v4: - Added new schema that makes ssh disks actually useable with nbdkit. - supports authentication with password or ssh key - enable both http and https protocols together - improve logging and error reporting - adds a dependency on libnbd to validate the storage before launching qemu - nbdkit output logged to a separate file - add missing support for hotplug - lots of smaller changes from Peter's review Jonathon Jongsma (31): schema: allow 'ssh' as a protocol for network disks qemu: Add functions for determining nbdkit availability qemu: expand nbdkit capabilities util: Allow virFileCache data to be any GObject qemu: implement basic virFileCache for nbdkit caps qemu: implement persistent file cache for nbdkit caps qemu: use file cache for nbdkit caps qemu: Add qemuNbdkitProcess qemu: query nbdkit module dir from binary qemu: add functions to start and stop nbdkit qemu: remove unused 'mode' param from qemuDomainLogContextNew() Generalize qemuDomainLogContextNew() qemu: Extract qemuDomainLogContext into a new file qemu: move qemuProcessReadLog() to qemuLogContext qemu: log error output from nbdkit tests: add ability to test various nbdkit capabilities qemu: split qemuDomainSecretStorageSourcePrepare qemu: include nbdkit state in private xml qemu: pass sensitive data to nbdkit via pipe qemu: use nbdkit to serve network disks if available util: make virCommandSetSendBuffer testable tests: add tests for nbdkit invocation qemu: add test for authenticating a https network disk qemu: Monitor nbdkit process for exit qemu: try to connect to nbdkit early to detect errors schema: add password configuration for ssh disk qemu: implement password auth for ssh disks with nbdkit schema: add configuration for host verification of ssh disks qemu: implement knownHosts for ssh disks with nbdkit schema: add keyfile configuration for ssh disks qemu: implement keyfile auth for ssh disk with nbdkit build-aux/syntax-check.mk | 2 +- docs/formatdomain.rst | 41 +- meson.build | 14 + meson_options.txt | 1 + po/POTFILES | 2 + src/conf/domain_conf.c | 32 + src/conf/schemas/domaincommon.rng | 53 + src/conf/storage_source_conf.c | 3 + src/conf/storage_source_conf.h | 6 +- src/libvirt_private.syms | 1 + src/qemu/meson.build | 3 + src/qemu/qemu_block.c | 162 +- src/qemu/qemu_conf.c | 22 + src/qemu/qemu_conf.h | 6 + src/qemu/qemu_domain.c | 415 ++---- src/qemu/qemu_domain.h | 39 +- src/qemu/qemu_driver.c | 3 + src/qemu/qemu_extdevice.c | 56 + src/qemu/qemu_hotplug.c | 7 + src/qemu/qemu_logcontext.c | 329 ++++ src/qemu/qemu_logcontext.h | 41 + src/qemu/qemu_nbdkit.c | 1326 +++++++++++++++++ src/qemu/qemu_nbdkit.h | 116 ++ src/qemu/qemu_nbdkitpriv.h | 31 + src/qemu/qemu_process.c | 119 +- src/util/vircommand.c | 17 +- src/util/vircommand.h | 8 + src/util/vircommandpriv.h | 4 + src/util/virfilecache.c | 14 +- src/util/virfilecache.h | 2 +- tests/meson.build | 1 + tests/qemublocktest.c | 2 +- ...w2-invalid.json => network-ssh-qcow2.json} | 0 ...cow2-invalid.xml => network-ssh-qcow2.xml} | 0 .../disk-cdrom-network.args.disk0 | 6 + .../disk-cdrom-network.args.disk1 | 8 + .../disk-cdrom-network.args.disk1.pipe.778 | 1 + .../disk-cdrom-network.args.disk2 | 8 + .../disk-cdrom-network.args.disk2.pipe.780 | 1 + .../disk-network-http.args.disk0 | 6 + .../disk-network-http.args.disk1 | 5 + .../disk-network-http.args.disk2 | 6 + .../disk-network-http.args.disk2.pipe.778 | 1 + .../disk-network-http.args.disk3 | 7 + .../disk-network-http.args.disk3.pipe.780 | 1 + ...work-source-curl-nbdkit-backing.args.disk0 | 7 + ...ce-curl-nbdkit-backing.args.disk0.pipe.778 | 1 + .../disk-network-source-curl.args.disk0 | 7 + ...sk-network-source-curl.args.disk0.pipe.778 | 1 + .../disk-network-source-curl.args.disk1 | 9 + ...sk-network-source-curl.args.disk1.pipe.780 | 1 + ...sk-network-source-curl.args.disk1.pipe.782 | 1 + .../disk-network-source-curl.args.disk2 | 7 + ...sk-network-source-curl.args.disk2.pipe.782 | 1 + ...sk-network-source-curl.args.disk2.pipe.784 | 1 + .../disk-network-source-curl.args.disk3 | 6 + .../disk-network-source-curl.args.disk4 | 6 + .../disk-network-ssh-key.args.disk0 | 10 + .../disk-network-ssh-password.args.disk0 | 9 + ...k-network-ssh-password.args.disk0.pipe.778 | 1 + .../disk-network-ssh.args.disk0 | 7 + .../disk-network-ssh.args.disk1 | 8 + .../disk-network-ssh.args.disk1.pipe.778 | 1 + .../disk-network-ssh.args.disk2 | 9 + tests/qemunbdkittest.c | 302 ++++ tests/qemustatusxml2xmldata/modern-in.xml | 4 + ...sk-cdrom-network-nbdkit.x86_64-latest.args | 42 + .../disk-cdrom-network-nbdkit.xml | 1 + ...isk-network-http-nbdkit.x86_64-latest.args | 45 + .../disk-network-http-nbdkit.xml | 1 + ...rce-curl-nbdkit-backing.x86_64-latest.args | 38 + ...isk-network-source-curl-nbdkit-backing.xml | 45 + ...work-source-curl-nbdkit.x86_64-latest.args | 50 + .../disk-network-source-curl-nbdkit.xml | 1 + ...isk-network-source-curl.x86_64-latest.args | 54 + .../disk-network-source-curl.xml | 74 + .../qemuxml2argvdata/disk-network-ssh-key.xml | 33 + ...disk-network-ssh-nbdkit.x86_64-latest.args | 36 + .../disk-network-ssh-nbdkit.xml | 1 + ...sk-network-ssh-password.x86_64-latest.args | 36 + .../disk-network-ssh-password.xml | 35 + .../disk-network-ssh.x86_64-latest.args | 36 + tests/qemuxml2argvdata/disk-network-ssh.xml | 32 + tests/qemuxml2argvtest.c | 19 + tests/testutilsqemu.c | 27 + tests/testutilsqemu.h | 5 + 86 files changed, 3463 insertions(+), 475 deletions(-) create mode 100644 src/qemu/qemu_logcontext.c create mode 100644 src/qemu/qemu_logcontext.h create mode 100644 src/qemu/qemu_nbdkit.c create mode 100644 src/qemu/qemu_nbdkit.h create mode 100644 src/qemu/qemu_nbdkitpriv.h rename tests/qemublocktestdata/imagecreate/{network-ssh-qcow2-invalid.json => network-ssh-qcow2.json} (100%) rename tests/qemublocktestdata/imagecreate/{network-ssh-qcow2-invalid.xml => network-ssh-qcow2.xml} (100%) create mode 100644 tests/qemunbdkitdata/disk-cdrom-network.args.disk0 create mode 100644 tests/qemunbdkitdata/disk-cdrom-network.args.disk1 create mode 100644 tests/qemunbdkitdata/disk-cdrom-network.args.disk1.pipe.778 create mode 100644 tests/qemunbdkitdata/disk-cdrom-network.args.disk2 create mode 100644 tests/qemunbdkitdata/disk-cdrom-network.args.disk2.pipe.780 create mode 100644 tests/qemunbdkitdata/disk-network-http.args.disk0 create mode 100644 tests/qemunbdkitdata/disk-network-http.args.disk1 create mode 100644 tests/qemunbdkitdata/disk-network-http.args.disk2 create mode 100644 tests/qemunbdkitdata/disk-network-http.args.disk2.pipe.778 create mode 100644 tests/qemunbdkitdata/disk-network-http.args.disk3 create mode 100644 tests/qemunbdkitdata/disk-network-http.args.disk3.pipe.780 create mode 100644 tests/qemunbdkitdata/disk-network-source-curl-nbdkit-backing.args.disk0 create mode 100644 tests/qemunbdkitdata/disk-network-source-curl-nbdkit-backing.args.disk0.pipe.778 create mode 100644 tests/qemunbdkitdata/disk-network-source-curl.args.disk0 create mode 100644 tests/qemunbdkitdata/disk-network-source-curl.args.disk0.pipe.778 create mode 100644 tests/qemunbdkitdata/disk-network-source-curl.args.disk1 create mode 100644 tests/qemunbdkitdata/disk-network-source-curl.args.disk1.pipe.780 create mode 100644 tests/qemunbdkitdata/disk-network-source-curl.args.disk1.pipe.782 create mode 100644 tests/qemunbdkitdata/disk-network-source-curl.args.disk2 create mode 100644 tests/qemunbdkitdata/disk-network-source-curl.args.disk2.pipe.782 create mode 100644 tests/qemunbdkitdata/disk-network-source-curl.args.disk2.pipe.784 create mode 100644 tests/qemunbdkitdata/disk-network-source-curl.args.disk3 create mode 100644 tests/qemunbdkitdata/disk-network-source-curl.args.disk4 create mode 100644 tests/qemunbdkitdata/disk-network-ssh-key.args.disk0 create mode 100644 tests/qemunbdkitdata/disk-network-ssh-password.args.disk0 create mode 100644 tests/qemunbdkitdata/disk-network-ssh-password.args.disk0.pipe.778 create mode 100644 tests/qemunbdkitdata/disk-network-ssh.args.disk0 create mode 100644 tests/qemunbdkitdata/disk-network-ssh.args.disk1 create mode 100644 tests/qemunbdkitdata/disk-network-ssh.args.disk1.pipe.778 create mode 100644 tests/qemunbdkitdata/disk-network-ssh.args.disk2 create mode 100644 tests/qemunbdkittest.c create mode 100644 tests/qemuxml2argvdata/disk-cdrom-network-nbdkit.x86_64-latest.args create mode 120000 tests/qemuxml2argvdata/disk-cdrom-network-nbdkit.xml create mode 100644 tests/qemuxml2argvdata/disk-network-http-nbdkit.x86_64-latest.args create mode 120000 tests/qemuxml2argvdata/disk-network-http-nbdkit.xml create mode 100644 tests/qemuxml2argvdata/disk-network-source-curl-nbdkit-backing.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/disk-network-source-curl-nbdkit-backing.xml create mode 100644 tests/qemuxml2argvdata/disk-network-source-curl-nbdkit.x86_64-latest.args create mode 120000 tests/qemuxml2argvdata/disk-network-source-curl-nbdkit.xml create mode 100644 tests/qemuxml2argvdata/disk-network-source-curl.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/disk-network-source-curl.xml create mode 100644 tests/qemuxml2argvdata/disk-network-ssh-key.xml create mode 100644 tests/qemuxml2argvdata/disk-network-ssh-nbdkit.x86_64-latest.args create mode 120000 tests/qemuxml2argvdata/disk-network-ssh-nbdkit.xml create mode 100644 tests/qemuxml2argvdata/disk-network-ssh-password.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/disk-network-ssh-password.xml create mode 100644 tests/qemuxml2argvdata/disk-network-ssh.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/disk-network-ssh.xml -- 2.39.0

2 46

[PATCH] qemu_namespace: Deal with nested mounts when umount()-ing /dev
by Michal Privoznik 07 Feb '23

07 Feb '23

In one of recent commits (v9.0.0-rc1~106) I've made our QEMU namespace code umount the original /dev. One of the reasons was enhanced security, because previously we just mounted a tmpfs over the original /dev. Thus a malicious QEMU could just umount("/dev") and it would get to the original /dev with all nodes. Now, on some systems this introduced a regression: failed to umount devfs on /dev: Device or resource busy But how this could be? We've moved all file systems mounted under /dev to a temporary location. Or have we? As it turns out, not quite. If there are two file systems mounted on the same target, e.g. like this: mount -t tmpfs tmpfs /dev/shm/ && mount -t tmpfs tmpfs /dev/shm/ then only the top most (i.e. the last one) is moved. See qemuDomainUnshareNamespace() for more info. Now, we could enhance our code to deal with these "doubled" mount points. Or, since it is the top most file system that is accessible anyways (and this one is preserved), we can umount("/dev") in a recursive fashion. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2167302 Fixes: 379c0ce4bfed8733dfbde557c359eecc5474ce38 Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_namespace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_namespace.c b/src/qemu/qemu_namespace.c index 5769a4dfe0..5fc043bd62 100644 --- a/src/qemu/qemu_namespace.c +++ b/src/qemu/qemu_namespace.c @@ -777,7 +777,7 @@ qemuDomainUnshareNamespace(virQEMUDriverConfig *cfg, } #if defined(__linux__) - if (umount("/dev") < 0) { + if (umount2("/dev", MNT_DETACH) < 0) { virReportSystemError(errno, "%s", _("failed to umount devfs on /dev")); return -1; } -- 2.39.1

2 1

[PATCH 00/10] remote: Pass 'mode' and 'socket' URI parameters to virt-ssh-helper
by Michal Privoznik 07 Feb '23

07 Feb '23

The first couple of patches are cleanups, mostly. The last 5 patches are the important ones. Now, the fix I went with in the 10/10 is to format URI anew, just for the virt-ssh-helper's sake. I did not want to touch @name as it's passed to sub-daemon's .open() method. If desired, I can change the @name variable instead as it seems that no driver relies on ?mode or ?socket (they couldn't anyway). Thoughts? Michal Prívozník (10): viruri: Search params case insensitively Drop checks for virURIFormat() retval doRemoteOpen(): Rename 'failed' label to 'error' remote_driver: Expose EXTRACT_URI_ARG_* macros src: Unify URI params parsing virt-ssh-helper: Accept ?mode= in connection URI virt-ssh-helper: Accept ?socket= in connection URI remote_driver: Move URI re-generation into a function viruri: Introduce virURIParamsSetIgnore() remote: Pass 'mode' and 'socket' URI parameters to virt-ssh-helper po/POTFILES | 1 + src/admin/libvirt-admin.c | 21 ++-- src/esx/esx_util.c | 96 ++++++++-------- src/hyperv/hyperv_util.c | 30 +++-- src/libvirt-host.c | 10 +- src/libvirt_private.syms | 1 + src/qemu/qemu_block.c | 3 +- src/qemu/qemu_migration.c | 24 ++-- src/remote/remote_driver.c | 158 +++++++++++++------------- src/remote/remote_ssh_helper.c | 27 ++++- src/storage/storage_backend_gluster.c | 6 +- src/util/virauth.c | 12 +- src/util/viruri.c | 24 +++- src/util/viruri.h | 37 ++++++ tests/viruritest.c | 3 +- 15 files changed, 245 insertions(+), 208 deletions(-) -- 2.39.1

4 22

[PATCH] qemu: Jump to cleanup label on umount failure
by Jim Fehlig 07 Feb '23

07 Feb '23

Similar to other error paths in qemuDomainUnshareNamespace(), jump to the cleanup label on umount error instead of directly returning -1. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- I noticed this while looking at a bug report containing the error. ATM I'm not sure why the umount failed, but have asked for more info in the bug https://bugzilla.opensuse.org/show_bug.cgi?id=1207889 src/qemu/qemu_namespace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_namespace.c b/src/qemu/qemu_namespace.c index 5769a4dfe0..833313d5a6 100644 --- a/src/qemu/qemu_namespace.c +++ b/src/qemu/qemu_namespace.c @@ -779,7 +779,7 @@ qemuDomainUnshareNamespace(virQEMUDriverConfig *cfg, #if defined(__linux__) if (umount("/dev") < 0) { virReportSystemError(errno, "%s", _("failed to umount devfs on /dev")); - return -1; + goto cleanup; } #endif /* !defined(__linux__) */ -- 2.39.1

2 1

[PATCH 0/2] virhostdevtest: Initialize hostdev @subsys
by Michal Privoznik 06 Feb '23

06 Feb '23

While the first one qualifies to be pushed as trivial, the second less so. I'll wait a while and if there's no reply I'll just push these, as the build is currently broken. Michal Prívozník (2): virhostdevtest: Initialize hostdev @subsys virhostdevtest: Decrease possibility of uninitialized @subsys tests/virhostdevtest.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) -- 2.39.1

3 4

[PATCH] Revert ".gitignore: Ignore cscope and other *tags files"
by Martin Kletzander 06 Feb '23

06 Feb '23

This reverts commit f2d379e7cb802f922409c35e4831ee52a2162486. On top of that it also removes the `/tags` file because we don't even have the `make tags` target any more. Any tool-related ignores should go to user's global ignore file or the user's local exclude file which is per-project. See git-config(1) and gitignore(5) for more details. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- .gitignore | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/.gitignore b/.gitignore index 61ea7779b02b..0898c0d29f3c 100644 --- a/.gitignore +++ b/.gitignore @@ -20,17 +20,6 @@ __pycache__/ /build/ /ci/scratch/ -# *tags and cscope files -/GPATH -/GRTAGS -/GTAGS -/TAGS -/cscope.files -/cscope.in.out -/cscope.out -/cscope.po.out -/tags - # clangd related ignores .clangd compile_commands.json -- 2.39.1

2 4

[PATCH v3 0/5] logging: add log cleanup for obsolete domains
by Oleg Vasilev 06 Feb '23

06 Feb '23

Presently, logs from deleted domains remain forever. Particular motivation comes from the case when libguestfs has repeatedly created transient VMs, which in turn created plenty of logs. This takes up space and lots of files troubles filesystem navigation. More motivation in [1]. Patch solving same problem in [2]. Changes in v3: codestyle cleanup, minor fixes Changes in v2: substantial rework according to Martin Kletzander's comments v1: https://www.mail-archive.com/libvir-list@redhat.com/msg233754.html v2: https://www.spinics.net/linux/fedora/libvir/msg236081.html [1]: https://listman.redhat.com/archives/libvir-list/2022-February/228149.html [2]: https://listman.redhat.com/archives/libvir-list/2022-February/msg00865.html CC: Martin Kletzander <mkletzan(a)redhat.com> Oleg Vasilev (5): logging: refactor to store config inside log handler logging: move virLogHandler to header logging: add configuration for future log cleaner logging: add log cleanup for obsolete domains logging: use the log cleaner po/POTFILES | 1 + src/logging/log_cleaner.c | 268 +++++++++++++++++++++++++++++++ src/logging/log_cleaner.h | 29 ++++ src/logging/log_daemon.c | 6 +- src/logging/log_daemon_config.c | 9 ++ src/logging/log_daemon_config.h | 3 + src/logging/log_handler.c | 64 +++----- src/logging/log_handler.h | 50 ++++-- src/logging/meson.build | 1 + src/logging/test_virtlogd.aug.in | 2 + src/logging/virtlogd.aug | 2 + src/logging/virtlogd.conf | 14 ++ 12 files changed, 391 insertions(+), 58 deletions(-) create mode 100644 src/logging/log_cleaner.c create mode 100644 src/logging/log_cleaner.h -- 2.39.1

3 10

[PATCH] .gitignore: Ignore cscope and other *tags files
by Martin Kletzander 06 Feb '23

06 Feb '23

Commit f7114e61dbc2 cleaned up way too much and now that I have cscope working again I noticed there are some files that ought to stay ignored. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- .gitignore | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 469539134280..61ea7779b02b 100644 --- a/.gitignore +++ b/.gitignore @@ -19,7 +19,17 @@ __pycache__/ # libvirt related ignores /build/ /ci/scratch/ -tags + +# *tags and cscope files +/GPATH +/GRTAGS +/GTAGS +/TAGS +/cscope.files +/cscope.in.out +/cscope.out +/cscope.po.out +/tags # clangd related ignores .clangd -- 2.39.1

5 6