Read about our upcoming Code of Conduct on this issue

Commit 68184082 authored by alex@thinkpad's avatar alex@thinkpad
Browse files

QEMU: updated gcc 7.x patch to also work with gcc 8.x

--HG--
branch : qemu
parent 70cfcb480f18
......@@ -490,9 +490,10 @@ cd ${QEMU_NAME}
mkdir -p hw/eos
cp -r ../$ML_PATH/contrib/qemu/eos/* hw/eos/
cp -r ../$ML_PATH/src/backtrace.[ch] hw/eos/dbi/
if gcc -v 2>&1 | grep -q "gcc version 7"; then
patch -N -p1 < ../$ML_PATH/contrib/qemu/$QEMU_NAME-gcc7.patch
git add -u . && git commit -q -m "$QEMU_NAME patched for gcc 7.x"
if gcc -v 2>&1 | grep -q "gcc version [789]"; then
# hopefully these will also work for gcc 9.x (not tested)
patch -N -p1 < ../$ML_PATH/contrib/qemu/$QEMU_NAME-gcc78.patch
git add -u . && git commit -q -m "$QEMU_NAME patched for gcc 7.x and 8.x"
fi
patch -N -p1 < ../$ML_PATH/contrib/qemu/$QEMU_NAME.patch
......
......@@ -24,6 +24,19 @@ index c5f8e8d..b242680 100644
bs->file->bs->exact_filename,
s->test_file->bs->exact_filename);
}
diff --git a/hw/char/exynos4210_uart.c b/hw/char/exynos4210_uart.c
index 215f962..53190a1 100644
--- a/hw/char/exynos4210_uart.c
+++ b/hw/char/exynos4210_uart.c
@@ -589,7 +589,7 @@ DeviceState *exynos4210_uart_create(hwaddr addr,
SysBusDevice *bus;
const char chr_name[] = "serial";
- char label[ARRAY_SIZE(chr_name) + 1];
+ char label[ARRAY_SIZE(chr_name) + 12];
dev = qdev_create(NULL, TYPE_EXYNOS4210_UART);
diff --git a/hw/usb/bus.c b/hw/usb/bus.c
index ee6b43a..c8a5f83 100644
--- a/hw/usb/bus.c
......@@ -38,7 +51,7 @@ index ee6b43a..c8a5f83 100644
downstream->hubcount = upstream->hubcount + 1;
} else {
diff --git a/net/slirp.c b/net/slirp.c
index f505570..1e36231 100644
index f505570..1c5c606 100644
--- a/net/slirp.c
+++ b/net/slirp.c
@@ -463,7 +463,7 @@ int net_slirp_redir(const char *redir_str)
......@@ -57,10 +70,23 @@ index f505570..1e36231 100644
- char smb_conf[128];
- char smb_cmdline[128];
+ char smb_conf[128+10];
+ char smb_cmdline[128+128];
+ char smb_cmdline[128+256];
struct passwd *passwd;
FILE *f;
diff --git a/qemu-char.c b/qemu-char.c
index 2969c44..84e13e4 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -87,7 +87,7 @@
#define READ_BUF_LEN 4096
#define READ_RETRIES 10
-#define CHR_MAX_FILENAME_SIZE 256
+#define CHR_MAX_FILENAME_SIZE 4096
#define TCP_MAX_FDS 16
/***********************************************************/
diff --git a/qga/commands-posix.c b/qga/commands-posix.c
index c2ff970..ae64df0 100644
--- a/qga/commands-posix.c
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment