Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package trinity for openSUSE:Factory checked 
in at 2024-05-16 17:16:30
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/trinity (Old)
 and      /work/SRC/openSUSE:Factory/.trinity.new.1880 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "trinity"

Thu May 16 17:16:30 2024 rev:76 rq:1174427 version:1.9+git.20230710

Changes:
--------
--- /work/SRC/openSUSE:Factory/trinity/trinity.changes  2024-03-19 
17:32:56.613191912 +0100
+++ /work/SRC/openSUSE:Factory/.trinity.new.1880/trinity.changes        
2024-05-16 17:19:05.524439702 +0200
@@ -1,0 +2,12 @@
+Thu May 16 10:03:21 UTC 2024 - Jiri Slaby <[email protected]>
+
+- support for kernel 6.9
+  * deleted (superseded)
+    0001-kvm-drop-deprecated-and-dropped-KVM-ioctls.patch
+  * added
+    0001-compat-add-deprecated-KVM-IOCTL-definitions.patch
+    0002-compat-add-removed-KVM-structures.patch
+    0003-ioctls-kvm-make-s390-ioctls-s390-only.patch
+    0004-ioctls-kvm-make-powerpc-ioctls-powerpc-only.patch
+
+-------------------------------------------------------------------

Old:
----
  0001-kvm-drop-deprecated-and-dropped-KVM-ioctls.patch

New:
----
  0001-compat-add-deprecated-KVM-IOCTL-definitions.patch
  0002-compat-add-removed-KVM-structures.patch
  0003-ioctls-kvm-make-s390-ioctls-s390-only.patch
  0004-ioctls-kvm-make-powerpc-ioctls-powerpc-only.patch

BETA DEBUG BEGIN:
  Old:  * deleted (superseded)
    0001-kvm-drop-deprecated-and-dropped-KVM-ioctls.patch
  * added
BETA DEBUG END:

BETA DEBUG BEGIN:
  New:  * added
    0001-compat-add-deprecated-KVM-IOCTL-definitions.patch
    0002-compat-add-removed-KVM-structures.patch
  New:    0001-compat-add-deprecated-KVM-IOCTL-definitions.patch
    0002-compat-add-removed-KVM-structures.patch
    0003-ioctls-kvm-make-s390-ioctls-s390-only.patch
  New:    0002-compat-add-removed-KVM-structures.patch
    0003-ioctls-kvm-make-s390-ioctls-s390-only.patch
    0004-ioctls-kvm-make-powerpc-ioctls-powerpc-only.patch
  New:    0003-ioctls-kvm-make-s390-ioctls-s390-only.patch
    0004-ioctls-kvm-make-powerpc-ioctls-powerpc-only.patch
BETA DEBUG END:

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ trinity.spec ++++++
--- /var/tmp/diff_new_pack.zQlATa/_old  2024-05-16 17:19:06.272466813 +0200
+++ /var/tmp/diff_new_pack.zQlATa/_new  2024-05-16 17:19:06.272466813 +0200
@@ -23,7 +23,10 @@
 License:        GPL-2.0-only
 URL:            https://github.com/kernelslacker/trinity
 Source0:        %{name}-%{version}.tar.gz
-Patch0:         0001-kvm-drop-deprecated-and-dropped-KVM-ioctls.patch
+Patch0:         0001-compat-add-deprecated-KVM-IOCTL-definitions.patch
+Patch1:         0002-compat-add-removed-KVM-structures.patch
+Patch2:         0003-ioctls-kvm-make-s390-ioctls-s390-only.patch
+Patch3:         0004-ioctls-kvm-make-powerpc-ioctls-powerpc-only.patch
 
 %description
 The basic idea is fairly simple. As 'fuzz testing' suggests, we call syscalls

++++++ 0001-compat-add-deprecated-KVM-IOCTL-definitions.patch ++++++
From: Jiri Slaby <[email protected]>
Date: Tue, 19 Mar 2024 09:54:52 +0100
Subject: compat: add deprecated KVM IOCTL definitions
Git-repo: https://github.com/jirislaby/trinity
Git-commit: 13ad68f3d5be5980c3ce3e91eca4dfd7533192b6
Patch-mainline: submitted, https://github.com/kernelslacker/trinity/pull/48
References: kernel 6.8 & 6.9

