Fix build with latest wireshark

Signed-off-by: Cole Robinson <crobinso@redhat.com>

.abignore

@@ -0,0 +1,31 @@
+[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.*

.gitignore

@@ -2,7 +2,4 @@
 *.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-*.tar.xz

0001-Fix-mocking-of-virQEMUCapsProbeHVF-function.patch

@@ -0,0 +1,31 @@
+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
+

0001-nss-Skip-empty-files-and-avoid-use-of-uninitialized-.patch

@@ -0,0 +1,85 @@
+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;
+     }

0001-qemu-Be-more-forgiving-when-acquiring-QUERY-job-when.patch

@@ -0,0 +1,68 @@
+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);

0001-storage-stop-hardcoding-paths-for-mkfs-mount-umount.patch

@@ -0,0 +1,94 @@
+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
+

0001-util-avoid-overflow-in-hextable-buffer.patch

@@ -0,0 +1,43 @@
+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
+

0001-util-stop-hardcoding-numad-path.patch

@@ -0,0 +1,58 @@
+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
+

0001-wireshark-Drop-needless-declaration-of-proto_registe.patch

@@ -0,0 +1,36 @@
+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
+

0002-wireshark-Switch-header-files-to-pragma-once.patch

@@ -0,0 +1,47 @@
+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
+

0003-wireshark-Move-WIRESHARK_VERSION-macro-definition.patch

@@ -0,0 +1,81 @@
+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
+

0004-wireshark-Fix-int-type-of-some-virNetMessageHeader-m.patch

@@ -0,0 +1,133 @@
+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
+

0005-wireshark-Don-t-special-case-retval-of-get_program_d.patch

@@ -0,0 +1,46 @@
+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
+

0006-wireshark-Introduce-and-use-vir_val_to_str.patch

@@ -0,0 +1,68 @@
+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
+

0007-wireshark-Don-t-leak-column-strings.patch

@@ -0,0 +1,165 @@
+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
+

0008-wireshark-Adapt-to-wireshark-4.6.0.patch

@@ -0,0 +1,493 @@
+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
+

Makefile

@@ -1,21 +0,0 @@
-# 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)

branch

@@ -1 +0,0 @@
-F-11

libvirt-0.6.2-avoid-broken-networking-with-newer-qemu.patch

@@ -1,30 +0,0 @@
-From 6e80c60b89728de28267242f7373ecf553e40bc1 Mon Sep 17 00:00:00 2001
-From: Daniel P. Berrange <berrange@redhat.com>
-Date: Thu, 28 May 2009 13:15:57 +0000
-Subject: [PATCH] Avoid broken networking with new QEMU/KVM >= 86
-
-(cherry picked from commit 2afc3bfd8b779ddba974da9d66d6ea337fc91c01)
-
-Fedora-patch: libvirt-0.6.2-avoid-broken-networking-with-newer-qemu.patch
----
- src/qemu_conf.c |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/qemu_conf.c b/src/qemu_conf.c
-index fc0e772..99f13c6 100644
---- a/src/qemu_conf.c
-+++ b/src/qemu_conf.c
-@@ -658,8 +658,8 @@ qemudNetworkIfaceConnect(virConnectPtr conn,
-     }
- 
-     snprintf(tapfdstr, sizeof(tapfdstr),
--             "tap,fd=%d,script=,vlan=%d,ifname=%s",
--             tapfd, vlan, net->ifname);
-+             "tap,fd=%d,vlan=%d",
-+             tapfd, vlan);
- 
-     if (!(retval = strdup(tapfdstr)))
-         goto no_memory;
--- 
-1.6.2.5
-

libvirt-0.6.2-bring-up-ipless-bridge.patch

