Update to 0.14.0 release
This commit is contained in:
parent
b3e15ae233
commit
6e62a18bd7
@ -1,75 +0,0 @@
|
|||||||
From beda5ec7a6848be20c0cac2a9a8ef2a41e8069c1 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Frediano Ziglio <fziglio@redhat.com>
|
|
||||||
Date: Thu, 28 Jun 2018 21:30:21 +0100
|
|
||||||
Subject: [PATCH] qxl_dev: Align QXLRam to 4 bytes
|
|
||||||
|
|
||||||
This avoids compilers detect misaligned access which can lead to
|
|
||||||
warnings.
|
|
||||||
In QEMU the structure is allocated at the beginning of a 4Kb page,
|
|
||||||
in Xspice is allocated with a calloc, so the structure will end up 4
|
|
||||||
bytes aligned as well with these users. We are not aware of other users
|
|
||||||
of QXLRam, but if there was, it's likely the struct would be at least
|
|
||||||
naturally aligned, so this change should not impact anyone.
|
|
||||||
Aligning to 4 bytes maintains the size of the structure unchanged
|
|
||||||
avoiding possible ABI changes.
|
|
||||||
clang currently generates an invalid function call if a misaligned
|
|
||||||
4 byte atomic operation is detected.
|
|
||||||
|
|
||||||
This fixes https://bugzilla.redhat.com/show_bug.cgi?id=1565766
|
|
||||||
|
|
||||||
Signed-off-by: Frediano Ziglio <fziglio@redhat.com>
|
|
||||||
Acked-by: Christophe Fergeau <cfergeau@redhat.com>
|
|
||||||
---
|
|
||||||
spice/end-packed.h | 1 +
|
|
||||||
spice/qxl_dev.h | 2 +-
|
|
||||||
spice/start-packed.h | 2 ++
|
|
||||||
3 files changed, 4 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/spice/end-packed.h b/spice/end-packed.h
|
|
||||||
index 1acea18..0efd588 100644
|
|
||||||
--- a/spice/end-packed.h
|
|
||||||
+++ b/spice/end-packed.h
|
|
||||||
@@ -32,6 +32,7 @@
|
|
||||||
/* See start-packed.h for details */
|
|
||||||
|
|
||||||
#undef SPICE_ATTR_PACKED
|
|
||||||
+#undef SPICE_ATTR_ALIGNED
|
|
||||||
|
|
||||||
#if defined(__MINGW32__) || !defined(__GNUC__)
|
|
||||||
#pragma pack(pop)
|
|
||||||
diff --git a/spice/qxl_dev.h b/spice/qxl_dev.h
|
|
||||||
index 9e753c4..a9cc4f4 100644
|
|
||||||
--- a/spice/qxl_dev.h
|
|
||||||
+++ b/spice/qxl_dev.h
|
|
||||||
@@ -253,7 +253,7 @@ SPICE_RING_DECLARE(QXLReleaseRing, uint64_t, QXL_RELEASE_RING_SIZE);
|
|
||||||
#define QXL_INTERRUPT_CLIENT_MONITORS_CONFIG (1 << 5)
|
|
||||||
|
|
||||||
/* qxl-1 compat: append only */
|
|
||||||
-typedef struct SPICE_ATTR_PACKED QXLRam {
|
|
||||||
+typedef struct SPICE_ATTR_ALIGNED(4) SPICE_ATTR_PACKED QXLRam {
|
|
||||||
uint32_t magic;
|
|
||||||
uint32_t int_pending;
|
|
||||||
uint32_t int_mask;
|
|
||||||
diff --git a/spice/start-packed.h b/spice/start-packed.h
|
|
||||||
index ab3fa98..de0c595 100644
|
|
||||||
--- a/spice/start-packed.h
|
|
||||||
+++ b/spice/start-packed.h
|
|
||||||
@@ -48,6 +48,7 @@
|
|
||||||
#ifdef __GNUC__
|
|
||||||
|
|
||||||
#define SPICE_ATTR_PACKED __attribute__ ((__packed__))
|
|
||||||
+#define SPICE_ATTR_ALIGNED(n) __attribute__ ((__aligned__ (n)))
|
|
||||||
|
|
||||||
#ifdef __MINGW32__
|
|
||||||
#pragma pack(push,1)
|
|
||||||
@@ -58,6 +59,7 @@
|
|
||||||
#pragma pack(push)
|
|
||||||
#pragma pack(1)
|
|
||||||
#define SPICE_ATTR_PACKED
|
|
||||||
+#define SPICE_ATTR_ALIGNED(n) __declspec (align (n))
|
|
||||||
#pragma warning(disable:4200)
|
|
||||||
#pragma warning(disable:4103)
|
|
||||||
|
|
||||||
--
|
|
||||||
2.17.1
|
|
||||||
|
|
2
sources
2
sources
@ -1 +1 @@
|
|||||||
SHA512 (spice-protocol-0.12.15.tar.bz2) = 1a3c3c26239d092c6c24708f5bd070ae1cb146f92f2329b63bec2d21a7276cdf1b9567f434bfbeeb1f7cd7dd4ad47494c51dcdbbba5af8e271e66dfe5b11de9d
|
SHA512 (spice-protocol-0.14.0.tar.bz2) = 797df5f529731e9fd395b5946af2490ecf02c26982cc4a0aef24c1766887a35222f68525a996f8bc7459c2c4a25fde0c9a10c489ee6cab6eed7a68a9b5d90f76
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
Name: spice-protocol
|
Name: spice-protocol
|
||||||
Version: 0.12.15
|
Version: 0.14.0
|
||||||
Release: 2%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: Spice protocol header files
|
Summary: Spice protocol header files
|
||||||
# Main headers are BSD, controller / foreign menu are LGPL
|
# Main headers are BSD, controller / foreign menu are LGPL
|
||||||
License: BSD and LGPLv2+
|
License: BSD and LGPLv2+
|
||||||
@ -25,12 +25,15 @@ make DESTDIR=%{buildroot} install
|
|||||||
|
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%doc COPYING NEWS
|
%doc COPYING CHANGELOG.md
|
||||||
%{_includedir}/spice-1
|
%{_includedir}/spice-1
|
||||||
%{_datadir}/pkgconfig/spice-protocol.pc
|
%{_datadir}/pkgconfig/spice-protocol.pc
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Apr 12 2019 Victor Toso <victortoso@redhat.com> - 0.14.0-1
|
||||||
|
- Update to 0.14.0 release
|
||||||
|
|
||||||
* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.12.15-2
|
* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.12.15-2
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user