They were dropped in 6.8 by commit a5d3df8ae13f (KVM: remove deprecated
UAPIs).

Signed-off-by: Jiri Slaby <[email protected]>
---
 include/compat.h | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/include/compat.h b/include/compat.h
index 05cf3b01..33132e22 100644
--- a/include/compat.h
+++ b/include/compat.h
@@ -1049,6 +1049,30 @@ struct kvm_ppc_pvinfo {
 #ifndef KVM_ASSIGN_SET_INTX_MASK
 #define KVM_ASSIGN_SET_INTX_MASK  _IOW(KVMIO,  0xa4, struct 
kvm_assigned_pci_dev)
 #endif
+#ifndef KVM_ASSIGN_PCI_DEVICE
+#define KVM_ASSIGN_PCI_DEVICE     _IOR(KVMIO,  0x69, struct 
kvm_assigned_pci_dev)
+#endif
+#ifndef KVM_ASSIGN_IRQ
+#define KVM_ASSIGN_IRQ            _IOR(KVMIO, 0x70, struct kvm_assigned_irq)
+#endif
+#ifndef KVM_ASSIGN_DEV_IRQ
+#define KVM_ASSIGN_DEV_IRQ        _IOW(KVMIO, 0x70, struct kvm_assigned_irq)
+#endif
+#ifndef KVM_DEASSIGN_PCI_DEVICE
+#define KVM_DEASSIGN_PCI_DEVICE   _IOW(KVMIO,  0x72, struct 
kvm_assigned_pci_dev)
+#endif
+#ifndef KVM_ASSIGN_SET_MSIX_NR
+#define KVM_ASSIGN_SET_MSIX_NR    _IOW(KVMIO,  0x73, struct 
kvm_assigned_msix_nr)
+#endif
+#ifndef KVM_ASSIGN_SET_MSIX_ENTRY
+#define KVM_ASSIGN_SET_MSIX_ENTRY _IOW(KVMIO,  0x74, struct 
kvm_assigned_msix_entry)
+#endif
+#ifndef KVM_DEASSIGN_DEV_IRQ
+#define KVM_DEASSIGN_DEV_IRQ      _IOW(KVMIO,  0x75, struct kvm_assigned_irq)
+#endif
+#ifndef KVM_DEBUG_GUEST
+#define KVM_DEBUG_GUEST           _IOW(KVMIO, 0x87, int)
+#endif
 
 #ifndef KVM_GET_DEBUGREGS
 struct kvm_debugregs {
-- 
2.45.0


++++++ 0002-compat-add-removed-KVM-structures.patch ++++++
From: Jiri Slaby <[email protected]>
Date: Tue, 19 Mar 2024 09:54:52 +0100
Subject: compat: add removed KVM structures
Git-repo: https://github.com/jirislaby/trinity
Git-commit: 144a55ea69e7ad5d5eebf8ea88c6f61b29bcff74
Patch-mainline: submitted, https://github.com/kernelslacker/trinity/pull/48
References: kernel 6.8 & 6.9

They were dropped in 6.9 in c0a411904e15 (KVM: remove more traces of
device assignment UAPI).

Signed-off-by: Jiri Slaby <[email protected]>
---
 include/compat.h | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/include/compat.h b/include/compat.h
index 33132e22..915149dc 100644
--- a/include/compat.h
+++ b/include/compat.h
@@ -1038,6 +1038,43 @@ struct kvm_ppc_pvinfo {
 #define KVM_PPC_GET_PVINFO        _IOW(KVMIO,  0xa1, struct kvm_ppc_pvinfo)
 #endif
 
+#ifndef KVM_DEV_ASSIGN_ENABLE_IOMMU
+struct kvm_assigned_pci_dev {
+       __u32 assigned_dev_id;
+       __u32 busnr;
+       __u32 devfn;
+       __u32 flags;
+       __u32 segnr;
+       union {
+               __u32 reserved[11];
+       };
+};
+
+struct kvm_assigned_irq {
+       __u32 assigned_dev_id;
+       __u32 host_irq;
+       __u32 guest_irq;
+       __u32 flags;
+       union {
+               __u32 reserved[12];
+       };
+};
+
+struct kvm_assigned_msix_nr {
+       __u32 assigned_dev_id;
+       __u16 entry_nr;
+       __u16 padding;
+};
+
+struct kvm_assigned_msix_entry {
+       __u32 assigned_dev_id;
+       __u32 gsi;
+       __u16 entry;
+       __u16 padding[3];
+};
+
+#endif
+
 #ifndef KVM_SET_TSC_KHZ
 #define KVM_SET_TSC_KHZ           _IO(KVMIO,  0xa2)
 #endif
-- 
2.45.0


++++++ 0003-ioctls-kvm-make-s390-ioctls-s390-only.patch ++++++
From: Jiri Slaby <[email protected]>
Date: Thu, 16 May 2024 11:00:36 +0200
Subject: ioctls/kvm: make s390 ioctls s390-only
Git-repo: https://github.com/jirislaby/trinity
Git-commit: 44013fd01a1e857d5bcb79b80fa4c8656d43bde2
Patch-mainline: submitted, https://github.com/kernelslacker/trinity/pull/48
References: kernel 6.8 & 6.9

They are now s390-only since commit 71cd774ad2f9 (KVM: s390: move
s390-specific structs to uapi/asm/kvm.h).

Signed-off-by: Jiri Slaby <[email protected]>
---
 ioctls/kvm.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ioctls/kvm.c b/ioctls/kvm.c
index 30aeed7a..8a2ef713 100644
--- a/ioctls/kvm.c
+++ b/ioctls/kvm.c
@@ -15,8 +15,10 @@ static const struct ioctl kvm_ioctls[] = {
        IOCTL(KVM_SET_USER_MEMORY_REGION),
        IOCTL(KVM_SET_TSS_ADDR),
        IOCTL(KVM_SET_IDENTITY_MAP_ADDR),
+#if defined(__s390__)
        IOCTL(KVM_S390_UCAS_MAP),
        IOCTL(KVM_S390_UCAS_UNMAP),
+#endif
        IOCTL(KVM_S390_VCPU_FAULT),
        IOCTL(KVM_CREATE_IRQCHIP),
        IOCTL(KVM_IRQ_LINE),
-- 
2.45.0


++++++ 0004-ioctls-kvm-make-powerpc-ioctls-powerpc-only.patch ++++++
From: Jiri Slaby <[email protected]>
Date: Thu, 16 May 2024 11:01:06 +0200
Subject: ioctls/kvm: make powerpc ioctls powerpc-only
Git-repo: https://github.com/jirislaby/trinity
Git-commit: fd172db547d3510793b53ce43e384e7bca6974d0
Patch-mainline: submitted, https://github.com/kernelslacker/trinity/pull/48
References: kernel 6.8 & 6.9

They are now powerpc-only since commit d750951c9ed7 (KVM: powerpc: move
powerpc-specific structs to uapi/asm/kvm.h).

Signed-off-by: Jiri Slaby <[email protected]>
---
 ioctls/kvm.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ioctls/kvm.c b/ioctls/kvm.c
index 8a2ef713..fa2f9fff 100644
--- a/ioctls/kvm.c
+++ b/ioctls/kvm.c
@@ -42,7 +42,9 @@ static const struct ioctl kvm_ioctls[] = {
        IOCTL(KVM_IOEVENTFD),
        IOCTL(KVM_SET_CLOCK),
        IOCTL(KVM_GET_CLOCK),
+#if defined(__powerpc__)
        IOCTL(KVM_PPC_GET_PVINFO),
+#endif
        IOCTL(KVM_SET_TSC_KHZ),
        IOCTL(KVM_GET_TSC_KHZ),
        IOCTL(KVM_ASSIGN_SET_INTX_MASK),
-- 
2.45.0

Reply via email to