@@ -1,49 +0,0 @@
-From 6635abc3bbe54e6b0168182805de92cd70d125e4 Mon Sep 17 00:00:00 2001
-From: Daniel Veillard <veillard@redhat.com>
-Date: Tue, 12 May 2009 15:31:22 +0000
-Subject: [PATCH] * src/network_driver.c: enable bridges which are not up without an IP address, patch by Ludwig Nussel
-
-(cherry picked from commit e978774ec67f4b062b1f65e5c76a13193a9430eb)
-
-Fedora-patch: libvirt-0.6.2-bring-up-ipless-bridge.patch
----
- src/network_driver.c |    9 +++------
- 1 files changed, 3 insertions(+), 6 deletions(-)
-
-diff --git a/src/network_driver.c b/src/network_driver.c
-index a17a769..a163b15 100644
---- a/src/network_driver.c
-+++ b/src/network_driver.c
-@@ -836,8 +836,7 @@ static int networkStartNetworkDaemon(virConnectPtr conn,
-         goto err_delbr;
-     }
- 
--    if (network->def->ipAddress &&
--        (err = brSetInterfaceUp(driver->brctl, network->def->bridge, 1))) {
-+    if ((err = brSetInterfaceUp(driver->brctl, network->def->bridge, 1))) {
-         virReportSystemError(conn, err,
-                              _("failed to bring the bridge '%s' up"),
-                              network->def->bridge);
-@@ -878,8 +877,7 @@ static int networkStartNetworkDaemon(virConnectPtr conn,
-     networkRemoveIptablesRules(driver, network);
- 
-  err_delbr1:
--    if (network->def->ipAddress &&
--        (err = brSetInterfaceUp(driver->brctl, network->def->bridge, 0))) {
-+    if ((err = brSetInterfaceUp(driver->brctl, network->def->bridge, 0))) {
-         char ebuf[1024];
-         networkLog(NETWORK_WARN, _("Failed to bring down bridge '%s' : %s\n"),
-                  network->def->bridge, virStrerror(err, ebuf, sizeof ebuf));
-@@ -920,8 +918,7 @@ static int networkShutdownNetworkDaemon(virConnectPtr conn,
-     networkRemoveIptablesRules(driver, network);
- 
-     char ebuf[1024];
--    if (network->def->ipAddress &&
--        (err = brSetInterfaceUp(driver->brctl, network->def->bridge, 0))) {
-+    if ((err = brSetInterfaceUp(driver->brctl, network->def->bridge, 0))) {
-         networkLog(NETWORK_WARN, _("Failed to bring down bridge '%s' : %s\n"),
-                  network->def->bridge, virStrerror(err, ebuf, sizeof ebuf));
-     }
--- 
-1.6.2.5
-

libvirt-0.6.2-buf-locale-escape.patch

@@ -1,33 +0,0 @@
-From f793cd9b7220145b6df8086d77db4fdc035d680b Mon Sep 17 00:00:00 2001
-From: Daniel P. Berrange <berrange@redhat.com>
-Date: Tue, 4 Aug 2009 18:13:09 +0100
-Subject: [PATCH] Fix escaping of 8-bit high characters
-
-Fix  https://bugzilla.redhat.com/show_bug.cgi?id=479517
-
-* src/buf.c: Cast to 'unsigned char' before doing compare to
-  avoid rejecting 8-bit high characters
-
-(cherry picked from commit 8feb499ba2c3625632210c997b49f5df515c05d4)
-
-Fedora-patch: libvirt-0.6.2-buf-locale-escape.patch
----
- src/buf.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/buf.c b/src/buf.c
-index 259175d..c802aa2 100644
---- a/src/buf.c
-+++ b/src/buf.c
-@@ -304,7 +304,7 @@ virBufferEscapeString(const virBufferPtr buf, const char *format, const char *st
-             *out++ = 'o';
-             *out++ = 's';
-             *out++ = ';';
--        } else if ((*cur >= 0x20) || (*cur == '\n') || (*cur == '\t') ||
-+        } else if (((unsigned char)*cur >= 0x20) || (*cur == '\n') || (*cur == '\t') ||
-                    (*cur == '\r')) {
-             /*
-              * default case, just copy !
--- 
-1.6.2.5
-

libvirt-0.6.2-detect-newer-qemu-kvm-versions.patch

@@ -1,170 +0,0 @@
-From fe3cb2edefceacc76d0dc9c98b8d3b677a495c32 Mon Sep 17 00:00:00 2001
-From: Mark McLoughlin <markmc@redhat.com>
-Date: Thu, 11 Jun 2009 14:15:49 +0000
-Subject: [PATCH] Detect newer qemu-kvm versions
-
-The KVM version string can be one of the following:
-
-  - qemu-kvm-x.y.z in stable releases
-  - kvm-XX for kvm versions up to kvm-85
-  - qemu-kvm-devel-XX for kvm version kvm-86 and later
-
-There are only a few of places where we need to detect
-differences between KVM versions based on 0.9.1:
-
-  1) VNET_HDR introduced in kvm-74
-
-  2) -incoming tcp introduced in kvm-79
-
-  3) -incoming exec introduced in kvm-80
-
-  4) -incoming stdio in all earlier kvm versions
-
-With qemu-kvm-0.10.x, we can now assume that (1) is available
-if it's a KVM release, (2) and (3) is always available and
-(4) is never available.
-
-So, from now on we should only need to check the qemu version
-number and the "is_kvm" flag for detecting feature availability.
-We only need the KVM version number for older releases.
-
-(cherry picked from commit 04cbe687974b3b46c96fa20180bbb07ffeff69da)
-
-Signed-off-by: Mark McLoughlin <markmc@redhat.com>
-Fedora-patch: libvirt-0.6.2-detect-newer-qemu-kvm-versions.patch
----
- src/qemu_conf.c |   44 +++++++++++++++++++++++++++++++-------------
- 1 files changed, 31 insertions(+), 13 deletions(-)
-
-diff --git a/src/qemu_conf.c b/src/qemu_conf.c
-index e488d74..d76b2b6 100644
---- a/src/qemu_conf.c
-+++ b/src/qemu_conf.c
-@@ -416,6 +416,7 @@ virCapsPtr qemudCapsInit(void) {
- 
- static unsigned int qemudComputeCmdFlags(const char *help,
-                                          unsigned int version,
-+                                         unsigned int is_kvm,
-                                          unsigned int kvm_version)
- {
-     unsigned int flags = 0;
-@@ -441,7 +442,8 @@ static unsigned int qemudComputeCmdFlags(const char *help,
-         flags |= QEMUD_CMD_FLAG_DRIVE_BOOT;
-     if (version >= 9000)
-         flags |= QEMUD_CMD_FLAG_VNC_COLON;
--    if (kvm_version >= 74)
-+
-+    if (is_kvm && (version >= 10000 || kvm_version >= 74))
-         flags |= QEMUD_CMD_FLAG_VNET_HDR;
- 
-     /*
-@@ -454,15 +456,15 @@ static unsigned int qemudComputeCmdFlags(const char *help,
-      * was broken, because it blocked the monitor console
-      * while waiting for data, so pretend it doesn't exist
-      */
--    if (kvm_version >= 79) {
-+    if (version >= 10000) {
-+        flags |= QEMUD_CMD_FLAG_MIGRATE_QEMU_TCP;
-+        flags |= QEMUD_CMD_FLAG_MIGRATE_QEMU_EXEC;
-+    } else if (kvm_version >= 79) {
-         flags |= QEMUD_CMD_FLAG_MIGRATE_QEMU_TCP;
-         if (kvm_version >= 80)
-             flags |= QEMUD_CMD_FLAG_MIGRATE_QEMU_EXEC;
-     } else if (kvm_version > 0) {
-         flags |= QEMUD_CMD_FLAG_MIGRATE_KVM_STDIO;
--    } else if (version >= 10000) {
--        flags |= QEMUD_CMD_FLAG_MIGRATE_QEMU_TCP;
--        flags |= QEMUD_CMD_FLAG_MIGRATE_QEMU_EXEC;
-     }
- 
-     return flags;
-@@ -472,10 +474,19 @@ static unsigned int qemudComputeCmdFlags(const char *help,
-  * version number. The first bit is easy, just parse
-  * 'QEMU PC emulator version x.y.z'.
-  *
-- * With qemu-kvm, however, that is followed by a kvm-XX
-- * string in parenthesis.
-+ * With qemu-kvm, however, that is followed by a string
-+ * in parenthesis as follows:
-+ *  - qemu-kvm-x.y.z in stable releases
-+ *  - kvm-XX for kvm versions up to kvm-85
-+ *  - qemu-kvm-devel-XX for kvm version kvm-86 and later
-+ *
-+ * For qemu-kvm versions before 0.10.z, we need to detect
-+ * the KVM version number for some features. With 0.10.z
-+ * and later, we just need the QEMU version number and
-+ * whether it is KVM QEMU or mainline QEMU.
-  */
- #define QEMU_VERSION_STR    "QEMU PC emulator version"
-+#define QEMU_KVM_VER_PREFIX "(qemu-kvm-"
- #define KVM_VER_PREFIX      "(kvm-"
- 
- #define SKIP_BLANKS(p) do { while ((*(p) == ' ') || (*(p) == '\t')) (p)++; } while (0)
-@@ -483,12 +494,13 @@ static unsigned int qemudComputeCmdFlags(const char *help,
- static int qemudParseHelpStr(const char *help,
-                              unsigned int *flags,
-                              unsigned int *version,
-+                             unsigned int *is_kvm,
-                              unsigned int *kvm_version)
- {
-     unsigned major, minor, micro;
-     const char *p = help;
- 
--    *flags = *version = *kvm_version = 0;
-+    *flags = *version = *is_kvm = *kvm_version = 0;
- 
-     if (!STRPREFIX(p, QEMU_VERSION_STR))
-         goto fail;
-@@ -515,9 +527,13 @@ static int qemudParseHelpStr(const char *help,
- 
-     SKIP_BLANKS(p);
- 
--    if (STRPREFIX(p, KVM_VER_PREFIX)) {
-+    if (STRPREFIX(p, QEMU_KVM_VER_PREFIX)) {
-+        *is_kvm = 1;
-+        p += strlen(QEMU_KVM_VER_PREFIX);
-+    } else if (STRPREFIX(p, KVM_VER_PREFIX)) {
-         int ret;
- 
-+        *is_kvm = 1;
-         p += strlen(KVM_VER_PREFIX);
- 
-         ret = virParseNumber(&p);
-@@ -529,12 +545,14 @@ static int qemudParseHelpStr(const char *help,
- 
-     *version = (major * 1000 * 1000) + (minor * 1000) + micro;
- 
--    *flags = qemudComputeCmdFlags(help, *version, *kvm_version);
-+    *flags = qemudComputeCmdFlags(help, *version, *is_kvm, *kvm_version);
- 
-     qemudDebug("Version %u.%u.%u, cooked version %u, flags %u",
-                major, minor, micro, *version, *flags);
-     if (*kvm_version)
--        qemudDebug("KVM version %u detected", *kvm_version);
-+        qemudDebug("KVM version %d detected", *kvm_version);
-+    else if (*is_kvm)
-+        qemudDebug("qemu-kvm version %u.%u.%u detected", major, minor, micro);
- 
-     return 0;
- 
-@@ -560,7 +578,7 @@ int qemudExtractVersionInfo(const char *qemu,
-     pid_t child;
-     int newstdout = -1;
-     int ret = -1, status;
--    unsigned int version, kvm_version;
-+    unsigned int version, is_kvm, kvm_version;
-     unsigned int flags = 0;
- 
-     if (retflags)
-@@ -581,7 +599,7 @@ int qemudExtractVersionInfo(const char *qemu,
-         goto cleanup2;
-     }
- 
--    if (qemudParseHelpStr(help, &flags, &version, &kvm_version) == -1)
-+    if (qemudParseHelpStr(help, &flags, &version, &is_kvm, &kvm_version) == -1)
-         goto cleanup2;
- 
-     if (retversion)
--- 
-1.6.2.5
-

libvirt-0.6.2-do-not-log-monitor-output.patch

@@ -1,208 +0,0 @@
-From 182a3cac2b4339e988802eb02279e7ab4c883c67 Mon Sep 17 00:00:00 2001
-From: =?utf-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org>
-Date: Thu, 16 Apr 2009 15:56:27 +0000
-Subject: [PATCH] Don't log monitor output to domain log file.
-
-It's logged via the logging system already. Prefix monitor debug output with vm
-name.
-
-(cherry picked from commit 5caa1e0eb050a12fe8ed02cf635bb672a56cdb6f)
-
-Fedora-patch: libvirt-0.6.2-do-not-log-monitor-output.patch
----
- src/qemu_driver.c |   60 +++++++++++++++++++++-------------------------------
- 1 files changed, 24 insertions(+), 36 deletions(-)
-
-diff --git a/src/qemu_driver.c b/src/qemu_driver.c
-index 5ca3d20..cb738b2 100644
---- a/src/qemu_driver.c
-+++ b/src/qemu_driver.c
-@@ -1706,27 +1706,11 @@ qemudMonitorCommandExtra(const virDomainObjPtr vm,
-             goto error;
-         }
-     }
--
--    /* Log, but ignore failures to write logfile for VM */
--    if (safewrite(vm->logfile, buf, strlen(buf)) < 0) {
--        char ebuf[1024];
--        VIR_WARN(_("Unable to log VM console data: %s\n"),
--                 virStrerror(errno, ebuf, sizeof ebuf));
--    }
--
-     *reply = buf;
-     return 0;
- 
-  error:
--    if (buf) {
--        /* Log, but ignore failures to write logfile for VM */
--        if (safewrite(vm->logfile, buf, strlen(buf)) < 0) {
--            char ebuf[1024];
--            VIR_WARN(_("Unable to log VM console data: %s\n"),
--                     virStrerror(errno, ebuf, sizeof ebuf));
--        }
--        VIR_FREE(buf);
--    }
-+    VIR_FREE(buf);
-     return -1;
- }
- 
-@@ -2461,7 +2445,7 @@ static int qemudDomainGetMemoryBalloon(virConnectPtr conn,
-         goto cleanup;
-     }
- 
--    DEBUG ("balloon reply: '%s'", reply);
-+    DEBUG ("%s: balloon reply: '%s'", vm->def->name, reply);
-     if ((offset = strstr(reply, BALLOON_PREFIX)) != NULL) {
-         unsigned int memMB;
-         char *end;
-@@ -2515,7 +2499,7 @@ static int qemudDomainSetMemoryBalloon(virConnectPtr conn,
- 
-     /* If the command failed qemu prints: 'unknown command'
-      * No message is printed on success it seems */
--    DEBUG ("balloon reply: %s", reply);
-+    DEBUG ("%s: balloon reply: %s",vm->def->name,  reply);
-     if (strstr(reply, "\nunknown command:")) {
-         /* Don't set error - it is expected memory balloon fails on many qemu */
-         ret = 0;
-@@ -2810,7 +2794,7 @@ static int qemudDomainSave(virDomainPtr dom,
-         goto cleanup;
-     }
- 
--    DEBUG ("migrate reply: %s", info);
-+    DEBUG ("%s: migrate reply: %s", vm->def->name, info);
- 
-     /* If the command isn't supported then qemu prints:
-      * unknown command: migrate" */
-@@ -3662,7 +3646,7 @@ static int qemudDomainChangeEjectableMedia(virConnectPtr conn,
-     /* If the command failed qemu prints:
-      * device not found, device is locked ...
-      * No message is printed on success it seems */
--    DEBUG ("ejectable media change reply: %s", reply);
-+    DEBUG ("%s: ejectable media change reply: %s", vm->def->name, reply);
-     if (strstr(reply, "\ndevice ")) {
-         qemudReportError (conn, dom, NULL, VIR_ERR_OPERATION_FAILED,
-                           _("changing cdrom media failed: %s"), reply);
-@@ -3723,7 +3707,7 @@ static int qemudDomainAttachPciDiskDevice(virConnectPtr conn,
-         return -1;
-     }
- 
--    DEBUG ("pci_add reply: %s", reply);
-+    DEBUG ("%s: pci_add reply: %s", vm->def->name, reply);
-     /* If the command succeeds qemu prints:
-      * OK bus 0... */
- #define PCI_ATTACH_OK_MSG "OK bus 0, slot "
-@@ -3791,7 +3775,7 @@ static int qemudDomainAttachUsbMassstorageDevice(virConnectPtr conn,
-         return -1;
-     }
- 
--    DEBUG ("attach_usb reply: %s", reply);
-+    DEBUG ("%s: attach_usb reply: %s",vm->def->name,  reply);
-     /* If the command failed qemu prints:
-      * Could not add ... */
-     if (strstr(reply, "Could not add ")) {
-@@ -3845,7 +3829,7 @@ static int qemudDomainAttachHostDevice(virConnectPtr conn,
-         return -1;
-     }
- 
--    DEBUG ("attach_usb reply: %s", reply);
-+    DEBUG ("%s: attach_usb reply: %s", vm->def->name, reply);
-     /* If the command failed qemu prints:
-      * Could not add ... */
-     if (strstr(reply, "Could not add ")) {
-@@ -3984,7 +3968,7 @@ static int qemudDomainDetachPciDiskDevice(virConnectPtr conn,
-         goto cleanup;
-     }
- 
--    DEBUG ("pci_del reply: %s", reply);
-+    DEBUG ("%s: pci_del reply: %s",vm->def->name,  reply);
-     /* If the command fails due to a wrong slot qemu prints: invalid slot,
-      * nothing is printed on success */
-     if (strstr(reply, "invalid slot")) {
-@@ -4214,7 +4198,7 @@ qemudDomainBlockStats (virDomainPtr dom,
-                           "%s", _("'info blockstats' command failed"));
-         goto cleanup;
-     }
--    DEBUG ("info blockstats reply: %s", info);
-+    DEBUG ("%s: info blockstats reply: %s", vm->def->name, info);
- 
-     /* If the command isn't supported then qemu prints the supported
-      * info commands, so the output starts "info ".  Since this is
-@@ -4255,21 +4239,25 @@ qemudDomainBlockStats (virDomainPtr dom,
-                 if (STRPREFIX (p, "rd_bytes=")) {
-                     p += 9;
-                     if (virStrToLong_ll (p, &dummy, 10, &stats->rd_bytes) == -1)
--                        DEBUG ("error reading rd_bytes: %s", p);
-+                        DEBUG ("%s: error reading rd_bytes: %s",
-+                               vm->def->name, p);
-                 } else if (STRPREFIX (p, "wr_bytes=")) {
-                     p += 9;
-                     if (virStrToLong_ll (p, &dummy, 10, &stats->wr_bytes) == -1)
--                        DEBUG ("error reading wr_bytes: %s", p);
-+                        DEBUG ("%s: error reading wr_bytes: %s",
-+                               vm->def->name, p);
-                 } else if (STRPREFIX (p, "rd_operations=")) {
-                     p += 14;
-                     if (virStrToLong_ll (p, &dummy, 10, &stats->rd_req) == -1)
--                        DEBUG ("error reading rd_req: %s", p);
-+                        DEBUG ("%s: error reading rd_req: %s",
-+                               vm->def->name, p);
-                 } else if (STRPREFIX (p, "wr_operations=")) {
-                     p += 14;
-                     if (virStrToLong_ll (p, &dummy, 10, &stats->wr_req) == -1)
--                        DEBUG ("error reading wr_req: %s", p);
-+                        DEBUG ("%s: error reading wr_req: %s",
-+                               vm->def->name, p);
-                 } else
--                    DEBUG ("unknown block stat near %s", p);
-+                    DEBUG ("%s: unknown block stat near %s", vm->def->name, p);
- 
-                 /* Skip to next label. */
-                 p = strchr (p, ' ');
-@@ -4481,7 +4469,7 @@ qemudDomainMemoryPeek (virDomainPtr dom,
-         goto cleanup;
-     }
- 
--    DEBUG ("memsave reply: %s", info);
-+    DEBUG ("%s: memsave reply: %s", vm->def->name, info);
- 
-     /* Read the memory file into buffer. */
-     if (saferead (fd, buffer, size) == (ssize_t) -1) {
-@@ -4798,7 +4786,7 @@ qemudDomainMigratePerform (virDomainPtr dom,
-                              "%s", _("off-line migration specified, but suspend operation failed"));
-             goto cleanup;
-         }
--        DEBUG ("stop reply: %s", info);
-+        DEBUG ("%s: stop reply: %s", vm->def->name, info);
-         VIR_FREE(info);
-         paused = 1;
- 
-@@ -4815,7 +4803,7 @@ qemudDomainMigratePerform (virDomainPtr dom,
-         snprintf (cmd, sizeof cmd, "migrate_set_speed %lum", resource);
-         qemudMonitorCommand (vm, cmd, &info);
- 
--        DEBUG ("migrate_set_speed reply: %s", info);
-+        DEBUG ("%s: migrate_set_speed reply: %s", vm->def->name, info);
-         VIR_FREE (info);
-     }
- 
-@@ -4834,7 +4822,7 @@ qemudDomainMigratePerform (virDomainPtr dom,
-         goto cleanup;
-     }
- 
--    DEBUG ("migrate reply: %s", info);
-+    DEBUG ("%s: migrate reply: %s", vm->def->name, info);
- 
-     /* Now check for "fail" in the output string */
-     if (strstr(info, "fail") != NULL) {
-@@ -4873,7 +4861,7 @@ cleanup:
-                       vm->def->name);
-         }
-         else {
--            DEBUG ("cont reply: %s", info);
-+            DEBUG ("%s: cont reply: %s", vm->def->name, info);
-             VIR_FREE(info);
-         }
- 
--- 
-1.6.2.5
-

libvirt-0.6.2-do-not-unnecessarily-try-to-change-a-file-context.patch

@@ -1,49 +0,0 @@
-From 2d299525f5de29d11c6dc4810aa41e893535695b Mon Sep 17 00:00:00 2001
-From: Mark McLoughlin <markmc@redhat.com>
-Date: Fri, 3 Jul 2009 10:27:46 +0000
-Subject: [PATCH] Don't unnecessarily try to change a file context
-
-As pointed out by Tim Waugh here:
-
-  https://bugzilla.redhat.com/507555
-
-We shouldn't bother trying to set the context of a file if it already
-matches what we want.
-
-(Fixed to use STREQ() and not use tabs, as pointed out by danpb)
-
-(cherry picked from commit add254feeaa830dd5af1118c141cb140bf55b5a7)
-
-Fedora-patch: libvirt-0.6.2-do-not-unnecessarily-try-to-change-a-file-context.patch
----
- src/security_selinux.c |   11 ++++++++++-
- 1 files changed, 10 insertions(+), 1 deletions(-)
-
-diff --git a/src/security_selinux.c b/src/security_selinux.c
-index 450fce2..8ebe1fe 100644
---- a/src/security_selinux.c
-+++ b/src/security_selinux.c
-@@ -280,10 +280,19 @@ static int
- SELinuxSetFilecon(virConnectPtr conn, const char *path, char *tcon)
- {
-     char ebuf[1024];
-+    security_context_t econ;
- 
-     VIR_INFO("Setting SELinux context on '%s' to '%s'", path, tcon);
- 
--    if(setfilecon(path, tcon) < 0) {
-+    if (setfilecon(path, tcon) < 0) {
-+        if (getfilecon(path, &econ) >= 0) {
-+            if (STREQ(tcon, econ)) {
-+                freecon(econ);
-+                /* It's alright, there's nothing to change anyway. */
-+                return 0;
-+            }
-+            freecon(econ);
-+        }
-         virSecurityReportError(conn, VIR_ERR_ERROR,
-                                _("%s: unable to set security context "
-                                  "'\%s\' on %s: %s."), __func__,
--- 
-1.6.2.5
-

libvirt-0.6.2-enable-qemu-0-10-migration.patch

@@ -1,48 +0,0 @@
-From 9b41d6550b6bf8d4450bb5b86550eb605cc1fd91 Mon Sep 17 00:00:00 2001
-From: Daniel P. Berrange <berrange@redhat.com>
-Date: Fri, 8 May 2009 10:07:15 +0000
-Subject: [PATCH] Enable save/restore/migrate for QEMU >= 0.10.0
-
-(cherry picked from commit 88e22e4e8cb7fc7e1fa1d132778aa1994f4b55b6)
-
-Fedora-patch: libvirt-0.6.2-enable-qemu-0-10-migration.patch
----
- src/qemu_conf.c |   10 +++++-----
- 1 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/src/qemu_conf.c b/src/qemu_conf.c
-index 6f9e610..929fe00 100644
---- a/src/qemu_conf.c
-+++ b/src/qemu_conf.c
-@@ -472,16 +472,13 @@ int qemudExtractVersionInfo(const char *qemu,
- 
-     /*
-      * Handling of -incoming arg with varying features
--     *  -incoming tcp    (kvm >= 79)
--     *  -incoming exec   (kvm >= 80)
-+     *  -incoming tcp    (kvm >= 79, qemu >= 0.10.0)
-+     *  -incoming exec   (kvm >= 80, qemu >= 0.10.0)
-      *  -incoming stdio  (all earlier kvm)
-      *
-      * NB, there was a pre-kvm-79 'tcp' support, but it
-      * was broken, because it blocked the monitor console
-      * while waiting for data, so pretend it doesn't exist
--     *
--     * XXX when next QEMU release after 0.9.1 arrives,
--     * we'll need to add MIGRATE_QEMU_TCP/EXEC here too
-      */
-     if (kvm_version >= 79) {
-         flags |= QEMUD_CMD_FLAG_MIGRATE_QEMU_TCP;
-@@ -489,6 +486,9 @@ int qemudExtractVersionInfo(const char *qemu,
-             flags |= QEMUD_CMD_FLAG_MIGRATE_QEMU_EXEC;
-     } else if (kvm_version > 0) {
-         flags |= QEMUD_CMD_FLAG_MIGRATE_KVM_STDIO;
-+    } else if (version >= 10000) {
-+        flags |= QEMUD_CMD_FLAG_MIGRATE_QEMU_TCP;
-+        flags |= QEMUD_CMD_FLAG_MIGRATE_QEMU_EXEC;
-     }
- 
-     if (retversion)
--- 
-1.6.2.5
-

libvirt-0.6.2-event-handling-1.patch

@@ -1,147 +0,0 @@
-From 261ec2c9597b2eb6c7d91589fc66e203f60b6735 Mon Sep 17 00:00:00 2001
-From: Daniel P. Berrange <berrange@redhat.com>
-Date: Tue, 12 May 2009 16:41:49 +0000
-Subject: [PATCH] Fix interrupting of main event thread & protect against accidental uniniitalized variables
-
-(cherry picked from commit 0a31be6ba243066378c344882cc1a32802774edb)
-
-Fedora-patch: libvirt-0.6.2-event-handling-1.patch
----
- qemud/event.c |   42 +++++++++++++++++++++++++++++++++++-------
- 1 files changed, 35 insertions(+), 7 deletions(-)
-
-diff --git a/qemud/event.c b/qemud/event.c
-index 0887008..4dc1020 100644
---- a/qemud/event.c
-+++ b/qemud/event.c
-@@ -83,10 +83,10 @@ struct virEventLoop {
- static struct virEventLoop eventLoop;
- 
- /* Unique ID for the next FD watch to be registered */
--static int nextWatch = 0;
-+static int nextWatch = 1;
- 
- /* Unique ID for the next timer to be registered */
--static int nextTimer = 0;
-+static int nextTimer = 1;
- 
- static void virEventLock(void)
- {
-@@ -142,15 +142,22 @@ int virEventAddHandleImpl(int fd, int events,
- 
- void virEventUpdateHandleImpl(int watch, int events) {
-     int i;
-+    EVENT_DEBUG("Update handle w=%d e=%d", watch, events);
-+
-+    if (watch <= 0) {
-+        VIR_WARN("Ignoring invalid update watch %d", watch);
-+        return;
-+    }
-+
-     virEventLock();
-     for (i = 0 ; i < eventLoop.handlesCount ; i++) {
-         if (eventLoop.handles[i].watch == watch) {
-             eventLoop.handles[i].events =
-                     virEventHandleTypeToPollEvent(events);
-+            virEventInterruptLocked();
-             break;
-         }
-     }
--    virEventInterruptLocked();
-     virEventUnlock();
- }
- 
-@@ -163,6 +170,12 @@ void virEventUpdateHandleImpl(int watch, int events) {
- int virEventRemoveHandleImpl(int watch) {
-     int i;
-     EVENT_DEBUG("Remove handle %d", watch);
-+
-+    if (watch <= 0) {
-+        VIR_WARN("Ignoring invalid remove watch %d", watch);
-+        return -1;
-+    }
-+
-     virEventLock();
-     for (i = 0 ; i < eventLoop.handlesCount ; i++) {
-         if (eventLoop.handles[i].deleted)
-@@ -171,11 +184,11 @@ int virEventRemoveHandleImpl(int watch) {
-         if (eventLoop.handles[i].watch == watch) {
-             EVENT_DEBUG("mark delete %d %d", i, eventLoop.handles[i].fd);
-             eventLoop.handles[i].deleted = 1;
-+            virEventInterruptLocked();
-             virEventUnlock();
-             return 0;
-         }
-     }
--    virEventInterruptLocked();
-     virEventUnlock();
-     return -1;
- }
-@@ -231,6 +244,12 @@ void virEventUpdateTimeoutImpl(int timer, int frequency) {
-     struct timeval tv;
-     int i;
-     EVENT_DEBUG("Updating timer %d timeout with %d ms freq", timer, frequency);
-+
-+    if (timer <= 0) {
-+        VIR_WARN("Ignoring invalid update timer %d", timer);
-+        return;
-+    }
-+
-     if (gettimeofday(&tv, NULL) < 0) {
-         return;
-     }
-@@ -243,10 +262,10 @@ void virEventUpdateTimeoutImpl(int timer, int frequency) {
-                 frequency >= 0 ? frequency +
-                 (((unsigned long long)tv.tv_sec)*1000) +
-                 (((unsigned long long)tv.tv_usec)/1000) : 0;
-+            virEventInterruptLocked();
-             break;
-         }
-     }
--    virEventInterruptLocked();
-     virEventUnlock();
- }
- 
-@@ -259,6 +278,12 @@ void virEventUpdateTimeoutImpl(int timer, int frequency) {
- int virEventRemoveTimeoutImpl(int timer) {
-     int i;
-     EVENT_DEBUG("Remove timer %d", timer);
-+
-+    if (timer <= 0) {
-+        VIR_WARN("Ignoring invalid remove timer %d", timer);
-+        return -1;
-+    }
-+
-     virEventLock();
-     for (i = 0 ; i < eventLoop.timeoutsCount ; i++) {
-         if (eventLoop.timeouts[i].deleted)
-@@ -266,11 +291,11 @@ int virEventRemoveTimeoutImpl(int timer) {
- 
-         if (eventLoop.timeouts[i].timer == timer) {
-             eventLoop.timeouts[i].deleted = 1;
-+            virEventInterruptLocked();
-             virEventUnlock();
-             return 0;
-         }
-     }
--    virEventInterruptLocked();
-     virEventUnlock();
-     return -1;
- }
-@@ -616,9 +641,12 @@ static int virEventInterruptLocked(void)
-     char c = '\0';
- 
-     if (!eventLoop.running ||
--        pthread_self() == eventLoop.leader)
-+        pthread_self() == eventLoop.leader) {
-+        VIR_DEBUG("Skip interrupt, %d %d", eventLoop.running, (int)eventLoop.leader);
-         return 0;
-+    }
- 
-+    VIR_DEBUG0("Interrupting");
-     if (safewrite(eventLoop.wakeupfd[1], &c, sizeof(c)) != sizeof(c))
-         return -1;
-     return 0;
--- 
-1.6.2.5
-

libvirt-0.6.2-event-handling-2.patch

@@ -1,200 +0,0 @@
-From ef1a3eaa58d83c3367a1addff6c8132f27aa09dd Mon Sep 17 00:00:00 2001
-From: Daniel P. Berrange <berrange@redhat.com>
-Date: Tue, 12 May 2009 16:43:04 +0000
-Subject: [PATCH] Fix watch/timer event deletion
-
-(cherry picked from commit 470317f5c71cbcc6b6d8d83d0978aea3510d3698)
-
-Fedora-patch: libvirt-0.6.2-event-handling-2.patch
----
- qemud/event.c |  112 ++++++++++++++++++++++++++-------------------------------
- 1 files changed, 51 insertions(+), 61 deletions(-)
-
-diff --git a/qemud/event.c b/qemud/event.c
-index 4dc1020..8bc7c34 100644
---- a/qemud/event.c
-+++ b/qemud/event.c
-@@ -312,7 +312,7 @@ static int virEventCalculateTimeout(int *timeout) {
-     EVENT_DEBUG("Calculate expiry of %d timers", eventLoop.timeoutsCount);
-     /* Figure out if we need a timeout */
-     for (i = 0 ; i < eventLoop.timeoutsCount ; i++) {
--        if (eventLoop.timeouts[i].deleted || eventLoop.timeouts[i].frequency < 0)
-+        if (eventLoop.timeouts[i].frequency < 0)
-             continue;
- 
-         EVENT_DEBUG("Got a timeout scheduled for %llu", eventLoop.timeouts[i].expiresAt);
-@@ -349,32 +349,26 @@ static int virEventCalculateTimeout(int *timeout) {
-  * file handles. The caller must free the returned data struct
-  * returns: the pollfd array, or NULL on error
-  */
--static int virEventMakePollFDs(struct pollfd **retfds) {
-+static struct pollfd *virEventMakePollFDs(void) {
-     struct pollfd *fds;
--    int i, nfds = 0;
-+    int i;
- 
--    for (i = 0 ; i < eventLoop.handlesCount ; i++) {
--        if (eventLoop.handles[i].deleted)
--            continue;
--        nfds++;
--    }
--    *retfds = NULL;
-     /* Setup the poll file handle data structs */
--    if (VIR_ALLOC_N(fds, nfds) < 0)
--        return -1;
-+    if (VIR_ALLOC_N(fds, eventLoop.handlesCount) < 0)
-+        return NULL;
- 
--    for (i = 0, nfds = 0 ; i < eventLoop.handlesCount ; i++) {
--        if (eventLoop.handles[i].deleted)
--            continue;
--        fds[nfds].fd = eventLoop.handles[i].fd;
--        fds[nfds].events = eventLoop.handles[i].events;
--        fds[nfds].revents = 0;
-+    for (i = 0 ; i < eventLoop.handlesCount ; i++) {
-+        EVENT_DEBUG("Prepare n=%d w=%d, f=%d e=%d", i,
-+                    eventLoop.handles[i].watch,
-+                    eventLoop.handles[i].fd,
-+                    eventLoop.handles[i].events);
-+        fds[i].fd = eventLoop.handles[i].fd;
-+        fds[i].events = eventLoop.handles[i].events;
-+        fds[i].revents = 0;
-         //EVENT_DEBUG("Wait for %d %d", eventLoop.handles[i].fd, eventLoop.handles[i].events);
--        nfds++;
-     }
- 
--    *retfds = fds;
--    return nfds;
-+    return fds;
- }
- 
- 
-@@ -434,26 +428,30 @@ static int virEventDispatchTimeouts(void) {
-  * Returns 0 upon success, -1 if an error occurred
-  */
- static int virEventDispatchHandles(int nfds, struct pollfd *fds) {
--    int i, n;
-+    int i;
- 
--    for (i = 0, n = 0 ; i < eventLoop.handlesCount && n < nfds ; i++) {
-+    /* NB, use nfds not eventLoop.handlesCount, because new
-+     * fds might be added on end of list, and they're not
-+     * in the fds array we've got */
-+    for (i = 0 ; i < nfds ; i++) {
-         if (eventLoop.handles[i].deleted) {
--            EVENT_DEBUG("Skip deleted %d", eventLoop.handles[i].fd);
-+            EVENT_DEBUG("Skip deleted n=%d w=%d f=%d", i,
-+                        eventLoop.handles[i].watch, eventLoop.handles[i].fd);
-             continue;
-         }
- 
--        if (fds[n].revents) {
-+        if (fds[i].revents) {
-             virEventHandleCallback cb = eventLoop.handles[i].cb;
-             void *opaque = eventLoop.handles[i].opaque;
--            int hEvents = virPollEventToEventHandleType(fds[n].revents);
--            EVENT_DEBUG("Dispatch %d %d %p", fds[n].fd,
--                        fds[n].revents, eventLoop.handles[i].opaque);
-+            int hEvents = virPollEventToEventHandleType(fds[i].revents);
-+            EVENT_DEBUG("Dispatch n=%d f=%d w=%d e=%d %p", i,
-+                        fds[i].fd, eventLoop.handles[i].watch,
-+                        fds[i].revents, eventLoop.handles[i].opaque);
-             virEventUnlock();
-             (cb)(eventLoop.handles[i].watch,
--                 fds[n].fd, hEvents, opaque);
-+                 fds[i].fd, hEvents, opaque);
-             virEventLock();
-         }
--        n++;
-     }
- 
-     return 0;
-@@ -544,22 +542,21 @@ static int virEventCleanupHandles(void) {
-  * at least one file handle has an event, or a timer expires
-  */
- int virEventRunOnce(void) {
--    struct pollfd *fds;
-+    struct pollfd *fds = NULL;
-     int ret, timeout, nfds;
- 
-     virEventLock();
-     eventLoop.running = 1;
-     eventLoop.leader = pthread_self();
--    if ((nfds = virEventMakePollFDs(&fds)) < 0) {
--        virEventUnlock();
--        return -1;
--    }
- 
--    if (virEventCalculateTimeout(&timeout) < 0) {
--        VIR_FREE(fds);
--        virEventUnlock();
--        return -1;
--    }
-+    if (virEventCleanupTimeouts() < 0 ||
-+        virEventCleanupHandles() < 0)
-+        goto error;
-+
-+    if (!(fds = virEventMakePollFDs()) ||
-+        virEventCalculateTimeout(&timeout) < 0)
-+        goto error;
-+    nfds = eventLoop.handlesCount;
- 
-     virEventUnlock();
- 
-@@ -571,38 +568,31 @@ int virEventRunOnce(void) {
-         if (errno == EINTR) {
-             goto retry;
-         }
--        VIR_FREE(fds);
--        return -1;
-+        goto error_unlocked;
-     }
- 
-     virEventLock();
--    if (virEventDispatchTimeouts() < 0) {
--        VIR_FREE(fds);
--        virEventUnlock();
--        return -1;
--    }
-+    if (virEventDispatchTimeouts() < 0)
-+        goto error;
- 
-     if (ret > 0 &&
--        virEventDispatchHandles(nfds, fds) < 0) {
--        VIR_FREE(fds);
--        virEventUnlock();
--        return -1;
--    }
--    VIR_FREE(fds);
--
--    if (virEventCleanupTimeouts() < 0) {
--        virEventUnlock();
--        return -1;
--    }
-+        virEventDispatchHandles(nfds, fds) < 0)
-+        goto error;
- 
--    if (virEventCleanupHandles() < 0) {
--        virEventUnlock();
--        return -1;
--    }
-+    if (virEventCleanupTimeouts() < 0 ||
-+        virEventCleanupHandles() < 0)
-+        goto error;
- 
-     eventLoop.running = 0;
-     virEventUnlock();
-+    VIR_FREE(fds);
-     return 0;
-+
-+error:
-+    virEventUnlock();
-+error_unlocked:
-+    VIR_FREE(fds);
-+    return -1;
- }
- 
- static void virEventHandleWakeup(int watch ATTRIBUTE_UNUSED,
--- 
-1.6.2.5
-

libvirt-0.6.2-fix-libvirtd-crash-with-bad-capabilities-data.patch

@@ -1,137 +0,0 @@
-From d8bd0cff27c0572e9305e7fdbc6b843f74d9e30f Mon Sep 17 00:00:00 2001
-From: Daniel P. Berrange <berrange@redhat.com>
-Date: Mon, 29 Jun 2009 10:41:56 +0000
-Subject: [PATCH] Fix crash in QEMU driver with bad capabilities data
-
-(cherry picked from commit 39c7e7a6b79bbdfa36928a430d56fa88a204e8fd)
-
-Fedora-patch: libvirt-0.6.2-fix-libvirtd-crash-with-bad-capabilities-data.patch
----
- src/qemu_driver.c |   80 +++++++++++++++++++++++++++++++++++-----------------
- 1 files changed, 54 insertions(+), 26 deletions(-)
-
-diff --git a/src/qemu_driver.c b/src/qemu_driver.c
-index cb738b2..3d3675c 100644
---- a/src/qemu_driver.c
-+++ b/src/qemu_driver.c
-@@ -360,12 +360,43 @@ next:
-     return 0;
- }
- 
-+
-+static int
-+qemudSecurityCapsInit(virSecurityDriverPtr secdrv,
-+                      virCapsPtr caps)
-+{
-+    const char *doi, *model;
-+
-+    doi = virSecurityDriverGetDOI(secdrv);
-+    model = virSecurityDriverGetModel(secdrv);
-+
-+    caps->host.secModel.model = strdup(model);
-+    if (!caps->host.secModel.model) {
-+        char ebuf[1024];
-+        VIR_ERROR(_("Failed to copy secModel model: %s"),
-+                  virStrerror(errno, ebuf, sizeof ebuf));
-+        return -1;
-+    }
-+
-+    caps->host.secModel.doi = strdup(doi);
-+    if (!caps->host.secModel.doi) {
-+        char ebuf[1024];
-+        VIR_ERROR(_("Failed to copy secModel DOI: %s"),
-+                  virStrerror(errno, ebuf, sizeof ebuf));
-+        return -1;
-+    }
-+
-+    VIR_DEBUG("Initialized caps for security driver \"%s\" with "
-+              "DOI \"%s\"", model, doi);
-+
-+    return 0;
-+}
-+
-+
- static int
- qemudSecurityInit(struct qemud_driver *qemud_drv)
- {
-     int ret;
--    const char *doi, *model;
--    virCapsPtr caps;
-     virSecurityDriverPtr security_drv;
- 
-     ret = virSecurityDriverStartup(&security_drv,
-@@ -381,36 +412,17 @@ qemudSecurityInit(struct qemud_driver *qemud_drv)
-     }
- 
-     qemud_drv->securityDriver = security_drv;
--    doi = virSecurityDriverGetDOI(security_drv);
--    model = virSecurityDriverGetModel(security_drv);
- 
--    VIR_DEBUG("Initialized security driver \"%s\" with "
--              "DOI \"%s\"", model, doi);
-+    VIR_INFO("Initialized security driver %s", security_drv->name);
- 
-     /*
-      * Add security policy host caps now that the security driver is
-      * initialized.
-      */
--    caps = qemud_drv->caps;
--
--    caps->host.secModel.model = strdup(model);
--    if (!caps->host.secModel.model) {
--        char ebuf[1024];
--        VIR_ERROR(_("Failed to copy secModel model: %s"),
--                  virStrerror(errno, ebuf, sizeof ebuf));
--        return -1;
--    }
-+    return qemudSecurityCapsInit(security_drv, qemud_drv->caps);
-+}
- 
--    caps->host.secModel.doi = strdup(doi);
--    if (!caps->host.secModel.doi) {
--        char ebuf[1024];
--        VIR_ERROR(_("Failed to copy secModel DOI: %s"),
--                  virStrerror(errno, ebuf, sizeof ebuf));
--        return -1;
--    }
- 
--    return 0;
--}
- 
- /**
-  * qemudStartup:
-@@ -1852,13 +1864,29 @@ static int qemudGetNodeInfo(virConnectPtr conn,
- 
- static char *qemudGetCapabilities(virConnectPtr conn) {
-     struct qemud_driver *driver = conn->privateData;
-+    virCapsPtr caps;
-     char *xml = NULL;
- 
-     qemuDriverLock(driver);
-+    if ((caps = qemudCapsInit()) == NULL) {
-+        virReportOOMError(conn);
-+        goto cleanup;
-+    }
-+
-+    if (qemu_driver->securityDriver &&
-+        qemudSecurityCapsInit(qemu_driver->securityDriver, caps) < 0) {
-+        virCapabilitiesFree(caps);
-+        virReportOOMError(conn);
-+        goto cleanup;
-+    }
-+
-     virCapabilitiesFree(qemu_driver->caps);
--    if ((qemu_driver->caps = qemudCapsInit()) == NULL ||
--        (xml = virCapabilitiesFormatXML(driver->caps)) == NULL)
-+    qemu_driver->caps = caps;
-+
-+    if ((xml = virCapabilitiesFormatXML(driver->caps)) == NULL)
-         virReportOOMError(conn);
-+
-+cleanup:
-     qemuDriverUnlock(driver);
- 
-     return xml;
--- 
-1.6.2.5
-

libvirt-0.6.2-fix-nosource-label.patch

@@ -1,37 +0,0 @@
-From 99c018831379f23e65860ad4f3628a6d5f1a7d5a Mon Sep 17 00:00:00 2001
-From: Mark McLoughlin <markmc@redhat.com>
-Date: Fri, 3 Jul 2009 10:29:09 +0000
-Subject: [PATCH] Skip labelling if no src path present
-
-Fixes startup of guest's with sourceless cdrom devices.
-
-Patch from Cole Robinson originally posted here:
-
-  https://bugzilla.redhat.com/499569
-
-but never sent upstream.
-
-(cherry picked from commit 67d0c6eb9410d5101f4820a7286deacb6398afde)
-
-Fedora-patch: libvirt-0.6.2-fix-nosource-label.patch
----
- src/security_selinux.c |    3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
-
-diff --git a/src/security_selinux.c b/src/security_selinux.c
-index 95fa0a6..450fce2 100644
---- a/src/security_selinux.c
-+++ b/src/security_selinux.c
-@@ -338,6 +338,9 @@ SELinuxSetSecurityImageLabel(virConnectPtr conn,
- {
-     const virSecurityLabelDefPtr secdef = &vm->def->seclabel;
- 
-+    if (!disk->src)
-+        return 0;
-+
-     if (disk->shared) {
-         return SELinuxSetFilecon(conn, disk->src, default_image_context);
-     } else if (disk->readonly) {
--- 
-1.6.2.5
-

libvirt-0.6.2-fix-qemu-argv-detection-with-kvm-85.patch

@@ -1,85 +0,0 @@
-From 9f6a5f50aee13575331f79f5d93635f701646eb7 Mon Sep 17 00:00:00 2001
-From: Daniel P. Berrange <berrange@redhat.com>
-Date: Mon, 11 May 2009 15:14:24 +0000
-Subject: [PATCH] Fix QEMU ARGV detection with kvm >= 85
-
-(cherry picked from commit 426f9772b84752b4901b72fd382ff6e28e258efd)
-
-Fedora-patch: libvirt-0.6.2-fix-qemu-argv-detection-with-kvm-85.patch
----
- src/qemu_conf.c   |   18 ++++++++++++++----
- src/qemu_driver.c |   12 ++----------
- 2 files changed, 16 insertions(+), 14 deletions(-)
-
-diff --git a/src/qemu_conf.c b/src/qemu_conf.c
-index 929fe00..3e7e32d 100644
---- a/src/qemu_conf.c
-+++ b/src/qemu_conf.c
-@@ -431,18 +431,28 @@ int qemudExtractVersionInfo(const char *qemu,
-         return -1;
- 
-     char *help = NULL;
--    enum { MAX_HELP_OUTPUT_SIZE = 8192 };
-+    enum { MAX_HELP_OUTPUT_SIZE = 1024*64 };
-     int len = virFileReadLimFD(newstdout, MAX_HELP_OUTPUT_SIZE, &help);
--    if (len < 0)
-+    if (len < 0) {
-+        virReportSystemError(NULL, errno, "%s",
-+                             _("Unable to read QEMU help output"));
-         goto cleanup2;
-+    }
- 
-     if (sscanf(help, "QEMU PC emulator version %u.%u.%u (kvm-%u)",
-                &major, &minor, &micro, &kvm_version) != 4)
-         kvm_version = 0;
- 
--    if (!kvm_version && sscanf(help, "QEMU PC emulator version %u.%u.%u",
--               &major, &minor, &micro) != 3)
-+    if (!kvm_version &&
-+        sscanf(help, "QEMU PC emulator version %u.%u.%u",
-+               &major, &minor, &micro) != 3) {
-+        char *eol = strchr(help, '\n');
-+        if (eol) *eol = '\0';
-+        qemudReportError(NULL, NULL, NULL, VIR_ERR_INTERNAL_ERROR,
-+                         _("cannot parse QEMU version number in '%s'"),
-+                         help);
-         goto cleanup2;
-+    }
- 
-     version = (major * 1000 * 1000) + (minor * 1000) + micro;
- 
-diff --git a/src/qemu_driver.c b/src/qemu_driver.c
-index 4752a64..5ca3d20 100644
---- a/src/qemu_driver.c
-+++ b/src/qemu_driver.c
-@@ -1379,12 +1379,8 @@ static int qemudStartVMDaemon(virConnectPtr conn,
- 
-     if (qemudExtractVersionInfo(emulator,
-                                 NULL,
--                                &qemuCmdFlags) < 0) {
--        qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR,
--                         _("Cannot determine QEMU argv syntax %s"),
--                         emulator);
-+                                &qemuCmdFlags) < 0)
-         goto cleanup;
--    }
- 
-     if (qemuPrepareHostDevices(conn, vm->def) < 0)
-         goto cleanup;
-@@ -3606,12 +3602,8 @@ static int qemudDomainChangeEjectableMedia(virConnectPtr conn,
- 
-     if (qemudExtractVersionInfo(vm->def->emulator,
-                                 NULL,
--                                &qemuCmdFlags) < 0) {
--        qemudReportError(conn, dom, NULL, VIR_ERR_INTERNAL_ERROR,
--                         _("Cannot determine QEMU argv syntax %s"),
--                         vm->def->emulator);
-+                                &qemuCmdFlags) < 0)
-         return -1;
--    }
- 
-     if (qemuCmdFlags & QEMUD_CMD_FLAG_DRIVE) {
-         if (!(devname = qemudDiskDeviceName(conn, newdisk)))
--- 
-1.6.2.5
-

libvirt-0.6.2-hotplug-labelling.patch

@@ -1,46 +0,0 @@
-From 0aac99f8e13dfc74b87986908165ae7f44662153 Mon Sep 17 00:00:00 2001
-From: Daniel P. Berrange <berrange@redhat.com>
-Date: Mon, 6 Jul 2009 16:01:55 +0100
-Subject: [PATCH] Fix SELinux denial during hotplug
-
-* src/qemu_driver.c: Relabel disk images *before* running QEMU
-hotplug monitor commands
-
-(cherry picked from commit 1795bfe4a177a5eff1b3b0a16d56df6f371c0f8e)
-
-Fedora-patch: libvirt-0.6.2-hotplug-labelling.patch
----
- src/qemu_driver.c |    6 ++++--
- 1 files changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/src/qemu_driver.c b/src/qemu_driver.c
-index 5fc21a1..f3661f8 100644
---- a/src/qemu_driver.c
-+++ b/src/qemu_driver.c
-@@ -3934,10 +3934,14 @@ static int qemudDomainAttachDevice(virDomainPtr dom,
-         switch (dev->data.disk->device) {
-         case VIR_DOMAIN_DISK_DEVICE_CDROM:
-         case VIR_DOMAIN_DISK_DEVICE_FLOPPY:
-+            if (driver->securityDriver)
-+                driver->securityDriver->domainSetSecurityImageLabel(dom->conn, vm, dev->data.disk);
-             ret = qemudDomainChangeEjectableMedia(dom->conn, vm, dev);
-             break;
- 
-         case VIR_DOMAIN_DISK_DEVICE_DISK:
-+            if (driver->securityDriver)
-+                driver->securityDriver->domainSetSecurityImageLabel(dom->conn, vm, dev->data.disk);
-             if (dev->data.disk->bus == VIR_DOMAIN_DISK_BUS_USB) {
-                 ret = qemudDomainAttachUsbMassstorageDevice(dom->conn, vm, dev);
-             } else if (dev->data.disk->bus == VIR_DOMAIN_DISK_BUS_SCSI ||
-@@ -3949,8 +3953,6 @@ static int qemudDomainAttachDevice(virDomainPtr dom,
-                                  virDomainDiskBusTypeToString(dev->data.disk->bus));
-                 goto cleanup;
-             }
--            if (driver->securityDriver)
--                driver->securityDriver->domainSetSecurityImageLabel(dom->conn, vm, dev->data.disk);
-             break;
- 
-         default:
--- 
-1.6.2.5
-

libvirt-0.6.2-hotplug-monitor-syntax.patch

@@ -1,134 +0,0 @@
-From ae80f9ec15b03d9d3ab6cfa2d48529b459a64fb2 Mon Sep 17 00:00:00 2001
-From: Daniel P. Berrange <berrange@redhat.com>
-Date: Mon, 6 Jul 2009 15:58:55 +0100
-Subject: [PATCH] Fix PCI device hotplug/unplug with newer QEMU
-
-* src/qemu_driver.c: Try new monitor syntax for hotplug first. If
-  that fails fallback to old KVM specific syntax
-
-(cherry picked from commit 326ecb78145cfeb7706ef0dcd521b19d934950e7)
-
-Fedora-patch: libvirt-0.6.2-hotplug-monitor-syntax.patch
----
- src/qemu_driver.c |   56 +++++++++++++++++++++++++++++++++++++++-------------
- 1 files changed, 42 insertions(+), 14 deletions(-)
-
-diff --git a/src/qemu_driver.c b/src/qemu_driver.c
-index f3661f8..8473616 100644
---- a/src/qemu_driver.c
-+++ b/src/qemu_driver.c
-@@ -3724,6 +3724,7 @@ static int qemudDomainAttachPciDiskDevice(virConnectPtr conn,
-     char *cmd, *reply, *s;
-     char *safe_path;
-     const char* type = virDomainDiskBusTypeToString(dev->data.disk->bus);
-+    int tryOldSyntax = 0;
- 
-     for (i = 0 ; i < vm->def->ndisks ; i++) {
-         if (STREQ(vm->def->disks[i]->dst, dev->data.disk->dst)) {
-@@ -3738,14 +3739,15 @@ static int qemudDomainAttachPciDiskDevice(virConnectPtr conn,
-         return -1;
-     }
- 
-+try_command:
-     safe_path = qemudEscapeMonitorArg(dev->data.disk->src);
-     if (!safe_path) {
-         virReportOOMError(conn);
-         return -1;
-     }
- 
--    ret = virAsprintf(&cmd, "pci_add 0 storage file=%s,if=%s",
--                      safe_path, type);
-+    ret = virAsprintf(&cmd, "pci_add %s storage file=%s,if=%s",
-+                      (tryOldSyntax ? "0": "pci_addr=auto"), safe_path, type);
-     VIR_FREE(safe_path);
-     if (ret == -1) {
-         virReportOOMError(conn);
-@@ -3761,17 +3763,27 @@ static int qemudDomainAttachPciDiskDevice(virConnectPtr conn,
- 
-     DEBUG ("%s: pci_add reply: %s", vm->def->name, reply);
-     /* If the command succeeds qemu prints:
--     * OK bus 0... */
--#define PCI_ATTACH_OK_MSG "OK bus 0, slot "
--    if ((s=strstr(reply, PCI_ATTACH_OK_MSG))) {
--        char* dummy = s;
--        s += strlen(PCI_ATTACH_OK_MSG);
-+     * OK bus 0, slot XXX...
-+     * or
-+     * OK domain 0, bus 0, slot XXX
-+     */
-+    if ((s = strstr(reply, "OK ")) &&
-+        (s = strstr(s, "slot "))) {
-+        char *dummy = s;
-+        s += strlen("slot ");
- 
-         if (virStrToLong_i ((const char*)s, &dummy, 10, &dev->data.disk->slotnum) == -1)
-             VIR_WARN("%s", _("Unable to parse slot number\n"));
-+        /* XXX not neccessarily always going to end up in domain 0 / bus 0 :-( */
-+        /* XXX this slotnum is not persistant across restarts :-( */
-+    } else if (!tryOldSyntax && strstr(reply, "invalid char in expression")) {
-+        VIR_FREE(reply);
-+        VIR_FREE(cmd);
-+        tryOldSyntax = 1;
-+        goto try_command;
-     } else {
-         qemudReportError (conn, dom, NULL, VIR_ERR_OPERATION_FAILED,
--                          _("adding %s disk failed"), type);
-+                          _("adding %s disk failed: %s"), type, reply);
-         VIR_FREE(reply);
-         VIR_FREE(cmd);
-         return -1;
-@@ -3990,6 +4002,7 @@ static int qemudDomainDetachPciDiskDevice(virConnectPtr conn,
-     char *cmd = NULL;
-     char *reply = NULL;
-     virDomainDiskDefPtr detach = NULL;
-+    int tryOldSyntax = 0;
- 
-     for (i = 0 ; i < vm->def->ndisks ; i++) {
-         if (STREQ(vm->def->disks[i]->dst, dev->data.disk->dst)) {
-@@ -4011,9 +4024,17 @@ static int qemudDomainDetachPciDiskDevice(virConnectPtr conn,
-         goto cleanup;
-     }
- 
--    if (virAsprintf(&cmd, "pci_del 0 %d", detach->slotnum) < 0) {
--        virReportOOMError(conn);
--        goto cleanup;
-+try_command:
-+    if (tryOldSyntax) {
-+        if (virAsprintf(&cmd, "pci_del 0 %d", detach->slotnum) < 0) {
-+            virReportOOMError(conn);
-+            goto cleanup;
-+        }
-+    } else {
-+        if (virAsprintf(&cmd, "pci_del pci_addr=0:0:%d", detach->slotnum) < 0) {
-+            virReportOOMError(conn);
-+            goto cleanup;
-+        }
-     }
- 
-     if (qemudMonitorCommand(vm, cmd, &reply) < 0) {
-@@ -4023,12 +4044,19 @@ static int qemudDomainDetachPciDiskDevice(virConnectPtr conn,
-     }
- 
-     DEBUG ("%s: pci_del reply: %s",vm->def->name,  reply);
-+
-+    if (!tryOldSyntax &&
-+        strstr(reply, "extraneous characters")) {
-+        tryOldSyntax = 1;
-+        goto try_command;
-+    }
-     /* If the command fails due to a wrong slot qemu prints: invalid slot,
-      * nothing is printed on success */
--    if (strstr(reply, "invalid slot")) {
-+    if (strstr(reply, "invalid slot") ||
-+        strstr(reply, "Invalid pci address")) {
-         qemudReportError (conn, NULL, NULL, VIR_ERR_OPERATION_FAILED,
--                          _("failed to detach disk %s: invalid slot %d"),
--                          detach->dst, detach->slotnum);
-+                          _("failed to detach disk %s: invalid slot %d: %s"),
-+                          detach->dst, detach->slotnum, reply);
-         goto cleanup;
-     }
- 
--- 
-1.6.2.5
-

libvirt-0.6.2-libvirtd-double-free.patch

@@ -1,57 +0,0 @@
-From 2c42e4c96efd390fa7a6957692a5863d30a10828 Mon Sep 17 00:00:00 2001
-From: Daniel P. Berrange <berrange@redhat.com>
-Date: Fri, 29 May 2009 14:34:35 +0000
-Subject: [PATCH] Avoid double-free in daemon client cleanup code
-
-(cherry picked from commit 6c3ef350649b959215cfc5ccfdaba35bf9560066)
-
-Fedora-patch: libvirt-0.6.2-libvirtd-double-free.patch
----
- qemud/qemud.c |   22 +++++++++++++++++-----
- 1 files changed, 17 insertions(+), 5 deletions(-)
-
-diff --git a/qemud/qemud.c b/qemud/qemud.c
-index 4f04355..e299a67 100644
---- a/qemud/qemud.c
-+++ b/qemud/qemud.c
-@@ -1397,7 +1397,10 @@ static int qemudDispatchServer(struct qemud_server *server, struct qemud_socket
-  * jobs have finished, then clean it up elsehwere
-  */
- void qemudDispatchClientFailure(struct qemud_client *client) {
--    virEventRemoveHandleImpl(client->watch);
-+    if (client->watch != -1) {
-+        virEventRemoveHandleImpl(client->watch);
-+        client->watch = -1;
-+    }
- 
-     /* Deregister event delivery callback */
-     if(client->conn) {
-@@ -1406,12 +1409,21 @@ void qemudDispatchClientFailure(struct qemud_client *client) {
-     }
- 
- #if HAVE_SASL
--    if (client->saslconn) sasl_dispose(&client->saslconn);
-+    if (client->saslconn) {
-+        sasl_dispose(&client->saslconn);
-+        client->saslconn = NULL;
-+    }
-     free(client->saslUsername);
-+    client->saslUsername = NULL;
- #endif
--    if (client->tlssession) gnutls_deinit (client->tlssession);
--    close(client->fd);
--    client->fd = -1;
-+    if (client->tlssession) {
-+        gnutls_deinit (client->tlssession);
-+        client->tlssession = NULL;
-+    }
-+    if (client->fd != -1) {
-+        close(client->fd);
-+        client->fd = -1;
-+    }
- }
- 
- 
--- 
-1.6.2.5
-

libvirt-0.6.2-monitor-prompt-discard.patch

@@ -1,60 +0,0 @@
-From eb2fad7e94ba9bf48787e24542931688b9926ca1 Mon Sep 17 00:00:00 2001
-From: Daniel P. Berrange <berrange@redhat.com>
-Date: Mon, 6 Jul 2009 15:45:04 +0100
-Subject: [PATCH] Fix problem with QEMU monitor welcome prompt confusing libvirt after a libvirtd daemon restart with active guests
-
-* src/qemu_driver: Read and dicard pending monitor data
-  before issuing new monitor commands.
-
-(cherry picked from commit 2d1f2e706c8b13571e1227df1c69b2302da35d5a)
-
-Fedora-patch: libvirt-0.6.2-monitor-prompt-discard.patch
----
- src/qemu_driver.c |   24 ++++++++++++++++++++++++
- 1 files changed, 24 insertions(+), 0 deletions(-)
-
-diff --git a/src/qemu_driver.c b/src/qemu_driver.c
-index 3d3675c..5fc21a1 100644
---- a/src/qemu_driver.c
-+++ b/src/qemu_driver.c
-@@ -1636,6 +1636,28 @@ cleanup:
-     qemuDriverUnlock(driver);
- }
- 
-+
-+/* Throw away any data available on the monitor
-+ * This is done before executing a command, in order
-+ * to allow re-synchronization if something went badly
-+ * wrong in the past. it also deals with problem of
-+ * QEMU *sometimes* re-printing its initial greeting
-+ * when we reconnect to the monitor after restarts.
-+ */
-+static void
-+qemuMonitorDiscardPendingData(virDomainObjPtr vm) {
-+    char buf[1024];
-+    int ret = 0;
-+
-+    /* Monitor is non-blocking, so just loop till we
-+     * get -1 or 0. Don't bother with detecting
-+     * errors, since we'll deal with that better later */
-+    do {
-+        ret = read(vm->monitor, buf, sizeof (buf)-1);
-+    } while (ret > 0);
-+}
-+
-+
- static int
- qemudMonitorCommandExtra(const virDomainObjPtr vm,
-                          const char *cmd,
-@@ -1647,6 +1669,8 @@ qemudMonitorCommandExtra(const virDomainObjPtr vm,
-     size_t cmdlen = strlen(cmd);
-     size_t extralen = extra ? strlen(extra) : 0;
- 
-+    qemuMonitorDiscardPendingData(vm);
-+
-     if (safewrite(vm->monitor, cmd, cmdlen) != cmdlen)
-         return -1;
-     if (safewrite(vm->monitor, "\r", 1) != 1)
--- 
-1.6.2.5
-

libvirt-0.6.2-numa-ignore-fail.patch

@@ -1,159 +0,0 @@
-From 3cf2f90a4747547f9877b15c1f573f8a771098e8 Mon Sep 17 00:00:00 2001
-From: Daniel P. Berrange <berrange@redhat.com>
-Date: Mon, 29 Jun 2009 10:41:56 +0000
-Subject: [PATCH] Fix crash in QEMU driver with bad capabilities data
-
-(cherry picked from commit 39c7e7a6b79bbdfa36928a430d56fa88a204e8fd)
-
-Fedora-patch: libvirt-0.6.2-numa-ignore-fail.patch
----
- src/capabilities.c       |   16 +++++++++++++---
- src/capabilities.h       |    3 +++
- src/libvirt_private.syms |    1 +
- src/lxc_conf.c           |   11 +++++++++--
- src/qemu_conf.c          |   10 ++++++++--
- src/uml_conf.c           |   11 +++++++++--
- 6 files changed, 43 insertions(+), 9 deletions(-)
-
-diff --git a/src/capabilities.c b/src/capabilities.c
-index d6e3478..8dc32a1 100644
---- a/src/capabilities.c
-+++ b/src/capabilities.c
-@@ -122,6 +122,18 @@ virCapabilitiesFreeGuest(virCapsGuestPtr guest)
- }
- 
- 
-+void
-+virCapabilitiesFreeNUMAInfo(virCapsPtr caps)
-+{
-+    int i;
-+
-+    for (i = 0 ; i < caps->host.nnumaCell ; i++)
-+        virCapabilitiesFreeHostNUMACell(caps->host.numaCell[i]);
-+    VIR_FREE(caps->host.numaCell);
-+    caps->host.nnumaCell = 0;
-+}
-+
-+
- /**
-  * virCapabilitiesFree:
-  * @caps: object to free
-@@ -141,9 +153,7 @@ virCapabilitiesFree(virCapsPtr caps) {
-     for (i = 0 ; i < caps->host.nfeatures ; i++)
-         VIR_FREE(caps->host.features[i]);
-     VIR_FREE(caps->host.features);
--    for (i = 0 ; i < caps->host.nnumaCell ; i++)
--        virCapabilitiesFreeHostNUMACell(caps->host.numaCell[i]);
--    VIR_FREE(caps->host.numaCell);
-+    virCapabilitiesFreeNUMAInfo(caps);
- 
-     for (i = 0 ; i < caps->host.nmigrateTrans ; i++)
-         VIR_FREE(caps->host.migrateTrans[i]);
-diff --git a/src/capabilities.h b/src/capabilities.h
-index 5b0bbab..1b49666 100644
---- a/src/capabilities.h
-+++ b/src/capabilities.h
-@@ -118,6 +118,9 @@ extern void
- virCapabilitiesFree(virCapsPtr caps);
- 
- extern void
-+virCapabilitiesFreeNUMAInfo(virCapsPtr caps);
-+
-+extern void
- virCapabilitiesSetMacPrefix(virCapsPtr caps,
-                             unsigned char *prefix);
- 
-diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
-index 350a931..9249a1a 100644
---- a/src/libvirt_private.syms
-+++ b/src/libvirt_private.syms
-@@ -24,6 +24,7 @@ virCapabilitiesDefaultGuestEmulator;
- virCapabilitiesDefaultGuestMachine;
- virCapabilitiesFormatXML;
- virCapabilitiesFree;
-+virCapabilitiesFreeNUMAInfo;
- virCapabilitiesNew;
- virCapabilitiesSetMacPrefix;
- virCapabilitiesGenerateMac;
-diff --git a/src/lxc_conf.c b/src/lxc_conf.c
-index 34c8aea..fe721e3 100644
---- a/src/lxc_conf.c
-+++ b/src/lxc_conf.c
-@@ -30,6 +30,7 @@
- #include "lxc_conf.h"
- #include "nodeinfo.h"
- #include "virterror_internal.h"
-+#include "logging.h"
- 
- #define VIR_FROM_THIS VIR_FROM_LXC
- 
-@@ -46,8 +47,14 @@ virCapsPtr lxcCapsInit(void)
-                                    0, 0)) == NULL)
-         goto no_memory;
- 
--    if (virCapsInitNUMA(caps) < 0)
--        goto no_memory;
-+    /* Some machines have problematic NUMA toplogy causing
-+     * unexpected failures. We don't want to break the QEMU
-+     * driver in this scenario, so log errors & carry on
-+     */
-+    if (virCapsInitNUMA(caps) < 0) {
-+        virCapabilitiesFreeNUMAInfo(caps);
-+        VIR_WARN0("Failed to query host NUMA topology, disabling NUMA capabilities");
-+    }
- 
-     /* XXX shouldn't 'borrow' KVM's prefix */
-     virCapabilitiesSetMacPrefix(caps, (unsigned char []){ 0x52, 0x54, 0x00 });
-diff --git a/src/qemu_conf.c b/src/qemu_conf.c
-index 99f13c6..1194e36 100644
---- a/src/qemu_conf.c
-+++ b/src/qemu_conf.c
-@@ -376,8 +376,14 @@ virCapsPtr qemudCapsInit(void) {
-     /* Using KVM's mac prefix for QEMU too */
-     virCapabilitiesSetMacPrefix(caps, (unsigned char[]){ 0x52, 0x54, 0x00 });
- 
--    if (virCapsInitNUMA(caps) < 0)
--        goto no_memory;
-+    /* Some machines have problematic NUMA toplogy causing
-+     * unexpected failures. We don't want to break the QEMU
-+     * driver in this scenario, so log errors & carry on
-+     */
-+    if (virCapsInitNUMA(caps) < 0) {
-+        virCapabilitiesFreeNUMAInfo(caps);
-+        VIR_WARN0("Failed to query host NUMA topology, disabling NUMA capabilities");
-+    }
- 
-     /* First the pure HVM guests */
-     for (i = 0 ; i < ARRAY_CARDINALITY(arch_info_hvm) ; i++)
-diff --git a/src/uml_conf.c b/src/uml_conf.c
-index c0d086e..9dd4967 100644
---- a/src/uml_conf.c
-+++ b/src/uml_conf.c
-@@ -44,6 +44,7 @@
- #include "memory.h"
- #include "nodeinfo.h"
- #include "verify.h"
-+#include "logging.h"
- 
- #define VIR_FROM_THIS VIR_FROM_UML
- 
-@@ -62,8 +63,14 @@ virCapsPtr umlCapsInit(void) {
-                                    0, 0)) == NULL)
-         goto no_memory;
- 
--    if (virCapsInitNUMA(caps) < 0)
--        goto no_memory;
-+    /* Some machines have problematic NUMA toplogy causing
-+     * unexpected failures. We don't want to break the QEMU
-+     * driver in this scenario, so log errors & carry on
-+     */
-+    if (virCapsInitNUMA(caps) < 0) {
-+        virCapabilitiesFreeNUMAInfo(caps);
-+        VIR_WARN0("Failed to query host NUMA topology, disabling NUMA capabilities");
-+    }
- 
-     if ((guest = virCapabilitiesAddGuest(caps,
-                                          "uml",
--- 
-1.6.2.5
-

libvirt-0.6.2-pci-device-crash.patch

@@ -1,31 +0,0 @@
-From d5d67ea357d92759d4a9ecb213e577835f961eed Mon Sep 17 00:00:00 2001
-From: Daniel P. Berrange <berrange@redhat.com>
-Date: Thu, 16 Jul 2009 13:23:32 +0100
-Subject: [PATCH] Fix free of unitialized data upon PCI open fail
-
-(cherry picked from commit 4a7acedd3c59a6a750576cb8680bc3f08fe0b52c)
-
-Fedora-patch: libvirt-0.6.2-pci-device-crash.patch
----
- src/pci.c |    4 +---
- 1 files changed, 1 insertions(+), 3 deletions(-)
-
-diff --git a/src/pci.c b/src/pci.c
-index ed64d68..68a380d 100644
---- a/src/pci.c
-+++ b/src/pci.c
-@@ -829,10 +829,8 @@ pciReadDeviceID(pciDevice *dev, const char *id_name)
-              dev->name, id_name);
- 
-     /* ID string is '0xNNNN\n' ... i.e. 7 bytes */
--    if (virFileReadAll(path, 7, &id_str) < 7) {
--        VIR_FREE(id_str);
-+    if (virFileReadAll(path, 7, &id_str) < 0)
-         return NULL;
--    }
- 
-     /* Check for 0x suffix */
-     if (id_str[0] != '0' || id_str[1] != 'x') {
--- 
-1.6.2.5
-

libvirt-0.6.2-qemu-drive-format.patch

@@ -1,31 +0,0 @@
-From bf7b58a2471a07111f8022c0176f45ee5dc5fe71 Mon Sep 17 00:00:00 2001
-From: Mark McLoughlin <markmc@redhat.com>
-Date: Thu, 16 Apr 2009 14:21:35 +0000
-Subject: [PATCH] qemu -drive takes format= not fmt=
-
-Seems like a simple typo - it has been "format=" since the flag
-was introduced, but we added it as "fmt=".
-
-(cherry picked from commit 9fa79000ecc883c699a6cb1ce7f00c34881bc8fe)
-
-Fedora-patch: libvirt-0.6.2-qemu-drive-format.patch
----
- src/qemu_conf.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/qemu_conf.c b/src/qemu_conf.c
-index f36c927..6f9e610 100644
---- a/src/qemu_conf.c
-+++ b/src/qemu_conf.c
-@@ -1135,7 +1135,7 @@ int qemudBuildCommandLine(virConnectPtr conn,
-                 disk->device == VIR_DOMAIN_DISK_DEVICE_DISK)
-                 virBufferAddLit(&opt, ",boot=on");
-             if (disk->driverType)
--                virBufferVSprintf(&opt, ",fmt=%s", disk->driverType);
-+                virBufferVSprintf(&opt, ",format=%s", disk->driverType);
- 
-             if (disk->cachemode) {
-                 const char *mode =
--- 
-1.6.2.5
-

libvirt-0.6.2-qemu-name-uniqueness.patch

@@ -1,176 +0,0 @@
-From 1f1a0ca63c5492c7d41a0cdbd452a2743f314ebc Mon Sep 17 00:00:00 2001
-From: Daniel P. Berrange <berrange@redhat.com>
-Date: Fri, 8 May 2009 10:11:14 +0000
-Subject: [PATCH] Improve name & UUID uniqueness checking in QEMU driver
-
-(cherry picked from commit 54ebbde1e18ec831ff2fddb44ec27ed5dde7874a)
-
-Fedora-patch: libvirt-0.6.2-qemu-name-uniqueness.patch
----
- src/qemu_driver.c |  103 ++++++++++++++++++++++++++++++++++++++++++----------
- 1 files changed, 83 insertions(+), 20 deletions(-)
-
-diff --git a/src/qemu_driver.c b/src/qemu_driver.c
-index 8473616..dfd19c5 100644
---- a/src/qemu_driver.c
-+++ b/src/qemu_driver.c
-@@ -2174,22 +2174,37 @@ static virDomainPtr qemudDomainCreate(virConnectPtr conn, const char *xml,
-     if (virSecurityDriverVerify(conn, def) < 0)
-         goto cleanup;
- 
--    vm = virDomainFindByName(&driver->domains, def->name);
--    if (vm) {
--        qemudReportError(conn, NULL, NULL, VIR_ERR_OPERATION_FAILED,
--                         _("domain '%s' is already defined"),
--                         def->name);
--        goto cleanup;
--    }
-+    /* See if a VM with matching UUID already exists */
-     vm = virDomainFindByUUID(&driver->domains, def->uuid);
-     if (vm) {
--        char uuidstr[VIR_UUID_STRING_BUFLEN];
-+        /* UUID matches, but if names don't match, refuse it */
-+        if (STRNEQ(vm->def->name, def->name)) {
-+            char uuidstr[VIR_UUID_STRING_BUFLEN];
-+            virUUIDFormat(vm->def->uuid, uuidstr);
-+            qemudReportError(conn, NULL, NULL, VIR_ERR_OPERATION_FAILED,
-+                             _("domain '%s' is already defined with uuid %s"),
-+                             vm->def->name, uuidstr);
-+            goto cleanup;
-+        }
- 
--        virUUIDFormat(def->uuid, uuidstr);
--        qemudReportError(conn, NULL, NULL, VIR_ERR_OPERATION_FAILED,
--                         _("domain with uuid '%s' is already defined"),
--                         uuidstr);
--        goto cleanup;
-+        /* UUID & name match, but if VM is already active, refuse it */
-+        if (virDomainIsActive(vm)) {
-+            qemudReportError(conn, NULL, NULL, VIR_ERR_OPERATION_FAILED,
-+                             _("domain is already active as '%s'"), vm->def->name);
-+            goto cleanup;
-+        }
-+        virDomainObjUnlock(vm);
-+    } else {
-+        /* UUID does not match, but if a name matches, refuse it */
-+        vm = virDomainFindByName(&driver->domains, def->name);
-+        if (vm) {
-+            char uuidstr[VIR_UUID_STRING_BUFLEN];
-+            virUUIDFormat(vm->def->uuid, uuidstr);
-+            qemudReportError(conn, NULL, NULL, VIR_ERR_OPERATION_FAILED,
-+                             _("domain '%s' is already defined with uuid %s"),
-+                             def->name, uuidstr);
-+            goto cleanup;
-+        }
-     }
- 
-     if (!(vm = virDomainAssignDef(conn,
-@@ -2368,6 +2383,11 @@ static int qemudDomainDestroy(virDomainPtr dom) {
-                          _("no domain with matching id %d"), dom->id);
-         goto cleanup;
-     }
-+    if (!virDomainIsActive(vm)) {
-+        qemudReportError(dom->conn, dom, NULL, VIR_ERR_OPERATION_FAILED,
-+                         "%s", _("domain is not running"));
-+        goto cleanup;
-+    }
- 
-     qemudShutdownVMDaemon(dom->conn, driver, vm);
-     event = virDomainEventNewFromObj(vm,
-@@ -3272,17 +3292,36 @@ static int qemudDomainRestore(virConnectPtr conn,
-         goto cleanup;
-     }
- 
--    /* Ensure the name and UUID don't already exist in an active VM */
-+    /* See if a VM with matching UUID already exists */
-     vm = virDomainFindByUUID(&driver->domains, def->uuid);
--    if (!vm)
--        vm = virDomainFindByName(&driver->domains, def->name);
-     if (vm) {
-+        /* UUID matches, but if names don't match, refuse it */
-+        if (STRNEQ(vm->def->name, def->name)) {
-+            char uuidstr[VIR_UUID_STRING_BUFLEN];
-+            virUUIDFormat(vm->def->uuid, uuidstr);
-+            qemudReportError(conn, NULL, NULL, VIR_ERR_OPERATION_FAILED,
-+                             _("domain '%s' is already defined with uuid %s"),
-+                             vm->def->name, uuidstr);
-+            goto cleanup;
-+        }
-+
-+        /* UUID & name match, but if VM is already active, refuse it */
-         if (virDomainIsActive(vm)) {
-             qemudReportError(conn, NULL, NULL, VIR_ERR_OPERATION_FAILED,
-                              _("domain is already active as '%s'"), vm->def->name);
-             goto cleanup;
--        } else {
--            virDomainObjUnlock(vm);
-+        }
-+        virDomainObjUnlock(vm);
-+    } else {
-+        /* UUID does not match, but if a name matches, refuse it */
-+        vm = virDomainFindByName(&driver->domains, def->name);
-+        if (vm) {
-+            char uuidstr[VIR_UUID_STRING_BUFLEN];
-+            virUUIDFormat(vm->def->uuid, uuidstr);
-+            qemudReportError(conn, NULL, NULL, VIR_ERR_OPERATION_FAILED,
-+                             _("domain '%s' is already defined with uuid %s"),
-+                             def->name, uuidstr);
-+            goto cleanup;
-         }
-     }
- 
-@@ -3470,18 +3509,41 @@ static virDomainPtr qemudDomainDefine(virConnectPtr conn, const char *xml) {
-     if (virSecurityDriverVerify(conn, def) < 0)
-         goto cleanup;
- 
--    vm = virDomainFindByName(&driver->domains, def->name);
-+    /* See if a VM with matching UUID already exists */
-+    vm = virDomainFindByUUID(&driver->domains, def->uuid);
-     if (vm) {
-+        /* UUID matches, but if names don't match, refuse it */
-+        if (STRNEQ(vm->def->name, def->name)) {
-+            char uuidstr[VIR_UUID_STRING_BUFLEN];
-+            virUUIDFormat(vm->def->uuid, uuidstr);
-+            qemudReportError(conn, NULL, NULL, VIR_ERR_OPERATION_FAILED,
-+                             _("domain '%s' is already defined with uuid %s"),
-+                             vm->def->name, uuidstr);
-+            goto cleanup;
-+        }
-+
-+        /* UUID & name match */
-         virDomainObjUnlock(vm);
-         newVM = 0;
-+    } else {
-+        /* UUID does not match, but if a name matches, refuse it */
-+        vm = virDomainFindByName(&driver->domains, def->name);
-+        if (vm) {
-+            char uuidstr[VIR_UUID_STRING_BUFLEN];
-+            virUUIDFormat(vm->def->uuid, uuidstr);
-+            qemudReportError(conn, NULL, NULL, VIR_ERR_OPERATION_FAILED,
-+                             _("domain '%s' is already defined with uuid %s"),
-+                             def->name, uuidstr);
-+            goto cleanup;
-+        }
-     }
- 
-     if (!(vm = virDomainAssignDef(conn,
-                                   &driver->domains,
-                                   def))) {
--        virDomainDefFree(def);
-         goto cleanup;
-     }
-+    def = NULL;
-     vm->persistent = 1;
- 
-     if (virDomainSaveConfig(conn,
-@@ -3503,6 +3565,7 @@ static virDomainPtr qemudDomainDefine(virConnectPtr conn, const char *xml) {
-     if (dom) dom->id = vm->def->id;
- 
- cleanup:
-+    virDomainDefFree(def);
-     if (vm)
-         virDomainObjUnlock(vm);
-     if (event)
--- 
-1.6.2.5
-

libvirt-0.6.2-qemu-ppc-machine-type.patch

@@ -1,56 +0,0 @@
-From 5c1ff776a3194bcc5d593aedd36cd676f1fcab64 Mon Sep 17 00:00:00 2001
-From: Daniel Veillard <veillard@redhat.com>
-Date: Fri, 29 May 2009 13:32:06 +0000
-Subject: [PATCH] PPC Qemu Machine Type update * src/qemu_conf.c docs/schemas/domain.rng tests/capabilityschemadata/caps-qemu-kvm.xml: PPC Qemu Machine Type changed from g3bw to g3beige some time ago, patch by Thomas Baker
-
-(cherry picked from commit 525c3d40a97a1ccce7c4dc314d2dd9e780b50d41)
-
-Fedora-patch: libvirt-0.6.2-qemu-ppc-machine-type.patch
----
- docs/schemas/domain.rng                      |    2 +-
- src/qemu_conf.c                              |    2 +-
- tests/capabilityschemadata/caps-qemu-kvm.xml |    2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/docs/schemas/domain.rng b/docs/schemas/domain.rng
-index 2f784e1..b29079a 100644
---- a/docs/schemas/domain.rng
-+++ b/docs/schemas/domain.rng
-@@ -184,7 +184,7 @@
-       </attribute>
-       <attribute name="machine">
-         <choice>
--          <value>g3bw</value>
-+          <value>g3beige</value>
-           <value>mac99</value>
-           <value>prep</value>
-         </choice>
-diff --git a/src/qemu_conf.c b/src/qemu_conf.c
-index 3e7e32d..fc0e772 100644
---- a/src/qemu_conf.c
-+++ b/src/qemu_conf.c
-@@ -192,7 +192,7 @@ static const char *const arch_info_hvm_sparc_machines[] = {
-     "sun4m"
- };
- static const char *const arch_info_hvm_ppc_machines[] = {
--    "g3bw", "mac99", "prep"
-+    "g3beige", "mac99", "prep"
- };
- 
- static const char *const arch_info_xen_x86_machines[] = {
-diff --git a/tests/capabilityschemadata/caps-qemu-kvm.xml b/tests/capabilityschemadata/caps-qemu-kvm.xml
-index fd8523e..893f9ed 100644
---- a/tests/capabilityschemadata/caps-qemu-kvm.xml
-+++ b/tests/capabilityschemadata/caps-qemu-kvm.xml
-@@ -81,7 +81,7 @@
-     <arch name='ppc'>
-       <wordsize>32</wordsize>
-       <emulator>/usr/bin/qemu-system-ppc</emulator>
--      <machine>g3bw</machine>
-+      <machine>g3beige</machine>
-       <machine>mac99</machine>
-       <machine>prep</machine>
-       <domain type='qemu'>
--- 
-1.6.2.5
-

libvirt-0.6.2-refactor-qemu-version-parsing.patch

@@ -1,224 +0,0 @@
-From 266df161bfd87220bac68918613a2ce9323c8238 Mon Sep 17 00:00:00 2001
-From: Mark McLoughlin <markmc@redhat.com>
-Date: Thu, 11 Jun 2009 14:12:30 +0000
-Subject: [PATCH] Re-factor qemu version parsing
-
-This patch is purely re-factoring without any functional changes
-to make way for the next patch.
-
-The main thing achieved by the refactoring is that we now have
-easier access to the parenthesised string that KVM folks seem
-to delight in changing.
-
-(cherry picked from commit 56ecebf22dd5a235503028e20bf936229037664b)
-
-Signed-off-by: Mark McLoughlin <markmc@redhat.com>
-Fedora-patch: libvirt-0.6.2-refactor-qemu-version-parsing.patch
----
- src/qemu_conf.c |  174 +++++++++++++++++++++++++++++++++++++++----------------
- 1 files changed, 123 insertions(+), 51 deletions(-)
-
-diff --git a/src/qemu_conf.c b/src/qemu_conf.c
-index 1194e36..e488d74 100644
---- a/src/qemu_conf.c
-+++ b/src/qemu_conf.c
-@@ -414,54 +414,12 @@ virCapsPtr qemudCapsInit(void) {
-     return NULL;
- }
- 
--
--int qemudExtractVersionInfo(const char *qemu,
--                            unsigned int *retversion,
--                            unsigned int *retflags) {
--    const char *const qemuarg[] = { qemu, "-help", NULL };
--    const char *const qemuenv[] = { "LC_ALL=C", NULL };
--    pid_t child;
--    int newstdout = -1;
--    int ret = -1, status;
--    unsigned int major, minor, micro;
--    unsigned int version, kvm_version;
-+static unsigned int qemudComputeCmdFlags(const char *help,
-+                                         unsigned int version,
-+                                         unsigned int kvm_version)
-+{
-     unsigned int flags = 0;
- 
--    if (retflags)
--        *retflags = 0;
--    if (retversion)
--        *retversion = 0;
--
--    if (virExec(NULL, qemuarg, qemuenv, NULL,
--                &child, -1, &newstdout, NULL, VIR_EXEC_NONE) < 0)
--        return -1;
--
--    char *help = NULL;
--    enum { MAX_HELP_OUTPUT_SIZE = 1024*64 };
--    int len = virFileReadLimFD(newstdout, MAX_HELP_OUTPUT_SIZE, &help);
--    if (len < 0) {
--        virReportSystemError(NULL, errno, "%s",
--                             _("Unable to read QEMU help output"));
--        goto cleanup2;
--    }
--
--    if (sscanf(help, "QEMU PC emulator version %u.%u.%u (kvm-%u)",
--               &major, &minor, &micro, &kvm_version) != 4)
--        kvm_version = 0;
--
--    if (!kvm_version &&
--        sscanf(help, "QEMU PC emulator version %u.%u.%u",
--               &major, &minor, &micro) != 3) {
--        char *eol = strchr(help, '\n');
--        if (eol) *eol = '\0';
--        qemudReportError(NULL, NULL, NULL, VIR_ERR_INTERNAL_ERROR,
--                         _("cannot parse QEMU version number in '%s'"),
--                         help);
--        goto cleanup2;
--    }
--
--    version = (major * 1000 * 1000) + (minor * 1000) + micro;
--
-     if (strstr(help, "-no-kqemu"))
-         flags |= QEMUD_CMD_FLAG_KQEMU;
-     if (strstr(help, "-no-kvm"))
-@@ -507,6 +465,125 @@ int qemudExtractVersionInfo(const char *qemu,
-         flags |= QEMUD_CMD_FLAG_MIGRATE_QEMU_EXEC;
-     }
- 
-+    return flags;
-+}
-+
-+/* We parse the output of 'qemu -help' to get the QEMU
-+ * version number. The first bit is easy, just parse
-+ * 'QEMU PC emulator version x.y.z'.
-+ *
-+ * With qemu-kvm, however, that is followed by a kvm-XX
-+ * string in parenthesis.
-+ */
-+#define QEMU_VERSION_STR    "QEMU PC emulator version"
-+#define KVM_VER_PREFIX      "(kvm-"
-+
-+#define SKIP_BLANKS(p) do { while ((*(p) == ' ') || (*(p) == '\t')) (p)++; } while (0)
-+
-+static int qemudParseHelpStr(const char *help,
-+                             unsigned int *flags,
-+                             unsigned int *version,
-+                             unsigned int *kvm_version)
-+{
-+    unsigned major, minor, micro;
-+    const char *p = help;
-+
-+    *flags = *version = *kvm_version = 0;
-+
-+    if (!STRPREFIX(p, QEMU_VERSION_STR))
-+        goto fail;
-+
-+    p += strlen(QEMU_VERSION_STR);
-+
-+    SKIP_BLANKS(p);
-+
-+    major = virParseNumber(&p);
-+    if (major == -1 || *p != '.')
-+        goto fail;
-+
-+    ++p;
-+
-+    minor = virParseNumber(&p);
-+    if (major == -1 || *p != '.')
-+        goto fail;
-+
-+    ++p;
-+
-+    micro = virParseNumber(&p);
-+    if (major == -1)
-+        goto fail;
-+
-+    SKIP_BLANKS(p);
-+
-+    if (STRPREFIX(p, KVM_VER_PREFIX)) {
-+        int ret;
-+
-+        p += strlen(KVM_VER_PREFIX);
-+
-+        ret = virParseNumber(&p);
-+        if (ret == -1)
-+            goto fail;
-+
-+        *kvm_version = ret;
-+    }
-+
-+    *version = (major * 1000 * 1000) + (minor * 1000) + micro;
-+
-+    *flags = qemudComputeCmdFlags(help, *version, *kvm_version);
-+
-+    qemudDebug("Version %u.%u.%u, cooked version %u, flags %u",
-+               major, minor, micro, *version, *flags);
-+    if (*kvm_version)
-+        qemudDebug("KVM version %u detected", *kvm_version);
-+
-+    return 0;
-+
-+fail:
-+    p = strchr(help, '\n');
-+    if (p)
-+        p = strndup(help, p - help);
-+
-+    qemudReportError(NULL, NULL, NULL, VIR_ERR_INTERNAL_ERROR,
-+                     _("cannot parse QEMU version number in '%s'"),
-+                     p ? p : help);
-+
-+    VIR_FREE(p);
-+
-+    return -1;
-+}
-+
-+int qemudExtractVersionInfo(const char *qemu,
-+                            unsigned int *retversion,
-+                            unsigned int *retflags) {
-+    const char *const qemuarg[] = { qemu, "-help", NULL };
-+    const char *const qemuenv[] = { "LC_ALL=C", NULL };
-+    pid_t child;
-+    int newstdout = -1;
-+    int ret = -1, status;
-+    unsigned int version, kvm_version;
-+    unsigned int flags = 0;
-+
-+    if (retflags)
-+        *retflags = 0;
-+    if (retversion)
-+        *retversion = 0;
-+
-+    if (virExec(NULL, qemuarg, qemuenv, NULL,
-+                &child, -1, &newstdout, NULL, VIR_EXEC_NONE) < 0)
-+        return -1;
-+
-+    char *help = NULL;
-+    enum { MAX_HELP_OUTPUT_SIZE = 1024*64 };
-+    int len = virFileReadLimFD(newstdout, MAX_HELP_OUTPUT_SIZE, &help);
-+    if (len < 0) {
-+        virReportSystemError(NULL, errno, "%s",
-+                             _("Unable to read QEMU help output"));
-+        goto cleanup2;
-+    }
-+
-+    if (qemudParseHelpStr(help, &flags, &version, &kvm_version) == -1)
-+        goto cleanup2;
-+
-     if (retversion)
-         *retversion = version;
-     if (retflags)
-@@ -514,11 +591,6 @@ int qemudExtractVersionInfo(const char *qemu,
- 
-     ret = 0;
- 
--    qemudDebug("Version %d %d %d  Cooked version: %d, with flags ? %d",
--               major, minor, micro, version, flags);
--    if (kvm_version)
--        qemudDebug("KVM version %d detected", kvm_version);
--
- cleanup2:
-     VIR_FREE(help);
-     if (close(newstdout) < 0)
--- 
-1.6.2.5
-

libvirt-0.6.2-shared-readonly-label.patch

@@ -1,100 +0,0 @@
-From 36cf92efa2b22f275bdc56411d9704e530cdb3fa Mon Sep 17 00:00:00 2001
-From: Mark McLoughlin <markmc@redhat.com>
-Date: Fri, 3 Jul 2009 10:26:37 +0000
-Subject: [PATCH] Re-label shared and readonly images
-
-This patch was posted ages ago here:
-
-  https://bugzilla.redhat.com/493692
-
-But was never posted upstream AFAICT.
-
-Patch from Dan Berrange
-
-(cherry picked from commit 547147084d03ebf30d09d242a5a721a4df664ffe)
-
-Fedora-patch: libvirt-0.6.2-shared-readonly-label.patch
----
- src/security_selinux.c |   26 +++++++++++++++++++-------
- 1 files changed, 19 insertions(+), 7 deletions(-)
-
-diff --git a/src/security_selinux.c b/src/security_selinux.c
-index ac317d7..95fa0a6 100644
---- a/src/security_selinux.c
-+++ b/src/security_selinux.c
-@@ -24,11 +24,12 @@
- #include "virterror_internal.h"
- #include "util.h"
- #include "memory.h"
--
-+#include "logging.h"
- 
- #define VIR_FROM_THIS VIR_FROM_SECURITY
- 
- static char default_domain_context[1024];
-+static char default_content_context[1024];
- static char default_image_context[1024];
- #define SECURITY_SELINUX_VOID_DOI       "0"
- #define SECURITY_SELINUX_NAME "selinux"
-@@ -148,8 +149,13 @@ SELinuxInitialize(virConnectPtr conn)
-     close(fd);
- 
-     ptr = strchrnul(default_image_context, '\n');
--    *ptr = '\0';
--
-+    if (*ptr == '\n') {
-+        *ptr = '\0';
-+        strcpy(default_content_context, ptr+1);
-+        ptr = strchrnul(default_content_context, '\n');
-+        if (*ptr == '\n')
-+            *ptr = '\0';
-+    }
-     return 0;
- }
- 
-@@ -275,6 +281,8 @@ SELinuxSetFilecon(virConnectPtr conn, const char *path, char *tcon)
- {
-     char ebuf[1024];
- 
-+    VIR_INFO("Setting SELinux context on '%s' to '%s'", path, tcon);
-+
-     if(setfilecon(path, tcon) < 0) {
-         virSecurityReportError(conn, VIR_ERR_ERROR,
-                                _("%s: unable to set security context "
-@@ -299,6 +307,8 @@ SELinuxRestoreSecurityImageLabel(virConnectPtr conn,
-     char *newpath = NULL;
-     const char *path = disk->src;
- 
-+    /* Don't restore labels on readoly/shared disks, because
-+     * other VMs may still be accessing these */
-     if (disk->readonly || disk->shared)
-         return 0;
- 
-@@ -328,8 +338,13 @@ SELinuxSetSecurityImageLabel(virConnectPtr conn,
- {
-     const virSecurityLabelDefPtr secdef = &vm->def->seclabel;
- 
--    if (secdef->imagelabel)
-+    if (disk->shared) {
-+        return SELinuxSetFilecon(conn, disk->src, default_image_context);
-+    } else if (disk->readonly) {
-+        return SELinuxSetFilecon(conn, disk->src, default_content_context);
-+    } else if (secdef->imagelabel) {
-         return SELinuxSetFilecon(conn, disk->src, secdef->imagelabel);
-+    }
- 
-     return 0;
- }
-@@ -403,9 +418,6 @@ SELinuxSetSecurityLabel(virConnectPtr conn,
- 
-     if (secdef->imagelabel) {
-         for (i = 0 ; i < vm->def->ndisks ; i++) {
--            if (vm->def->disks[i]->readonly ||
--                vm->def->disks[i]->shared) continue;
--
-             if (SELinuxSetSecurityImageLabel(conn, vm, vm->def->disks[i]) < 0)
-                 return -1;
-         }
--- 
-1.6.2.5
-

libvirt-0.6.2-svirt-sound.patch

@@ -1,51 +0,0 @@
-From 2fcd18b6a39f495d84eb3ef56a49994621c8f7d3 Mon Sep 17 00:00:00 2001
-From: Daniel P. Berrange <berrange@redhat.com>
-Date: Mon, 17 Aug 2009 08:52:30 +0100
-Subject: [PATCH] Disable sound cards when running sVirt
-
-Temporary hack till PulseAudio autostart problems are sorted out when
-SELinux enforcing (bz 486112)
-
-Fedora-patch: libvirt-0.6.2-svirt-sound.patch
----
- src/qemu_conf.c |   17 ++++++++++++++++-
- 1 files changed, 16 insertions(+), 1 deletions(-)
-
-diff --git a/src/qemu_conf.c b/src/qemu_conf.c
-index d76b2b6..22c5363 100644
---- a/src/qemu_conf.c
-+++ b/src/qemu_conf.c
-@@ -885,6 +885,20 @@ int qemudBuildCommandLine(virConnectPtr conn,
-     char domid[50];
-     char *pidfile;
-     const char *cpu = NULL;
-+    int skipSound = 0;
-+
-+    if (driver->securityDriver &&
-+        driver->securityDriver->name &&
-+        STREQ(driver->securityDriver->name, "selinux") &&
-+        getuid() == 0) {
-+        static int soundWarned = 0;
-+        skipSound = 1;
-+        if (vm->def->nsounds &&
-+            !soundWarned) {
-+            soundWarned = 1;
-+            VIR_WARN0("Sound cards for VMs are disabled while SELinux security model is active");
-+        }
-+    }
- 
-     uname_normalize(&ut);
- 
-@@ -1531,7 +1545,8 @@ int qemudBuildCommandLine(virConnectPtr conn,
-     }
- 
-     /* Add sound hardware */
--    if (vm->def->nsounds) {
-+    if (vm->def->nsounds &&
-+        !skipSound) {
-         int size = 100;
-         char *modstr;
-         if (VIR_ALLOC_N(modstr, size+1) < 0)
--- 
-1.6.2.5
-

libvirt-0.6.2-xml-attribute-escaping.patch

@@ -1,49 +0,0 @@
-From a7d81a2f9e80942c9951c1d16ad69c66b9a47bbb Mon Sep 17 00:00:00 2001
-From: Daniel Veillard <veillard@redhat.com>
-Date: Wed, 13 May 2009 16:19:59 +0000
-Subject: [PATCH] * src/buf.c: avoid an XML attribute escaping bug #499791 daniel
-
-(cherry picked from commit 7afe94e7e236ec465d838e7d60e961975c526ab2)
-
-Fedora-patch: libvirt-0.6.2-xml-attribute-escaping.patch
----
- src/buf.c |   16 +++++++++++++++-
- 1 files changed, 15 insertions(+), 1 deletions(-)
-
-diff --git a/src/buf.c b/src/buf.c
-index cdcdac9..259175d 100644
---- a/src/buf.c
-+++ b/src/buf.c
-@@ -266,7 +266,7 @@ virBufferEscapeString(const virBufferPtr buf, const char *format, const char *st
-         return;
- 
-     len = strlen(str);
--    if (VIR_ALLOC_N(escaped, 5 * len + 1) < 0) {
-+    if (VIR_ALLOC_N(escaped, 6 * len + 1) < 0) {
-         virBufferNoMemory(buf);
-         return;
-     }
-@@ -290,6 +290,20 @@ virBufferEscapeString(const virBufferPtr buf, const char *format, const char *st
-             *out++ = 'm';
-             *out++ = 'p';
-             *out++ = ';';
-+        } else if (*cur == '"') {
-+            *out++ = '&';
-+            *out++ = 'q';
-+            *out++ = 'u';
-+            *out++ = 'o';
-+            *out++ = 't';
-+            *out++ = ';';
-+        } else if (*cur == '\'') {
-+            *out++ = '&';
-+            *out++ = 'a';
-+            *out++ = 'p';
-+            *out++ = 'o';
-+            *out++ = 's';
-+            *out++ = ';';
-         } else if ((*cur >= 0x20) || (*cur == '\n') || (*cur == '\t') ||
-                    (*cur == '\r')) {
-             /*
--- 
-1.6.2.5
-

libvirt-0.6.3-hostdev-managed.patch

@@ -1,47 +0,0 @@
-From b3f02d5528c121bcf7b9ac5c4284517e71a5e2f2 Mon Sep 17 00:00:00 2001
-From: Mark McLoughlin <markmc@redhat.com>
-Date: Wed, 6 May 2009 15:56:20 +0000
-Subject: [PATCH] Fix qemu driver's interpretation of <hostdev managed='yes'/>
-
-This change:
-
-  Tue Mar  3 08:55:13 GMT 2009 Daniel P. Berrange <berrange@redhat.com>
-
-       Don't try to detach & reset PCI devices while running test
-       suite for XML-> ARGV conversion.
-       * src/qemu_driver.c: Add qemuPrepareHostDevices() helper to
-       detach and reset PCI devices.
-       * src/qemu_conf.c: Don't detach & reset PCI devices while
-       building the command line argv
-
-accidentally did this:
-
--            if (hostdev->managed) {
-+        if (!hostdev->managed) {
-
-Which results in managed='yes' not causing the device to be
-detached when the guest is starting.
-
-(cherry picked from commit 1d6c713b18741f1a0e3d0ccd094275a11aef138c)
-
-Fedora-patch: libvirt-0.6.3-hostdev-managed.patch
----
- src/qemu_driver.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/qemu_driver.c b/src/qemu_driver.c
-index 79ee072..162d072 100644
---- a/src/qemu_driver.c
-+++ b/src/qemu_driver.c
-@@ -1215,7 +1215,7 @@ static int qemuPrepareHostDevices(virConnectPtr conn,
-         if (hostdev->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI)
-             continue;
- 
--        if (!hostdev->managed) {
-+        if (hostdev->managed) {
-             pciDevice *dev = pciGetDevice(conn,
-                                           hostdev->source.subsys.u.pci.domain,
-                                           hostdev->source.subsys.u.pci.bus,
--- 
-1.6.2.5
-

libvirt-0.6.3-refresh-qemu-caps.patch

@@ -1,85 +0,0 @@
-From a521796bac21f0c8af38a8551a420d87b61c7a9a Mon Sep 17 00:00:00 2001
-From: Cole Robinson <crobinso@redhat.com>
-Date: Wed, 6 May 2009 14:20:34 +0000
-Subject: [PATCH] Refresh QEMU driver capabilities for each getCapabilities call.
-
-Also fix up a couple issues where caps are accessed without locking
-the driver structure.
-
-(cherry picked from commit 4f107590243631869677ddea2bb667db4a1282a6)
-
-Fedora-patch: libvirt-0.6.3-refresh-qemu-caps.patch
----
- src/qemu_driver.c |   28 ++++++++++++++++++++--------
- 1 files changed, 20 insertions(+), 8 deletions(-)
-
-diff --git a/src/qemu_driver.c b/src/qemu_driver.c
-index 162d072..4752a64 100644
---- a/src/qemu_driver.c
-+++ b/src/qemu_driver.c
-@@ -1872,10 +1872,12 @@ static int qemudGetNodeInfo(virConnectPtr conn,
- 
- static char *qemudGetCapabilities(virConnectPtr conn) {
-     struct qemud_driver *driver = conn->privateData;
--    char *xml;
-+    char *xml = NULL;
- 
-     qemuDriverLock(driver);
--    if ((xml = virCapabilitiesFormatXML(driver->caps)) == NULL)
-+    virCapabilitiesFree(qemu_driver->caps);
-+    if ((qemu_driver->caps = qemudCapsInit()) == NULL ||
-+        (xml = virCapabilitiesFormatXML(driver->caps)) == NULL)
-         virReportOOMError(conn);
-     qemuDriverUnlock(driver);
- 
-@@ -3142,20 +3144,26 @@ cleanup:
-     return ret;
- }
- 
--static int qemudNodeGetSecurityModel(virConnectPtr conn, virSecurityModelPtr secmodel)
-+static int qemudNodeGetSecurityModel(virConnectPtr conn,
-+                                     virSecurityModelPtr secmodel)
- {
-     struct qemud_driver *driver = (struct qemud_driver *)conn->privateData;
-     char *p;
-+    int ret = 0;
- 
--    if (!driver->securityDriver)
--        return -2;
-+    qemuDriverLock(driver);
-+    if (!driver->securityDriver) {
-+        ret = -2;
-+        goto cleanup;
-+    }
- 
-     p = driver->caps->host.secModel.model;
-     if (strlen(p) >= VIR_SECURITY_MODEL_BUFLEN-1) {
-         qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR,
-                          _("security model string exceeds max %d bytes"),
-                          VIR_SECURITY_MODEL_BUFLEN-1);
--        return -1;
-+        ret = -1;
-+        goto cleanup;
-     }
-     strcpy(secmodel->model, p);
- 
-@@ -3164,10 +3172,14 @@ static int qemudNodeGetSecurityModel(virConnectPtr conn, virSecurityModelPtr sec
-         qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR,
-                          _("security DOI string exceeds max %d bytes"),
-                          VIR_SECURITY_DOI_BUFLEN-1);
--        return -1;
-+        ret = -1;
-+        goto cleanup;
-     }
-     strcpy(secmodel->doi, p);
--    return 0;
-+
-+cleanup:
-+    qemuDriverUnlock(driver);
-+    return ret;
- }
- 
- /* TODO: check seclabel restore */
--- 
-1.6.2.5
-

libvirt-add-space-to-nodedev-list-tree.patch

@@ -1,60 +0,0 @@
-From b77d11b221862343d304e11ed878e2f176101f24 Mon Sep 17 00:00:00 2001
-From: Daniel P. Berrange <berrange@redhat.com>
-Date: Tue, 28 Apr 2009 10:55:45 +0000
-Subject: [PATCH] Cosmetic change to 'virsh nodedev-list --tree' output
-
-Maybe it's just me, but I try to select an item from the tree using
-double-click and get annoyed when "+-" gets included in the selection.
-
-* src/virsh.c: add a space between "+-" and the node device name
-  in 'virsh nodedev-list --tree'
-
-(cherry picked from commit cb4a6614fae48d05f09b7b15328ea6ef4071ccb3)
-(cherry picked from commit 097c818bf00b3777778ffc32fea3a6ed1e741e2b)
-
-Fedora-patch: libvirt-add-space-to-nodedev-list-tree.patch
----
- src/virsh.c |   10 ++++++----
- 1 files changed, 6 insertions(+), 4 deletions(-)
-
-diff --git a/src/virsh.c b/src/virsh.c
-index 26764a7..c92bb8f 100644
---- a/src/virsh.c
-+++ b/src/virsh.c
-@@ -4460,10 +4460,12 @@ cmdNodeListDevicesPrint(vshControl *ctl,
-     if (depth && depth < MAX_DEPTH) {
-         indentBuf[indentIdx] = '+';
-         indentBuf[indentIdx+1] = '-';
-+        indentBuf[indentIdx+2] = ' ';
-+        indentBuf[indentIdx+3] = '\0';
-     }
- 
-     /* Print this device */
--    vshPrint(ctl, indentBuf);
-+    vshPrint(ctl, "%s", indentBuf);
-     vshPrint(ctl, "%s\n", devices[devid]);
- 
- 
-@@ -4487,8 +4489,8 @@ cmdNodeListDevicesPrint(vshControl *ctl,
- 
-     /* If there is a child device, then print another blank line */
-     if (nextlastdev != -1) {
--        vshPrint(ctl, indentBuf);
--        vshPrint(ctl, "  |\n");
-+        vshPrint(ctl, "%s", indentBuf);
-+        vshPrint(ctl, " |\n");
-     }
- 
-     /* Finally print all children */
-@@ -4511,7 +4513,7 @@ cmdNodeListDevicesPrint(vshControl *ctl,
-     /* If there was no child device, and we're the last in
-      * a list of devices, then print another blank line */
-     if (nextlastdev == -1 && devid == lastdev) {
--        vshPrint(ctl, indentBuf);
-+        vshPrint(ctl, "%s", indentBuf);
-         vshPrint(ctl, "\n");
-     }
- }
--- 
-1.6.2.5
-

libvirt-allow-pci-hostdev-reset-to-reset-other-devices.patch

@@ -1,812 +0,0 @@
-From 6878a049e27f2eaea7bd3d5c266a2d2b39e444f1 Mon Sep 17 00:00:00 2001
-From: Mark McLoughlin <markmc@redhat.com>
-Date: Mon, 17 Aug 2009 15:05:23 +0100
-Subject: [PATCH] Maintain a list of active PCI hostdevs and use it in pciResetDevice()
-
-https://bugzilla.redhat.com/499678
-
-First we add a pciDeviceList type and add a qemuGetPciHostDeviceList()
-function to build a list from a domain definition. Use this in
-prepare/re-attach to simplify things and eliminate the multiple
-pciGetDevice() calls.
-
-Then, as we start/shutdown guests we can add or delete devices as
-appropriate from a list of active devices.
-
-Finally, in pciReset(), we can use this to determine whether its safe to
-reset a device as a side effect of resetting another device.
-
-(cherry picked from commit 78675b228b76a83f83d64856bfb63b9e14c103a0)
-(cherry picked from commit e8ad33931296c67de0538e78d12e21706a826d37)
-
-Fedora-patch: libvirt-allow-pci-hostdev-reset-to-reset-other-devices.patch
----
- src/libvirt_private.syms |    7 +-
- src/pci.c                |  211 +++++++++++++++++++++++++++++++++--------
- src/pci.h                |   23 +++++-
- src/qemu_conf.h          |    3 +
- src/qemu_driver.c        |  237 +++++++++++++++++++++++++++-------------------
- src/xen_unified.c        |    2 +-
- 6 files changed, 339 insertions(+), 144 deletions(-)
-
-diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
-index 9249a1a..75ddda8 100644
---- a/src/libvirt_private.syms
-+++ b/src/libvirt_private.syms
-@@ -240,7 +240,12 @@ pciFreeDevice;
- pciDettachDevice;
- pciReAttachDevice;
- pciResetDevice;
--
-+pciDeviceSetManaged;
-+pciDeviceGetManaged;
-+pciDeviceListNew;
-+pciDeviceListFree;
-+pciDeviceListAdd;
-+pciDeviceListDel;
- 
- # qparams.h
- qparam_get_query;
-diff --git a/src/pci.c b/src/pci.c
-index 1dddb08..1e68261 100644
---- a/src/pci.c
-+++ b/src/pci.c
-@@ -58,6 +58,7 @@ struct _pciDevice {
-     unsigned      pci_pm_cap_pos;
-     unsigned      has_flr : 1;
-     unsigned      has_pm_reset : 1;
-+    unsigned      managed : 1;
- };
- 
- /* For virReportOOMError()  and virReportSystemError() */
-@@ -220,7 +221,7 @@ pciWrite32(pciDevice *dev, unsigned pos, uint32_t val)
-     pciWrite(dev, pos, &buf[0], sizeof(buf));
- }
- 
--typedef int (*pciIterPredicate)(pciDevice *, pciDevice *);
-+typedef int (*pciIterPredicate)(pciDevice *, pciDevice *, void *);
- 
- /* Iterate over available PCI devices calling @predicate
-  * to compare each one to @dev.
-@@ -231,7 +232,8 @@ static int
- pciIterDevices(virConnectPtr conn,
-                pciIterPredicate predicate,
-                pciDevice *dev,
--               pciDevice **matched)
-+               pciDevice **matched,
-+               void *data)
- {
-     DIR *dir;
-     struct dirent *entry;
-@@ -249,7 +251,7 @@ pciIterDevices(virConnectPtr conn,
- 
-     while ((entry = readdir(dir))) {
-         unsigned domain, bus, slot, function;
--        pciDevice *try;
-+        pciDevice *check;
- 
-         /* Ignore '.' and '..' */
-         if (entry->d_name[0] == '.')
-@@ -261,18 +263,18 @@ pciIterDevices(virConnectPtr conn,
-             continue;
-         }
- 
--        try = pciGetDevice(conn, domain, bus, slot, function);
--        if (!try) {
-+        check = pciGetDevice(conn, domain, bus, slot, function);
-+        if (!check) {
-             ret = -1;
-             break;
-         }
- 
--        if (predicate(try, dev)) {
--            VIR_DEBUG("%s %s: iter matched on %s", dev->id, dev->name, try->name);
--            *matched = try;
-+        if (predicate(dev, check, data)) {
-+            VIR_DEBUG("%s %s: iter matched on %s", dev->id, dev->name, check->name);
-+            *matched = check;
-             break;
-         }
--        pciFreeDevice(conn, try);
-+        pciFreeDevice(conn, check);
-     }
-     closedir(dir);
-     return ret;
-@@ -374,63 +376,70 @@ pciDetectPowerManagementReset(pciDevice *dev)
-     return 0;
- }
- 
--/* Any devices other than the one supplied on the same domain/bus ? */
-+/* Any active devices other than the one supplied on the same domain/bus ? */
- static int
--pciSharesBus(pciDevice *a, pciDevice *b)
-+pciSharesBusWithActive(pciDevice *dev, pciDevice *check, void *data)
- {
--    return
--        a->domain == b->domain &&
--        a->bus == b->bus &&
--        (a->slot != b->slot ||
--         a->function != b->function);
--}
-+    pciDeviceList *activeDevs = data;
- 
--static int
--pciBusContainsOtherDevices(virConnectPtr conn, pciDevice *dev)
--{
--    pciDevice *matched = NULL;
--    if (pciIterDevices(conn, pciSharesBus, dev, &matched) < 0)
--        return 1;
--    if (!matched)
-+    if (dev->domain != check->domain ||
-+        dev->bus != check->bus ||
-+        (check->slot == check->slot &&
-+         check->function == check->function))
-+        return 0;
-+
-+    if (activeDevs && !pciDeviceListFind(activeDevs, check))
-         return 0;
--    pciFreeDevice(conn, matched);
-+
-     return 1;
- }
- 
--/* Is @a the parent of @b ? */
-+static pciDevice *
-+pciBusContainsActiveDevices(virConnectPtr conn,
-+                            pciDevice *dev,
-+                            pciDeviceList *activeDevs)
-+{
-+    pciDevice *active = NULL;
-+    if (pciIterDevices(conn, pciSharesBusWithActive,
-+                       dev, &active, activeDevs) < 0)
-+        return NULL;
-+    return active;
-+}
-+
-+/* Is @check the parent of @dev ? */
- static int
--pciIsParent(pciDevice *a, pciDevice *b)
-+pciIsParent(pciDevice *dev, pciDevice *check, void *data ATTRIBUTE_UNUSED)
- {
-     uint16_t device_class;
-     uint8_t header_type, secondary, subordinate;
- 
--    if (a->domain != b->domain)
-+    if (dev->domain != check->domain)
-         return 0;
- 
-     /* Is it a bridge? */
--    device_class = pciRead16(a, PCI_CLASS_DEVICE);
-+    device_class = pciRead16(check, PCI_CLASS_DEVICE);
-     if (device_class != PCI_CLASS_BRIDGE_PCI)
-         return 0;
- 
-     /* Is it a plane? */
--    header_type = pciRead8(a, PCI_HEADER_TYPE);
-+    header_type = pciRead8(check, PCI_HEADER_TYPE);
-     if ((header_type & PCI_HEADER_TYPE_MASK) != PCI_HEADER_TYPE_BRIDGE)
-         return 0;
- 
--    secondary   = pciRead8(a, PCI_SECONDARY_BUS);
--    subordinate = pciRead8(a, PCI_SUBORDINATE_BUS);
-+    secondary   = pciRead8(check, PCI_SECONDARY_BUS);
-+    subordinate = pciRead8(check, PCI_SUBORDINATE_BUS);
- 
--    VIR_DEBUG("%s %s: found parent device %s\n", b->id, b->name, a->name);
-+    VIR_DEBUG("%s %s: found parent device %s\n", dev->id, dev->name, check->name);
- 
-     /* No, it's superman! */
--    return (b->bus >= secondary && b->bus <= subordinate);
-+    return (dev->bus >= secondary && dev->bus <= subordinate);
- }
- 
- static pciDevice *
- pciGetParentDevice(virConnectPtr conn, pciDevice *dev)
- {
-     pciDevice *parent = NULL;
--    pciIterDevices(conn, pciIsParent, dev, &parent);
-+    pciIterDevices(conn, pciIsParent, dev, &parent, NULL);
-     return parent;
- }
- 
-@@ -438,9 +447,11 @@ pciGetParentDevice(virConnectPtr conn, pciDevice *dev)
-  * devices behind a bus.
-  */
- static int
--pciTrySecondaryBusReset(virConnectPtr conn, pciDevice *dev)
-+pciTrySecondaryBusReset(virConnectPtr conn,
-+                        pciDevice *dev,
-+                        pciDeviceList *activeDevs)
- {
--    pciDevice *parent;
-+    pciDevice *parent, *conflict;
-     uint8_t config_space[PCI_CONF_LEN];
-     uint16_t ctl;
-     int ret = -1;
-@@ -450,10 +461,10 @@ pciTrySecondaryBusReset(virConnectPtr conn, pciDevice *dev)
-      * In future, we could allow it so long as those devices
-      * are not in use by the host or other guests.
-      */
--    if (pciBusContainsOtherDevices(conn, dev)) {
-+    if ((conflict = pciBusContainsActiveDevices(conn, dev, activeDevs))) {
-         pciReportError(conn, VIR_ERR_NO_SUPPORT,
--                       _("Other devices on bus with %s, not doing bus reset"),
--                       dev->name);
-+                       _("Active %s devices on bus with %s, not doing bus reset"),
-+                       conflict->name, dev->name);
-         return -1;
-     }
- 
-@@ -567,10 +578,18 @@ pciInitDevice(virConnectPtr conn, pciDevice *dev)
- }
- 
- int
--pciResetDevice(virConnectPtr conn, pciDevice *dev)
-+pciResetDevice(virConnectPtr conn,
-+               pciDevice *dev,
-+               pciDeviceList *activeDevs)
- {
-     int ret = -1;
- 
-+    if (activeDevs && pciDeviceListFind(activeDevs, dev)) {
-+        pciReportError(conn, VIR_ERR_INTERNAL_ERROR,
-+                       _("Not resetting active device %s"), dev->name);
-+        return -1;
-+    }
-+
-     if (!dev->initted && pciInitDevice(conn, dev) < 0)
-         return -1;
- 
-@@ -589,7 +608,7 @@ pciResetDevice(virConnectPtr conn, pciDevice *dev)
- 
-     /* Bus reset is not an option with the root bus */
-     if (ret < 0 && dev->bus != 0)
--        ret = pciTrySecondaryBusReset(conn, dev);
-+        ret = pciTrySecondaryBusReset(conn, dev, activeDevs);
- 
-     if (ret < 0) {
-         virErrorPtr err = virGetLastError();
-@@ -885,8 +904,116 @@ pciGetDevice(virConnectPtr conn,
- void
- pciFreeDevice(virConnectPtr conn ATTRIBUTE_UNUSED, pciDevice *dev)
- {
-+    if (!dev)
-+        return;
-     VIR_DEBUG("%s %s: freeing", dev->id, dev->name);
-     if (dev->fd >= 0)
-         close(dev->fd);
-     VIR_FREE(dev);
- }
-+
-+void pciDeviceSetManaged(pciDevice *dev, unsigned managed)
-+{
-+    dev->managed = !!managed;
-+}
-+
-+unsigned pciDeviceGetManaged(pciDevice *dev)
-+{
-+    return dev->managed;
-+}
-+
-+pciDeviceList *
-+pciDeviceListNew(virConnectPtr conn)
-+{
-+    pciDeviceList *list;
-+
-+    if (VIR_ALLOC(list) < 0) {
-+        virReportOOMError(conn);
-+        return NULL;
-+    }
-+
-+    return list;
-+}
-+
-+void
-+pciDeviceListFree(virConnectPtr conn,
-+                  pciDeviceList *list)
-+{
-+    int i;
-+
-+    if (!list)
-+        return;
-+
-+    for (i = 0; i < list->count; i++) {
-+        pciFreeDevice(conn, list->devs[i]);
-+        list->devs[i] = NULL;
-+    }
-+
-+    list->count = 0;
-+    VIR_FREE(list->devs);
-+    VIR_FREE(list);
-+}
-+
-+int
-+pciDeviceListAdd(virConnectPtr conn,
-+                 pciDeviceList *list,
-+                 pciDevice *dev)
-+{
-+    if (pciDeviceListFind(list, dev)) {
-+        pciReportError(conn, VIR_ERR_INTERNAL_ERROR,
-+                       _("Device %s is already in use"), dev->name);
-+        return -1;
-+    }
-+
-+    if (VIR_REALLOC_N(list->devs, list->count+1) < 0) {
-+        virReportOOMError(conn);
-+        return -1;
-+    }
-+
-+    list->devs[list->count++] = dev;
-+
-+    return 0;
-+}
-+
-+void
-+pciDeviceListDel(virConnectPtr conn ATTRIBUTE_UNUSED,
-+                 pciDeviceList *list,
-+                 pciDevice *dev)
-+{
-+    int i;
-+
-+    for (i = 0; i < list->count; i++) {
-+        if (list->devs[i]->domain   != dev->domain ||
-+            list->devs[i]->bus      != dev->bus    ||
-+            list->devs[i]->slot     != dev->slot   ||
-+            list->devs[i]->function != dev->function)
-+            continue;
-+
-+        pciFreeDevice(conn, list->devs[i]);
-+
-+        if (i != --list->count)
-+            memmove(&list->devs[i],
-+                    &list->devs[i+1],
-+                    sizeof(*list->devs) * (list->count-i));
-+
-+        if (VIR_REALLOC_N(list->devs, list->count) < 0) {
-+            ; /* not fatal */
-+        }
-+
-+        break;
-+    }
-+}
-+
-+pciDevice *
-+pciDeviceListFind(pciDeviceList *list, pciDevice *dev)
-+{
-+    int i;
-+
-+    for (i = 0; i < list->count; i++)
-+        if (list->devs[i]->domain   == dev->domain &&
-+            list->devs[i]->bus      == dev->bus    &&
-+            list->devs[i]->slot     == dev->slot   &&
-+            list->devs[i]->function == dev->function)
-+            return list->devs[i];
-+    return NULL;
-+}
-diff --git a/src/pci.h b/src/pci.h
-index 47882ef..685b0af 100644
---- a/src/pci.h
-+++ b/src/pci.h
-@@ -27,6 +27,11 @@
- 
- typedef struct _pciDevice pciDevice;
- 
-+typedef struct {
-+    unsigned count;
-+    pciDevice **devs;
-+} pciDeviceList;
-+
- pciDevice *pciGetDevice      (virConnectPtr  conn,
-                               unsigned       domain,
-                               unsigned       bus,
-@@ -39,6 +44,22 @@ int        pciDettachDevice  (virConnectPtr  conn,
- int        pciReAttachDevice (virConnectPtr  conn,
-                               pciDevice     *dev);
- int        pciResetDevice    (virConnectPtr  conn,
--                              pciDevice     *dev);
-+                              pciDevice     *dev,
-+                              pciDeviceList *activeDevs);
-+void      pciDeviceSetManaged(pciDevice     *dev,
-+                              unsigned       managed);
-+unsigned  pciDeviceGetManaged(pciDevice     *dev);
-+
-+pciDeviceList *pciDeviceListNew  (virConnectPtr conn);
-+void           pciDeviceListFree (virConnectPtr conn,
-+                                  pciDeviceList *list);
-+int            pciDeviceListAdd  (virConnectPtr conn,
-+                                  pciDeviceList *list,
-+                                  pciDevice *dev);
-+void           pciDeviceListDel  (virConnectPtr conn,
-+                                  pciDeviceList *list,
-+                                  pciDevice *dev);
-+pciDevice *    pciDeviceListFind (pciDeviceList *list,
-+                                  pciDevice *dev);
- 
- #endif /* __VIR_PCI_H__ */
-diff --git a/src/qemu_conf.h b/src/qemu_conf.h
-index 70fe9c8..cde326d 100644
---- a/src/qemu_conf.h
-+++ b/src/qemu_conf.h
-@@ -34,6 +34,7 @@
- #include "domain_event.h"
- #include "threads.h"
- #include "security.h"
-+#include "pci.h"
- 
- #define qemudDebug(fmt, ...) do {} while(0)
- 
-@@ -90,6 +91,8 @@ struct qemud_driver {
- 
-     char *securityDriverName;
-     virSecurityDriverPtr securityDriver;
-+
-+    pciDeviceList *activePciHostdevs;
- };
- 
- /* Status needed to reconenct to running VMs */
-diff --git a/src/qemu_driver.c b/src/qemu_driver.c
-index 9f87d2a..7dbf4a2 100644
---- a/src/qemu_driver.c
-+++ b/src/qemu_driver.c
-@@ -126,6 +126,9 @@ static int qemudDomainSetMemoryBalloon(virConnectPtr conn,
-                                        virDomainObjPtr vm,
-                                        unsigned long newmem);
- 
-+static int qemuUpdateActivePciHostdevs(struct qemud_driver *driver,
-+                                       virDomainDefPtr def);
-+
- static struct qemud_driver *qemu_driver = NULL;
- 
- 
-@@ -334,6 +337,10 @@ qemudReconnectVMs(struct qemud_driver *driver)
-         if ((vm->logfile = qemudLogFD(NULL, driver->logDir, vm->def->name)) < 0)
-             goto next_error;
- 
-+        if (qemuUpdateActivePciHostdevs(driver, vm->def) < 0) {
-+            goto next_error;
-+        }
-+
-         if (vm->def->id >= driver->nextvmid)
-             driver->nextvmid = vm->def->id + 1;
- 
-@@ -515,6 +522,9 @@ qemudStartup(void) {
-     if ((qemu_driver->caps = qemudCapsInit()) == NULL)
-         goto out_of_memory;
- 
-+    if ((qemu_driver->activePciHostdevs = pciDeviceListNew(NULL)) == NULL)
-+        goto error;
-+
-     if (qemudLoadDriverConfig(qemu_driver, driverConf) < 0) {
-         goto error;
-     }
-@@ -627,6 +637,7 @@ qemudShutdown(void) {
-         return -1;
- 
-     qemuDriverLock(qemu_driver);
-+    pciDeviceListFree(NULL, qemu_driver->activePciHostdevs);
-     virCapabilitiesFree(qemu_driver->caps);
- 
-     virDomainObjListFree(&qemu_driver->domains);
-@@ -1209,48 +1220,16 @@ static int qemudNextFreeVNCPort(struct qemud_driver *driver ATTRIBUTE_UNUSED) {
-     return -1;
- }
- 
--static int qemuPrepareHostDevices(virConnectPtr conn,
--                                  virDomainDefPtr def) {
-+static pciDeviceList *
-+qemuGetPciHostDeviceList(virConnectPtr conn,
-+                         virDomainDefPtr def)
-+{
-+    pciDeviceList *list;
-     int i;
- 
--    /* We have to use 2 loops here. *All* devices must
--     * be detached before we reset any of them, because
--     * in some cases you have to reset the whole PCI,
--     * which impacts all devices on it
--     */
--
--    for (i = 0 ; i < def->nhostdevs ; i++) {
--        virDomainHostdevDefPtr hostdev = def->hostdevs[i];
--
--        if (hostdev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS)
--            continue;
--        if (hostdev->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI)
--            continue;
--
--        if (hostdev->managed) {
--            pciDevice *dev = pciGetDevice(conn,
--                                          hostdev->source.subsys.u.pci.domain,
--                                          hostdev->source.subsys.u.pci.bus,
--                                          hostdev->source.subsys.u.pci.slot,
--                                          hostdev->source.subsys.u.pci.function);
--            if (!dev)
--                goto error;
--
--            if (pciDettachDevice(conn, dev) < 0) {
--                pciFreeDevice(conn, dev);
--                goto error;
--            }
--
--            pciFreeDevice(conn, dev);
--        } /* else {
--             XXX validate that non-managed device isn't in use, eg
--             by checking that device is either un-bound, or bound
--             to pci-stub.ko
--        } */
--    }
-+    if (!(list = pciDeviceListNew(conn)))
-+        return NULL;
- 
--    /* Now that all the PCI hostdevs have be dettached, we can safely
--     * reset them */
-     for (i = 0 ; i < def->nhostdevs ; i++) {
-         virDomainHostdevDefPtr hostdev = def->hostdevs[i];
-         pciDevice *dev;
-@@ -1265,95 +1244,151 @@ static int qemuPrepareHostDevices(virConnectPtr conn,
-                            hostdev->source.subsys.u.pci.bus,
-                            hostdev->source.subsys.u.pci.slot,
-                            hostdev->source.subsys.u.pci.function);
--        if (!dev)
--            goto error;
-+        if (!dev) {
-+            pciDeviceListFree(conn, list);
-+            return NULL;
-+        }
- 
--        if (pciResetDevice(conn, dev) < 0) {
-+        if (pciDeviceListAdd(conn, list, dev) < 0) {
-             pciFreeDevice(conn, dev);
--            goto error;
-+            pciDeviceListFree(conn, list);
-+            return NULL;
-         }
- 
--        pciFreeDevice(conn, dev);
-+        pciDeviceSetManaged(dev, hostdev->managed);
-     }
- 
--    return 0;
-+    return list;
-+}
- 
--error:
--    return -1;
-+static int
-+qemuUpdateActivePciHostdevs(struct qemud_driver *driver,
-+                            virDomainDefPtr def)
-+{
-+    pciDeviceList *pcidevs;
-+    int i, ret;
-+
-+    if (!def->nhostdevs)
-+        return 0;
-+
-+    if (!(pcidevs = qemuGetPciHostDeviceList(NULL, def)))
-+        return -1;
-+
-+    ret = 0;
-+
-+    for (i = 0; i < pcidevs->count; i++) {
-+        if (pciDeviceListAdd(NULL,
-+                             driver->activePciHostdevs,
-+                             pcidevs->devs[i]) < 0) {
-+            ret = -1;
-+            break;
-+        }
-+        pcidevs->devs[i] = NULL;
-+    }
-+
-+    pciDeviceListFree(NULL, pcidevs);
-+    return ret;
- }
- 
--static void
--qemuDomainReAttachHostDevices(virConnectPtr conn, virDomainDefPtr def)
-+static int
-+qemuPrepareHostDevices(virConnectPtr conn,
-+                       struct qemud_driver *driver,
-+                       virDomainDefPtr def)
- {
-+    pciDeviceList *pcidevs;
-     int i;
- 
--    /* Again 2 loops; reset all the devices before re-attach */
-+    if (!def->nhostdevs)
-+        return 0;
- 
--    for (i = 0 ; i < def->nhostdevs ; i++) {
--        virDomainHostdevDefPtr hostdev = def->hostdevs[i];
--        pciDevice *dev;
-+    if (!(pcidevs = qemuGetPciHostDeviceList(conn, def)))
-+        return -1;
- 
--        if (hostdev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS)
--            continue;
--        if (hostdev->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI)
--            continue;
-+    /* We have to use 3 loops here. *All* devices must
-+     * be detached before we reset any of them, because
-+     * in some cases you have to reset the whole PCI,
-+     * which impacts all devices on it. Also, all devices
-+     * must be reset before being marked as active.
-+     */
- 
--        dev = pciGetDevice(conn,
--                           hostdev->source.subsys.u.pci.domain,
--                           hostdev->source.subsys.u.pci.bus,
--                           hostdev->source.subsys.u.pci.slot,
--                           hostdev->source.subsys.u.pci.function);
--        if (!dev) {
--            virErrorPtr err = virGetLastError();
--            VIR_ERROR(_("Failed to allocate pciDevice: %s\n"),
--                      err ? err->message : "");
--            virResetError(err);
--            continue;
--        }
-+    /* XXX validate that non-managed device isn't in use, eg
-+     * by checking that device is either un-bound, or bound
-+     * to pci-stub.ko
-+     */
- 
--        if (pciResetDevice(conn, dev) < 0) {
--            virErrorPtr err = virGetLastError();
--            VIR_ERROR(_("Failed to reset PCI device: %s\n"),
--                      err ? err->message : "");
--            virResetError(err);
--        }
-+    for (i = 0; i < pcidevs->count; i++)
-+        if (pciDeviceGetManaged(pcidevs->devs[i]) &&
-+            pciDettachDevice(conn, pcidevs->devs[i]) < 0)
-+            goto error;
-+
-+    /* Now that all the PCI hostdevs have be dettached, we can safely
-+     * reset them */
-+    for (i = 0; i < pcidevs->count; i++)
-+        if (pciResetDevice(conn, pcidevs->devs[i],
-+                           driver->activePciHostdevs) < 0)
-+            goto error;
- 
--        pciFreeDevice(conn, dev);
-+    /* Now mark all the devices as active */
-+    for (i = 0; i < pcidevs->count; i++) {
-+        if (pciDeviceListAdd(conn,
-+                             driver->activePciHostdevs,
-+                             pcidevs->devs[i]) < 0)
-+            goto error;
-+        pcidevs->devs[i] = NULL;
-     }
- 
--    for (i = 0 ; i < def->nhostdevs ; i++) {
--        virDomainHostdevDefPtr hostdev = def->hostdevs[i];
--        pciDevice *dev;
-+    pciDeviceListFree(conn, pcidevs);
-+    return 0;
- 
--        if (hostdev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS)
--            continue;
--        if (hostdev->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI)
--            continue;
--        if (!hostdev->managed)
--            continue;
-+error:
-+    pciDeviceListFree(conn, pcidevs);
-+    return -1;
-+}
- 
--        dev = pciGetDevice(conn,
--                           hostdev->source.subsys.u.pci.domain,
--                           hostdev->source.subsys.u.pci.bus,
--                           hostdev->source.subsys.u.pci.slot,
--                           hostdev->source.subsys.u.pci.function);
--        if (!dev) {
-+static void
-+qemuDomainReAttachHostDevices(virConnectPtr conn,
-+                              struct qemud_driver *driver,
-+                              virDomainDefPtr def)
-+{
-+    pciDeviceList *pcidevs;
-+    int i;
-+
-+    if (!def->nhostdevs)
-+        return;
-+
-+    if (!(pcidevs = qemuGetPciHostDeviceList(conn, def))) {
-+        virErrorPtr err = virGetLastError();
-+        VIR_ERROR(_("Failed to allocate pciDeviceList: %s\n"),
-+                  err ? err->message : "");
-+        virResetError(err);
-+        return;
-+    }
-+
-+    /* Again 3 loops; mark all devices as inactive before reset
-+     * them and reset all the devices before re-attach */
-+
-+    for (i = 0; i < pcidevs->count; i++)
-+        pciDeviceListDel(conn, driver->activePciHostdevs, pcidevs->devs[i]);
-+
-+    for (i = 0; i < pcidevs->count; i++)
-+        if (pciResetDevice(conn, pcidevs->devs[i],
-+                           driver->activePciHostdevs) < 0) {
-             virErrorPtr err = virGetLastError();
--            VIR_ERROR(_("Failed to allocate pciDevice: %s\n"),
-+            VIR_ERROR(_("Failed to reset PCI device: %s\n"),
-                       err ? err->message : "");
-             virResetError(err);
--            continue;
-         }
- 
--        if (pciReAttachDevice(conn, dev) < 0) {
-+    for (i = 0; i < pcidevs->count; i++)
-+        if (pciDeviceGetManaged(pcidevs->devs[i]) &&
-+            pciReAttachDevice(conn, pcidevs->devs[i]) < 0) {
-             virErrorPtr err = virGetLastError();
-             VIR_ERROR(_("Failed to re-attach PCI device: %s\n"),
-                       err ? err->message : "");
-             virResetError(err);
-         }
- 
--        pciFreeDevice(conn, dev);
--    }
-+    pciDeviceListFree(conn, pcidevs);
- }
- 
- static int qemudDomainSetSecurityLabel(virConnectPtr conn, struct qemud_driver *driver, virDomainObjPtr vm)
-@@ -1468,7 +1503,7 @@ static int qemudStartVMDaemon(virConnectPtr conn,
-                                 &qemuCmdFlags) < 0)
-         goto cleanup;
- 
--    if (qemuPrepareHostDevices(conn, vm->def) < 0)
-+    if (qemuPrepareHostDevices(conn, driver, vm->def) < 0)
-         goto cleanup;
- 
-     vm->def->id = driver->nextvmid++;
-@@ -1634,7 +1669,7 @@ static void qemudShutdownVMDaemon(virConnectPtr conn ATTRIBUTE_UNUSED,
-         VIR_FREE(vm->def->seclabel.imagelabel);
-     }
- 
--    qemuDomainReAttachHostDevices(conn, vm->def);
-+    qemuDomainReAttachHostDevices(conn, driver, vm->def);
- 
-     if (qemudRemoveDomainStatus(conn, driver, vm) < 0) {
-         VIR_WARN(_("Failed to remove domain status for %s"),
-@@ -5247,6 +5282,7 @@ out:
- static int
- qemudNodeDeviceReset (virNodeDevicePtr dev)
- {
-+    struct qemud_driver *driver = dev->conn->privateData;
-     pciDevice *pci;
-     unsigned domain, bus, slot, function;
-     int ret = -1;
-@@ -5258,11 +5294,14 @@ qemudNodeDeviceReset (virNodeDevicePtr dev)
-     if (!pci)
-         return -1;
- 
--    if (pciResetDevice(dev->conn, pci) < 0)
-+    qemuDriverLock(driver);
-+
-+    if (pciResetDevice(dev->conn, pci, driver->activePciHostdevs) < 0)
-         goto out;
- 
-     ret = 0;
- out:
-+    qemuDriverUnlock(driver);
-     pciFreeDevice(dev->conn, pci);
-     return ret;
- }
-diff --git a/src/xen_unified.c b/src/xen_unified.c
-index e708980..ba8c769 100644
---- a/src/xen_unified.c
-+++ b/src/xen_unified.c
-@@ -1529,7 +1529,7 @@ xenUnifiedNodeDeviceReset (virNodeDevicePtr dev)
-     if (!pci)
-         return -1;
- 
--    if (pciResetDevice(dev->conn, pci) < 0)
-+    if (pciResetDevice(dev->conn, pci, NULL) < 0)
-         goto out;
- 
-     ret = 0;
--- 
-1.6.2.5
-

libvirt-allow-pm-reset-on-multi-function-pci-devices.patch

@@ -1,121 +0,0 @@
-From d79f35fbd4eaf610972621b042993d00f3247d5c Mon Sep 17 00:00:00 2001
-From: Mark McLoughlin <markmc@redhat.com>
-Date: Fri, 14 Aug 2009 08:31:11 +0100
-Subject: [PATCH] Allow PM reset on multi-function PCI devices
-
-https://bugzilla.redhat.com/515689
-
-It turns out that a PCI Power Management reset only affects individual
-functions, and not the whole device.
-
-The PCI Power Management spec talks about resetting the 'device' rather
-than the 'function', but Intel's Dexuan Cui informs me that it is
-actually a per-function reset.
-
-Also, Yu Zhao has added pci_pm_reset() to the kernel, and it doesn't
-reject multi-function devices, so it must be true! :-)
-
-(A side issue is that we could defer the PM reset to the kernel if we
-could detect that the kernel has PM reset support, but barring version
-number checks we don't have a way to detect that support)
-
-* src/pci.c: remove the pciDeviceContainsOtherFunctions() check from
-  pciTryPowerManagementReset() and prefer PM reset over bus reset
-  where both are available
-
-Cc: Cui, Dexuan <dexuan.cui@intel.com>
-Cc: Yu Zhao <yu.zhao@intel.com>
-
-(cherry picked from commit 64a6682b93a2a8aa38067a43979c9eaf993d2b41)
-
-Fedora-patch: libvirt-allow-pm-reset-on-multi-function-pci-devices.patch
----
- src/pci.c |   48 +++++++++---------------------------------------
- 1 files changed, 9 insertions(+), 39 deletions(-)
-
-diff --git a/src/pci.c b/src/pci.c
-index 68a380d..f78ab9f 100644
---- a/src/pci.c
-+++ b/src/pci.c
-@@ -397,29 +397,6 @@ pciBusContainsOtherDevices(virConnectPtr conn, pciDevice *dev)
-     return 1;
- }
- 
--/* Any other functions on this device ? */
--static int
--pciSharesDevice(pciDevice *a, pciDevice *b)
--{
--    return
--        a->domain == b->domain &&
--        a->bus == b->bus &&
--        a->slot == b->slot &&
--        a->function != b->function;
--}
--
--static int
--pciDeviceContainsOtherFunctions(virConnectPtr conn, pciDevice *dev)
--{
--    pciDevice *matched = NULL;
--    if (pciIterDevices(conn, pciSharesDevice, dev, &matched) < 0)
--        return 1;
--    if (!matched)
--        return 0;
--    pciFreeDevice(conn, matched);
--    return 1;
--}
--
- /* Is @a the parent of @b ? */
- static int
- pciIsParent(pciDevice *a, pciDevice *b)
-@@ -524,7 +501,7 @@ out:
-  * above we require the device supports a full internal reset.
-  */
- static int
--pciTryPowerManagementReset(virConnectPtr conn, pciDevice *dev)
-+pciTryPowerManagementReset(virConnectPtr conn ATTRIBUTE_UNUSED, pciDevice *dev)
- {
-     uint8_t config_space[PCI_CONF_LEN];
-     uint32_t ctl;
-@@ -532,16 +509,6 @@ pciTryPowerManagementReset(virConnectPtr conn, pciDevice *dev)
-     if (!dev->pci_pm_cap_pos)
-         return -1;
- 
--    /* For now, we just refuse to do a power management reset
--     * if there are other functions on this device.
--     * In future, we could allow it so long as those functions
--     * are not in use by the host or other guests.
--     */
--    if (pciDeviceContainsOtherFunctions(conn, dev)) {
--        VIR_WARN("%s contains other functions, not resetting", dev->name);
--        return -1;
--    }
--
-     /* Save and restore the device's config space. */
-     if (pciRead(dev, 0, &config_space[0], PCI_CONF_LEN) < 0) {
-         VIR_WARN("Failed to save PCI config space for %s", dev->name);
-@@ -599,14 +566,17 @@ pciResetDevice(virConnectPtr conn, pciDevice *dev)
-     if (dev->has_flr)
-         return 0;
- 
-+    /* If the device supports PCI power management reset,
-+     * that's the next best thing because it only resets
-+     * the function, not the whole device.
-+     */
-+    if (dev->has_pm_reset)
-+        ret = pciTryPowerManagementReset(conn, dev);
-+
-     /* Bus reset is not an option with the root bus */
--    if (dev->bus != 0)
-+    if (ret < 0 && dev->bus != 0)
-         ret = pciTrySecondaryBusReset(conn, dev);
- 
--    /* Next best option is a PCI power management reset */
--    if (ret < 0 && dev->has_pm_reset)
--        ret = pciTryPowerManagementReset(conn, dev);
--
-     if (ret < 0)
-         pciReportError(conn, VIR_ERR_NO_SUPPORT,
-                        _("No PCI reset capability available for %s"),
--- 
-1.6.2.5
-

libvirt-do-not-overwrite-error-in-wait-for-monitor.patch

@@ -1,31 +0,0 @@
-From 1319852c443c432d44a2e73508f3be742027f780 Mon Sep 17 00:00:00 2001
-From: Mark McLoughlin <markmc@redhat.com>
-Date: Wed, 19 Aug 2009 11:28:02 +0100
-Subject: [PATCH] Don't overwrite error in qemudWaitForMonitor()
-
-May help diagnose https://bugzilla.redhat.com/515054
-
-Fedora-patch: libvirt-do-not-overwrite-error-in-wait-for-monitor.patch
----
- src/qemu_driver.c |    5 +++--
- 1 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/src/qemu_driver.c b/src/qemu_driver.c
-index dfd19c5..74e106a 100644
---- a/src/qemu_driver.c
-+++ b/src/qemu_driver.c
-@@ -985,8 +985,9 @@ static int qemudWaitForMonitor(virConnectPtr conn,
-         return 0;
- 
-     /* Unexpected end of file - inform user of QEMU log data */
--    qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR,
--                     _("unable to start guest: %s"), buf);
-+    if (!virGetLastError())
-+        qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR,
-+                         _("unable to start guest: %s"), buf);
-     return -1;
- }
- 
--- 
-1.6.2.5
-

libvirt-fix-device-list-update-after-detach.patch

@@ -1,53 +0,0 @@
-From 2754da03d65f216271c81ece791b96a19272c812 Mon Sep 17 00:00:00 2001
-From: Mark McLoughlin <markmc@redhat.com>
-Date: Sat, 15 Aug 2009 19:38:15 +0100
-Subject: [PATCH] Fix list updating after disk hot-unplug
-
-The current code makes a poor effort at updating the device arrays after
-hot-unplug. Fix that and combine the two code paths into one.
-
-* src/qemu_driver.c: fix list updating in qemudDomainDetachPciDiskDevice()
-
-(cherry picked from commit 4e12af5623e4a962a6bb911af06fa29aa85befba)
-
-Fedora-patch: libvirt-fix-device-list-update-after-detach.patch
----
- src/qemu_driver.c |   21 ++++++++++-----------
- 1 files changed, 10 insertions(+), 11 deletions(-)
-
-diff --git a/src/qemu_driver.c b/src/qemu_driver.c
-index dfd19c5..ce04beb 100644
---- a/src/qemu_driver.c
-+++ b/src/qemu_driver.c
-@@ -4123,18 +4123,17 @@ try_command:
-         goto cleanup;
-     }
- 
--    if (vm->def->ndisks > 1) {
--        vm->def->disks[i] = vm->def->disks[--vm->def->ndisks];
--        if (VIR_REALLOC_N(vm->def->disks, vm->def->ndisks) < 0) {
--            virReportOOMError(conn);
--            goto cleanup;
--        }
--        qsort(vm->def->disks, vm->def->ndisks, sizeof(*vm->def->disks),
--              virDomainDiskQSort);
--    } else {
--        VIR_FREE(vm->def->disks[0]);
--        vm->def->ndisks = 0;
-+    if (i != --vm->def->ndisks)
-+        memmove(&vm->def->disks[i],
-+                &vm->def->disks[i+1],
-+                sizeof(*vm->def->disks) * (vm->def->ndisks-i));
-+    if (VIR_REALLOC_N(vm->def->disks, vm->def->ndisks) < 0) {
-+        virReportOOMError(conn);
-+        goto cleanup;
-     }
-+    qsort(vm->def->disks, vm->def->ndisks, sizeof(*vm->def->disks),
-+          virDomainDiskQSort);
-+
-     ret = 0;
- 
- cleanup:
--- 
-1.6.2.5
-

libvirt-fix-migration-completion-with-newer-qemu.patch

@@ -1,45 +0,0 @@
-From 21ef933dfdd64c754d184d41d87ecd94eaddf697 Mon Sep 17 00:00:00 2001
-From: Chris Lalancette <clalance@redhat.com>
-Date: Wed, 5 Aug 2009 13:42:07 +0200
-Subject: [PATCH] Run 'cont' on successful migration finish.
-
-https://bugzilla.redhat.com/516187
-
-As of qemu 0.10.6, qemu now honors the -S flag on incoming migration.
-That means that when the migration completes, we have to issue a
-'cont' command to get the VM running again.  We do it unconditionally
-since it won't hurt on older qemu.
-
-(cherry picked from commit d1ec4d7a5a4f50c9492137eaab4f021caa075f95)
-
-Fedora-patch: libvirt-fix-migration-completion-with-newer-qemu.patch
----
- src/qemu_driver.c |   11 +++++++++++
- 1 files changed, 11 insertions(+), 0 deletions(-)
-
-diff --git a/src/qemu_driver.c b/src/qemu_driver.c
-index 7dbf4a2..ff56f61 100644
---- a/src/qemu_driver.c
-+++ b/src/qemu_driver.c
-@@ -5162,7 +5162,18 @@ qemudDomainMigrateFinish2 (virConnectPtr dconn,
-      */
-     if (retcode == 0) {
-         dom = virGetDomain (dconn, vm->def->name, vm->def->uuid);
-+
-+        /* run 'cont' on the destination, which allows migration on qemu
-+         * >= 0.10.6 to work properly.  This isn't strictly necessary on
-+         * older qemu's, but it also doesn't hurt anything there
-+         */
-+        if (qemudMonitorCommand(vm, "cont", &info) < 0) {
-+            qemudReportError(dconn, NULL, NULL, VIR_ERR_INTERNAL_ERROR,
-+                             "%s", _("resume operation failed"));
-+            goto cleanup;
-+        }
-         VIR_FREE(info);
-+
-         vm->state = VIR_DOMAIN_RUNNING;
-         event = virDomainEventNewFromObj(vm,
-                                          VIR_DOMAIN_EVENT_RESUMED,
--- 
-1.6.2.5
-

libvirt-fix-selinux-problem-with-images-on-nfs.patch

@@ -1,61 +0,0 @@
-From ea544e7b038776c7db555ab0428b63ebb1604163 Mon Sep 17 00:00:00 2001
-From: Darryl L. Pierce <dpierce@redhat.com>
-Date: Fri, 21 Aug 2009 16:57:29 +0200
-Subject: [PATCH] 517157 fix selinux problem with images on NFS
-
-* src/security_selinux.c: ignores EOPNOTSUPP when attempting to access an
-  NFS share
-
-(cherry picked from commit 777fc2e9d60844a7387355d9cef06bd25190d146)
-
-Fedora-patch: libvirt-fix-selinux-problem-with-images-on-nfs.patch
----
- src/security_selinux.c |   25 +++++++++++++++++--------
- 1 files changed, 17 insertions(+), 8 deletions(-)
-
-diff --git a/src/security_selinux.c b/src/security_selinux.c
-index 8ebe1fe..97f16b3 100644
---- a/src/security_selinux.c
-+++ b/src/security_selinux.c
-@@ -285,6 +285,8 @@ SELinuxSetFilecon(virConnectPtr conn, const char *path, char *tcon)
-     VIR_INFO("Setting SELinux context on '%s' to '%s'", path, tcon);
- 
-     if (setfilecon(path, tcon) < 0) {
-+        int setfilecon_errno = errno;
-+
-         if (getfilecon(path, &econ) >= 0) {
-             if (STREQ(tcon, econ)) {
-                 freecon(econ);
-@@ -293,14 +295,21 @@ SELinuxSetFilecon(virConnectPtr conn, const char *path, char *tcon)
-             }
-             freecon(econ);
-         }
--        virSecurityReportError(conn, VIR_ERR_ERROR,
--                               _("%s: unable to set security context "
--                                 "'\%s\' on %s: %s."), __func__,
--                               tcon,
--                               path,
--                               virStrerror(errno, ebuf, sizeof ebuf));
--        if (security_getenforce() == 1)
--            return -1;
-+
-+        /* if the error complaint is related to an image hosted on
-+         * an nfs mount, then ignore it.
-+         * rhbz 517157
-+         */
-+        if (setfilecon_errno != EOPNOTSUPP) {
-+            virSecurityReportError(conn, VIR_ERR_ERROR,
-+                                 _("%s: unable to set security context "
-+                                   "'\%s\' on %s: %s."), __func__,
-+                                 tcon,
-+                                 path,
-+                                 virStrerror(errno, ebuf, sizeof ebuf));
-+            if (security_getenforce() == 1)
-+                return -1;
-+        }
-     }
-     return 0;
- }
--- 
-1.6.2.5
-

libvirt-fix-xen-driver-segfault-with-newer-xen.patch

@@ -1,38 +0,0 @@
-From 0878a15ad937449b5dfc4cf49888cc7753473e33 Mon Sep 17 00:00:00 2001
-From: Daniel Veillard <veillard@redhat.com>
-Date: Fri, 26 Jun 2009 18:14:16 +0000
-Subject: [PATCH] Fix xen driver segfault with newer Xen
-
-https://bugzilla.redhat.com/518091
-
-(cherry picked from commit 14435163a086c0bcdff04308077fa46a5fa08bb0)
-
-Fedora-patch: libvirt-fix-xen-driver-segfault-with-newer-xen.patch
----
- src/xend_internal.c |   10 +++++++++-
- 1 files changed, 9 insertions(+), 1 deletions(-)
-
-diff --git a/src/xend_internal.c b/src/xend_internal.c
-index 2e2fd21..c3a9836 100644
---- a/src/xend_internal.c
-+++ b/src/xend_internal.c
-@@ -2077,7 +2077,15 @@ xenDaemonParseSxprGraphicsNew(virConnectPtr conn,
-         if (sexpr_lookup(node, "device/vfb")) {
-             /* New style graphics config for PV guests in >= 3.0.4,
-              * or for HVM guests in >= 3.0.5 */
--            tmp = sexpr_node(node, "device/vfb/type");
-+            if (sexpr_node(node, "device/vfb/type")) {
-+                tmp = sexpr_node(node, "device/vfb/type");
-+            } else if (sexpr_node(node, "device/vfb/vnc")) {
-+                tmp = "vnc";
-+            } else if (sexpr_node(node, "device/vfb/sdl")) {
-+                tmp = "sdl";
-+            } else {
-+                tmp = "unknown";
-+            }
- 
-             if (VIR_ALLOC(graphics) < 0)
-                 goto no_memory;
--- 
-1.6.2.5
-

libvirt-improve-pci-hostdev-reset-error-message.patch

@@ -1,141 +0,0 @@
-From 9f80bab3829b97ac2802c15b9f3e4a6bbbb24627 Mon Sep 17 00:00:00 2001
-From: Mark McLoughlin <markmc@redhat.com>
-Date: Fri, 14 Aug 2009 08:31:11 +0100
-Subject: [PATCH] Improve PCI host device reset error message
-
-https://bugzilla.redhat.com/499678
-
-Currently, if we are unable to reset a PCI device we return a fairly
-generic 'No PCI reset capability available' error message.
-
-Fix that by returning an error from the individual reset messages and
-using that error to construct the higher level error mesage.
-
-* src/pci.c: set errors in pciTryPowerManagementReset() and
-  pciTrySecondaryBusReset() on failure; use those error messages
-  in pciResetDevice(), or explain that no reset support is available
-
-(cherry picked from commit ebea34185612c3b96d7d3bbd8b7c2ce6c9f4fe6f)
-
-Fedora-patch: libvirt-improve-pci-hostdev-reset-error-message.patch
----
- src/pci.c         |   44 +++++++++++++++++++++++++++++++-------------
- src/qemu_driver.c |    4 ++--
- 2 files changed, 33 insertions(+), 15 deletions(-)
-
-diff --git a/src/pci.c b/src/pci.c
-index f78ab9f..1dddb08 100644
---- a/src/pci.c
-+++ b/src/pci.c
-@@ -451,15 +451,18 @@ pciTrySecondaryBusReset(virConnectPtr conn, pciDevice *dev)
-      * are not in use by the host or other guests.
-      */
-     if (pciBusContainsOtherDevices(conn, dev)) {
--        VIR_WARN("Other devices on bus with %s, not doing bus reset",
--                 dev->name);
-+        pciReportError(conn, VIR_ERR_NO_SUPPORT,
-+                       _("Other devices on bus with %s, not doing bus reset"),
-+                       dev->name);
-         return -1;
-     }
- 
-     /* Find the parent bus */
-     parent = pciGetParentDevice(conn, dev);
-     if (!parent) {
--        VIR_WARN("Failed to find parent device for %s", dev->name);
-+        pciReportError(conn, VIR_ERR_NO_SUPPORT,
-+                       _("Failed to find parent device for %s"),
-+                       dev->name);
-         return -1;
-     }
- 
-@@ -470,7 +473,9 @@ pciTrySecondaryBusReset(virConnectPtr conn, pciDevice *dev)
-      * are multiple devices/functions
-      */
-     if (pciRead(dev, 0, config_space, PCI_CONF_LEN) < 0) {
--        VIR_WARN("Failed to save PCI config space for %s", dev->name);
-+        pciReportError(conn, VIR_ERR_NO_SUPPORT,
-+                       _("Failed to save PCI config space for %s"),
-+                       dev->name);
-         goto out;
-     }
- 
-@@ -487,9 +492,12 @@ pciTrySecondaryBusReset(virConnectPtr conn, pciDevice *dev)
- 
-     usleep(200 * 1000); /* sleep 200ms */
- 
--    if (pciWrite(dev, 0, config_space, PCI_CONF_LEN) < 0)
--        VIR_WARN("Failed to restore PCI config space for %s", dev->name);
--
-+    if (pciWrite(dev, 0, config_space, PCI_CONF_LEN) < 0) {
-+        pciReportError(conn, VIR_ERR_NO_SUPPORT,
-+                       _("Failed to restore PCI config space for %s"),
-+                       dev->name);
-+        goto out;
-+    }
-     ret = 0;
- out:
-     pciFreeDevice(conn, parent);
-@@ -511,7 +519,9 @@ pciTryPowerManagementReset(virConnectPtr conn ATTRIBUTE_UNUSED, pciDevice *dev)
- 
-     /* Save and restore the device's config space. */
-     if (pciRead(dev, 0, &config_space[0], PCI_CONF_LEN) < 0) {
--        VIR_WARN("Failed to save PCI config space for %s", dev->name);
-+        pciReportError(conn, VIR_ERR_NO_SUPPORT,
-+                       _("Failed to save PCI config space for %s"),
-+                       dev->name);
-         return -1;
-     }
- 
-@@ -528,8 +538,12 @@ pciTryPowerManagementReset(virConnectPtr conn ATTRIBUTE_UNUSED, pciDevice *dev)
- 
-     usleep(10 * 1000); /* sleep 10ms */
- 
--    if (pciWrite(dev, 0, &config_space[0], PCI_CONF_LEN) < 0)
--        VIR_WARN("Failed to restore PCI config space for %s", dev->name);
-+    if (pciWrite(dev, 0, &config_space[0], PCI_CONF_LEN) < 0) {
-+        pciReportError(conn, VIR_ERR_NO_SUPPORT,
-+                       _("Failed to restore PCI config space for %s"),
-+                       dev->name);
-+        return -1;
-+    }
- 
-     return 0;
- }
-@@ -577,10 +591,14 @@ pciResetDevice(virConnectPtr conn, pciDevice *dev)
-     if (ret < 0 && dev->bus != 0)
-         ret = pciTrySecondaryBusReset(conn, dev);
- 
--    if (ret < 0)
-+    if (ret < 0) {
-+        virErrorPtr err = virGetLastError();
-         pciReportError(conn, VIR_ERR_NO_SUPPORT,
--                       _("No PCI reset capability available for %s"),
--                       dev->name);
-+                       _("Unable to reset PCI device %s: %s"),
-+                       dev->name,
-+                       err ? err->message : _("no FLR, PM reset or bus reset available"));
-+    }
-+
-     return ret;
- }
- 
-diff --git a/src/qemu_driver.c b/src/qemu_driver.c
-index ddd3693..9f87d2a 100644
---- a/src/qemu_driver.c
-+++ b/src/qemu_driver.c
-@@ -1345,9 +1345,9 @@ qemuDomainReAttachHostDevices(virConnectPtr conn, virDomainDefPtr def)
-             continue;
-         }
- 
--        if (pciDettachDevice(conn, dev) < 0) {
-+        if (pciReAttachDevice(conn, dev) < 0) {
-             virErrorPtr err = virGetLastError();
--            VIR_ERROR(_("Failed to reset PCI device: %s\n"),
-+            VIR_ERROR(_("Failed to re-attach PCI device: %s\n"),
-                       err ? err->message : "");
-             virResetError(err);
-         }
--- 
-1.6.2.5
-

libvirt-reattach-pci-hostdevs-after-guest-shutdown.patch

@@ -1,124 +0,0 @@
-From 1e44604c0d4c2d4c1347c2a1027f1ea02a6499f9 Mon Sep 17 00:00:00 2001
-From: Mark McLoughlin <markmc@redhat.com>
-Date: Fri, 14 Aug 2009 08:31:11 +0100
-Subject: [PATCH] Reset and re-attach PCI host devices on guest shutdown
-
-https://bugzilla.redhat.com/499561
-
-When the guest shuts down, we should attempt to restore all PCI host
-devices to a sane state.
-
-In the case of managed hostdevs, we should reset and re-attach the
-devices. In the case of unmanaged hostdevs, we should just reset them.
-
-Note, KVM will already reset assigned devices when the guest shuts
-down using whatever means it can, so we are only doing it to cover the
-cases the kernel can't handle.
-
-* src/qemu_driver.c: add qemuDomainReAttachHostDevices() and call
-  it from qemudShutdownVMDaemon()
-
-(cherry picked from commit 4035152a8767e72fd4e26a91cb4d5afa75b72e61)
-
-Fedora-patch: libvirt-reattach-pci-hostdevs-after-guest-shutdown.patch
----
- src/qemu_driver.c |   76 +++++++++++++++++++++++++++++++++++++++++++++++++++++
- 1 files changed, 76 insertions(+), 0 deletions(-)
-
-diff --git a/src/qemu_driver.c b/src/qemu_driver.c
-index ce04beb..ddd3693 100644
---- a/src/qemu_driver.c
-+++ b/src/qemu_driver.c
-@@ -1282,6 +1282,80 @@ error:
-     return -1;
- }
- 
-+static void
-+qemuDomainReAttachHostDevices(virConnectPtr conn, virDomainDefPtr def)
-+{
-+    int i;
-+
-+    /* Again 2 loops; reset all the devices before re-attach */
-+
-+    for (i = 0 ; i < def->nhostdevs ; i++) {
-+        virDomainHostdevDefPtr hostdev = def->hostdevs[i];
-+        pciDevice *dev;
-+
-+        if (hostdev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS)
-+            continue;
-+        if (hostdev->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI)
-+            continue;
-+
-+        dev = pciGetDevice(conn,
-+                           hostdev->source.subsys.u.pci.domain,
-+                           hostdev->source.subsys.u.pci.bus,
-+                           hostdev->source.subsys.u.pci.slot,
-+                           hostdev->source.subsys.u.pci.function);
-+        if (!dev) {
-+            virErrorPtr err = virGetLastError();
-+            VIR_ERROR(_("Failed to allocate pciDevice: %s\n"),
-+                      err ? err->message : "");
-+            virResetError(err);
-+            continue;
-+        }
-+
-+        if (pciResetDevice(conn, dev) < 0) {
-+            virErrorPtr err = virGetLastError();
-+            VIR_ERROR(_("Failed to reset PCI device: %s\n"),
-+                      err ? err->message : "");
-+            virResetError(err);
-+        }
-+
-+        pciFreeDevice(conn, dev);
-+    }
-+
-+    for (i = 0 ; i < def->nhostdevs ; i++) {
-+        virDomainHostdevDefPtr hostdev = def->hostdevs[i];
-+        pciDevice *dev;
-+
-+        if (hostdev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS)
-+            continue;
-+        if (hostdev->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI)
-+            continue;
-+        if (!hostdev->managed)
-+            continue;
-+
-+        dev = pciGetDevice(conn,
-+                           hostdev->source.subsys.u.pci.domain,
-+                           hostdev->source.subsys.u.pci.bus,
-+                           hostdev->source.subsys.u.pci.slot,
-+                           hostdev->source.subsys.u.pci.function);
-+        if (!dev) {
-+            virErrorPtr err = virGetLastError();
-+            VIR_ERROR(_("Failed to allocate pciDevice: %s\n"),
-+                      err ? err->message : "");
-+            virResetError(err);
-+            continue;
-+        }
-+
-+        if (pciDettachDevice(conn, dev) < 0) {
-+            virErrorPtr err = virGetLastError();
-+            VIR_ERROR(_("Failed to reset PCI device: %s\n"),
-+                      err ? err->message : "");
-+            virResetError(err);
-+        }
-+
-+        pciFreeDevice(conn, dev);
-+    }
-+}
-+
- static int qemudDomainSetSecurityLabel(virConnectPtr conn, struct qemud_driver *driver, virDomainObjPtr vm)
- {
-     if (vm->def->seclabel.label != NULL)
-@@ -1560,6 +1634,8 @@ static void qemudShutdownVMDaemon(virConnectPtr conn ATTRIBUTE_UNUSED,
-         VIR_FREE(vm->def->seclabel.imagelabel);
-     }
- 
-+    qemuDomainReAttachHostDevices(conn, vm->def);
-+
-     if (qemudRemoveDomainStatus(conn, driver, vm) < 0) {
-         VIR_WARN(_("Failed to remove domain status for %s"),
-                  vm->def->name);
--- 
-1.6.2.5
-

sources

@@ -1 +1 @@
-3035b484861516a1cd425acef1e760e3  libvirt-0.6.2.tar.gz
+SHA512 (libvirt-11.0.0.tar.xz) = ac5fd17d3f488c241017d967364e0441373e9ab0457dab1acfe84fd0b90353dc5d185cc7fcd2b0d7995af4137a3fa18371abb5511686456a9e720f7ec7829da9