rpm/qemu
SHA256
1
0
Fork 0
forked from pool/qemu
Code Pull Requests Activity

Accepting request 399560 from home:bfrogers:branches:Virtualization

Browse Source 
To add to the previous changes over the last day or so, we now are gcc6 and perl 5.24 compatible. yeah!

OBS-URL: https://build.opensuse.org/request/show/399560
OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=295
This commit is contained in:
Bruce Rogers 2016-06-01 21:35:28 +00:00 committed by Git OBS Bridge
parent 1b4a71c4b8
commit e07f3c2588
13 changed files with 1370 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
_constraints
View File

@ -9,4 +9,16 @@
</physicalmemory>
</hardware>
</overwrite>
<overwrite>
<conditions>
<arch>ppc64</arch>
<arch>ppc64le</arch>
<package>qemu</package>
</conditions>
<hardware>
<disk>
<size unit="G">7</size>
</disk>
</hardware>
</overwrite>
</constraints>

1003
ipxe-ath-Fix-building-with-GCC-6.patch Normal file
View File

File diff suppressed because it is too large Load Diff

52
ipxe-ath9k-Fix-buffer-overrun-for-ar9287.patch Normal file
View File

@ -0,0 +1,52 @@
From 858f56e68b7089a3dc8473bb94dd198554a24eeb Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Sat, 7 May 2016 21:20:37 +0200
Subject: [PATCH] [ath9k] Fix buffer overrun for ar9287
This backport is from linux kernel upstream commit 83d6f1f ("ath9k:
fix buffer overrun for ar9287").
Signed-off-by: Christian Hesse <mail@eworm.de>
Signed-off-by: Michael Brown <mcb30@ipxe.org>
Signed-off-by: Bruce Rogers <brogers@suse.com>
---
src/drivers/net/ath/ath9k/ath9k_eeprom.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/drivers/net/ath/ath9k/ath9k_eeprom.c b/src/drivers/net/ath/ath9k/ath9k_eeprom.c
index f552aca..a204237 100644
--- a/src/drivers/net/ath/ath9k/ath9k_eeprom.c
+++ b/src/drivers/net/ath/ath9k/ath9k_eeprom.c
@@ -368,10 +368,9 @@ void ath9k_hw_get_gain_boundaries_pdadcs(struct ath_hw *ah,
if (match) {
if (AR_SREV_9287(ah)) {
- /* FIXME: array overrun? */
for (i = 0; i < numXpdGains; i++) {
minPwrT4[i] = data_9287[idxL].pwrPdg[i][0];
- maxPwrT4[i] = data_9287[idxL].pwrPdg[i][4];
+ maxPwrT4[i] = data_9287[idxL].pwrPdg[i][intercepts - 1];
ath9k_hw_fill_vpd_table(minPwrT4[i], maxPwrT4[i],
data_9287[idxL].pwrPdg[i],
data_9287[idxL].vpdPdg[i],
@@ -381,7 +380,7 @@ void ath9k_hw_get_gain_boundaries_pdadcs(struct ath_hw *ah,
} else if (eeprom_4k) {
for (i = 0; i < numXpdGains; i++) {
minPwrT4[i] = data_4k[idxL].pwrPdg[i][0];
- maxPwrT4[i] = data_4k[idxL].pwrPdg[i][4];
+ maxPwrT4[i] = data_4k[idxL].pwrPdg[i][intercepts - 1];
ath9k_hw_fill_vpd_table(minPwrT4[i], maxPwrT4[i],
data_4k[idxL].pwrPdg[i],
data_4k[idxL].vpdPdg[i],
@@ -391,7 +390,7 @@ void ath9k_hw_get_gain_boundaries_pdadcs(struct ath_hw *ah,
} else {
for (i = 0; i < numXpdGains; i++) {
minPwrT4[i] = data_def[idxL].pwrPdg[i][0];
- maxPwrT4[i] = data_def[idxL].pwrPdg[i][4];
+ maxPwrT4[i] = data_def[idxL].pwrPdg[i][intercepts - 1];
ath9k_hw_fill_vpd_table(minPwrT4[i], maxPwrT4[i],
data_def[idxL].pwrPdg[i],
data_def[idxL].vpdPdg[i],
--
1.9.0

28
ipxe-legacy-Fix-building-with-GCC-6.patch Normal file
View File

@ -0,0 +1,28 @@
From a5885fbc19c4b60dc1a21624d1a9d1b77a93504e Mon Sep 17 00:00:00 2001
From: Michael Brown <mcb30@ipxe.org>
Date: Wed, 4 May 2016 15:58:14 +0100
Subject: [PATCH] [legacy] Fix building with GCC 6
Signed-off-by: Michael Brown <mcb30@ipxe.org>
Signed-off-by: Bruce Rogers <brogers@suse.com>
---
src/include/nic.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/include/nic.h b/src/include/nic.h
index 4c91f57..8b06e88 100644
--- a/src/include/nic.h
+++ b/src/include/nic.h
@@ -209,7 +209,8 @@ static inline void * legacy_isa_get_drvdata ( void *hwdev ) {
#undef DRIVER
#define DRIVER(_name_text,_unused2,_unused3,_name,_probe,_disable) \
- static const char _name ## _text[] = _name_text; \
+ static __attribute__ (( unused )) const char \
+ _name ## _text[] = _name_text; \
static inline int \
_name ## _probe ( struct nic *nic, void *hwdev ) { \
return _probe ( nic, hwdev ); \
--
1.9.0

67
ipxe-mucurses-Fix-GCC-6-nonnull-compare-errors.patch Normal file
View File

@ -0,0 +1,67 @@
From e2f14c2f8c10674dbbd4f1228d79dc4c9be213b5 Mon Sep 17 00:00:00 2001
From: Vinson Lee <vlee@freedesktop.org>
Date: Fri, 15 Apr 2016 22:38:35 +0000
Subject: [PATCH] [mucurses] Fix GCC 6 nonnull-compare errors
Remove null checks for arguments declared as nonnull.
Signed-off-by: Vinson Lee <vlee@freedesktop.org>
Signed-off-by: Michael Brown <mcb30@ipxe.org>
Signed-off-by: Bruce Rogers <brogers@suse.com>
---
src/hci/mucurses/windows.c | 11 -----------
1 file changed, 11 deletions(-)
diff --git a/src/hci/mucurses/windows.c b/src/hci/mucurses/windows.c
index 7f39bde..5f5d1f4 100644
--- a/src/hci/mucurses/windows.c
+++ b/src/hci/mucurses/windows.c
@@ -18,9 +18,6 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
* @ret rc return status code
*/
int delwin ( WINDOW *win ) {
- if ( win == NULL )
- return ERR;
-
/* I think we should blank the region covered by the window -
ncurses doesn't do this, but they have a buffer, so they
may just be deleting from an offscreen context whereas we
@@ -51,8 +48,6 @@ int delwin ( WINDOW *win ) {
WINDOW *derwin ( WINDOW *parent, int nlines, int ncols,
int begin_y, int begin_x ) {
WINDOW *child;
- if ( parent == NULL )
- return NULL;
if ( ( child = malloc( sizeof( WINDOW ) ) ) == NULL )
return NULL;
if ( ( (unsigned)ncols > parent->width ) ||
@@ -75,8 +70,6 @@ WINDOW *derwin ( WINDOW *parent, int nlines, int ncols,
*/
WINDOW *dupwin ( WINDOW *orig ) {
WINDOW *copy;
- if ( orig == NULL )
- return NULL;
if ( ( copy = malloc( sizeof( WINDOW ) ) ) == NULL )
return NULL;
copy->scr = orig->scr;
@@ -99,8 +92,6 @@ WINDOW *dupwin ( WINDOW *orig ) {
* @ret rc return status code
*/
int mvwin ( WINDOW *win, int y, int x ) {
- if ( win == NULL )
- return ERR;
if ( ( ( (unsigned)y + win->height ) > LINES ) ||
( ( (unsigned)x + win->width ) > COLS ) )
return ERR;
@@ -149,8 +140,6 @@ WINDOW *newwin ( int nlines, int ncols, int begin_y, int begin_x ) {
WINDOW *subwin ( WINDOW *parent, int nlines, int ncols,
int begin_y, int begin_x ) {
WINDOW *child;
- if ( parent == NULL )
- return NULL;
if ( ( child = malloc( sizeof( WINDOW ) ) ) == NULL )
return NULL;
child = newwin( nlines, ncols, begin_y, begin_x );
--
1.9.0

50
ipxe-sis190-Fix-building-with-GCC-6.patch Normal file
View File

@ -0,0 +1,50 @@
From 65b32a0b7000f70a5bb1d33190d40f9b04c93172 Mon Sep 17 00:00:00 2001
From: Michael Brown <mcb30@ipxe.org>
Date: Wed, 4 May 2016 15:53:52 +0100
Subject: [PATCH] [sis190] Fix building with GCC 6
Signed-off-by: Michael Brown <mcb30@ipxe.org>
Signed-off-by: Bruce Rogers <brogers@suse.com>
---
src/drivers/net/sis190.c | 6 ------
src/drivers/net/sis190.h | 7 -------
2 files changed, 13 deletions(-)
diff --git a/src/drivers/net/sis190.c b/src/drivers/net/sis190.c
index 991c30f..81f3d98 100644
--- a/src/drivers/net/sis190.c
+++ b/src/drivers/net/sis190.c
@@ -72,12 +72,6 @@ struct pci_driver sis190_isa_bridge_driver __pci_driver = {
static const u32 sis190_intr_mask =
RxQEmpty | RxQInt | TxQ1Int | TxQ0Int | RxHalt | TxHalt | LinkChange;
-/*
- * Maximum number of multicast addresses to filter (vs. Rx-all-multicast).
- * The chips use a 64 element hash table based on the Ethernet CRC.
- */
-static const int multicast_filter_limit = 32;
-
static void __mdio_cmd(void *ioaddr, u32 ctl)
{
unsigned int i;
diff --git a/src/drivers/net/sis190.h b/src/drivers/net/sis190.h
index 0551333..79f94d2 100644
--- a/src/drivers/net/sis190.h
+++ b/src/drivers/net/sis190.h
@@ -297,13 +297,6 @@ static struct mii_chip_info {
{ NULL, { 0x00, 0x00 }, 0, 0 }
};
-static const struct {
- const char *name;
-} sis_chip_info[] = {
- { "SiS 190 PCI Fast Ethernet adapter" },
- { "SiS 191 PCI Gigabit Ethernet adapter" },
-};
-
static void sis190_phy_task(struct sis190_private *tp);
static void sis190_free(struct net_device *dev);
static inline void sis190_init_rxfilter(struct net_device *dev);
--
1.9.0

37
ipxe-skge-Fix-building-with-GCC-6.patch Normal file
View File

@ -0,0 +1,37 @@
From 76ec2a0540b25dbd183b9ce185583a4b24278cf1 Mon Sep 17 00:00:00 2001
From: Michael Brown <mcb30@ipxe.org>
Date: Wed, 4 May 2016 15:54:10 +0100
Subject: [PATCH] [skge] Fix building with GCC 6
Signed-off-by: Michael Brown <mcb30@ipxe.org>
Signed-off-by: Bruce Rogers <brogers@suse.com>
---
src/drivers/net/skge.c | 5 -----
1 file changed, 5 deletions(-)
diff --git a/src/drivers/net/skge.c b/src/drivers/net/skge.c
index 6384e76..c326422 100755
--- a/src/drivers/net/skge.c
+++ b/src/drivers/net/skge.c
@@ -84,9 +84,6 @@ static struct net_device_operations skge_operations = {
/* Avoid conditionals by using array */
static const int txqaddr[] = { Q_XA1, Q_XA2 };
static const int rxqaddr[] = { Q_R1, Q_R2 };
-static const u32 rxirqmask[] = { IS_R1_F, IS_R2_F };
-static const u32 txirqmask[] = { IS_XA1_F, IS_XA2_F };
-static const u32 napimask[] = { IS_R1_F|IS_XA1_F, IS_R2_F|IS_XA2_F };
static const u32 portmask[] = { IS_PORT_1, IS_PORT_2 };
/* Determine supported/advertised modes based on hardware.
@@ -1922,8 +1919,6 @@ static void skge_tx_clean(struct net_device *dev)
skge->tx_ring.to_clean = e;
}
-static const u8 pause_mc_addr[ETH_ALEN] = { 0x1, 0x80, 0xc2, 0x0, 0x0, 0x1 };
-
static inline u16 phy_length(const struct skge_hw *hw, u32 status)
{
if (hw->chip_id == CHIP_ID_GENESIS)
--
1.9.0

33
ipxe-util-v5.24-perl-errors-on-redeclare.patch Normal file
View File

@ -0,0 +1,33 @@
From 8eed6cfa2540976fab0e6ce93c82f413cf3f4e5e Mon Sep 17 00:00:00 2001
From: Bruce Rogers <brogers@suse.com>
Date: Wed, 1 Jun 2016 13:00:46 -0600
Subject: [PATCH] util: v5.24 perl errors on redeclare
I get this error using perl v5.24:
Can't redeclare "my" in "my" at ./util/parserom.pl
line 160, near ", "
From what I can gather, we don't need those additional
"my"'s in the statement.
Signed-off-by: Bruce Rogers <brogers@suse.com>
---
src/util/parserom.pl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/util/parserom.pl b/src/util/parserom.pl
index 28df606..5a849a5 100755
--- a/src/util/parserom.pl
+++ b/src/util/parserom.pl
@@ -157,7 +157,7 @@ sub process_isa_rom {
# Output Makefile rules for the specified ROM declarations
sub print_make_rules {
- my ( $state, my $image, my $desc, my $vendor, my $device, my $dup ) = @_;
+ my ( $state, $image, $desc, $vendor, $device, $dup ) = @_;
unless ( $state->{'is_header_printed'} ) {
print "# NIC\t\n";
print "# NIC\tfamily\t$state->{family}\n";
--
1.9.0

15
qemu-testsuite.changes
View File

@ -1,3 +1,18 @@
-------------------------------------------------------------------
Wed Jun 1 17:14:40 UTC 2016 - brogers@suse.com
- Fix build compatibility with gcc6 wrt ipxe rom where compiler
warnings are treated as errors.
ipxe-ath9k-Fix-buffer-overrun-for-ar9287.patch
ipxe-mucurses-Fix-GCC-6-nonnull-compare-errors.patch
ipxe-sis190-Fix-building-with-GCC-6.patch
ipxe-skge-Fix-building-with-GCC-6.patch
ipxe-ath-Fix-building-with-GCC-6.patch
ipxe-legacy-Fix-building-with-GCC-6.patch
- Fix ipxe build script which fails under perl v5.24
ipxe-util-v5.24-perl-errors-on-redeclare.patch
- Specify build time disk space requirements for ppc64 and ppc64le
-------------------------------------------------------------------
Thu May 26 16:23:33 UTC 2016 - brogers@suse.com

20
qemu-testsuite.spec
View File

@ -117,10 +117,19 @@ Patch0048: 0048-vga-add-sr_vbe-register-set.patch
# Please do not add QEMU patches manually here.
# Run update_git.sh to regenerate this queue.
# SeaBIOS
%if %{build_x86_fw_from_source}
# SeaBIOS
# PATCH-FIX-OPENSUSE seabios_128kb.patch brogers@suse.com -- make it fit
Patch1000: seabios_128kb.patch
# ipxe
Patch1100: ipxe-ath9k-Fix-buffer-overrun-for-ar9287.patch
Patch1101: ipxe-mucurses-Fix-GCC-6-nonnull-compare-errors.patch
Patch1102: ipxe-sis190-Fix-building-with-GCC-6.patch
Patch1103: ipxe-skge-Fix-building-with-GCC-6.patch
Patch1104: ipxe-ath-Fix-building-with-GCC-6.patch
Patch1105: ipxe-legacy-Fix-building-with-GCC-6.patch
Patch1106: ipxe-util-v5.24-perl-errors-on-redeclare.patch
%endif
# this is to make lint happy
@ -704,6 +713,15 @@ This package provides a service file for starting and stopping KSM.
pushd roms/seabios
%patch1000 -p1
popd
pushd roms/ipxe
%patch1100 -p1
%patch1101 -p1
%patch1102 -p1
%patch1103 -p1
%patch1104 -p1
%patch1105 -p1
%patch1106 -p1
popd
# as a safeguard, delete the firmware files that we intend to build
for i in %built_firmware_files

15
qemu.changes
View File

@ -1,3 +1,18 @@
-------------------------------------------------------------------
Wed Jun 1 17:14:40 UTC 2016 - brogers@suse.com
- Fix build compatibility with gcc6 wrt ipxe rom where compiler
warnings are treated as errors.
ipxe-ath9k-Fix-buffer-overrun-for-ar9287.patch
ipxe-mucurses-Fix-GCC-6-nonnull-compare-errors.patch
ipxe-sis190-Fix-building-with-GCC-6.patch
ipxe-skge-Fix-building-with-GCC-6.patch
ipxe-ath-Fix-building-with-GCC-6.patch
ipxe-legacy-Fix-building-with-GCC-6.patch
- Fix ipxe build script which fails under perl v5.24
ipxe-util-v5.24-perl-errors-on-redeclare.patch
- Specify build time disk space requirements for ppc64 and ppc64le
-------------------------------------------------------------------
Thu May 26 16:23:33 UTC 2016 - brogers@suse.com

20
qemu.spec
View File

@ -117,10 +117,19 @@ Patch0048: 0048-vga-add-sr_vbe-register-set.patch
# Please do not add QEMU patches manually here.
# Run update_git.sh to regenerate this queue.
# SeaBIOS
%if %{build_x86_fw_from_source}
# SeaBIOS
# PATCH-FIX-OPENSUSE seabios_128kb.patch brogers@suse.com -- make it fit
Patch1000: seabios_128kb.patch
# ipxe
Patch1100: ipxe-ath9k-Fix-buffer-overrun-for-ar9287.patch
Patch1101: ipxe-mucurses-Fix-GCC-6-nonnull-compare-errors.patch
Patch1102: ipxe-sis190-Fix-building-with-GCC-6.patch
Patch1103: ipxe-skge-Fix-building-with-GCC-6.patch
Patch1104: ipxe-ath-Fix-building-with-GCC-6.patch
Patch1105: ipxe-legacy-Fix-building-with-GCC-6.patch
Patch1106: ipxe-util-v5.24-perl-errors-on-redeclare.patch
%endif
# this is to make lint happy
@ -704,6 +713,15 @@ This package provides a service file for starting and stopping KSM.
pushd roms/seabios
%patch1000 -p1
popd
pushd roms/ipxe
%patch1100 -p1
%patch1101 -p1
%patch1102 -p1
%patch1103 -p1
%patch1104 -p1
%patch1105 -p1
%patch1106 -p1
popd
# as a safeguard, delete the firmware files that we intend to build
for i in %built_firmware_files

21
qemu.spec.in
View File

@ -70,10 +70,19 @@ PATCH_FILES
# Please do not add QEMU patches manually here.
# Run update_git.sh to regenerate this queue.
# SeaBIOS
%if %{build_x86_fw_from_source}
# SeaBIOS
# PATCH-FIX-OPENSUSE seabios_128kb.patch brogers@suse.com -- make it fit
Patch1000: seabios_128kb.patch
# ipxe
Patch1100: ipxe-ath9k-Fix-buffer-overrun-for-ar9287.patch
Patch1101: ipxe-mucurses-Fix-GCC-6-nonnull-compare-errors.patch
Patch1102: ipxe-sis190-Fix-building-with-GCC-6.patch
Patch1103: ipxe-skge-Fix-building-with-GCC-6.patch
Patch1104: ipxe-ath-Fix-building-with-GCC-6.patch
Patch1105: ipxe-legacy-Fix-building-with-GCC-6.patch
Patch1106: ipxe-util-v5.24-perl-errors-on-redeclare.patch
%endif
# this is to make lint happy
@ -610,6 +619,16 @@ PATCH_EXEC
pushd roms/seabios
%patch1000 -p1
popd
pushd roms/ipxe
%patch1100 -p1
%patch1101 -p1
%patch1102 -p1
%patch1103 -p1
%patch1104 -p1
%patch1105 -p1
%patch1106 -p1
popd
# as a safeguard, delete the firmware files that we intend to build
for i in %built_firmware_files