3 files changed, 16 insertions, 82 deletions

diff --git a/recipes-extended/libvirt/libvirt/0001-messon.build-remove-build-path-information-to-avoid-.patch b/recipes-extended/libvirt/libvirt/0001-messon.build-remove-build-path-information-to-avoid-.patch
index 1e09cd68..d9bcef0b 100644
--- a/recipes-extended/libvirt/libvirt/0001-messon.build-remove-build-path-information-to-avoid-.patch
+++ b/recipes-extended/libvirt/libvirt/0001-messon.build-remove-build-path-information-to-avoid-.patch
@@ -25,34 +25,31 @@ Signed-off-by: Xiangyu Chen <xiangyu.chen@windriver.com>
  meson.build | 10 +++++-----
  1 file changed, 5 insertions(+), 5 deletions(-)
 
-diff --git a/meson.build b/meson.build
-index 9016c04..fb78d44 100644
---- a/meson.build
-+++ b/meson.build
-@@ -26,8 +26,8 @@ endif
+Index: libvirt-9.2.0/meson.build
+===================================================================
+--- libvirt-9.2.0.orig/meson.build
++++ libvirt-9.2.0/meson.build
+@@ -26,8 +26,8 @@
  conf = configuration_data()
  
  conf.set('_GNU_SOURCE', 1)
--conf.set_quoted('abs_top_builddir', meson.build_root())
--conf.set_quoted('abs_top_srcdir', meson.source_root())
+-conf.set_quoted('abs_top_builddir', meson.project_build_root())
+-conf.set_quoted('abs_top_srcdir', meson.project_source_root())
 +conf.set_quoted('abs_top_builddir', ' ')
 +conf.set_quoted('abs_top_srcdir', ' ')
  conf.set_quoted('PACKAGE', meson.project_name())
  conf.set_quoted('PACKAGE_NAME', meson.project_name())
  conf.set_quoted('PACKAGE_VERSION', meson.project_version())
-@@ -1830,9 +1830,9 @@ if conf.has('WITH_LIBVIRTD')
+@@ -1770,9 +1770,9 @@
        use_storage = true
  
        conf.set('WITH_STORAGE_FS', 1)
--      conf.set_quoted('MOUNT', mount_prog.path())
--      conf.set_quoted('UMOUNT', umount_prog.path())
--      conf.set_quoted('MKFS', mkfs_prog.path())
+-      conf.set_quoted('MOUNT', mount_prog.full_path())
+-      conf.set_quoted('UMOUNT', umount_prog.full_path())
+-      conf.set_quoted('MKFS', mkfs_prog.full_path())
 +      conf.set_quoted('MOUNT', '/usr/bin/mount')
 +      conf.set_quoted('UMOUNT', '/usr/bin/umount')
 +      conf.set_quoted('MKFS', '/usr/sbin/mkfs')
  
        showmount_prog = find_program('showmount', required: false, dirs: libvirt_sbin_path)
        showmount_path = ''
--- 
-2.17.1
-
diff --git a/recipes-extended/libvirt/libvirt/0001-prevent-gendispatch.pl-generating-build-path-in-code.patch b/recipes-extended/libvirt/libvirt/0001-prevent-gendispatch.pl-generating-build-path-in-code.patch
index 5a909b49..defbd7ee 100644
--- a/recipes-extended/libvirt/libvirt/0001-prevent-gendispatch.pl-generating-build-path-in-code.patch
+++ b/recipes-extended/libvirt/libvirt/0001-prevent-gendispatch.pl-generating-build-path-in-code.patch
@@ -22,11 +22,11 @@ Signed-off-by: Xiangyu Chen <xiangyu.chen@windriver.com>
  src/rpc/gendispatch.pl | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
