Add qemu.conf options for audio workaround

Fix parsing certain USB sysfs files (bz 598272) Sanitize pool target paths (bz 494005) Add qemu.conf for clear emulator capabilities Prevent libvirtd inside a VM from breaking network access (bz 235961) Mention --all in 'virsh list' docs (bz 575512) Initscript fixes (bz 565238) List wireless interfaces via nodedev-list (bz 596928)
Fix nodedev XML conversion errors (bz 591262)
2010-06-17 17:42:36 +00:00 · 2010-05-18 18:49:49 +00:00 · 2010-04-20 19:39:41 +00:00 · 2010-03-22 15:09:54 +00:00 · 2010-03-05 17:11:45 +00:00 · 2010-03-05 16:59:20 +00:00
37 changed files with 2682 additions and 4255 deletions
@@ -1,31 +0,0 @@
-[suppress_function]
-symbol_version_regexp = LIBVIRT_PRIVATE.*
-soname_regexp = libvirt\\.so.*
-
-[suppress_function]
-symbol_version_regexp = LIBVIRT_ADMIN_PRIVATE.*
-soname_regexp = libvirt-admin\\.so.*
-
-[suppress_variable]
-symbol_version_regexp = LIBVIRT_PRIVATE.*
-soname_regexp = libvirt\\.so.*
-
-[suppress_variable]
-symbol_version_regexp = LIBVIRT_ADMIN_PRIVATE.*
-soname_regexp = libvirt-admin\\.so.*
-
-[suppress_function]
-symbol_version_regexp = .*
-soname_regexp = libvirt_storage_.*\\.so.*
-
-[suppress_variable]
-symbol_version_regexp = .*
-soname_regexp = libvirt_storage_.*\\.so.*
-
-[suppress_function]
-symbol_version_regexp = .*
-soname_regexp = libvirt_driver_.*\\.so.*
-
-[suppress_variable]
-symbol_version_regexp = .*
-soname_regexp = libvirt_driver_.*\\.so.*
@@ -0,0 +1,18 @@
+.build*.log
+*.rpm
+i686
+x86_64
+libvirt-*.tar.gz
+libvirt-0.6.0.tar.gz
+libvirt-0.6.1.tar.gz
+libvirt-0.6.2.tar.gz
+libvirt-0.6.3.tar.gz
+libvirt-0.6.4.tar.gz
+libvirt-0.6.5.tar.gz
+libvirt-0.7.0.tar.gz
+libvirt-0.7.1.tar.gz
+libvirt-0.7.2.tar.gz
+libvirt-0.7.3.tar.gz
+libvirt-0.7.4.tar.gz
+libvirt-0.7.5.tar.gz
+libvirt-0.7.6.tar.gz
@@ -1,5 +0,0 @@
-.build*.log
-*.rpm
-i686
-x86_64
-libvirt-*.tar.xz
@@ -1,31 +0,0 @@
-From 5629ebcb4234fde10fd9468d5fc5dd4947ed8677 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
-Date: Tue, 29 Apr 2025 15:49:10 +0100
-Subject: [PATCH] Fix mocking of virQEMUCapsProbeHVF function
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-From: Daniel P. Berrangé <berrange@redhat.com>
-
-Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
- src/qemu/qemu_capabilities.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
-index ea7c14daa9..488a1a058e 100644
--- a/src/qemu/qemu_capabilities.h
-+++ b/src/qemu/qemu_capabilities.h
-@@ -943,7 +943,7 @@ bool
- virQEMUCapsGetKVMSupportsSecureGuest(virQEMUCaps *qemuCaps) G_NO_INLINE;
- 
- bool
-virQEMUCapsProbeHVF(virQEMUCaps *qemuCaps) G_NO_INLINE;
-+virQEMUCapsProbeHVF(virQEMUCaps *qemuCaps) G_NO_INLINE __attribute__((noipa));
- 
- virArch virQEMUCapsArchFromString(const char *arch);
- const char *virQEMUCapsArchToString(virArch arch);
-- 
-2.49.0
-
@@ -1,85 +0,0 @@
-From 63a3d70697dc44ef2f8b40f7c8e9aa869227a7da Mon Sep 17 00:00:00 2001
-From: Jiang XueQian <jiangxueqian@gmail.com>
-Date: Sat, 18 Jan 2025 16:32:10 +0800
-Subject: [PATCH] nss: Skip empty files and avoid use of uninitialized value
-Content-type: text/plain
-
-JSON parser isn't called when reading empty files so `jerr` will be used
-uninitialized in the original code. Empty files appear when a network
-has no dhcp clients.
-
-This patch checks for such files and skip them.
-
-Fixes: a8d828c88bbdaf83ae78dc06cdd84d5667fcc424
-Signed-off-by: Jiang XueQian <jiangxueqian@gmail.com>
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
---
- tools/nss/libvirt_nss_leases.c | 9 +++++++--
- tools/nss/libvirt_nss_macs.c   | 9 +++++++--
- 2 files changed, 14 insertions(+), 4 deletions(-)
-
-diff --git a/tools/nss/libvirt_nss_leases.c b/tools/nss/libvirt_nss_leases.c
-index aea81bb56e..25ea6b0ce2 100644
--- a/tools/nss/libvirt_nss_leases.c
-+++ b/tools/nss/libvirt_nss_leases.c
-@@ -263,7 +263,7 @@ findLeases(const char *file,
-     enum json_tokener_error jerr;
-     int jsonflags = JSON_TOKENER_STRICT | JSON_TOKENER_VALIDATE_UTF8;
-     char line[1024];
-    ssize_t nreadTotal = 0;
-+    size_t nreadTotal = 0;
-     int rv;
- 
-     if ((fd = open(file, O_RDONLY)) < 0) {
-@@ -290,12 +290,17 @@ findLeases(const char *file,
-         jerr = json_tokener_get_error(tok);
-     } while (jerr == json_tokener_continue);
- 
-+    if (nreadTotal == 0) {
-+        ret = 0;
-+        goto cleanup;
-+    }
-+
-     if (jerr == json_tokener_continue) {
-         ERROR("Cannot parse %s: incomplete json found", file);
-         goto cleanup;
-     }
- 
-    if (nreadTotal > 0 && jerr != json_tokener_success) {
-+    if (jerr != json_tokener_success) {
-         ERROR("Cannot parse %s: %s", file, json_tokener_error_desc(jerr));
-         goto cleanup;
-     }
-diff --git a/tools/nss/libvirt_nss_macs.c b/tools/nss/libvirt_nss_macs.c
-index 23229a18f3..bac8c0e1bb 100644
--- a/tools/nss/libvirt_nss_macs.c
-+++ b/tools/nss/libvirt_nss_macs.c
-@@ -124,7 +124,7 @@ findMACs(const char *file,
-     json_tokener *tok = NULL;
-     enum json_tokener_error jerr;
-     int jsonflags = JSON_TOKENER_STRICT | JSON_TOKENER_VALIDATE_UTF8;
-    ssize_t nreadTotal = 0;
-+    size_t nreadTotal = 0;
-     int rv;
-     size_t i;
- 
-@@ -152,12 +152,17 @@ findMACs(const char *file,
-         jerr = json_tokener_get_error(tok);
-     } while (jerr == json_tokener_continue);
- 
-+    if (nreadTotal == 0) {
-+        ret = 0;
-+        goto cleanup;
-+    }
-+
-     if (jerr == json_tokener_continue) {
-         ERROR("Cannot parse %s: incomplete json found", file);
-         goto cleanup;
-     }
- 
-    if (nreadTotal > 0 && jerr != json_tokener_success) {
-+    if (jerr != json_tokener_success) {
-         ERROR("Cannot parse %s: %s", file, json_tokener_error_desc(jerr));
-         goto cleanup;
-     }
@@ -1,68 +0,0 @@
-From cd0de70e05475d5f4aa46e578fbb98033d38c06b Mon Sep 17 00:00:00 2001
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Mon, 16 Jun 2025 10:28:37 +0200
-Subject: [PATCH] qemu: Be more forgiving when acquiring QUERY job when
- formatting domain XML
-Content-type: text/plain
-
-In my previous commit of v11.0.0-rc1~115 I've made QEMU driver
-implementation for virDomainGetXMLDesc() (qemuDomainGetXMLDesc())
-acquire QERY job. See its commit message for more info. But this
-unfortunately broke apps witch fetch domain XML for incoming
-migration (like virt-manager). The reason is that for incoming
-migration the VIR_ASYNC_JOB_MIGRATION_IN async job is set, but
-the mask of allowed synchronous jobs is empty (because QEMU can't
-talk on monitor really). This makes virDomainObjBeginJob() fail
-which in turn makes qemuDomainGetXMLDesc() fail too.
-
-It makes sense for qemuDomainGetXMLDesc() to acquire the job
-(e.g. so that it's coherent with another thread that might be in
-the middle of a MODIFY job). But failure to dump XML may be
-treated as broken daemon (e.g. virt-manager does so).
-
-Therefore, still try to acquire the QUERY job (if job mask
-permits it) but, do not treat failure as an error.
-
-Fixes: 6cc93bf28842526be2fd596a607ebca796b7fb2e
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2369243
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
---
- src/qemu/qemu_driver.c | 10 +++++++---
- 1 file changed, 7 insertions(+), 3 deletions(-)
-
-diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
-index d2eddbd9ae..6bdeede2e8 100644
--- a/src/qemu/qemu_driver.c
-+++ b/src/qemu/qemu_driver.c
-@@ -6158,6 +6158,7 @@ static char
- {
-     virQEMUDriver *driver = dom->conn->privateData;
-     virDomainObj *vm;
-+    bool hasJob = false;
-     char *ret = NULL;
- 
-     virCheckFlags(VIR_DOMAIN_XML_COMMON_FLAGS | VIR_DOMAIN_XML_UPDATE_CPU,
-@@ -6169,8 +6170,10 @@ static char
-     if (virDomainGetXMLDescEnsureACL(dom->conn, vm->def, flags) < 0)
-         goto cleanup;
- 
-    if (virDomainObjBeginJob(vm, VIR_JOB_QUERY) < 0)
-        goto cleanup;
-+    if (virDomainNestedJobAllowed(vm->job, VIR_JOB_QUERY) &&
-+        virDomainObjBeginJob(vm, VIR_JOB_QUERY) >= 0) {
-+        hasJob = true;
-+    }
- 
-     qemuDomainUpdateCurrentMemorySize(vm);
- 
-@@ -6186,7 +6189,8 @@ static char
- 
-     ret = qemuDomainFormatXML(driver, vm, flags);
- 
-    virDomainObjEndJob(vm);
-+    if (hasJob)
-+        virDomainObjEndJob(vm);
- 
-  cleanup:
-     virDomainObjEndAPI(&vm);
@@ -1,94 +0,0 @@
-From 63e4cbd109374f44e8bd4f8d1af5e2a2c67611bc Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
-Date: Mon, 28 Apr 2025 11:42:13 +0100
-Subject: [PATCH] storage: stop hardcoding paths for mkfs, mount, umount
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-From: Daniel P. Berrangé <berrange@redhat.com>
-
-This was always undesirable but now causes problems on Fedora 42
-where at build time we detect a /sbin path but at runtime this
-will only exist on upgraded machines, not fresh installs.
-
-Reviewed-by: Peter Krempa <pkrempa@redhat.com>
-Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
- meson.build                      | 13 -------------
- src/storage/storage_backend_fs.c | 17 +++--------------
- 2 files changed, 3 insertions(+), 27 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index 37b1caa566..14c98b49a1 100644
--- a/meson.build
-+++ b/meson.build
-@@ -1827,23 +1827,10 @@ if conf.has('WITH_LIBVIRTD')
-       endif
-     endif
- 
-    if fs_enable
-      mount_prog = find_program('mount', required: get_option('storage_fs'), dirs: libvirt_sbin_path)
-      umount_prog = find_program('umount', required: get_option('storage_fs'), dirs: libvirt_sbin_path)
-      mkfs_prog = find_program('mkfs', required: get_option('storage_fs'), dirs: libvirt_sbin_path)
-
-      if not mount_prog.found() or not umount_prog.found() or not mkfs_prog.found()
-        fs_enable = false
-      endif
-    endif
-
-     if fs_enable
-       use_storage = true
- 
-       conf.set('WITH_STORAGE_FS', 1)
-      conf.set_quoted('MOUNT', mount_prog.full_path())
-      conf.set_quoted('UMOUNT', umount_prog.full_path())
-      conf.set_quoted('MKFS', mkfs_prog.full_path())
-     endif
-   endif
- 
-diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c
-index fce395d60f..6ec359625a 100644
--- a/src/storage/storage_backend_fs.c
-+++ b/src/storage/storage_backend_fs.c
-@@ -304,7 +304,7 @@ virStorageBackendFileSystemMount(virStoragePoolObj *pool)
-     if (!(src = virStorageBackendFileSystemGetPoolSource(pool)))
-         return -1;
- 
-    cmd = virStorageBackendFileSystemMountCmd(MOUNT, def, src);
-+    cmd = virStorageBackendFileSystemMountCmd("mount", def, src);
- 
-     /* Mounting a shared FS might take a long time. Don't hold
-      * the pool locked meanwhile. */
-@@ -362,7 +362,7 @@ virStorageBackendFileSystemStop(virStoragePoolObj *pool)
-     if ((rc = virStorageBackendFileSystemIsMounted(pool)) != 1)
-         return rc;
- 
-    cmd = virCommandNewArgList(UMOUNT, def->target.path, NULL);
-+    cmd = virCommandNewArgList("umount", def->target.path, NULL);
-     return virCommandRun(cmd, NULL);
- }
- #endif /* WITH_STORAGE_FS */
-@@ -402,18 +402,7 @@ virStorageBackendExecuteMKFS(const char *device,
-     g_autoptr(virCommand) cmd = NULL;
-     g_autofree char *mkfs = NULL;
- 
-#if WITH_STORAGE_FS
-    mkfs = virFindFileInPath(MKFS);
-#endif /* WITH_STORAGE_FS */
-
-    if (!mkfs) {
-        virReportError(VIR_ERR_INTERNAL_ERROR,
-                       _("mkfs is not available on this platform: Failed to make filesystem of type '%1$s' on device '%2$s'"),
-                       format, device);
-        return -1;
-    }
-
-    cmd = virCommandNewArgList(mkfs, "-t", format, NULL);
-+    cmd = virCommandNewArgList("mkfs", "-t", format, NULL);
- 
-     /* use the force, otherwise mkfs.xfs won't overwrite existing fs.
-      * Similarly mkfs.ext2, mkfs.ext3, and mkfs.ext4 require supplying -F
-- 
-2.49.0
-
@@ -1,43 +0,0 @@
-From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
-To: devel@lists.libvirt.org
-Subject: [PATCH] util: avoid overflow in hextable buffer
-Date: Mon, 20 Jan 2025 10:09:24 +0000
-Message-ID: <20250120100924.3864818-1-berrange@redhat.com>
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The assigned string is 17 chars long once the trailing nul is taken
-into account. This triggers a warning with GCC 15
-
- src/util/virsystemd.c: In function â€˜virSystemdEscapeNameâ€™:
- src/util/virsystemd.c:59:38: error: initializer-string for array of â€˜charâ€™ is too long [-Werror=unterminated-string-initialization]
-    59 |     static const char hextable[16] = "0123456789abcdef";
-       |                                      ^~~~~~~~~~~~~~~~~~
-
-Switch to a dynamically sized array as used in all the other places
-we have a hextable array.
-
-See also: https://gcc.gnu.org/PR115185
-Reported-by: Yaakov Selkowitz <yselkowi@redhat.com>
-Signed-off-by: Daniel P. BerrangÃ© <berrange@redhat.com>
---
- src/util/virsystemd.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/util/virsystemd.c b/src/util/virsystemd.c
-index 5b772e29dd..d46e5f74fc 100644
--- a/src/util/virsystemd.c
-+++ b/src/util/virsystemd.c
-@@ -56,7 +56,7 @@ struct _virSystemdActivationEntry {
- static void virSystemdEscapeName(virBuffer *buf,
-                                  const char *name)
- {
-    static const char hextable[16] = "0123456789abcdef";
-+    static const char hextable[] = "0123456789abcdef";
- 
- #define ESCAPE(c) \
-     do { \
-- 
-2.47.1
-
@@ -1,58 +0,0 @@
-From 7ab0f1c2a3fddf46d381f055e49111e3063b4829 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
-Date: Mon, 28 Apr 2025 11:47:34 +0100
-Subject: [PATCH] util: stop hardcoding numad path
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-From: Daniel P. Berrangé <berrange@redhat.com>
-
-Change the meson rules to always enable numad if on a Linux host, unless
-the meson options say not to.
-
-Reviewed-by: Peter Krempa <pkrempa@redhat.com>
-Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
- meson.build        | 10 +++-------
- src/util/virnuma.c |  2 +-
- 2 files changed, 4 insertions(+), 8 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index 14c98b49a1..767205f44b 100644
--- a/meson.build
-+++ b/meson.build
-@@ -2028,14 +2028,10 @@ if not get_option('nss').disabled()
-   endif
- endif
- 
-if not get_option('numad').disabled() and numactl_dep.found()
-  numad_prog = find_program('numad', required: get_option('numad'), dirs: libvirt_sbin_path)
-  if numad_prog.found()
-    conf.set('WITH_NUMAD', 1)
-    conf.set_quoted('NUMAD', numad_prog.full_path())
-  endif
-+if not get_option('numad').disabled() and numactl_dep.found() and host_machine.system() == 'linux'
-+  conf.set('WITH_NUMAD', 1)
- elif get_option('numad').enabled()
-  error('You must have numactl enabled for numad support.')
-+  error('You must have a Linux host with numactl enabled for numad support.')
- endif
- 
- # nwfilter should only be compiled for linux, and only if the
-diff --git a/src/util/virnuma.c b/src/util/virnuma.c
-index 9393c20875..67c51630c7 100644
--- a/src/util/virnuma.c
-+++ b/src/util/virnuma.c
-@@ -61,7 +61,7 @@ virNumaGetAutoPlacementAdvice(unsigned short vcpus,
-     g_autoptr(virCommand) cmd = NULL;
-     char *output = NULL;
- 
-    cmd = virCommandNewArgList(NUMAD, "-w", NULL);
-+    cmd = virCommandNewArgList("numad", "-w", NULL);
-     virCommandAddArgFormat(cmd, "%d:%llu", vcpus,
-                            VIR_DIV_UP(balloon, 1024));
- 
-- 
-2.49.0
-
@@ -1,36 +0,0 @@
-From b825bb556bd3967bf5422c243b77bd4038e317e2 Mon Sep 17 00:00:00 2001
-Message-ID: <b825bb556bd3967bf5422c243b77bd4038e317e2.1760476767.git.crobinso@redhat.com>
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Mon, 13 Oct 2025 10:34:51 +0200
-Subject: [PATCH 1/8] wireshark: Drop needless declaration of
- proto_register_libvirt() and proto_reg_handoff_libvirt()
-Content-type: text/plain
-
-Both proto_register_libvirt() and proto_reg_handoff_libvirt() are
-declared in packet-libvirt.h which is included from plugin.c.
-There's no need to provide another declaration in plugin.c.
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Peter Krempa <pkrempa@redhat.com>
-Signed-off-by: Cole Robinson <crobinso@redhat.com>
---
- tools/wireshark/src/plugin.c | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/tools/wireshark/src/plugin.c b/tools/wireshark/src/plugin.c
-index 9a83f2ca07..19b25e7b1a 100644
--- a/tools/wireshark/src/plugin.c
-+++ b/tools/wireshark/src/plugin.c
-@@ -72,9 +72,6 @@ void plugin_register(void)
- 
- #else /* WIRESHARK_VERSION >= 2009000 */
- 
-void proto_register_libvirt(void);
-void proto_reg_handoff_libvirt(void);
-
- WS_DLL_PUBLIC_DEF const gchar plugin_version[] = PLUGIN_VERSION;
- WS_DLL_PUBLIC_DEF const int plugin_want_major = WIRESHARK_VERSION_MAJOR;
- WS_DLL_PUBLIC_DEF const int plugin_want_minor = WIRESHARK_VERSION_MINOR;
-- 
-2.51.0
-
@@ -1,47 +0,0 @@
-From 41d3b457972bde85991fa7ed6f282370aca4b2af Mon Sep 17 00:00:00 2001
-Message-ID: <41d3b457972bde85991fa7ed6f282370aca4b2af.1760476767.git.crobinso@redhat.com>
-In-Reply-To: <b825bb556bd3967bf5422c243b77bd4038e317e2.1760476767.git.crobinso@redhat.com>
-References: <b825bb556bd3967bf5422c243b77bd4038e317e2.1760476767.git.crobinso@redhat.com>
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Fri, 10 Oct 2025 15:20:05 +0200
-Subject: [PATCH 2/8] wireshark: Switch header files to #pragma once
-Content-type: text/plain
-
-The genxdrstub.pl script generates some header files. But they
-use the old pattern to guard against multiple inclusion:
-
-  #ifndef SOMETHING_H
-  #define SOMETHING_H
-  ...
-  #endif
-
-Change the script to generate just '#pragma once' used everywhere
-else in our code.
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Peter Krempa <pkrempa@redhat.com>
-Signed-off-by: Cole Robinson <crobinso@redhat.com>
---
- tools/wireshark/util/genxdrstub.pl | 5 +----
- 1 file changed, 1 insertion(+), 4 deletions(-)
-
-diff --git a/tools/wireshark/util/genxdrstub.pl b/tools/wireshark/util/genxdrstub.pl
-index 8cfda25a27..01b663a88c 100755
--- a/tools/wireshark/util/genxdrstub.pl
-+++ b/tools/wireshark/util/genxdrstub.pl
-@@ -563,11 +563,8 @@ sub add_header_file {
-     local $self->{header_contents} = [];
-     $self->print("/* *DO NOT MODIFY* this file directly.\n");
-     $self->print(" * This file was generated by $0 from libvirt version $libvirt_version */\n");
-    my $ucname = uc $name;
-    $self->print("#ifndef _$ucname\_H_\n");
-    $self->print("#define _$ucname\_H_\n");
-+    $self->print("#pragma once\n");
-     $block->();
-    $self->print("#endif /* _$ucname\_H_ */");
-     push @{ $self->{headers} }, [ $name, delete $self->{header_contents} ];
- }
- 
-- 
-2.51.0
-
@@ -1,81 +0,0 @@
-From 02a0e78bf54c903da8922c56bade9b3298ade351 Mon Sep 17 00:00:00 2001
-Message-ID: <02a0e78bf54c903da8922c56bade9b3298ade351.1760476767.git.crobinso@redhat.com>
-In-Reply-To: <b825bb556bd3967bf5422c243b77bd4038e317e2.1760476767.git.crobinso@redhat.com>
-References: <b825bb556bd3967bf5422c243b77bd4038e317e2.1760476767.git.crobinso@redhat.com>
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Mon, 13 Oct 2025 09:04:17 +0200
-Subject: [PATCH 3/8] wireshark: Move WIRESHARK_VERSION macro definition
-Content-type: text/plain
-
-Soon, other parts of the wireshark code will need to
-differentiate wrt wireshark version. Therefore, move the
-WIRESHARK_VERSION macro definition among with its deps into
-packet-libvirt.h.
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Peter Krempa <pkrempa@redhat.com>
-Signed-off-by: Cole Robinson <crobinso@redhat.com>
---
- tools/wireshark/src/packet-libvirt.h | 14 ++++++++++++++
- tools/wireshark/src/plugin.c         | 14 --------------
- 2 files changed, 14 insertions(+), 14 deletions(-)
-
-diff --git a/tools/wireshark/src/packet-libvirt.h b/tools/wireshark/src/packet-libvirt.h
-index 14e6e13696..15cfcb0534 100644
--- a/tools/wireshark/src/packet-libvirt.h
-+++ b/tools/wireshark/src/packet-libvirt.h
-@@ -19,5 +19,19 @@
- 
- #pragma once
- 
-+#ifdef WITH_WS_VERSION
-+# include <wireshark/ws_version.h>
-+#else
-+# include <wireshark/config.h>
-+# define WIRESHARK_VERSION_MAJOR VERSION_MAJOR
-+# define WIRESHARK_VERSION_MINOR VERSION_MINOR
-+# define WIRESHARK_VERSION_MICRO VERSION_MICRO
-+#endif
-+
-+#define WIRESHARK_VERSION \
-+    ((WIRESHARK_VERSION_MAJOR * 1000 * 1000) + \
-+     (WIRESHARK_VERSION_MINOR * 1000) + \
-+     (WIRESHARK_VERSION_MICRO))
-+
- void proto_register_libvirt(void);
- void proto_reg_handoff_libvirt(void);
-diff --git a/tools/wireshark/src/plugin.c b/tools/wireshark/src/plugin.c
-index 19b25e7b1a..64317b5280 100644
--- a/tools/wireshark/src/plugin.c
-+++ b/tools/wireshark/src/plugin.c
-@@ -12,15 +12,6 @@
- 
- #include <config.h>
- 
-#ifdef WITH_WS_VERSION
-# include <wireshark/ws_version.h>
-#else
-# include <wireshark/config.h>
-# define WIRESHARK_VERSION_MAJOR VERSION_MAJOR
-# define WIRESHARK_VERSION_MINOR VERSION_MINOR
-# define WIRESHARK_VERSION_MICRO VERSION_MICRO
-#endif
-
- #define HAVE_PLUGINS 1
- #include <wireshark/epan/proto.h>
- /* plugins are DLLs */
-@@ -32,11 +23,6 @@
- /* Let the plugin version be the version of libvirt */
- #define PLUGIN_VERSION VERSION
- 
-#define WIRESHARK_VERSION \
-    ((WIRESHARK_VERSION_MAJOR * 1000 * 1000) + \
-     (WIRESHARK_VERSION_MINOR * 1000) + \
-     (WIRESHARK_VERSION_MICRO))
-
- #if WIRESHARK_VERSION < 2005000
- 
- WS_DLL_PUBLIC_DEF const gchar version[] = VERSION;
-- 
-2.51.0
-
@@ -1,133 +0,0 @@
-From 7374c4ecbd591b02f7be4b2918addc6d5852aafb Mon Sep 17 00:00:00 2001
-Message-ID: <7374c4ecbd591b02f7be4b2918addc6d5852aafb.1760476767.git.crobinso@redhat.com>
-In-Reply-To: <b825bb556bd3967bf5422c243b77bd4038e317e2.1760476767.git.crobinso@redhat.com>
-References: <b825bb556bd3967bf5422c243b77bd4038e317e2.1760476767.git.crobinso@redhat.com>
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Mon, 13 Oct 2025 09:21:30 +0200
-Subject: [PATCH 4/8] wireshark: Fix int type of some virNetMessageHeader
- members
-Content-type: text/plain
-
-Our virNetMessageHeader is a struct that's declared as follows:
-
-  struct virNetMessageHeader {
-      unsigned prog;
-      unsigned vers;
-      int proc;
-      virNetMessageType type;
-      unsigned serial;
-      virNetMessageStatus status;
-  };
-
-Now, per RFC 4506 enums are also encoded as signed integers. This
-means, that only 'prog', 'vers' and 'serial' are really unsigned
-integers. The others ('proc', 'type' and 'status') are encoded as
-signed integers. Fix their type when dissecting.
-
-While at it, also follow latest trend in wireshark and switch
-from guint32 to uint32_t.
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Peter Krempa <pkrempa@redhat.com>
-Signed-off-by: Cole Robinson <crobinso@redhat.com>
---
- tools/wireshark/src/packet-libvirt.c | 34 +++++++++++++++++++---------
- 1 file changed, 23 insertions(+), 11 deletions(-)
-
-diff --git a/tools/wireshark/src/packet-libvirt.c b/tools/wireshark/src/packet-libvirt.c
-index da2aabd98a..af14c6bed7 100644
--- a/tools/wireshark/src/packet-libvirt.c
-+++ b/tools/wireshark/src/packet-libvirt.c
-@@ -92,7 +92,7 @@ typedef gboolean (*vir_xdr_dissector_t)(tvbuff_t *tvb, proto_tree *tree, XDR *xd
- 
- typedef struct vir_dissector_index vir_dissector_index_t;
- struct vir_dissector_index {
-    guint32             proc;
-+    int32_t             proc;
-     vir_xdr_dissector_t args;
-     vir_xdr_dissector_t ret;
-     vir_xdr_dissector_t msg;
-@@ -275,8 +275,10 @@ dissect_xdr_array(tvbuff_t *tvb, proto_tree *tree, XDR *xdrs, int hf, gint ett,
- }
- 
- static vir_xdr_dissector_t
-find_payload_dissector(guint32 proc, guint32 type,
-                       const vir_dissector_index_t *pds, gsize length)
-+find_payload_dissector(int32_t proc,
-+                       enum vir_net_message_type type,
-+                       const vir_dissector_index_t *pds,
-+                       gsize length)
- {
-     const vir_dissector_index_t *pd;
-     guint32 first, last, direction;
-@@ -309,6 +311,10 @@ find_payload_dissector(guint32 proc, guint32 type,
-         return pd->ret;
-     case VIR_NET_MESSAGE:
-         return pd->msg;
-+    case VIR_NET_STREAM:
-+    case VIR_NET_STREAM_HOLE:
-+        /* Handled elsewhere */
-+        return NULL;
-     }
-     return NULL;
- }
-@@ -397,8 +403,12 @@ dissect_xdr_stream_hole(tvbuff_t *tvb, proto_tree *tree, XDR *xdrs, int hf)
- #include "libvirt/protocol.h"
- 
- static void
-dissect_libvirt_payload(tvbuff_t *tvb, proto_tree *tree,
-                        guint32 prog, guint32 proc, guint32 type, guint32 status)
-+dissect_libvirt_payload(tvbuff_t *tvb,
-+                        proto_tree *tree,
-+                        uint32_t prog,
-+                        int32_t proc,
-+                        int32_t type,
-+                        int32_t status)
- {
-     gssize payload_length;
- 
-@@ -430,7 +440,8 @@ dissect_libvirt_payload(tvbuff_t *tvb, proto_tree *tree,
-     return;
- 
-  unknown:
-    dbg("Cannot determine payload: Prog=%u, Proc=%u, Type=%u, Status=%u", prog, proc, type, status);
-+    dbg("Cannot determine payload: Prog=%u, Proc=%d, Type=%d, Status=%d",
-+        prog, proc, type, status);
-     proto_tree_add_item(tree, hf_libvirt_unknown, tvb, VIR_HEADER_LEN, -1, ENC_NA);
- }
- 
-@@ -439,7 +450,8 @@ dissect_libvirt_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
-                         void *opaque G_GNUC_UNUSED)
- {
-     goffset offset;
-    guint32 prog, proc, type, serial, status;
-+    uint32_t prog, serial;
-+    int32_t proc, type, status;
-     const value_string *vs;
- 
-     col_set_str(pinfo->cinfo, COL_PROTOCOL, "Libvirt");
-@@ -448,17 +460,17 @@ dissect_libvirt_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
-     offset = 4; /* End of length field */
-     prog   = tvb_get_ntohl(tvb, offset); offset += 4;
-     offset += 4; /* Ignore version header field */
-    proc   = tvb_get_ntohl(tvb, offset); offset += 4;
-    type   = tvb_get_ntohl(tvb, offset); offset += 4;
-+    proc   = tvb_get_ntohil(tvb, offset); offset += 4;
-+    type   = tvb_get_ntohil(tvb, offset); offset += 4;
-     serial = tvb_get_ntohl(tvb, offset); offset += 4;
-    status = tvb_get_ntohl(tvb, offset); offset += 4;
-+    status = tvb_get_ntohil(tvb, offset); offset += 4;
- 
-     col_add_fstr(pinfo->cinfo, COL_INFO, "Prog=%s",
-                  val_to_str(prog, program_strings, "%x"));
- 
-     vs = get_program_data(prog, VIR_PROGRAM_PROCSTRINGS);
-     if (vs == NULL) {
-        col_append_fstr(pinfo->cinfo, COL_INFO, " Proc=%u", proc);
-+        col_append_fstr(pinfo->cinfo, COL_INFO, " Proc=%d", proc);
-     } else {
-         col_append_fstr(pinfo->cinfo, COL_INFO, " Proc=%s", val_to_str(proc, vs, "%d"));
-     }
-- 
-2.51.0
-
@@ -1,46 +0,0 @@
-From 1086888f95a322101f8cf53b63c96600ccbeb882 Mon Sep 17 00:00:00 2001
-Message-ID: <1086888f95a322101f8cf53b63c96600ccbeb882.1760476767.git.crobinso@redhat.com>
-In-Reply-To: <b825bb556bd3967bf5422c243b77bd4038e317e2.1760476767.git.crobinso@redhat.com>
-References: <b825bb556bd3967bf5422c243b77bd4038e317e2.1760476767.git.crobinso@redhat.com>
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Fri, 10 Oct 2025 19:16:54 +0200
-Subject: [PATCH 5/8] wireshark: Don't special case retval of
- get_program_data() in dissect_libvirt_message()
-Content-type: text/plain
-
-The get_program_data() function returns a pointer (in this
-specific case to an array of procedure strings) which, if
-non-NULL is then passed val_to_str(). Well, if val_to_str() sees
-NULL it is treated gracefully, i.e. like if the numeric value
-'proc' wasn't found in the array.
-
-Therefore, there's no need to special case call to
-col_append_fstr(). Both result into the same behaviour.
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Peter Krempa <pkrempa@redhat.com>
-Signed-off-by: Cole Robinson <crobinso@redhat.com>
---
- tools/wireshark/src/packet-libvirt.c | 6 +-----
- 1 file changed, 1 insertion(+), 5 deletions(-)
-
-diff --git a/tools/wireshark/src/packet-libvirt.c b/tools/wireshark/src/packet-libvirt.c
-index af14c6bed7..6c729801d4 100644
--- a/tools/wireshark/src/packet-libvirt.c
-+++ b/tools/wireshark/src/packet-libvirt.c
-@@ -469,11 +469,7 @@ dissect_libvirt_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
-                  val_to_str(prog, program_strings, "%x"));
- 
-     vs = get_program_data(prog, VIR_PROGRAM_PROCSTRINGS);
-    if (vs == NULL) {
-        col_append_fstr(pinfo->cinfo, COL_INFO, " Proc=%d", proc);
-    } else {
-        col_append_fstr(pinfo->cinfo, COL_INFO, " Proc=%s", val_to_str(proc, vs, "%d"));
-    }
-+    col_append_fstr(pinfo->cinfo, COL_INFO, " Proc=%s", val_to_str(proc, vs, "%d"));
- 
-     col_append_fstr(pinfo->cinfo, COL_INFO, " Type=%s Serial=%u Status=%s",
-                     val_to_str(type, type_strings, "%d"), serial,
-- 
-2.51.0
-
@@ -1,68 +0,0 @@
-From ba2c4bdd5cbccd5c0673149cf76802c98b70d2f7 Mon Sep 17 00:00:00 2001
-Message-ID: <ba2c4bdd5cbccd5c0673149cf76802c98b70d2f7.1760476767.git.crobinso@redhat.com>
-In-Reply-To: <b825bb556bd3967bf5422c243b77bd4038e317e2.1760476767.git.crobinso@redhat.com>
-References: <b825bb556bd3967bf5422c243b77bd4038e317e2.1760476767.git.crobinso@redhat.com>
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Fri, 10 Oct 2025 18:23:18 +0200
-Subject: [PATCH 6/8] wireshark: Introduce and use vir_val_to_str()
-Content-type: text/plain
-
-Wireshark offers val_to_str() function which converts numeric
-value to string by looking up value ('val') in an array ('vs') of
-<val, string> pairs. If no corresponding string is found, then
-the value is formatted using given 'fmt' string.
-
-Starting from wireshark-4.6.0 not only this function gained
-another argument but also returns a strdup()-ed string. To keep
-our code simple, let's introduce a wrapper so which can be then
-adjusted as needed.
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Peter Krempa <pkrempa@redhat.com>
-Signed-off-by: Cole Robinson <crobinso@redhat.com>
---
- tools/wireshark/src/packet-libvirt.c | 17 +++++++++++++----
- 1 file changed, 13 insertions(+), 4 deletions(-)
-
-diff --git a/tools/wireshark/src/packet-libvirt.c b/tools/wireshark/src/packet-libvirt.c
-index 6c729801d4..f6ad2c4578 100644
--- a/tools/wireshark/src/packet-libvirt.c
-+++ b/tools/wireshark/src/packet-libvirt.c
-@@ -140,6 +140,15 @@ static const value_string status_strings[] = {
-     { -1, NULL }
- };
- 
-+static const char *
-+G_GNUC_PRINTF(3, 0)
-+vir_val_to_str(const uint32_t val,
-+               const value_string *vs,
-+               const char *fmt)
-+{
-+    return val_to_str(val, vs, fmt);
-+}
-+
- static gboolean
- dissect_xdr_string(tvbuff_t *tvb, proto_tree *tree, XDR *xdrs, int hf,
-                    guint32 maxlen)
-@@ -466,14 +475,14 @@ dissect_libvirt_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
-     status = tvb_get_ntohil(tvb, offset); offset += 4;
- 
-     col_add_fstr(pinfo->cinfo, COL_INFO, "Prog=%s",
-                 val_to_str(prog, program_strings, "%x"));
-+                 vir_val_to_str(prog, program_strings, "%x"));
- 
-     vs = get_program_data(prog, VIR_PROGRAM_PROCSTRINGS);
-    col_append_fstr(pinfo->cinfo, COL_INFO, " Proc=%s", val_to_str(proc, vs, "%d"));
-+    col_append_fstr(pinfo->cinfo, COL_INFO, " Proc=%s", vir_val_to_str(proc, vs, "%d"));
- 
-     col_append_fstr(pinfo->cinfo, COL_INFO, " Type=%s Serial=%u Status=%s",
-                    val_to_str(type, type_strings, "%d"), serial,
-                    val_to_str(status, status_strings, "%d"));
-+                    vir_val_to_str(type, type_strings, "%d"), serial,
-+                    vir_val_to_str(status, status_strings, "%d"));
- 
-     if (tree) {
-         gint *hf_proc;
-- 
-2.51.0
-
@@ -1,165 +0,0 @@
-From 002b9f559d69b92e77ab2d234df6966fecdaf0ec Mon Sep 17 00:00:00 2001
-Message-ID: <002b9f559d69b92e77ab2d234df6966fecdaf0ec.1760476767.git.crobinso@redhat.com>
-In-Reply-To: <b825bb556bd3967bf5422c243b77bd4038e317e2.1760476767.git.crobinso@redhat.com>
-References: <b825bb556bd3967bf5422c243b77bd4038e317e2.1760476767.git.crobinso@redhat.com>
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Fri, 10 Oct 2025 19:13:48 +0200
-Subject: [PATCH 7/8] wireshark: Don't leak column strings
-Content-type: text/plain
-
-One of the problems of using val_to_str() is that it may return a
-const string from given table ('vs'), OR return an allocated one.
-Since the caller has no idea which case it is, it resides to safe
-option and don't free returned string. But that might lead to a
-memleak. This behaviour is fixed with wireshark-4.6.0 and support
-for it will be introduced soon. But first, make vir_val_to_str()
-behave like fixed val_to_str() from newer wireshark: just always
-allocate the string.
-
-Now, if val_to_str() needs to allocate new memory it obtains
-allocator by calling wmem_packet_scope() which is what we may do
-too.
-
-Hand in hand with that, we need to free the memory using the
-correct allocator, hence wmem_free(). But let's put it into a
-wrapper vir_wmem_free() because just like val_to_str(), it'll
-need additional argument when adapting to new wireshark.
-
-Oh, and freeing the memory right after col_add_fstr() is safe as
-it uses vsnprintf() under the hood to format passed args.
-
-One last thing, the wmem.h file used to live under epan/wmem/ but
-then in v3.5.0~240 [1] was moved to wsutil/wmem/.
-
-1: https://gitlab.com/wireshark/wireshark/-/commit/7f9c1f5f92c131354fc8b2b88d473706786064c0
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Peter Krempa <pkrempa@redhat.com>
-Signed-off-by: Cole Robinson <crobinso@redhat.com>
---
- meson.build                          | 20 ++++++++++++++++
- tools/wireshark/src/meson.build      |  1 +
- tools/wireshark/src/packet-libvirt.c | 35 ++++++++++++++++++++++------
- 3 files changed, 49 insertions(+), 7 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index bcc18b20e5..a1e0e5ecd5 100644
--- a/meson.build
-+++ b/meson.build
-@@ -1365,6 +1365,26 @@ if wireshark_dep.found()
-   if cc.check_header('wireshark/ws_version.h')
-     conf.set('WITH_WS_VERSION', 1)
-   endif
-+
-+  # Find wmem.h
-+  # But it's not as easy as you'd think. Ubuntu 20.04 has split parts of
-+  # libwireshark.so into libwsutil.so but:
-+  # a) wireshark.pc never mentions it,
-+  # b) libwsutil-dev package doesn't install pkg-config file.
-+  # Fortunately, it's fixed in 24.04.
-+  if cc.check_header('wireshark/epan/wmem/wmem.h', dependencies: wireshark_dep)
-+    conf.set('WITH_WS_EPAN_WMEM', 1)
-+  elif cc.check_header('wireshark/wsutil/wmem/wmem.h', dependencies: wireshark_dep)
-+    conf.set('WITH_WS_WSUTIL_WMEM', 1)
-+  else
-+    error('Unable to locate wmem.h file')
-+  endif
-+
-+  # TODO: drop wsutil dep once support for Ubuntu 20.04 is dropped
-+  wsutil_dep = dependency('', required: false)
-+  if not cc.has_function('wmem_free', dependencies: wireshark_dep)
-+    wsutil_dep = cc.find_library('wsutil', required: true)
-+  endif
- endif
- 
- # generic build dependencies checks
-diff --git a/tools/wireshark/src/meson.build b/tools/wireshark/src/meson.build
-index 9b452dc5ca..ba0df913e0 100644
--- a/tools/wireshark/src/meson.build
-+++ b/tools/wireshark/src/meson.build
-@@ -9,6 +9,7 @@ shared_library(
-   ],
-   dependencies: [
-     wireshark_dep,
-+    wsutil_dep,
-     xdr_dep,
-     tools_dep,
-   ],
-diff --git a/tools/wireshark/src/packet-libvirt.c b/tools/wireshark/src/packet-libvirt.c
-index f6ad2c4578..3178ac6f27 100644
--- a/tools/wireshark/src/packet-libvirt.c
-+++ b/tools/wireshark/src/packet-libvirt.c
-@@ -21,6 +21,11 @@
- #include <wireshark/epan/proto.h>
- #include <wireshark/epan/packet.h>
- #include <wireshark/epan/dissectors/packet-tcp.h>
-+#ifdef WITH_WS_EPAN_WMEM
-+# include <wireshark/epan/wmem/wmem.h>
-+#elif WITH_WS_WSUTIL_WMEM
-+# include <wireshark/wsutil/wmem/wmem.h>
-+#endif
- #include <rpc/types.h>
- #include <rpc/xdr.h>
- #include "packet-libvirt.h"
-@@ -140,13 +145,19 @@ static const value_string status_strings[] = {
-     { -1, NULL }
- };
- 
-static const char *
-+static char *
- G_GNUC_PRINTF(3, 0)
- vir_val_to_str(const uint32_t val,
-                const value_string *vs,
-                const char *fmt)
- {
-    return val_to_str(val, vs, fmt);
-+    return val_to_str_wmem(wmem_packet_scope(), val, vs, fmt);
-+}
-+
-+static void
-+vir_wmem_free(void *ptr)
-+{
-+    wmem_free(wmem_packet_scope(), ptr);
- }
- 
- static gboolean
-@@ -462,6 +473,10 @@ dissect_libvirt_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
-     uint32_t prog, serial;
-     int32_t proc, type, status;
-     const value_string *vs;
-+    char *prog_str = NULL;
-+    char *proc_str = NULL;
-+    char *type_str = NULL;
-+    char *status_str = NULL;
- 
-     col_set_str(pinfo->cinfo, COL_PROTOCOL, "Libvirt");
-     col_clear(pinfo->cinfo, COL_INFO);
-@@ -474,15 +489,21 @@ dissect_libvirt_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
-     serial = tvb_get_ntohl(tvb, offset); offset += 4;
-     status = tvb_get_ntohil(tvb, offset); offset += 4;
- 
-    col_add_fstr(pinfo->cinfo, COL_INFO, "Prog=%s",
-                 vir_val_to_str(prog, program_strings, "%x"));
-+    prog_str = vir_val_to_str(prog, program_strings, "%x");
-+    col_add_fstr(pinfo->cinfo, COL_INFO, "Prog=%s", prog_str);
-+    vir_wmem_free(prog_str);
- 
-     vs = get_program_data(prog, VIR_PROGRAM_PROCSTRINGS);
-    col_append_fstr(pinfo->cinfo, COL_INFO, " Proc=%s", vir_val_to_str(proc, vs, "%d"));
-+    proc_str = vir_val_to_str(proc, vs, "%d");
-+    col_append_fstr(pinfo->cinfo, COL_INFO, " Proc=%s", proc_str);
-+    vir_wmem_free(proc_str);
- 
-+    type_str = vir_val_to_str(type, type_strings, "%d");
-+    status_str = vir_val_to_str(status, status_strings, "%d");
-     col_append_fstr(pinfo->cinfo, COL_INFO, " Type=%s Serial=%u Status=%s",
-                    vir_val_to_str(type, type_strings, "%d"), serial,
-                    vir_val_to_str(status, status_strings, "%d"));
-+                    type_str, serial, status_str);
-+    vir_wmem_free(status_str);
-+    vir_wmem_free(type_str);
- 
-     if (tree) {
-         gint *hf_proc;
-- 
-2.51.0
-
@@ -1,493 +0,0 @@
-From b42a12174c787b99cd6fcb29b44e4b13bd64ee58 Mon Sep 17 00:00:00 2001
-Message-ID: <b42a12174c787b99cd6fcb29b44e4b13bd64ee58.1760476767.git.crobinso@redhat.com>
-In-Reply-To: <b825bb556bd3967bf5422c243b77bd4038e317e2.1760476767.git.crobinso@redhat.com>
-References: <b825bb556bd3967bf5422c243b77bd4038e317e2.1760476767.git.crobinso@redhat.com>
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Fri, 10 Oct 2025 15:22:34 +0200
-Subject: [PATCH 8/8] wireshark: Adapt to wireshark-4.6.0
-Content-type: text/plain
-
-The main difference is that wmem_packet_scope() is gone [1] but
-the packet_info struct has 'pool` member which points to the
-allocator used for given packet.
-
-Unfortunately, while we were given pointer to packet_info at the
-entry level to our dissector (dissect_libvirt() ->
-tcp_dissect_pdus() -> dissect_libvirt_message()) it was never
-propagated to generated/primitive dissectors.
-
-But not all dissectors need to allocate memory, so mark the new
-argument as unused. And while our generator could be rewritten so
-that the argument is annotated as unused iff it's really unused,
-I couldn't bother rewriting it. It's generated code after all.
-Too much work for little gain.
-
-Another significant change is that val_to_str() now requires new
-argument: pointer to allocator to use because it always allocates
-new memory [2][3].
-
-1: https://gitlab.com/wireshark/wireshark/-/commit/5ca5c9ca372e06881b23ba9f4fdcb6b479886444
-2: https://gitlab.com/wireshark/wireshark/-/commit/b63599762468e4cf1783419a5556377604d344bb
-3: https://gitlab.com/wireshark/wireshark/-/commit/84799be215313e61b83a3eaf074f89d6ee349b8c
-Resolves: https://gitlab.com/libvirt/libvirt/-/issues/823
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Peter Krempa <pkrempa@redhat.com>
-Signed-off-by: Cole Robinson <crobinso@redhat.com>
---
- tools/wireshark/src/packet-libvirt.c | 157 +++++++++++++++++++--------
- tools/wireshark/util/genxdrstub.pl   |  18 +--
- 2 files changed, 119 insertions(+), 56 deletions(-)
-
-diff --git a/tools/wireshark/src/packet-libvirt.c b/tools/wireshark/src/packet-libvirt.c
-index 3178ac6f27..c5c8fb4756 100644
--- a/tools/wireshark/src/packet-libvirt.c
-+++ b/tools/wireshark/src/packet-libvirt.c
-@@ -63,7 +63,7 @@ static gint ett_libvirt_stream_hole = -1;
- 
- #define XDR_PRIMITIVE_DISSECTOR(xtype, ctype, ftype) \
-     static gboolean \
-    dissect_xdr_##xtype(tvbuff_t *tvb, proto_tree *tree, XDR *xdrs, int hf) \
-+    dissect_xdr_##xtype(tvbuff_t *tvb, packet_info *pinfo G_GNUC_UNUSED, proto_tree *tree, XDR *xdrs, int hf) \
-     { \
-         goffset start; \
-         ctype val; \
-@@ -93,7 +93,7 @@ XDR_PRIMITIVE_DISSECTOR(bool,    bool_t,   boolean)
- 
- VIR_WARNINGS_RESET
- 
-typedef gboolean (*vir_xdr_dissector_t)(tvbuff_t *tvb, proto_tree *tree, XDR *xdrs, int hf);
-+typedef gboolean (*vir_xdr_dissector_t)(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, XDR *xdrs, int hf);
- 
- typedef struct vir_dissector_index vir_dissector_index_t;
- struct vir_dissector_index {
-@@ -146,22 +146,32 @@ static const value_string status_strings[] = {
- };
- 
- static char *
-G_GNUC_PRINTF(3, 0)
-vir_val_to_str(const uint32_t val,
-+G_GNUC_PRINTF(4, 0)
-+vir_val_to_str(packet_info *pinfo,
-+               const uint32_t val,
-                const value_string *vs,
-                const char *fmt)
- {
-    return val_to_str_wmem(wmem_packet_scope(), val, vs, fmt);
-+#if WIRESHARK_VERSION < 4006000
-+    return val_to_str_wmem(pinfo->pool, val, vs, fmt);
-+#else
-+    return val_to_str(pinfo->pool, val, vs, fmt);
-+#endif
- }
- 
- static void
-vir_wmem_free(void *ptr)
-+vir_wmem_free(packet_info *pinfo,
-+              void *ptr)
- {
-    wmem_free(wmem_packet_scope(), ptr);
-+    wmem_free(pinfo->pool, ptr);
- }
- 
- static gboolean
-dissect_xdr_string(tvbuff_t *tvb, proto_tree *tree, XDR *xdrs, int hf,
-+dissect_xdr_string(tvbuff_t *tvb,
-+                   packet_info *pinfo G_GNUC_UNUSED,
-+                   proto_tree *tree,
-+                   XDR *xdrs,
-+                   int hf,
-                    guint32 maxlen)
- {
-     goffset start;
-@@ -179,7 +189,11 @@ dissect_xdr_string(tvbuff_t *tvb, proto_tree *tree, XDR *xdrs, int hf,
- }
- 
- static gboolean
-dissect_xdr_opaque(tvbuff_t *tvb, proto_tree *tree, XDR *xdrs, int hf,
-+dissect_xdr_opaque(tvbuff_t *tvb,
-+                   packet_info *pinfo,
-+                   proto_tree *tree,
-+                   XDR *xdrs,
-+                   int hf,
-                    guint32 size)
- {
-     goffset start;
-@@ -190,7 +204,7 @@ dissect_xdr_opaque(tvbuff_t *tvb, proto_tree *tree, XDR *xdrs, int hf,
-     start = xdr_getpos(xdrs);
-     if ((rc = xdr_opaque(xdrs, (caddr_t)val, size))) {
-         gint len = xdr_getpos(xdrs) - start;
-        const char *s = tvb_bytes_to_str(wmem_packet_scope(), tvb, start, len);
-+        const char *s = tvb_bytes_to_str(pinfo->pool, tvb, start, len);
- 
-         proto_tree_add_bytes_format_value(tree, hf, tvb, start, len, NULL, "%s", s);
-     } else {
-@@ -202,7 +216,11 @@ dissect_xdr_opaque(tvbuff_t *tvb, proto_tree *tree, XDR *xdrs, int hf,
- }
- 
- static gboolean
-dissect_xdr_bytes(tvbuff_t *tvb, proto_tree *tree, XDR *xdrs, int hf,
-+dissect_xdr_bytes(tvbuff_t *tvb,
-+                  packet_info *pinfo,
-+                  proto_tree *tree,
-+                  XDR *xdrs,
-+                  int hf,
-                   guint32 maxlen)
- {
-     goffset start;
-@@ -212,7 +230,7 @@ dissect_xdr_bytes(tvbuff_t *tvb, proto_tree *tree, XDR *xdrs, int hf,
-     start = xdr_getpos(xdrs);
-     if (xdr_bytes(xdrs, (char **)&val, &length, maxlen)) {
-         gint len = xdr_getpos(xdrs) - start;
-        const char *s = tvb_bytes_to_str(wmem_packet_scope(), tvb, start, len);
-+        const char *s = tvb_bytes_to_str(pinfo->pool, tvb, start, len);
- 
-         proto_tree_add_bytes_format_value(tree, hf, tvb, start, len, NULL, "%s", s);
-         free(val);
-@@ -224,7 +242,11 @@ dissect_xdr_bytes(tvbuff_t *tvb, proto_tree *tree, XDR *xdrs, int hf,
- }
- 
- static gboolean
-dissect_xdr_pointer(tvbuff_t *tvb, proto_tree *tree, XDR *xdrs, int hf,
-+dissect_xdr_pointer(tvbuff_t *tvb,
-+                    packet_info *pinfo,
-+                    proto_tree *tree,
-+                    XDR *xdrs,
-+                    int hf,
-                     vir_xdr_dissector_t dissect)
- {
-     goffset start;
-@@ -236,7 +258,7 @@ dissect_xdr_pointer(tvbuff_t *tvb, proto_tree *tree, XDR *xdrs, int hf,
-         return FALSE;
-     }
-     if (not_null) {
-        return dissect(tvb, tree, xdrs, hf);
-+        return dissect(tvb, pinfo, tree, xdrs, hf);
-     } else {
-         proto_item *ti;
-         ti = proto_tree_add_item(tree, hf, tvb, start, xdr_getpos(xdrs) - start, ENC_NA);
-@@ -246,15 +268,22 @@ dissect_xdr_pointer(tvbuff_t *tvb, proto_tree *tree, XDR *xdrs, int hf,
- }
- 
- static gboolean
-dissect_xdr_iterable(tvbuff_t *tvb, proto_item *ti, XDR *xdrs, gint ett, int rhf,
-                     guint32 length, vir_xdr_dissector_t dissect, goffset start)
-+dissect_xdr_iterable(tvbuff_t *tvb,
-+                     packet_info *pinfo,
-+                     proto_item *ti,
-+                     XDR *xdrs,
-+                     gint ett,
-+                     int rhf,
-+                     guint32 length,
-+                     vir_xdr_dissector_t dissect,
-+                     goffset start)
- {
-     proto_tree *tree;
-     guint32 i;
- 
-     tree = proto_item_add_subtree(ti, ett);
-     for (i = 0; i < length; i++) {
-        if (!dissect(tvb, tree, xdrs, rhf))
-+        if (!dissect(tvb, pinfo, tree, xdrs, rhf))
-             return FALSE;
-     }
-     proto_item_set_len(ti, xdr_getpos(xdrs) - start);
-@@ -262,8 +291,16 @@ dissect_xdr_iterable(tvbuff_t *tvb, proto_item *ti, XDR *xdrs, gint ett, int rhf
- }
- 
- static gboolean
-dissect_xdr_vector(tvbuff_t *tvb, proto_tree *tree, XDR *xdrs, int hf, gint ett,
-                   int rhf, const gchar *rtype, guint32 size, vir_xdr_dissector_t dissect)
-+dissect_xdr_vector(tvbuff_t *tvb,
-+                   packet_info *pinfo,
-+                   proto_tree *tree,
-+                   XDR *xdrs,
-+                   int hf,
-+                   gint ett,
-+                   int rhf,
-+                   const gchar *rtype,
-+                   guint32 size,
-+                   vir_xdr_dissector_t dissect)
- {
-     goffset start;
-     proto_item *ti;
-@@ -271,12 +308,20 @@ dissect_xdr_vector(tvbuff_t *tvb, proto_tree *tree, XDR *xdrs, int hf, gint ett,
-     start = xdr_getpos(xdrs);
-     ti = proto_tree_add_item(tree, hf, tvb, start, -1, ENC_NA);
-     proto_item_append_text(ti, " :: %s[%u]", rtype, size);
-    return dissect_xdr_iterable(tvb, ti, xdrs, ett, rhf, size, dissect, start);
-+    return dissect_xdr_iterable(tvb, pinfo, ti, xdrs, ett, rhf, size, dissect, start);
- }
- 
- static gboolean
-dissect_xdr_array(tvbuff_t *tvb, proto_tree *tree, XDR *xdrs, int hf, gint ett,
-                  int rhf, const gchar *rtype, guint32 maxlen, vir_xdr_dissector_t dissect)
-+dissect_xdr_array(tvbuff_t *tvb,
-+                  packet_info *pinfo,
-+                  proto_tree *tree,
-+                  XDR *xdrs,
-+                  int hf,
-+                  gint ett,
-+                  int rhf,
-+                  const gchar *rtype,
-+                  guint32 maxlen,
-+                  vir_xdr_dissector_t dissect)
- {
-     goffset start;
-     proto_item *ti;
-@@ -291,7 +336,7 @@ dissect_xdr_array(tvbuff_t *tvb, proto_tree *tree, XDR *xdrs, int hf, gint ett,
- 
-     ti = proto_tree_add_item(tree, hf, tvb, start, -1, ENC_NA);
-     proto_item_append_text(ti, " :: %s<%u>", rtype, length);
-    return dissect_xdr_iterable(tvb, ti, xdrs, ett, rhf, length, dissect, start);
-+    return dissect_xdr_iterable(tvb, pinfo, ti, xdrs, ett, rhf, length, dissect, start);
- }
- 
- static vir_xdr_dissector_t
-@@ -340,7 +385,10 @@ find_payload_dissector(int32_t proc,
- }
- 
- static void
-dissect_libvirt_stream(tvbuff_t *tvb, proto_tree *tree, gint payload_length)
-+dissect_libvirt_stream(tvbuff_t *tvb,
-+                       packet_info *pinfo G_GNUC_UNUSED,
-+                       proto_tree *tree,
-+                       gint payload_length)
- {
-     proto_tree_add_item(tree, hf_libvirt_stream, tvb, VIR_HEADER_LEN,
-                         payload_length - VIR_HEADER_LEN, ENC_NA);
-@@ -357,6 +405,7 @@ dissect_libvirt_num_of_fds(tvbuff_t *tvb, proto_tree *tree)
- 
- static void
- dissect_libvirt_fds(tvbuff_t *tvb G_GNUC_UNUSED,
-+                    packet_info *pinfo G_GNUC_UNUSED,
-                     gint start G_GNUC_UNUSED,
-                     gint32 nfds G_GNUC_UNUSED)
- {
-@@ -364,8 +413,12 @@ dissect_libvirt_fds(tvbuff_t *tvb G_GNUC_UNUSED,
- }
- 
- static void
-dissect_libvirt_payload_xdr_data(tvbuff_t *tvb, proto_tree *tree, gint payload_length,
-                                 gint32 status, vir_xdr_dissector_t dissect)
-+dissect_libvirt_payload_xdr_data(tvbuff_t *tvb,
-+                                 packet_info *pinfo,
-+                                 proto_tree *tree,
-+                                 gint payload_length,
-+                                 gint32 status,
-+                                 vir_xdr_dissector_t dissect)
- {
-     gint32 nfds = 0;
-     gint start = VIR_HEADER_LEN;
-@@ -384,17 +437,21 @@ dissect_libvirt_payload_xdr_data(tvbuff_t *tvb, proto_tree *tree, gint payload_l
-     payload_data = (caddr_t)tvb_memdup(NULL, payload_tvb, 0, payload_length);
-     xdrmem_create(&xdrs, payload_data, payload_length, XDR_DECODE);
- 
-    dissect(payload_tvb, tree, &xdrs, -1);
-+    dissect(payload_tvb, pinfo, tree, &xdrs, -1);
- 
-     xdr_destroy(&xdrs);
-     g_free(payload_data);
- 
-     if (nfds != 0)
-        dissect_libvirt_fds(tvb, start + payload_length, nfds);
-+        dissect_libvirt_fds(tvb, pinfo, start + payload_length, nfds);
- }
- 
- static gboolean
-dissect_xdr_stream_hole(tvbuff_t *tvb, proto_tree *tree, XDR *xdrs, int hf)
-+dissect_xdr_stream_hole(tvbuff_t *tvb,
-+                        packet_info *pinfo,
-+                        proto_tree *tree,
-+                        XDR *xdrs,
-+                        int hf)
- {
-     goffset start;
-     proto_item *ti;
-@@ -411,10 +468,10 @@ dissect_xdr_stream_hole(tvbuff_t *tvb, proto_tree *tree, XDR *xdrs, int hf)
-     tree = proto_item_add_subtree(ti, ett_libvirt_stream_hole);
- 
-     hf = hf_libvirt_stream_hole_length;
-    if (!dissect_xdr_hyper(tvb, tree, xdrs, hf)) return FALSE;
-+    if (!dissect_xdr_hyper(tvb, pinfo, tree, xdrs, hf)) return FALSE;
- 
-     hf = hf_libvirt_stream_hole_flags;
-    if (!dissect_xdr_u_int(tvb, tree, xdrs, hf)) return FALSE;
-+    if (!dissect_xdr_u_int(tvb, pinfo, tree, xdrs, hf)) return FALSE;
- 
-     proto_item_set_len(ti, xdr_getpos(xdrs) - start);
-     return TRUE;
-@@ -424,6 +481,7 @@ dissect_xdr_stream_hole(tvbuff_t *tvb, proto_tree *tree, XDR *xdrs, int hf)
- 
- static void
- dissect_libvirt_payload(tvbuff_t *tvb,
-+                        packet_info *pinfo,
-                         proto_tree *tree,
-                         uint32_t prog,
-                         int32_t proc,
-@@ -447,13 +505,13 @@ dissect_libvirt_payload(tvbuff_t *tvb,
-         xd = find_payload_dissector(proc, type, pds, *len);
-         if (xd == NULL)
-             goto unknown;
-        dissect_libvirt_payload_xdr_data(tvb, tree, payload_length, status, xd);
-+        dissect_libvirt_payload_xdr_data(tvb, pinfo, tree, payload_length, status, xd);
-     } else if (status == VIR_NET_ERROR) {
-        dissect_libvirt_payload_xdr_data(tvb, tree, payload_length, status, dissect_xdr_remote_error);
-+        dissect_libvirt_payload_xdr_data(tvb, pinfo, tree, payload_length, status, dissect_xdr_remote_error);
-     } else if (type == VIR_NET_STREAM) { /* implicitly, status == VIR_NET_CONTINUE */
-        dissect_libvirt_stream(tvb, tree, payload_length);
-+        dissect_libvirt_stream(tvb, pinfo, tree, payload_length);
-     } else if (type == VIR_NET_STREAM_HOLE) {
-        dissect_libvirt_payload_xdr_data(tvb, tree, payload_length, status, dissect_xdr_stream_hole);
-+        dissect_libvirt_payload_xdr_data(tvb, pinfo, tree, payload_length, status, dissect_xdr_stream_hole);
-     } else {
-         goto unknown;
-     }
-@@ -489,21 +547,21 @@ dissect_libvirt_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
-     serial = tvb_get_ntohl(tvb, offset); offset += 4;
-     status = tvb_get_ntohil(tvb, offset); offset += 4;
- 
-    prog_str = vir_val_to_str(prog, program_strings, "%x");
-+    prog_str = vir_val_to_str(pinfo, prog, program_strings, "%x");
-     col_add_fstr(pinfo->cinfo, COL_INFO, "Prog=%s", prog_str);
-    vir_wmem_free(prog_str);
-+    vir_wmem_free(pinfo, prog_str);
- 
-     vs = get_program_data(prog, VIR_PROGRAM_PROCSTRINGS);
-    proc_str = vir_val_to_str(proc, vs, "%d");
-+    proc_str = vir_val_to_str(pinfo, proc, vs, "%d");
-     col_append_fstr(pinfo->cinfo, COL_INFO, " Proc=%s", proc_str);
-    vir_wmem_free(proc_str);
-+    vir_wmem_free(pinfo, proc_str);
- 
-    type_str = vir_val_to_str(type, type_strings, "%d");
-    status_str = vir_val_to_str(status, status_strings, "%d");
-+    type_str = vir_val_to_str(pinfo, type, type_strings, "%d");
-+    status_str = vir_val_to_str(pinfo, status, status_strings, "%d");
-     col_append_fstr(pinfo->cinfo, COL_INFO, " Type=%s Serial=%u Status=%s",
-                     type_str, serial, status_str);
-    vir_wmem_free(status_str);
-    vir_wmem_free(type_str);
-+    vir_wmem_free(pinfo, status_str);
-+    vir_wmem_free(pinfo, type_str);
- 
-     if (tree) {
-         gint *hf_proc;
-@@ -532,21 +590,26 @@ dissect_libvirt_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
-         proto_tree_add_item(libvirt_tree, hf_libvirt_status,  tvb, offset, 4, ENC_NA); offset += 4;
- 
-         /* Dissect payload remaining */
-        dissect_libvirt_payload(tvb, libvirt_tree, prog, proc, type, status);
-+        dissect_libvirt_payload(tvb, pinfo, libvirt_tree, prog, proc, type, status);
-     }
- 
-     return 0;
- }
- 
- static guint
-get_message_len(packet_info *pinfo G_GNUC_UNUSED, tvbuff_t *tvb, int offset, void *data G_GNUC_UNUSED)
-+get_message_len(packet_info *pinfo G_GNUC_UNUSED,
-+                tvbuff_t *tvb,
-+                int offset,
-+                void *data G_GNUC_UNUSED)
- {
-     return tvb_get_ntohl(tvb, offset);
- }
- 
- static int
-dissect_libvirt(tvbuff_t *tvb, packet_info *pinfo,
-                proto_tree *tree, void *data G_GNUC_UNUSED)
-+dissect_libvirt(tvbuff_t *tvb,
-+                packet_info *pinfo,
-+                proto_tree *tree,
-+                void *data G_GNUC_UNUSED)
- {
-     /* Another magic const - 4; simply, how much bytes
-      * is needed to tell the length of libvirt packet. */
-diff --git a/tools/wireshark/util/genxdrstub.pl b/tools/wireshark/util/genxdrstub.pl
-index 01b663a88c..f69695c091 100755
--- a/tools/wireshark/util/genxdrstub.pl
-+++ b/tools/wireshark/util/genxdrstub.pl
-@@ -250,7 +250,7 @@ sub xdr_type {
- sub render_caller {
-     my ($self, $hfid) = @_;
-     my $name = $c->rinc( 'dissect_xdr_'.($self->idstrip || lc($self->xdr_type)) );
-    "$name(tvb, tree, xdrs, hf)";
-+    "$name(tvb, pinfo, tree, xdrs, hf)";
- }
- 
- sub ft_type {
-@@ -345,7 +345,7 @@ BEGIN{::register_profile(
- sub render_caller {
-     my ($self) = @_;
-     my ($klass) = ref($self) =~ /([^:]+)$/;
-    sprintf '%s(tvb, tree, xdrs, hf, %s)',
-+    sprintf '%s(tvb, pinfo, tree, xdrs, hf, %s)',
-         $c->rinc('dissect_xdr_'.lc($klass)),
-         $c->rinc('dissect_xdr_'.$self->reftype->idstrip);
- }
-@@ -359,7 +359,7 @@ BEGIN{::register_profile(
- sub render_caller {
-     my ($self, $hfid) = @_;
-     my ($klass) = ref($self) =~ /([^:]+)$/;
-    sprintf '%s(tvb, tree, xdrs, hf, %s)',
-+    sprintf '%s(tvb, pinfo, tree, xdrs, hf, %s)',
-         $c->rinc('dissect_xdr_'.lc($klass)), $self->length || '~0';
- }
- 
-@@ -447,7 +447,7 @@ BEGIN{::register_profile(
- sub render_caller {
-     my ($self, $hfid) = @_;
-     my ($pname) = reverse split /__/, $hfid;
-    sprintf 'dissect_xdr_array(tvb, tree, xdrs, hf, %s, %s, "%s", %s, %s)',
-+    sprintf 'dissect_xdr_array(tvb, pinfo, tree, xdrs, hf, %s, %s, "%s", %s, %s)',
-         $c->rinc('ett_'.$self->idstrip),
-         $c->rinc("hf_$hfid\__$pname"),
-         $self->reftype->idstrip,
-@@ -476,7 +476,7 @@ BEGIN{::register_profile(
- sub render_caller {
-     my ($self, $hfid) = @_;
-     my ($pname) = reverse split /__/, $hfid;
-    sprintf 'dissect_xdr_vector(tvb, tree, xdrs, hf, %s, %s, "%s", %s, %s)',
-+    sprintf 'dissect_xdr_vector(tvb, pinfo, tree, xdrs, hf, %s, %s, "%s", %s, %s)',
-         $c->rinc('ett_'.$self->idstrip),
-         $c->rinc("hf_$hfid\__$pname"),
-         $self->reftype->idstrip,
-@@ -857,7 +857,7 @@ __END__<<DUMMY # Dummy heredoc to disable perl syntax highlighting
- my ($self, $ident) = @_;
- return if $self->is_primitive;
- %>
-static gboolean dissect_xdr_<%= $ident %>(tvbuff_t *tvb, proto_tree *tree, XDR *xdrs, int hf)
-+static gboolean dissect_xdr_<%= $ident %>(tvbuff_t *tvb, packet_info *pinfo G_GNUC_UNUSED, proto_tree *tree, XDR *xdrs, int hf)
- {
-     return <%= $self->dealias->render_caller($self->ident eq $ident ? undef : $ident) %>;
- }
-@@ -865,7 +865,7 @@ static gboolean dissect_xdr_<%= $ident %>(tvbuff_t *tvb, proto_tree *tree, XDR *
- <% my ($self, $ident) = @_;
-    my $hfvar = $c->rinc('hf_'.$self->idstrip);
- %>
-static gboolean dissect_xdr_<%= $ident %>(tvbuff_t *tvb, proto_tree *tree, XDR *xdrs, int hf)
-+static gboolean dissect_xdr_<%= $ident %>(tvbuff_t *tvb, packet_info *pinfo G_GNUC_UNUSED, proto_tree *tree, XDR *xdrs, int hf)
- {
-     goffset start;
-     proto_item *ti;
-@@ -890,7 +890,7 @@ static gboolean dissect_xdr_<%= $ident %>(tvbuff_t *tvb, proto_tree *tree, XDR *
- }
- @@ Sym::Type::Enum#render_dissector
- <% my ($self, $ident) = @_; %>
-static gboolean dissect_xdr_<%= $ident %>(tvbuff_t *tvb, proto_tree *tree, XDR *xdrs, int hf)
-+static gboolean dissect_xdr_<%= $ident %>(tvbuff_t *tvb, packet_info *pinfo G_GNUC_UNUSED, proto_tree *tree, XDR *xdrs, int hf)
- {
-     goffset start;
-     enum { DUMMY } es;
-@@ -914,7 +914,7 @@ static gboolean dissect_xdr_<%= $ident %>(tvbuff_t *tvb, proto_tree *tree, XDR *
- my ($self, $ident) = @_;
- my $decl_type = $self->decl->type->idstrip;
- %>
-static gboolean dissect_xdr_<%= $ident %>(tvbuff_t *tvb, proto_tree *tree, XDR *xdrs, int hf)
-+static gboolean dissect_xdr_<%= $ident %>(tvbuff_t *tvb, packet_info *pinfo G_GNUC_UNUSED, proto_tree *tree, XDR *xdrs, int hf)
- {
-     gboolean rc = TRUE;
-     goffset start;
-- 
-2.51.0
-
@@ -0,0 +1,21 @@
+# Makefile for source rpm: libvirt
+# $Id$
+NAME := libvirt
+SPECFILE = $(firstword $(wildcard *.spec))
+
+define find-makefile-common
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+endef
+
+MAKEFILE_COMMON := $(shell $(find-makefile-common))
+
+ifeq ($(MAKEFILE_COMMON),)
+# attempt a checkout
+define checkout-makefile-common
+test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
+endef
+
+MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
+endif
+
+include $(MAKEFILE_COMMON)
@@ -0,0 +1 @@
+F-13
@@ -0,0 +1,163 @@
+commit 377bc412ce10845930346744e30fe9c4790e5e63
+Author: Cole Robinson <crobinso@redhat.com>
+Date:   Wed May 19 16:03:52 2010 -0400
+
+    daemon: Export SDL audio environment variables
+    
+    /etc/sysconfig/libvirtd has a few environment variables for configuring
+    libvirt SDL audio. The libvirtd process doesn't see these, however, because
+    they are never exported. Let's export the variables after sourcing the
+    sysconfig script.
+    
+    There is another problem here that the commented out values in the
+    sysconfig script are not neccessarily the actual defaults, we are qemus
+    mercy here. Not sure how to solve that.
+
+diff --git a/daemon/libvirtd.init.in b/daemon/libvirtd.init.in
+index 809433e..aa7870c 100644
+--- a/daemon/libvirtd.init.in
+++ b/daemon/libvirtd.init.in
+@@ -45,6 +45,9 @@ KRB5_KTNAME=/etc/libvirt/krb5.tab
+ 
+ test -f @sysconfdir@/sysconfig/libvirtd && . @sysconfdir@/sysconfig/libvirtd
+ 
+export QEMU_AUDIO_DRV
+export SDL_AUDIODRIVER
+
+ LIBVIRTD_CONFIG_ARGS=
+ if [ -n "$LIBVIRTD_CONFIG" ]
+ then
+commit 7f44743c524faa493d05eaf026f1e90a807e502b
+Author: Cole Robinson <crobinso@redhat.com>
+Date:   Wed May 26 10:51:36 2010 -0400
+
+    daemon: sysconf: Update comment about VNC audio
+
+diff --git a/daemon/libvirtd.sysconf b/daemon/libvirtd.sysconf
+index 28080a0..b730c5e 100644
+--- a/daemon/libvirtd.sysconf
+++ b/daemon/libvirtd.sysconf
+@@ -11,7 +11,8 @@
+ # Override the QEMU/SDL default audio driver probing when
+ # starting virtual machines using SDL graphics
+ #
+-# NB these have no effect for VMs using VNC
+# NB these have no effect for VMs using VNC, unless vnc_allow_host_audio
+# is enabled in /etc/libvirt/qemu.conf
+ #QEMU_AUDIO_DRV=sdl
+ #
+ #SDL_AUDIODRIVER=pulse
+commit fb3ebd0397980ae035e66f0008b09e13377ef80f
+Author: Cole Robinson <crobinso@redhat.com>
+Date:   Wed May 19 16:41:01 2010 -0400
+
+    qemu: Allow using regular audio backends with VNC
+    
+    Currently all host audio backends are disabled if a VM is using VNC, in
+    favor of the QEMU VNC audio extension. Unfortunately no released VNC
+    client supports this extension, so users have no way of getting audio
+    to work if using VNC.
+    
+    Add a new config option in qemu.conf which allows changing libvirt's
+    behavior, but keep the default intact.
+    
+    v2: Fix doc typos, change name to vnc_allow_host_audio
+
+diff --git a/src/qemu/libvirtd_qemu.aug b/src/qemu/libvirtd_qemu.aug
+index 5bd60b3..551cc20 100644
+--- a/src/qemu/libvirtd_qemu.aug
+++ b/src/qemu/libvirtd_qemu.aug
+@@ -38,6 +38,7 @@ module Libvirtd_qemu =
+                  | str_entry "save_image_format"
+                  | str_entry "hugetlbfs_mount"
+                  | bool_entry "relaxed_acs_check"
+                 | bool_entry "vnc_allow_host_audio"
+ 
+    (* Each enty in the config is one of the following three ... *)
+    let entry = vnc_entry
+diff --git a/src/qemu/qemu.conf b/src/qemu/qemu.conf
+index 3da332f..98a1176 100644
+--- a/src/qemu/qemu.conf
+++ b/src/qemu/qemu.conf
+@@ -168,3 +168,13 @@
+ # be assigned to guests.
+ #
+ # relaxed_acs_check = 1
+
+
+# QEMU implements an extension for providing audio over a VNC connection,
+# though if your VNC client does not support it, your only chance for getting
+# sound output is through regular audio backends. By default, libvirt will
+# disable all QEMU sound backends if using VNC, since they can cause
+# permissions issues. Enabling this option will make libvirtd honor the
+# QEMU_AUDIO_DRV environment variable when using VNC.
+#
+# vnc_allow_host_audio = 0
+diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c
+index 2755545..b4d8e74 100644
+--- a/src/qemu/qemu_conf.c
+++ b/src/qemu/qemu_conf.c
+@@ -351,6 +351,10 @@ int qemudLoadDriverConfig(struct qemud_driver *driver,
+     CHECK_TYPE ("relaxed_acs_check", VIR_CONF_LONG);
+     if (p) driver->relaxedACS = p->l;
+ 
+    p = virConfGetValue (conf, "vnc_allow_host_audio");
+    CHECK_TYPE ("vnc_allow_host_audio", VIR_CONF_LONG);
+    if (p) driver->vncAllowHostAudio = p->l;
+
+     virConfFree (conf);
+     return 0;
+ }
+@@ -4399,12 +4403,15 @@ int qemudBuildCommandLine(virConnectPtr conn,
+             ADD_ARG_LIT(def->graphics[0]->data.vnc.keymap);
+         }
+ 
+-        /* QEMU implements a VNC extension for providing audio, so we
+-         * set the audio backend to none, to prevent it opening the
+-         * host OS audio devices since that causes security issues
+-         * and is non-sensical when using VNC.
+        /* Unless user requested it, set the audio backend to none, to
+         * prevent it opening the host OS audio devices, since that causes
+         * security issues and might not work when using VNC.
+          */
+-        ADD_ENV_LIT("QEMU_AUDIO_DRV=none");
+        if (driver->vncAllowHostAudio) {
+            ADD_ENV_COPY("QEMU_AUDIO_DRV");
+        } else {
+            ADD_ENV_LIT("QEMU_AUDIO_DRV=none");
+        }
+     } else if ((def->ngraphics == 1) &&
+                def->graphics[0]->type == VIR_DOMAIN_GRAPHICS_TYPE_SDL) {
+         char *xauth = NULL;
+diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h
+index 8fd8d79..7fb4de5 100644
+--- a/src/qemu/qemu_conf.h
+++ b/src/qemu/qemu_conf.h
+@@ -138,6 +138,8 @@ struct qemud_driver {
+ 
+     unsigned int relaxedACS : 1;
+ 
+    unsigned int vncAllowHostAudio : 1;
+
+     virCapsPtr caps;
+ 
+     /* An array of callbacks */
+diff --git a/src/qemu/test_libvirtd_qemu.aug b/src/qemu/test_libvirtd_qemu.aug
+index 2feedc0..a048ae5 100644
+--- a/src/qemu/test_libvirtd_qemu.aug
+++ b/src/qemu/test_libvirtd_qemu.aug
+@@ -97,6 +97,8 @@ save_image_format = \"gzip\"
+ hugetlbfs_mount = \"/dev/hugepages\"
+ 
+ relaxed_acs_check = 1
+
+vnc_allow_host_audio = 1
+ "
+ 
+    test Libvirtd_qemu.lns get conf =
+@@ -204,3 +206,5 @@ relaxed_acs_check = 1
+ { "hugetlbfs_mount" = "/dev/hugepages" }
+ { "#empty" }
+ { "relaxed_acs_check" = "1" }
+{ "#empty" }
+{ "vnc_allow_host_audio" = "1" }
@@ -0,0 +1,110 @@
+diff -rup libvirt-0.7.7/src/qemu/libvirtd_qemu.aug new/src/qemu/libvirtd_qemu.aug
+--- libvirt-0.7.7/src/qemu/libvirtd_qemu.aug	2010-06-17 12:38:52.998946000 -0400
+++ new/src/qemu/libvirtd_qemu.aug	2010-06-17 12:39:28.504148000 -0400
+@@ -39,6 +39,7 @@ module Libvirtd_qemu =
+                  | str_entry "hugetlbfs_mount"
+                  | bool_entry "relaxed_acs_check"
+                  | bool_entry "vnc_allow_host_audio"
+                 | bool_entry "clear_emulator_capabilities"
+ 
+    (* Each enty in the config is one of the following three ... *)
+    let entry = vnc_entry
+diff -rup libvirt-0.7.7/src/qemu/qemu.conf new/src/qemu/qemu.conf
+--- libvirt-0.7.7/src/qemu/qemu.conf	2010-06-17 12:38:53.001953000 -0400
+++ new/src/qemu/qemu.conf	2010-06-17 12:39:28.508149000 -0400
+@@ -178,3 +178,12 @@
+ # QEMU_AUDIO_DRV environment variable when using VNC.
+ #
+ # vnc_allow_host_audio = 0
+
+# If clear_emulator_capabilities is enabled, libvirt will drop all
+# privileged capabilities of the QEmu/KVM emulator. This is enabled by
+# default.
+#
+# Warning: Disabling this option means that a compromised guest can
+# exploit the privileges and possibly do damage to the host.
+#
+# clear_emulator_capabilities = 1
+diff -rup libvirt-0.7.7/src/qemu/qemu_conf.c new/src/qemu/qemu_conf.c
+--- libvirt-0.7.7/src/qemu/qemu_conf.c	2010-06-17 12:38:53.010946000 -0400
+++ new/src/qemu/qemu_conf.c	2010-06-17 12:39:28.526151000 -0400
+@@ -103,6 +103,7 @@ int qemudLoadDriverConfig(struct qemud_d
+ 
+     /* Setup critical defaults */
+     driver->dynamicOwnership = 1;
+    driver->clearEmulatorCapabilities = 1;
+ 
+     if (!(driver->vncListen = strdup("127.0.0.1"))) {
+         virReportOOMError();
+@@ -354,6 +355,10 @@ int qemudLoadDriverConfig(struct qemud_d
+     CHECK_TYPE ("vnc_allow_host_audio", VIR_CONF_LONG);
+     if (p) driver->vncAllowHostAudio = p->l;
+ 
+    p = virConfGetValue (conf, "clear_emulator_capabilities");
+    CHECK_TYPE ("clear_emulator_capabilities", VIR_CONF_LONG);
+    if (p) driver->clearEmulatorCapabilities = p->l;
+
+     virConfFree (conf);
+     return 0;
+ }
+diff -rup libvirt-0.7.7/src/qemu/qemu_conf.h new/src/qemu/qemu_conf.h
+--- libvirt-0.7.7/src/qemu/qemu_conf.h	2010-06-17 12:38:53.015945000 -0400
+++ new/src/qemu/qemu_conf.h	2010-06-17 12:39:28.531146000 -0400
+@@ -129,8 +129,8 @@ struct qemud_driver {
+     ebtablesContext *ebtables;
+ 
+     unsigned int relaxedACS : 1;
+-
+     unsigned int vncAllowHostAudio : 1;
+    unsigned int clearEmulatorCapabilities : 1;
+ 
+     virCapsPtr caps;
+ 
+diff -rup libvirt-0.7.7/src/qemu/qemu_driver.c new/src/qemu/qemu_driver.c
+--- libvirt-0.7.7/src/qemu/qemu_driver.c	2010-06-17 12:38:52.988953000 -0400
+++ new/src/qemu/qemu_driver.c	2010-06-17 12:39:28.542147000 -0400
+@@ -2699,7 +2699,7 @@ static int qemudStartVMDaemon(virConnect
+                               int stdin_fd) {
+     const char **argv = NULL, **tmp;
+     const char **progenv = NULL;
+-    int i, ret;
+    int i, ret, runflags;
+     struct stat sb;
+     int *tapfds = NULL;
+     int ntapfds = 0;
+@@ -2893,9 +2893,16 @@ static int qemudStartVMDaemon(virConnect
+     for (i = 0 ; i < ntapfds ; i++)
+         FD_SET(tapfds[i], &keepfd);
+ 
+    VIR_DEBUG("Clear emulator capabilities: %d",
+              driver->clearEmulatorCapabilities);
+    runflags = VIR_EXEC_NONBLOCK;
+    if (driver->clearEmulatorCapabilities) {
+        runflags |= VIR_EXEC_CLEAR_CAPS;
+    }
+
+     ret = virExecDaemonize(argv, progenv, &keepfd, &child,
+                            stdin_fd, &logfile, &logfile,
+-                           VIR_EXEC_NONBLOCK | VIR_EXEC_CLEAR_CAPS,
+                           runflags,
+                            qemudSecurityHook, &hookData,
+                            pidfile);
+     VIR_FREE(pidfile);
+diff -rup libvirt-0.7.7/src/qemu/test_libvirtd_qemu.aug new/src/qemu/test_libvirtd_qemu.aug
+--- libvirt-0.7.7/src/qemu/test_libvirtd_qemu.aug	2010-06-17 12:38:53.018948000 -0400
+++ new/src/qemu/test_libvirtd_qemu.aug	2010-06-17 12:39:28.546145000 -0400
+@@ -99,6 +99,8 @@ hugetlbfs_mount = \"/dev/hugepages\"
+ relaxed_acs_check = 1
+ 
+ vnc_allow_host_audio = 1
+
+clear_emulator_capabilities = 0
+ "
+ 
+    test Libvirtd_qemu.lns get conf =
+@@ -208,3 +210,5 @@ vnc_allow_host_audio = 1
+ { "relaxed_acs_check" = "1" }
+ { "#empty" }
+ { "vnc_allow_host_audio" = "1" }
+{ "#empty" }
+{ "clear_emulator_capabilities" = "0" }
@@ -0,0 +1,132 @@
+commit c4896d378b921ba6471562d7b17641be121c19d6
+Author: Daniel P. Berrange <berrange@redhat.com>
+Date:   Thu Apr 15 11:35:07 2010 +0100
+
+    Fix CDROM media change for QEMU when using -device syntax
+    
+    Disk devices in QEMU have two parts, the guest device and the host
+    backend driver. Historically these two parts have had the same
+    "unique" name. With the switch to using -device though, they now
+    have separate names. Thus when changing CDROM media, for guests
+    using -device syntax, we need to prepend the QEMU_DRIVE_HOST_PREFIX
+    constant
+    
+    * src/qemu/qemu_conf.c, src/qemu/qemu_conf.h: Add helper function
+      qemuDeviceDriveHostAlias() for building a host backend alias
+    * src/qemu/qemu_driver.c: Use qemuDeviceDriveHostAlias() to determine
+      the host backend alias for performing eject/change commands in the
+      monitor
+
+diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c
+index 1a8b4aa..0cbedf2 100644
+--- a/src/qemu/qemu_conf.c
+++ b/src/qemu/qemu_conf.c
+@@ -1699,6 +1699,26 @@ static int qemuAssignDeviceDiskAliasLegacy(virDomainDiskDefPtr disk)
+ }
+ 
+ 
+char *qemuDeviceDriveHostAlias(virDomainDiskDefPtr disk,
+                               unsigned long long qemudCmdFlags)
+{
+    char *ret;
+
+    if (qemudCmdFlags & QEMUD_CMD_FLAG_DEVICE) {
+        if (virAsprintf(&ret, "%s%s", QEMU_DRIVE_HOST_PREFIX, disk->info.alias) < 0) {
+            virReportOOMError();
+            return NULL;
+        }
+    } else {
+        if (!(ret = strdup(disk->info.alias))) {
+            virReportOOMError();
+            return NULL;
+        }
+    }
+    return ret;
+}
+
+
+ /* Names used before -drive supported the id= option */
+ static int qemuAssignDeviceDiskAliasFixed(virDomainDiskDefPtr disk)
+ {
+diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h
+index 574709e..b2820f0 100644
+--- a/src/qemu/qemu_conf.h
+++ b/src/qemu/qemu_conf.h
+@@ -220,6 +220,9 @@ char * qemuBuildNicStr(virDomainNetDefPtr net,
+ char * qemuBuildNicDevStr(virDomainNetDefPtr net,
+                           int vlan);
+ 
+char *qemuDeviceDriveHostAlias(virDomainDiskDefPtr disk,
+                               unsigned long long qemudCmdFlags);
+
+ /* Both legacy & current support */
+ char *qemuBuildDriveStr(virDomainDiskDefPtr disk,
+                         int bootable,
+diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
+index 0189dcf..7d2f3ef 100644
+--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
+@@ -6552,11 +6552,13 @@ cleanup:
+ 
+ static int qemudDomainChangeEjectableMedia(struct qemud_driver *driver,
+                                            virDomainObjPtr vm,
+-                                           virDomainDiskDefPtr disk)
+                                           virDomainDiskDefPtr disk,
+                                           unsigned long long qemuCmdFlags)
+ {
+     virDomainDiskDefPtr origdisk = NULL;
+     int i;
+     int ret;
+    char *driveAlias = NULL;
+ 
+     origdisk = NULL;
+     for (i = 0 ; i < vm->def->ndisks ; i++) {
+@@ -6594,6 +6596,9 @@ static int qemudDomainChangeEjectableMedia(struct qemud_driver *driver,
+         driver->securityDriver->domainSetSecurityImageLabel(vm, disk) < 0)
+         return -1;
+ 
+    if (!(driveAlias = qemuDeviceDriveHostAlias(origdisk, qemuCmdFlags)))
+        goto error;
+
+     qemuDomainObjPrivatePtr priv = vm->privateData;
+     qemuDomainObjEnterMonitorWithDriver(driver, vm);
+     if (disk->src) {
+@@ -6605,10 +6610,10 @@ static int qemudDomainChangeEjectableMedia(struct qemud_driver *driver,
+                 format = origdisk->driverType;
+         }
+         ret = qemuMonitorChangeMedia(priv->mon,
+-                                     origdisk->info.alias,
+                                     driveAlias,
+                                      disk->src, format);
+     } else {
+-        ret = qemuMonitorEjectMedia(priv->mon, origdisk->info.alias);
+        ret = qemuMonitorEjectMedia(priv->mon, driveAlias);
+     }
+     qemuDomainObjExitMonitorWithDriver(driver, vm);
+ 
+@@ -6625,11 +6630,14 @@ static int qemudDomainChangeEjectableMedia(struct qemud_driver *driver,
+     disk->src = NULL;
+     origdisk->type = disk->type;
+ 
+    VIR_FREE(driveAlias);
+
+     virDomainDiskDefFree(disk);
+ 
+     return ret;
+ 
+ error:
+    VIR_FREE(driveAlias);
+     if (driver->securityDriver &&
+         driver->securityDriver->domainRestoreSecurityImageLabel &&
+         driver->securityDriver->domainRestoreSecurityImageLabel(vm, disk) < 0)
+@@ -7434,7 +7442,9 @@ static int qemudDomainAttachDevice(virDomainPtr dom,
+         switch (dev->data.disk->device) {
+         case VIR_DOMAIN_DISK_DEVICE_CDROM:
+         case VIR_DOMAIN_DISK_DEVICE_FLOPPY:
+-            ret = qemudDomainChangeEjectableMedia(driver, vm, dev->data.disk);
+            ret = qemudDomainChangeEjectableMedia(driver, vm,
+                                                  dev->data.disk,
+                                                  qemuCmdFlags);
+             if (ret == 0)
+                 dev->data.disk = NULL;
+             break;
@@ -0,0 +1,41 @@
+From e3c36a2575bc88a16d776693dc39ea01c780b406 Mon Sep 17 00:00:00 2001
+From: Jiri Denemark <jdenemar@redhat.com>
+Date: Tue, 16 Mar 2010 16:03:59 +0100
+Subject: [PATCH] Use fsync() at the end of file allocation instead of O_DSYNC
+
+Instead of opening storage file with O_DSYNC, make sure data are written
+to a disk only before we claim allocation has finished.
+---
+ src/storage/storage_backend.c |    9 ++++++++-
+ 1 files changed, 8 insertions(+), 1 deletions(-)
+
+diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c
+index ec9fc43..7294a00 100644
+--- a/src/storage/storage_backend.c
+++ b/src/storage/storage_backend.c
+@@ -331,6 +331,13 @@ static int createRawFileOpHook(int fd, void *data) {
+                 goto cleanup;
+             }
+         }
+
+        if (fsync(fd) < 0) {
+            ret = errno;
+            virReportSystemError(errno, _("cannot sync data to file '%s'"),
+                                 hdata->vol->target.path);
+            goto cleanup;
+        }
+     }
+ 
+ cleanup:
+@@ -359,7 +366,7 @@ virStorageBackendCreateRaw(virConnectPtr conn ATTRIBUTE_UNUSED,
+     gid_t gid = (vol->target.perms.gid == -1) ? getgid() : vol->target.perms.gid;
+ 
+     if ((createstat = virFileOperation(vol->target.path,
+-                                       O_RDWR | O_CREAT | O_EXCL | O_DSYNC,
+                                       O_RDWR | O_CREAT | O_EXCL,
+                                        vol->target.perms.mode, uid, gid,
+                                        createRawFileOpHook, &hdata,
+                                        VIR_FILE_OP_FORCE_PERMS |
+-- 
+1.6.6.1
+
@@ -0,0 +1,12 @@
+diff -rup libvirt-0.7.1/src/util/hostusb.c new/src/hostusb.c
+--- libvirt-0.7.1/src/util/hostusb.c	2010-06-03 13:51:14.392459000 -0400
+++ new/src/util/hostusb.c	2010-06-03 14:49:11.763379000 -0400
+@@ -123,7 +123,7 @@ static int usbFindBusByVendor(virConnect
+             char *tmpstr = de->d_name;
+             unsigned found_bus, found_addr;
+ 
+-            if (STREQ(de->d_name, "usb"))
+            if (STRPREFIX(de->d_name, "usb"))
+                 tmpstr += 3;
+ 
+             if (virStrToLong_ui(tmpstr, &ignore, 10, &found_bus) < 0) {
@@ -0,0 +1,233 @@
+From 3a441522017aa9c1b8b54d2ce4569d0f0d96fa72 Mon Sep 17 00:00:00 2001
+From: Cole Robinson <crobinso@redhat.com>
+Date: Fri, 12 Mar 2010 12:36:56 -0500
+Subject: [PATCH] qemu: Add some debugging at domain startup
+
+---
+ src/qemu/qemu_driver.c |   24 +++++++++++++++++++++++-
+ 1 files changed, 23 insertions(+), 1 deletions(-)
+
+diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
+index f8ab545..040d645 100644
+--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
+@@ -2695,6 +2695,8 @@ static int qemudStartVMDaemon(virConnectPtr conn,
+ 
+     FD_ZERO(&keepfd);
+ 
+    DEBUG0("Beginning VM startup process");
+
+     if (virDomainObjIsActive(vm)) {
+         qemuReportError(VIR_ERR_OPERATION_INVALID,
+                         "%s", _("VM is already active"));
+@@ -2703,22 +2705,27 @@ static int qemudStartVMDaemon(virConnectPtr conn,
+ 
+     /* If you are using a SecurityDriver with dynamic labelling,
+        then generate a security label for isolation */
+    DEBUG0("Generating domain security label (if required)");
+     if (driver->securityDriver &&
+         driver->securityDriver->domainGenSecurityLabel &&
+         driver->securityDriver->domainGenSecurityLabel(vm) < 0)
+         return -1;
+ 
+    DEBUG0("Generating setting domain security labels (if required)");
+     if (driver->securityDriver &&
+         driver->securityDriver->domainSetSecurityAllLabel &&
+         driver->securityDriver->domainSetSecurityAllLabel(vm) < 0)
+         goto cleanup;
+ 
+-    /* Ensure no historical cgroup for this VM is lieing around bogus settings */
+    /* Ensure no historical cgroup for this VM is lying around bogus
+     * settings */
+    DEBUG0("Ensuring no historical cgroup is lying around");
+     qemuRemoveCgroup(driver, vm, 1);
+ 
+     if ((vm->def->ngraphics == 1) &&
+         vm->def->graphics[0]->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC &&
+         vm->def->graphics[0]->data.vnc.autoport) {
+        DEBUG0("Determining VNC port");
+         int port = qemudNextFreeVNCPort(driver);
+         if (port < 0) {
+             qemuReportError(VIR_ERR_INTERNAL_ERROR,
+@@ -2735,6 +2742,7 @@ static int qemudStartVMDaemon(virConnectPtr conn,
+         goto cleanup;
+     }
+ 
+    DEBUG0("Creating domain log file");
+     if ((logfile = qemudLogFD(driver, vm->def->name)) < 0)
+         goto cleanup;
+ 
+@@ -2751,14 +2759,17 @@ static int qemudStartVMDaemon(virConnectPtr conn,
+         goto cleanup;
+     }
+ 
+    DEBUG0("Determing emulator version");
+     if (qemudExtractVersionInfo(emulator,
+                                 NULL,
+                                 &qemuCmdFlags) < 0)
+         goto cleanup;
+ 
+    DEBUG0("Setting up domain cgroup (if required)");
+     if (qemuSetupCgroup(driver, vm) < 0)
+         goto cleanup;
+ 
+    DEBUG0("Preparing host devices");
+     if (qemuPrepareHostDevices(driver, vm->def) < 0)
+         goto cleanup;
+ 
+@@ -2767,6 +2778,7 @@ static int qemudStartVMDaemon(virConnectPtr conn,
+         goto cleanup;
+     }
+ 
+    DEBUG0("Preparing monitor state");
+     if (qemuPrepareMonitorChr(driver, priv->monConfig, vm->def->name) < 0)
+         goto cleanup;
+ 
+@@ -2798,6 +2810,7 @@ static int qemudStartVMDaemon(virConnectPtr conn,
+      * use in hotplug
+      */
+     if (qemuCmdFlags & QEMUD_CMD_FLAG_DEVICE) {
+        DEBUG0("Assigning domain PCI addresses");
+         /* Populate cache with current addresses */
+         if (priv->pciaddrs) {
+             qemuDomainPCIAddressSetFree(priv->pciaddrs);
+@@ -2816,6 +2829,7 @@ static int qemudStartVMDaemon(virConnectPtr conn,
+         priv->persistentAddrs = 0;
+     }
+ 
+    DEBUG0("Building emulator command line");
+     vm->def->id = driver->nextvmid++;
+     if (qemudBuildCommandLine(conn, driver, vm->def, priv->monConfig,
+                               priv->monJSON, qemuCmdFlags, &argv, &progenv,
+@@ -2899,25 +2913,31 @@ static int qemudStartVMDaemon(virConnectPtr conn,
+     if (ret == -1) /* The VM failed to start */
+         goto cleanup;
+ 
+    DEBUG0("Waiting for monitor to show up");
+     if (qemudWaitForMonitor(driver, vm, pos) < 0)
+         goto abort;
+ 
+    DEBUG0("Detecting VCPU PIDs");
+     if (qemuDetectVcpuPIDs(driver, vm) < 0)
+         goto abort;
+ 
+    DEBUG0("Setting CPU affinity");
+     if (qemudInitCpuAffinity(vm) < 0)
+         goto abort;
+ 
+    DEBUG0("Setting any required VM passwords");
+     if (qemuInitPasswords(conn, driver, vm, qemuCmdFlags) < 0)
+         goto abort;
+ 
+     /* If we have -device, then addresses are assigned explicitly.
+      * If not, then we have to detect dynamic ones here */
+     if (!(qemuCmdFlags & QEMUD_CMD_FLAG_DEVICE)) {
+        DEBUG0("Determining domain device PCI addresses");
+         if (qemuInitPCIAddresses(driver, vm) < 0)
+             goto abort;
+     }
+ 
+    DEBUG0("Setting initial memory amount");
+     qemuDomainObjEnterMonitorWithDriver(driver, vm);
+     if (qemuMonitorSetBalloon(priv->mon, vm->def->memory) < 0) {
+         qemuDomainObjExitMonitorWithDriver(driver, vm);
+@@ -2925,6 +2945,7 @@ static int qemudStartVMDaemon(virConnectPtr conn,
+     }
+ 
+     if (migrateFrom == NULL) {
+        DEBUG0("Starting domain CPUs");
+         /* Allow the CPUS to start executing */
+         if (qemuMonitorStartCPUs(priv->mon, conn) < 0) {
+             if (virGetLastError() == NULL)
+@@ -2937,6 +2958,7 @@ static int qemudStartVMDaemon(virConnectPtr conn,
+     qemuDomainObjExitMonitorWithDriver(driver, vm);
+ 
+ 
+    DEBUG0("Writing domain status to disk");
+     if (virDomainSaveStatus(driver->caps, driver->stateDir, vm) < 0)
+         goto abort;
+ 
+-- 
+1.6.6.1
+
+From 6d5c8a8f51db8ce97ab35ab6022dd5c94ab016b4 Mon Sep 17 00:00:00 2001
+From: Cole Robinson <crobinso@redhat.com>
+Date: Fri, 12 Mar 2010 12:37:52 -0500
+Subject: [PATCH] qemu: Fix USB by product with security enabled
+
+We need to call PrepareHostdevs to determine the USB device path before
+any security calls. PrepareHostUSBDevices was also incorrectly skipping
+all USB devices.
+---
+ src/qemu/qemu_driver.c |   11 ++++++-----
+ 1 files changed, 6 insertions(+), 5 deletions(-)
+
+diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
+index 040d645..b17d26d 100644
+--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
+@@ -2360,7 +2360,7 @@ qemuPrepareHostUSBDevices(struct qemud_driver *driver ATTRIBUTE_UNUSED,
+ 
+         if (hostdev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS)
+             continue;
+-        if (hostdev->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI)
+        if (hostdev->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB)
+             continue;
+ 
+         /* Resolve a vendor/product to bus/device */
+@@ -2703,6 +2703,11 @@ static int qemudStartVMDaemon(virConnectPtr conn,
+         return -1;
+     }
+ 
+    /* Must be run before security labelling */
+    DEBUG0("Preparing host devices");
+    if (qemuPrepareHostDevices(driver, vm->def) < 0)
+        goto cleanup;
+
+     /* If you are using a SecurityDriver with dynamic labelling,
+        then generate a security label for isolation */
+     DEBUG0("Generating domain security label (if required)");
+@@ -2769,10 +2774,6 @@ static int qemudStartVMDaemon(virConnectPtr conn,
+     if (qemuSetupCgroup(driver, vm) < 0)
+         goto cleanup;
+ 
+-    DEBUG0("Preparing host devices");
+-    if (qemuPrepareHostDevices(driver, vm->def) < 0)
+-        goto cleanup;
+-
+     if (VIR_ALLOC(priv->monConfig) < 0) {
+         virReportOOMError();
+         goto cleanup;
+-- 
+1.6.6.1
+
+From 65e97240e6e4606820dd1c42ac172319e0af4d8d Mon Sep 17 00:00:00 2001
+From: Cole Robinson <crobinso@redhat.com>
+Date: Mon, 22 Mar 2010 10:45:36 -0400
+Subject: [PATCH] security: selinux: Fix crash when releasing non-existent label
+
+This can be triggered by the qemuStartVMDaemon cleanup path if a
+VM references a non-existent USB device (by product) in the XML.
+
+Signed-off-by: Cole Robinson <crobinso@redhat.com>
+---
+ src/security/security_selinux.c |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c
+index 975b315..6680e2d 100644
+--- a/src/security/security_selinux.c
+++ b/src/security/security_selinux.c
+@@ -632,7 +632,8 @@ SELinuxReleaseSecurityLabel(virDomainObjPtr vm)
+ {
+     const virSecurityLabelDefPtr secdef = &vm->def->seclabel;
+ 
+-    if (secdef->type == VIR_DOMAIN_SECLABEL_STATIC)
+    if (secdef->type == VIR_DOMAIN_SECLABEL_STATIC ||
+        secdef->label == NULL)
+         return 0;
+ 
+     context_t con = context_new(secdef->label);
+-- 
+1.6.6.1
+
@@ -0,0 +1,35 @@
+commit 9d0adf249827dde9e1c0d1c19513cf6018ceb34e
+Author: Cole Robinson <crobinso@redhat.com>
+Date:   Wed May 19 15:57:56 2010 -0400
+
+    daemon: A few initscript corrections
+    
+    Fedora bug https://bugzilla.redhat.com/show_bug.cgi?id=565238
+    
+    - Avahi service is called 'avahi-daemon'
+    - chkconfig descriptions must use \ for line continuations
+
+diff --git a/daemon/libvirtd.init.in b/daemon/libvirtd.init.in
+index d4dc98b..809433e 100644
+--- a/daemon/libvirtd.init.in
+++ b/daemon/libvirtd.init.in
+@@ -9,7 +9,7 @@
+ # Should-Start: $named
+ # Should-Start: xend
+ # Should-Start: hal
+-# Should-Start: avahi
+# Should-Start: avahi-daemon
+ # Required-Stop: $network messagebus
+ # Should-Stop: $named
+ # Default-Start: 3 4 5
+@@ -24,8 +24,8 @@
+ # libvirtd:   guest and virtual network management daemon
+ #
+ # chkconfig: 345 97 03
+-# description:  This is a daemon for managing guest instances
+-#               and libvirt virtual networks
+# description:  This is a daemon for managing guest instances \
+#               and libvirt virtual networks \
+ #               See http://libvirt.org
+ #
+ # processname: libvirtd
@@ -0,0 +1,65 @@
+commit e5f31f461f63bbad211e84b810d6ba43a705f9dd
+Author: Justin Clift <justin@salasaga.org>
+Date:   Sun May 30 13:28:42 2010 +1000
+
+    Trivial virsh.pod additions --all for "list" command and similar
+    
+    This is just a trivial patch to virsh.pod (from git master). It adds the
+    following pieces to the virsh man page:
+    
+      + Shows the --inactive and --all optional parameters for the list
+        command.
+    
+        Closes Bugzilla #575512, reported by Renich Bon Ciric
+        https://bugzilla.redhat.com/show_bug.cgi?id=575512
+    
+      + Corrects the existing description of the list command, to now say
+        that only running domains are listed if no domains are specified.
+    
+        The man page up until this point has said all domains are listed if
+        no domains are specified, which is incorrect.
+    
+      + Adds the "shut off" state to the list of states for the list
+        command.
+    
+      + Adds a missing =back around line 755, that pod2man was complaining
+        was missing.
+
+diff --git a/tools/virsh.pod b/tools/virsh.pod
+index cf7585d..495bb46 100644
+--- a/tools/virsh.pod
+++ b/tools/virsh.pod
+@@ -156,10 +156,10 @@ description see:
+   L<http://libvirt.org/formatcaps.html>
+ The XML also show the NUMA topology information if available.
+ 
+-=item B<list>
+=item B<list> optional I<--inactive> I<--all>
+ 
+ Prints information about one or more domains.  If no domains are
+-specified it prints out information about all domains.
+specified it prints out information about running domains.
+ 
+ An example format for the list is as follows:
+ 
+@@ -177,7 +177,7 @@ State is the run state (see below).
+ 
+ B<STATES>
+ 
+-The State field lists 6 states for a domain, and which ones the
+The State field lists 7 states for a domain, and which ones the
+ current domain is in.
+ 
+ =over 4
+@@ -205,6 +205,11 @@ The domain is in the process of shutting down, i.e. the guest operating system
+ has been notified and should be in the process of stopping its operations
+ gracefully.
+ 
+=item B<shut off>
+
+The domain is not running.  Usually this indicates the domain has been
+shut down completely, or has not been started.
+
+ =item B<crashed>
+ 
+ The domain has crashed, which is always a violent ending.  Usually
@@ -0,0 +1,169 @@
+commit a83fe2c23efad190a1e00e448f607fe032650fd6
+Author: Cole Robinson <crobinso@redhat.com>
+Date:   Thu May 20 19:31:16 2010 -0400
+
+    network: bridge: Don't start network if it collides with host routing
+    
+    Fedora bug https://bugzilla.redhat.com/show_bug.cgi?id=235961
+    
+    If using the default virtual network, an easy way to lose guest network
+    connectivity is to install libvirt inside the VM. The autostarted
+    default network inside the guest collides with host virtual network
+    routing. This is a long standing issue that has caused users quite a
+    bit of pain and confusion.
+    
+    On network startup, parse /proc/net/route and compare the requested
+    IP+netmask against host routing destinations: if any matches are found,
+    refuse to start the network.
+    
+    v2: Drop sscanf, fix a comment typo, comment that function could use
+        libnl instead of /proc
+    
+    v3: Consider route netmask. Compare binary data rather than convert to
+        string.
+    
+    v4: Return to using sscanf, drop inet functions in favor of virSocket,
+        parsing safety checks. Don't make parse failures fatal, in case
+        expected format changes.
+    
+    v5: Try and continue if we receive unexpected. Delimit parsed lines to
+        prevent scanning past newline
+
+diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c
+index 5d7ef19..7ab3f3e 100644
+--- a/src/network/bridge_driver.c
+++ b/src/network/bridge_driver.c
+@@ -57,6 +57,7 @@
+ #include "iptables.h"
+ #include "bridge.h"
+ #include "logging.h"
+#include "util/network.h"
+ 
+ #define NETWORK_PID_DIR LOCAL_STATE_DIR "/run/libvirt/network"
+ #define NETWORK_STATE_DIR LOCAL_STATE_DIR "/lib/libvirt/network"
+@@ -908,6 +909,114 @@ cleanup:
+     return ret;
+ }
+ 
+#define PROC_NET_ROUTE "/proc/net/route"
+
+/* XXX: This function can be a lot more exhaustive, there are certainly
+ *      other scenarios where we can ruin host network connectivity.
+ * XXX: Using a proper library is preferred over parsing /proc
+ */
+static int networkCheckRouteCollision(virNetworkObjPtr network)
+{
+    int ret = -1, len;
+    unsigned int net_dest;
+    char *cur, *buf = NULL;
+    enum {MAX_ROUTE_SIZE = 1024*64};
+    virSocketAddr inaddress, innetmask;
+
+    if (!network->def->ipAddress || !network->def->netmask)
+        return 0;
+
+    if (virSocketParseAddr(network->def->ipAddress, &inaddress, 0) < 0) {
+        networkReportError(VIR_ERR_INTERNAL_ERROR,
+                           _("cannot parse IP address '%s'"),
+                           network->def->ipAddress);
+        goto error;
+    }
+
+    if (virSocketParseAddr(network->def->netmask, &innetmask, 0) < 0) {
+        networkReportError(VIR_ERR_INTERNAL_ERROR,
+                           _("cannot parse netmask '%s'"),
+                           network->def->netmask);
+        goto error;
+    }
+
+    if (inaddress.stor.ss_family != AF_INET ||
+        innetmask.stor.ss_family != AF_INET) {
+        /* Only support collision check for IPv4 */
+        goto out;
+    }
+
+    net_dest = (inaddress.inet4.sin_addr.s_addr &
+                innetmask.inet4.sin_addr.s_addr);
+
+    /* Read whole routing table into memory */
+    if ((len = virFileReadAll(PROC_NET_ROUTE, MAX_ROUTE_SIZE, &buf)) < 0)
+        goto error;
+
+    /* Dropping the last character shouldn't hurt */
+    if (len > 0)
+        buf[len-1] = '\0';
+
+    VIR_DEBUG("%s output:\n%s", PROC_NET_ROUTE, buf);
+
+    if (!STRPREFIX (buf, "Iface"))
+        goto out;
+
+    /* First line is just headings, skip it */
+    cur = strchr(buf, '\n');
+    if (cur)
+        cur++;
+
+    while (cur) {
+        char iface[17], dest[128], mask[128];
+        unsigned int addr_val, mask_val;
+        int num;
+
+        /* NUL-terminate the line, so sscanf doesn't go beyond a newline.  */
+        char *nl = strchr(cur, '\n');
+        if (nl) {
+            *nl++ = '\0';
+        }
+
+        num = sscanf(cur, "%16s %127s %*s %*s %*s %*s %*s %127s",
+                     iface, dest, mask);
+        cur = nl;
+
+        if (num != 3) {
+            VIR_DEBUG("Failed to parse %s", PROC_NET_ROUTE);
+            continue;
+        }
+
+        if (virStrToLong_ui(dest, NULL, 16, &addr_val) < 0) {
+            VIR_DEBUG("Failed to convert network address %s to uint", dest);
+            continue;
+        }
+
+        if (virStrToLong_ui(mask, NULL, 16, &mask_val) < 0) {
+            VIR_DEBUG("Failed to convert network mask %s to uint", mask);
+            continue;
+        }
+
+        addr_val &= mask_val;
+
+        if ((net_dest == addr_val) &&
+            (innetmask.inet4.sin_addr.s_addr == mask_val)) {
+            networkReportError(VIR_ERR_INTERNAL_ERROR,
+                              _("Network %s/%s is already in use by "
+                                "interface %s"),
+                                network->def->ipAddress,
+                                network->def->netmask, iface);
+            goto error;
+        }
+    }
+
+out:
+    ret = 0;
+error:
+    VIR_FREE(buf);
+    return ret;
+}
+
+ static int networkStartNetworkDaemon(struct network_driver *driver,
+                                      virNetworkObjPtr network)
+ {
+@@ -919,6 +1028,10 @@ static int networkStartNetworkDaemon(struct network_driver *driver,
+         return -1;
+     }
+ 
+    /* Check to see if network collides with an existing route */
+    if (networkCheckRouteCollision(network) < 0)
+        return -1;
+
+     if ((err = brAddBridge(driver->brctl, network->def->bridge))) {
+         virReportSystemError(err,
+                              _("cannot create bridge '%s'"),
@@ -0,0 +1,26 @@
+commit b7a7b3365145f6e9e434a3265a58666cd2e6d8dd
+Author: Guido Günther <agx@sigxcpu.org>
+Date:   Wed Mar 17 21:04:11 2010 +0100
+
+    Don't crash without a security driver
+    
+    "virsh dominfo <vm>" crashes if there's no primary security driver set
+    since we only intialize the secmodel.model and secmodel.doi if we have
+    one. Attached patch checks for securityPrimaryDriver instead of
+    securityDriver since the later is always set in qemudSecurityInit().
+    
+    Closes: http://bugs.debian.org/574359
+
+diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
+index 1f2b11d..257f914 100644
+--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
+@@ -4979,7 +4979,7 @@ static int qemudNodeGetSecurityModel(virConnectPtr conn,
+     int ret = 0;
+ 
+     qemuDriverLock(driver);
+-    if (!driver->securityDriver) {
+    if (!driver->securityPrimaryDriver) {
+         memset(secmodel, 0, sizeof (*secmodel));
+         goto cleanup;
+     }
@@ -0,0 +1,77 @@
+commit 74c7a3463d18a530d6d749d0199061b5d3f17faa
+Author: Cole Robinson <crobinso@redhat.com>
+Date:   Tue May 11 14:44:34 2010 -0400
+
+    node_device: udev: Fix PCI product/vendor swappage
+    
+    Product and vendor values were swapped in the XML, which made virt-manager
+    PCI device listing kinda useless.
+
+diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c
+index bcfe991..4a9d65f 100644
+--- a/src/node_device/node_device_udev.c
+++ b/src/node_device/node_device_udev.c
+@@ -382,8 +382,8 @@ static int udevTranslatePCIIds(unsigned int vendor,
+ 
+     /* pci_get_strings returns void */
+     pci_get_strings(&m,
+-                    &vendor_name,
+                     &device_name,
+                    &vendor_name,
+                     NULL,
+                     NULL);
+ 
+commit 75d88455f54088f88bc7a503da0a4cd413ef7b95
+Author: Klaus Ethgen <Klaus@Ethgen.de>
+Date:   Tue Apr 27 09:20:47 2010 +0200
+
+    The base used for conversion of USB values should be 16 not 10.
+    
+    Signed-off-by: Guido Günther <agx@sigxcpu.org>
+
+diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c
+index b12a49e..3a5a7e2 100644
+--- a/src/node_device/node_device_udev.c
+++ b/src/node_device/node_device_udev.c
+@@ -548,8 +548,6 @@ out:
+ }
+ 
+ 
+-/* XXX Is 10 the correct base for the Number/Class/SubClass/Protocol
+- * conversions?  */
+ static int udevProcessUSBInterface(struct udev_device *device,
+                                    virNodeDeviceDefPtr def)
+ {
+@@ -559,28 +557,28 @@ static int udevProcessUSBInterface(struct udev_device *device,
+     if (udevGetUintSysfsAttr(device,
+                              "bInterfaceNumber",
+                              &data->usb_if.number,
+-                             10) == PROPERTY_ERROR) {
+                             16) == PROPERTY_ERROR) {
+         goto out;
+     }
+ 
+     if (udevGetUintSysfsAttr(device,
+                              "bInterfaceClass",
+                              &data->usb_if._class,
+-                             10) == PROPERTY_ERROR) {
+                             16) == PROPERTY_ERROR) {
+         goto out;
+     }
+ 
+     if (udevGetUintSysfsAttr(device,
+                              "bInterfaceSubClass",
+                              &data->usb_if.subclass,
+-                             10) == PROPERTY_ERROR) {
+                             16) == PROPERTY_ERROR) {
+         goto out;
+     }
+ 
+     if (udevGetUintSysfsAttr(device,
+                              "bInterfaceProtocol",
+                              &data->usb_if.protocol,
+-                             10) == PROPERTY_ERROR) {
+                             16) == PROPERTY_ERROR) {
+         goto out;
+     }
+ 
@@ -0,0 +1,50 @@
+commit e984019688509605966c03cd77f4591d2cc222d3
+Author: Cole Robinson <crobinso@redhat.com>
+Date:   Fri Apr 30 18:14:35 2010 +0200
+
+    domain: Fix PCI address decimal parsing regression
+    
+    <hostdev> address parsing previously attempted to detect the number
+    base: currently it is hardcoded to base 16, which can break PCI
+    assignment via virt-manager. Revert to the previous behavior.
+    
+    * src/conf/domain_conf.c: virDomainDevicePCIAddressParseXML, switch to
+      virStrToLong_ui(bus, NULL, 0, ...) to autodetect base
+
+diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
+index 1607e8b..546ddf2 100644
+--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
+@@ -1079,28 +1079,28 @@ virDomainDevicePCIAddressParseXML(xmlNodePtr node,
+     function = virXMLPropString(node, "function");
+ 
+     if (domain &&
+-        virStrToLong_ui(domain, NULL, 16, &addr->domain) < 0) {
+        virStrToLong_ui(domain, NULL, 0, &addr->domain) < 0) {
+         virDomainReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+                              _("Cannot parse <address> 'domain' attribute"));
+         goto cleanup;
+     }
+ 
+     if (bus &&
+-        virStrToLong_ui(bus, NULL, 16, &addr->bus) < 0) {
+        virStrToLong_ui(bus, NULL, 0, &addr->bus) < 0) {
+         virDomainReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+                              _("Cannot parse <address> 'bus' attribute"));
+         goto cleanup;
+     }
+ 
+     if (slot &&
+-        virStrToLong_ui(slot, NULL, 16, &addr->slot) < 0) {
+        virStrToLong_ui(slot, NULL, 0, &addr->slot) < 0) {
+         virDomainReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+                              _("Cannot parse <address> 'slot' attribute"));
+         goto cleanup;
+     }
+ 
+     if (function &&
+-        virStrToLong_ui(function, NULL, 16, &addr->function) < 0) {
+        virStrToLong_ui(function, NULL, 0, &addr->function) < 0) {
+         virDomainReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+                              _("Cannot parse <address> 'function' attribute"));
+         goto cleanup;
@@ -0,0 +1,108 @@
+commit 83be64034a0b530c904ceb4fd1ed1c10b5cdf4bf
+Author: Cole Robinson <crobinso@redhat.com>
+Date:   Mon May 17 10:15:53 2010 -0400
+
+    qemu: Report cmdline output if VM dies early
+    
+    qemuReadLogOutput early VM death detection is racy and won't always work.
+    Startup then errors when connecting to the VM monitor. This won't report
+    the emulator cmdline output which is typically the most useful diagnostic.
+    
+    Check if the VM has died at the very end of the monitor connection step,
+    and if so, report the cmdline output.
+    
+    See also: https://bugzilla.redhat.com/show_bug.cgi?id=581381
+
+diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
+index ab6bec8..582fdee 100644
+--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
+@@ -2034,39 +2034,47 @@ static void qemudFreePtyPath(void *payload, const char *name ATTRIBUTE_UNUSED)
+     VIR_FREE(payload);
+ }
+ 
+static void
+qemuReadLogFD(int logfd, char *buf, int maxlen, int off)
+{
+    int ret;
+    char *tmpbuf = buf + off;
+
+    ret = saferead(logfd, tmpbuf, maxlen - off - 1);
+    if (ret < 0) {
+        ret = 0;
+    }
+
+    tmpbuf[ret] = '\0';
+}
+
+ static int
+ qemudWaitForMonitor(struct qemud_driver* driver,
+                     virDomainObjPtr vm, off_t pos)
+ {
+-    char buf[4096]; /* Plenty of space to get startup greeting */
+    char buf[4096] = ""; /* Plenty of space to get startup greeting */
+     int logfd;
+     int ret = -1;
+    virHashTablePtr paths = NULL;
+ 
+-    if ((logfd = qemudLogReadFD(driver->logDir, vm->def->name, pos))
+-        < 0)
+    if ((logfd = qemudLogReadFD(driver->logDir, vm->def->name, pos)) < 0)
+         return -1;
+ 
+-    ret = qemudReadLogOutput(vm, logfd, buf, sizeof(buf),
+-                             qemudFindCharDevicePTYs,
+-                             "console", 30);
+-    if (close(logfd) < 0) {
+-        char ebuf[4096];
+-        VIR_WARN(_("Unable to close logfile: %s"),
+-                 virStrerror(errno, ebuf, sizeof ebuf));
+-    }
+-
+-    if (ret < 0)
+-        return -1;
+    if (qemudReadLogOutput(vm, logfd, buf, sizeof(buf),
+                           qemudFindCharDevicePTYs,
+                           "console", 30) < 0)
+        goto closelog;
+ 
+     VIR_DEBUG("Connect monitor to %p '%s'", vm, vm->def->name);
+-    if (qemuConnectMonitor(driver, vm) < 0)
+-        return -1;
+    if (qemuConnectMonitor(driver, vm) < 0) {
+        goto cleanup;
+    }
+ 
+     /* Try to get the pty path mappings again via the monitor. This is much more
+      * reliable if it's available.
+      * Note that the monitor itself can be on a pty, so we still need to try the
+      * log output method. */
+-    virHashTablePtr paths = virHashCreate(0);
+    paths = virHashCreate(0);
+     if (paths == NULL) {
+         virReportOOMError();
+         goto cleanup;
+@@ -2087,6 +2095,23 @@ cleanup:
+         virHashFree(paths, qemudFreePtyPath);
+     }
+ 
+    if (kill(vm->pid, 0) == -1 && errno == ESRCH) {
+        /* VM is dead, any other error raised in the interim is probably
+         * not as important as the qemu cmdline output */
+        qemuReadLogFD(logfd, buf, sizeof(buf), strlen(buf));
+        qemuReportError(VIR_ERR_INTERNAL_ERROR,
+                        _("process exited while connecting to monitor: %s"),
+                        buf);
+        ret = -1;
+    }
+
+closelog:
+    if (close(logfd) < 0) {
+        char ebuf[4096];
+        VIR_WARN(_("Unable to close logfile: %s"),
+                 virStrerror(errno, ebuf, sizeof ebuf));
+    }
+
+     return ret;
+ }
+ 
@@ -0,0 +1,155 @@
+diff -rup libvirt-0.7.7/src/conf/storage_conf.c new/src/conf/storage_conf.c
+--- libvirt-0.7.7/src/conf/storage_conf.c	2010-03-05 09:46:29.000000000 -0500
+++ new/src/conf/storage_conf.c	2010-06-17 12:28:44.319588000 -0400
+@@ -601,6 +601,7 @@ virStoragePoolDefParseXML(xmlXPathContex
+     xmlNodePtr source_node;
+     char *type = NULL;
+     char *uuid = NULL;
+    char *tmppath;
+ 
+     if (VIR_ALLOC(ret) < 0) {
+         virReportOOMError();
+@@ -698,11 +699,16 @@ virStoragePoolDefParseXML(xmlXPathContex
+         }
+     }
+ 
+-    if ((ret->target.path = virXPathString("string(./target/path)", ctxt)) == NULL) {
+    if ((tmppath = virXPathString("string(./target/path)", ctxt)) == NULL) {
+         virStorageReportError(VIR_ERR_XML_ERROR,
+                               "%s", _("missing storage pool target path"));
+         goto cleanup;
+     }
+    ret->target.path = virFileSanitizePath(tmppath);
+    VIR_FREE(tmppath);
+    if (!ret->target.path)
+        goto cleanup;
+
+ 
+     if (virStorageDefParsePerms(ctxt, &ret->target.perms,
+                                 "./target/permissions", 0700) < 0)
+diff -rup libvirt-0.7.7/src/libvirt_private.syms new/src/libvirt_private.syms
+--- libvirt-0.7.7/src/libvirt_private.syms	2010-03-05 10:45:23.000000000 -0500
+++ new/src/libvirt_private.syms	2010-06-17 12:28:44.334585000 -0400
+@@ -582,6 +582,7 @@ virFileReadLimFD;
+ virFilePid;
+ virFileReadPid;
+ virFileLinkPointsTo;
+virFileSanitizePath;
+ virParseNumber;
+ virAsprintf;
+ virRun;
+diff -rup libvirt-0.7.7/src/storage/storage_driver.c new/src/storage/storage_driver.c
+--- libvirt-0.7.7/src/storage/storage_driver.c	2010-03-05 09:46:29.000000000 -0500
+++ new/src/storage/storage_driver.c	2010-06-17 12:28:44.346586000 -0400
+@@ -1200,6 +1200,11 @@ storageVolumeLookupByPath(virConnectPtr 
+     virStorageDriverStatePtr driver = conn->storagePrivateData;
+     unsigned int i;
+     virStorageVolPtr ret = NULL;
+    char *cleanpath;
+
+    cleanpath = virFileSanitizePath(path);
+    if (!cleanpath)
+        return NULL;
+ 
+     storageDriverLock(driver);
+     for (i = 0 ; i < driver->pools.count && !ret ; i++) {
+@@ -1209,7 +1214,7 @@ storageVolumeLookupByPath(virConnectPtr 
+             const char *stable_path;
+ 
+             stable_path = virStorageBackendStablePath(driver->pools.objs[i],
+-                                                      path);
+                                                      cleanpath);
+             /*
+              * virStorageBackendStablePath already does
+              * virStorageReportError if it fails; we just need to keep
+@@ -1238,6 +1243,7 @@ storageVolumeLookupByPath(virConnectPtr 
+                               "%s", _("no storage vol with matching path"));
+ 
+ cleanup:
+    VIR_FREE(cleanpath);
+     storageDriverUnlock(driver);
+     return ret;
+ }
+diff -rup libvirt-0.7.7/src/util/util.c new/src/util/util.c
+--- libvirt-0.7.7/src/util/util.c	2010-03-03 05:48:25.000000000 -0500
+++ new/src/util/util.c	2010-06-17 12:28:44.357588000 -0400
+@@ -1867,6 +1867,55 @@ int virFileAbsPath(const char *path, cha
+     return 0;
+ }
+ 
+/* Remove spurious / characters from a path. The result must be freed */
+char *
+virFileSanitizePath(const char *path)
+{
+    const char *cur = path;
+    char *cleanpath;
+    int idx = 0;
+
+    cleanpath = strdup(path);
+    if (!cleanpath) {
+        virReportOOMError();
+        return NULL;
+    }
+
+    /* Need to sanitize:
+     * //           -> //
+     * ///          -> /
+     * /../foo      -> /../foo
+     * /foo///bar/  -> /foo/bar
+     */
+
+    /* Starting with // is valid posix, but ///foo == /foo */
+    if (cur[0] == '/' && cur[1] == '/' && cur[2] != '/') {
+        idx = 2;
+        cur += 2;
+    }
+
+    /* Sanitize path in place */
+    while (*cur != '\0') {
+        if (*cur != '/') {
+            cleanpath[idx++] = *cur++;
+            continue;
+        }
+
+        /* Skip all extra / */
+        while (*++cur == '/')
+            continue;
+
+        /* Don't add a trailing / */
+        if (idx != 0 && *cur == '\0')
+            break;
+
+        cleanpath[idx++] = '/';
+    }
+    cleanpath[idx] = '\0';
+
+    return cleanpath;
+}
+
+ /* Like strtol, but produce an "int" result, and check more carefully.
+    Return 0 upon success;  return -1 to indicate failure.
+    When END_PTR is NULL, the byte after the final valid digit must be NUL.
+diff -rup libvirt-0.7.7/src/util/util.h new/src/util/util.h
+--- libvirt-0.7.7/src/util/util.h	2010-02-19 12:14:07.000000000 -0500
+++ new/src/util/util.h	2010-06-17 12:28:44.364585000 -0400
+@@ -109,6 +109,8 @@ char *virFindFileInPath(const char *file
+ 
+ int virFileExists(const char *path);
+ 
+char *virFileSanitizePath(const char *path);
+
+ enum {
+     VIR_FILE_OP_NONE        = 0,
+     VIR_FILE_OP_AS_UID      = (1 << 0),
+diff -rup libvirt-0.7.7/tests/storagepoolxml2xmlin/pool-dir.xml new/tests/storagepoolxml2xmlin/pool-dir.xml
+--- libvirt-0.7.7/tests/storagepoolxml2xmlin/pool-dir.xml	2009-12-22 04:37:57.000000000 -0500
+++ new/tests/storagepoolxml2xmlin/pool-dir.xml	2010-06-17 12:28:44.367585000 -0400
+@@ -7,7 +7,7 @@
+   <source>
+   </source>
+   <target>
+-    <path>/var/lib/libvirt/images</path>
+    <path>///var/////lib/libvirt/images//</path>
+     <permissions>
+       <mode>0700</mode>
+       <owner>0</owner>
@@ -0,0 +1,87 @@
+From 3f1aa08af6580c215d973bc6bf57f505dbf8b926 Mon Sep 17 00:00:00 2001
+From: Cole Robinson <crobinso@redhat.com>
+Date: Fri, 12 Mar 2010 13:38:39 -0500
+Subject: [PATCH] security: Set permissions for kernel/initrd
+
+Fixes URL installs when running virt-install as root on Fedora.
+---
+ src/qemu/qemu_security_dac.c    |   21 +++++++++++++++++++++
+ src/security/security_selinux.c |   16 ++++++++++++++++
+ 2 files changed, 37 insertions(+), 0 deletions(-)
+
+diff --git a/src/qemu/qemu_security_dac.c b/src/qemu/qemu_security_dac.c
+index 6911f48..1883fbe 100644
+--- a/src/qemu/qemu_security_dac.c
+++ b/src/qemu/qemu_security_dac.c
+@@ -332,6 +332,15 @@ qemuSecurityDACRestoreSecurityAllLabel(virDomainObjPtr vm)
+                                                      vm->def->disks[i]) < 0)
+             rc = -1;
+     }
+
+    if (vm->def->os.kernel &&
+        qemuSecurityDACRestoreSecurityFileLabel(vm->def->os.kernel) < 0)
+        rc = -1;
+
+    if (vm->def->os.initrd &&
+        qemuSecurityDACRestoreSecurityFileLabel(vm->def->os.initrd) < 0)
+        rc = -1;
+
+     return rc;
+ }
+ 
+@@ -356,6 +365,18 @@ qemuSecurityDACSetSecurityAllLabel(virDomainObjPtr vm)
+             return -1;
+     }
+ 
+    if (vm->def->os.kernel &&
+        qemuSecurityDACSetOwnership(vm->def->os.kernel,
+                                    driver->user,
+                                    driver->group) < 0)
+        return -1;
+
+    if (vm->def->os.initrd &&
+        qemuSecurityDACSetOwnership(vm->def->os.initrd,
+                                    driver->user,
+                                    driver->group) < 0)
+        return -1;
+
+     return 0;
+ }
+ 
+diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c
+index b2c8581..975b315 100644
+--- a/src/security/security_selinux.c
+++ b/src/security/security_selinux.c
+@@ -616,6 +616,14 @@ SELinuxRestoreSecurityAllLabel(virDomainObjPtr vm)
+             rc = -1;
+     }
+ 
+    if (vm->def->os.kernel &&
+        SELinuxRestoreSecurityFileLabel(vm->def->os.kernel) < 0)
+        rc = -1;
+
+    if (vm->def->os.initrd &&
+        SELinuxRestoreSecurityFileLabel(vm->def->os.initrd) < 0)
+        rc = -1;
+
+     return rc;
+ }
+ 
+@@ -736,6 +744,14 @@ SELinuxSetSecurityAllLabel(virDomainObjPtr vm)
+             return -1;
+     }
+ 
+    if (vm->def->os.kernel &&
+        SELinuxSetFilecon(vm->def->os.kernel, default_content_context) < 0)
+        return -1;
+
+    if (vm->def->os.initrd &&
+        SELinuxSetFilecon(vm->def->os.initrd, default_content_context) < 0)
+        return -1;
+
+     return 0;
+ }
+ 
+-- 
+1.6.6.1
+
@@ -0,0 +1,66 @@
+commit 07f6c3a95f1caca368c8723b5b0a25ae2faa1ffe
+Author: David Allan <dallan@redhat.com>
+Date:   Thu May 27 10:44:02 2010 -0400
+
+    v2 of Cole's wlan support
+    
+    * Incorporated Jim's feedback (v1 & v2)
+    
+    * Moved case of DEVTYPE == "wlan" up as it's definitive that we have a network interface.
+    
+    * Made comment more detailed about the wired case to explain better
+      how it differentiates between wired network interfaces and USB
+      devices.
+
+diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c
+index f0485f1..c437861 100644
+--- a/src/node_device/node_device_udev.c
+++ b/src/node_device/node_device_udev.c
+@@ -597,8 +597,15 @@ static int udevProcessNetworkInterface(struct udev_device *device,
+                                        virNodeDeviceDefPtr def)
+ {
+     int ret = -1;
+    const char *devtype = udev_device_get_devtype(device);
+     union _virNodeDevCapData *data = &def->caps->data;
+ 
+    if (devtype && STREQ(devtype, "wlan")) {
+        data->net.subtype = VIR_NODE_DEV_CAP_NET_80211;
+    } else {
+        data->net.subtype = VIR_NODE_DEV_CAP_NET_80203;
+    }
+
+     if (udevGetStringProperty(device,
+                               "INTERFACE",
+                               &data->net.ifname) == PROPERTY_ERROR) {
+@@ -1074,6 +1081,8 @@ static int udevGetDeviceType(struct udev_device *device,
+     int ret = 0;
+ 
+     devtype = udev_device_get_devtype(device);
+    VIR_DEBUG("Found device type '%s' for device '%s'",
+              NULLSTR(devtype), udev_device_get_sysname(device));
+ 
+     if (devtype != NULL && STREQ(devtype, "usb_device")) {
+         *type = VIR_NODE_DEV_CAP_USB_DEV;
+@@ -1105,13 +1114,20 @@ static int udevGetDeviceType(struct udev_device *device,
+         goto out;
+     }
+ 
+    if (devtype != NULL && STREQ(devtype, "wlan")) {
+        *type = VIR_NODE_DEV_CAP_NET;
+        goto out;
+    }
+
+     if (udevGetUintProperty(device, "PCI_CLASS", &tmp, 16) == PROPERTY_FOUND) {
+         *type = VIR_NODE_DEV_CAP_PCI_DEV;
+         goto out;
+     }
+ 
+-    /* It does not appear that network interfaces set the device type
+-     * property. */
+    /* It does not appear that wired network interfaces set the
+     * DEVTYPE property.  USB devices also have an INTERFACE property,
+     * but they do set DEVTYPE, so if devtype is NULL and the
+     * INTERFACE property exists, we have a network device. */
+     if (devtype == NULL &&
+         udevGetStringProperty(device,
+                               "INTERFACE",
@@ -1 +1 @@
-SHA512 (libvirt-11.0.0.tar.xz) = ac5fd17d3f488c241017d967364e0441373e9ab0457dab1acfe84fd0b90353dc5d185cc7fcd2b0d7995af4137a3fa18371abb5511686456a9e720f7ec7829da9
+5f315b0bf20e3964f7657ba1e630cd67  libvirt-0.7.7.tar.gz
Author	SHA1	Message	Date
Cole Robinson	3d90c2f845	Add qemu.conf options for audio workaround Fix parsing certain USB sysfs files (bz 598272) Sanitize pool target paths (bz 494005) Add qemu.conf for clear emulator capabilities Prevent libvirtd inside a VM from breaking network access (bz 235961) Mention --all in 'virsh list' docs (bz 575512) Initscript fixes (bz 565238) List wireless interfaces via nodedev-list (bz 596928)	2010-06-17 17:42:36 +00:00
Cole Robinson	5c3e8a7ac0	Fix nodedev XML conversion errors (bz 591262) Fix PCI xml decimal parsing (bz 582752) Fix CDROM media connect/eject (bz 582005) Always report qemu startup output on error (bz 581381) Fix crash from 'virsh dominfo' if secdriver disabled (bz 581166)	2010-05-18 18:49:49 +00:00
Cole Robinson	09a86187e8	Fix slow storage volume allocation (bz 582356)	2010-04-20 19:39:41 +00:00
Cole Robinson	a8bac7d647	Fix USB devices by product with security enabled (bz 574136) Set kernel/initrd in security driver, fixes some URL installs (bz 566425)	2010-03-22 15:09:54 +00:00
Daniel Veillard	74d9fb3860	oops forgot to update sources too, Daniel	2010-03-05 17:11:45 +00:00
Daniel Veillard	1b3b9bf1cc	Upstream release of 0.7.7, Daniel	2010-03-05 16:59:20 +00:00
Adam Jackson	1d1a47ccaf	bump to appease cvs	2010-02-17 15:34:59 +00:00
Adam Jackson	14f81abaae	all of libvirt_test.la needs -ldl	2010-02-17 15:33:23 +00:00
Jesse Keating	6b3af81b0e	Initialize branch F-13 for libvirt	2010-02-17 01:56:25 +00:00