-diff --git a/src/rpc/gendispatch.pl b/src/rpc/gendispatch.pl
-index 9f5bf0e..c73a9dd 100755
---- a/src/rpc/gendispatch.pl
-+++ b/src/rpc/gendispatch.pl
-@@ -449,19 +449,19 @@ sub hyper_to_long
+Index: libvirt-9.2.0/src/rpc/gendispatch.pl
+===================================================================
+--- libvirt-9.2.0.orig/src/rpc/gendispatch.pl
++++ libvirt-9.2.0/src/rpc/gendispatch.pl
+@@ -449,12 +449,12 @@
  
  if ($mode eq "aclsym") {
      print <<__EOF__;
@@ -34,14 +34,6 @@ index 9f5bf0e..c73a9dd 100755
 +# Automatically generated by gendispatch.pl.
  # Do not edit this file.  Any changes you make will be lost.
  __EOF__
- } elsif ($mode eq "aclapi") {
-     print <<__EOF__;
- <!--
--  -  Automatically generated from $protocol by gendispatch.pl.
-+  -  Automatically generated by gendispatch.pl.
-   -  Do not edit this file.  Any changes you make will be lost.
-   -->
- __EOF__
  } else {
      print <<__EOF__;
 -/* Automatically generated from $protocol by gendispatch.pl.
@@ -49,6 +41,3 @@ index 9f5bf0e..c73a9dd 100755
   * Do not edit this file.  Any changes you make will be lost.
   */
  __EOF__
--- 
-2.33.1
-
diff --git a/recipes-extended/libvirt/libvirt/0001-qemu-segmentation-fault-in-virtqemud-executing-qemuD.patch b/recipes-extended/libvirt/libvirt/0001-qemu-segmentation-fault-in-virtqemud-executing-qemuD.patch
deleted file mode 100644
index 85870e09..00000000
--- a/recipes-extended/libvirt/libvirt/0001-qemu-segmentation-fault-in-virtqemud-executing-qemuD.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 823a62ec8aac4fb75e6e281164f3eb56ae47597c Mon Sep 17 00:00:00 2001
-From: Boris Fiuczynski <fiuczy@linux.ibm.com>
-Date: Tue, 1 Mar 2022 18:47:59 +0100
-Subject: [PATCH] qemu: segmentation fault in virtqemud executing
- qemuDomainUndefineFlags
-
-Commit 5adfb3472342741c443ac91dee0abb18b5a3d038 causes a segmentation fault.
-
-Stack trace of thread 664419:
- #0  0x000003ff62ec553c in qemuDomainUndefineFlags (dom=0x3ff6c002810, flags=<optimized out>) at ../src/qemu/qemu_driver.c:6618
- #1  0x000003ff876a7e5c in virDomainUndefineFlags (domain=domain@entry=0x3ff6c002810, flags=<optimized out>) at ../src/libvirt-domain.c:6519
- #2  0x000002aa2b64a808 in remoteDispatchDomainUndefineFlags (server=0x2aa2c3d7880, msg=0x2aa2c3d2770, args=<optimized out>, rerr=0x3ff8287b950, client=<optimized out>)
-        at src/remote/remote_daemon_dispatch_stubs.h:13080
- #3  remoteDispatchDomainUndefineFlagsHelper (server=0x2aa2c3d7880, client=<optimized out>, msg=0x2aa2c3d2770, rerr=0x3ff8287b950, args=<optimized out>, ret=0x0)
-        at src/remote/remote_daemon_dispatch_stubs.h:13059
- #4  0x000003ff8758bbf4 in virNetServerProgramDispatchCall (msg=0x2aa2c3d2770, client=0x2aa2c3e3050, server=0x2aa2c3d7880, prog=0x2aa2c3d8010)
-        at ../src/rpc/virnetserverprogram.c:428
- #5  virNetServerProgramDispatch (prog=0x2aa2c3d8010, server=server@entry=0x2aa2c3d7880, client=0x2aa2c3e3050, msg=0x2aa2c3d2770) at ../src/rpc/virnetserverprogram.c:302
- #6  0x000003ff8758c260 in virNetServerProcessMsg (msg=<optimized out>, prog=<optimized out>, client=<optimized out>, srv=0x2aa2c3d7880) at ../src/rpc/virnetserver.c:140
- #7  virNetServerHandleJob (jobOpaque=0x2aa2c3e2d30, opaque=0x2aa2c3d7880) at ../src/rpc/virnetserver.c:160
- #8  0x000003ff874c49aa in virThreadPoolWorker (opaque=<optimized out>) at ../src/util/virthreadpool.c:164
- #9  0x000003ff874c3f62 in virThreadHelper (data=<optimized out>) at ../src/util/virthread.c:256
- #10 0x000003ff86c1cf8c in start_thread () from /lib64/libc.so.6
- #11 0x000003ff86c9650e in thread_start () from /lib64/libc.so.6
-
-Signed-off-by: Boris Fiuczynski <fiuczy@linux.ibm.com>
-Reviewed-by: Jim Fehlig <jfehlig@suse.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-
-Upstream-Status: Backport [823a62ec8aac4fb75e6e281164f3eb56ae47597c]
-
-Signed-off-by: He Zhe <zhe.he@windriver.com>
----
- src/qemu/qemu_driver.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
-index bcd9bdb436..8337eed510 100644
---- a/src/qemu/qemu_driver.c
-+++ b/src/qemu/qemu_driver.c
-@@ -6615,7 +6615,7 @@ qemuDomainUndefineFlags(virDomainPtr dom,
-         }
-     }
- 
--    if (vm->def->os.loader->nvram) {
-+    if (vm->def->os.loader && vm->def->os.loader->nvram) {
-         nvram_path = g_strdup(vm->def->os.loader->nvram);
-     } else if (vm->def->os.firmware == VIR_DOMAIN_OS_DEF_FIRMWARE_EFI) {
-         qemuDomainNVRAMPathFormat(cfg, vm->def, &nvram_path);
--- 
-2.25.1
-