Skip to content

GitLab

Q
qemu
Commit 01383064 authored by Vladimir Bashkirtsev's avatar Vladimir Bashkirtsev
Browse files
Options

Updated qemu to 6.0.0

parent 7a44f3e8
Expand all Show whitespace changes
Inline Side-by-side
Showing with 71 additions and 948 deletions
Makefile
View file @ 01383064
...@@ -6,15 +6,15 @@ i386: ...@@ -6,15 +6,15 @@ i386:
mkdir tmp mkdir tmp
mount --bind tmp /var/tmp mount --bind tmp /var/tmp
tar xf qemu-5.2.0.tar.xz tar xf qemu-6.0.0.tar.xz
patch -Np1 -d qemu-5.2.0 < qemu-5.2.0-reduce_default_code_gen_buffer.patch patch -Np1 -d qemu-6.0.0 < qemu-6.0.0-reduce_default_code_gen_buffer.patch
patch -Np1 -d qemu-5.2.0 < qemu-5.2.0-allow_custom_size_sd.patch patch -Np1 -d qemu-6.0.0 < qemu-6.0.0-allow_custom_size_sd.patch
patch -Np1 -d qemu-5.2.0 < qemu-5.2.0-armv7_kvm_support.patch patch -Np1 -d qemu-6.0.0 < qemu-6.0.0-fix_test_timeout.patch
cd qemu-5.2.0 && ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --target-list=i386-softmmu,i386-linux-user cd qemu-6.0.0 && ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --target-list=i386-softmmu,i386-linux-user
$(MAKE) -C qemu-5.2.0 $(MAKE) -C qemu-6.0.0
$(MAKE) -C qemu-5.2.0 check $(MAKE) -C qemu-6.0.0 check
$(MAKE) -C qemu-5.2.0 install $(MAKE) -C qemu-6.0.0 install
rm -rf qemu-5.2.0 rm -rf qemu-6.0.0
umount /var/tmp umount /var/tmp
rm -rf tmp rm -rf tmp
...@@ -29,15 +29,15 @@ x86_64: ...@@ -29,15 +29,15 @@ x86_64:
mkdir tmp mkdir tmp
mount --bind tmp /var/tmp mount --bind tmp /var/tmp
tar xf qemu-5.2.0.tar.xz tar xf qemu-6.0.0.tar.xz
patch -Np1 -d qemu-5.2.0 < qemu-5.2.0-reduce_default_code_gen_buffer.patch patch -Np1 -d qemu-6.0.0 < qemu-6.0.0-reduce_default_code_gen_buffer.patch
patch -Np1 -d qemu-5.2.0 < qemu-5.2.0-allow_custom_size_sd.patch patch -Np1 -d qemu-6.0.0 < qemu-6.0.0-allow_custom_size_sd.patch
patch -Np1 -d qemu-5.2.0 < qemu-5.2.0-armv7_kvm_support.patch patch -Np1 -d qemu-6.0.0 < qemu-6.0.0-fix_test_timeout.patch
cd qemu-5.2.0 && ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --target-list=x86_64-softmmu,x86_64-linux-user cd qemu-6.0.0 && ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --target-list=x86_64-softmmu,x86_64-linux-user
$(MAKE) -C qemu-5.2.0 $(MAKE) -C qemu-6.0.0
$(MAKE) -C qemu-5.2.0 check $(MAKE) -C qemu-6.0.0 check
$(MAKE) -C qemu-5.2.0 install $(MAKE) -C qemu-6.0.0 install
rm -rf qemu-5.2.0 rm -rf qemu-6.0.0
if [ `uname -m` = 'x86_64' ] ; then \ if [ `uname -m` = 'x86_64' ] ; then \
install -v -m755 qemu-kvm-x86_64 /usr/bin/qemu-kvm ; \ install -v -m755 qemu-kvm-x86_64 /usr/bin/qemu-kvm ; \
...@@ -49,22 +49,22 @@ x86_64: ...@@ -49,22 +49,22 @@ x86_64:
rm -rf swap rm -rf swap
arm: arm:
dd if=/dev/zero of=swap bs=1048576 count=1024 dd if=/dev/zero of=swap bs=1048576 count=2048
chmod 600 swap chmod 600 swap
mkswap swap mkswap swap
swapon swap swapon swap
mkdir tmp mkdir tmp
mount --bind tmp /var/tmp mount --bind tmp /var/tmp
tar xf qemu-5.2.0.tar.xz tar xf qemu-6.0.0.tar.xz
patch -Np1 -d qemu-5.2.0 < qemu-5.2.0-reduce_default_code_gen_buffer.patch patch -Np1 -d qemu-6.0.0 < qemu-6.0.0-reduce_default_code_gen_buffer.patch
patch -Np1 -d qemu-5.2.0 < qemu-5.2.0-allow_custom_size_sd.patch patch -Np1 -d qemu-6.0.0 < qemu-6.0.0-allow_custom_size_sd.patch
patch -Np1 -d qemu-5.2.0 < qemu-5.2.0-armv7_kvm_support.patch patch -Np1 -d qemu-6.0.0 < qemu-6.0.0-fix_test_timeout.patch
cd qemu-5.2.0 && ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --target-list=arm-softmmu,arm-linux-user,armeb-linux-user cd qemu-6.0.0 && ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --target-list=arm-softmmu,arm-linux-user,armeb-linux-user
$(MAKE) -C qemu-5.2.0 $(MAKE) -C qemu-6.0.0
$(MAKE) -C qemu-5.2.0 check $(MAKE) -C qemu-6.0.0 check
$(MAKE) -C qemu-5.2.0 install $(MAKE) -C qemu-6.0.0 install
rm -rf qemu-5.2.0 rm -rf qemu-6.0.0
if [ `uname -m` = 'armv7l' ] ; then \ if [ `uname -m` = 'armv7l' ] ; then \
install -v -m755 qemu-kvm-armv7l /usr/bin/qemu-kvm ; \ install -v -m755 qemu-kvm-armv7l /usr/bin/qemu-kvm ; \
...@@ -76,22 +76,22 @@ arm: ...@@ -76,22 +76,22 @@ arm:
rm -rf swap rm -rf swap
aarch64: aarch64:
dd if=/dev/zero of=swap bs=1048576 count=1024 dd if=/dev/zero of=swap bs=1048576 count=2048
chmod 600 swap chmod 600 swap
mkswap swap mkswap swap
swapon swap swapon swap
mkdir tmp mkdir tmp
mount --bind tmp /var/tmp mount --bind tmp /var/tmp
tar xf qemu-5.2.0.tar.xz tar xf qemu-6.0.0.tar.xz
patch -Np1 -d qemu-5.2.0 < qemu-5.2.0-reduce_default_code_gen_buffer.patch patch -Np1 -d qemu-6.0.0 < qemu-6.0.0-reduce_default_code_gen_buffer.patch
patch -Np1 -d qemu-5.2.0 < qemu-5.2.0-allow_custom_size_sd.patch patch -Np1 -d qemu-6.0.0 < qemu-6.0.0-allow_custom_size_sd.patch
patch -Np1 -d qemu-5.2.0 < qemu-5.2.0-armv7_kvm_support.patch patch -Np1 -d qemu-6.0.0 < qemu-6.0.0-fix_test_timeout.patch
cd qemu-5.2.0 && ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --target-list=aarch64-softmmu,aarch64-linux-user,aarch64_be-linux-user cd qemu-6.0.0 && ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --target-list=aarch64-softmmu,aarch64-linux-user,aarch64_be-linux-user
$(MAKE) -C qemu-5.2.0 $(MAKE) -C qemu-6.0.0
$(MAKE) -C qemu-5.2.0 check $(MAKE) -C qemu-6.0.0 check
$(MAKE) -C qemu-5.2.0 install $(MAKE) -C qemu-6.0.0 install
rm -rf qemu-5.2.0 rm -rf qemu-6.0.0
if [ `uname -m` = 'aarch64' ] ; then \ if [ `uname -m` = 'aarch64' ] ; then \
install -v -m755 qemu-kvm-aarch64 /usr/bin/qemu-kvm ; \ install -v -m755 qemu-kvm-aarch64 /usr/bin/qemu-kvm ; \
......
qemu-5.2.0-armv7_kvm_support.patch deleted 100644 → 0
View file @ 7a44f3e8
This diff is collapsed.
qemu-5.2.0-allow_custom_size_sd.patch → qemu-6.0.0-allow_custom_size_sd.patch
View file @ 01383064
diff -uNr qemu-5.2.0/hw/sd/sd.c qemu-5.2.0-allow_custom_size_sd/hw/sd/sd.c diff -uNr qemu-6.0.0/hw/sd/sd.c qemu-6.0.0-allow_custom_size_sd/hw/sd/sd.c
--- qemu-5.2.0/hw/sd/sd.c 2020-12-09 03:29:44.000000000 +1030 --- qemu-6.0.0/hw/sd/sd.c 2021-04-30 02:48:58.000000000 +0930
+++ qemu-5.2.0-allow_custom_size_sd/hw/sd/sd.c 2022-03-29 03:07:56.808634756 +1030 +++ qemu-6.0.0-allow_custom_size_sd/hw/sd/sd.c 2023-08-25 13:23:36.741826182 +0930
@@ -32,7 +32,6 @@ @@ -32,7 +32,6 @@
#include "qemu/osdep.h" #include "qemu/osdep.h"
...@@ -9,13 +9,13 @@ diff -uNr qemu-5.2.0/hw/sd/sd.c qemu-5.2.0-allow_custom_size_sd/hw/sd/sd.c ...@@ -9,13 +9,13 @@ diff -uNr qemu-5.2.0/hw/sd/sd.c qemu-5.2.0-allow_custom_size_sd/hw/sd/sd.c
#include "hw/irq.h" #include "hw/irq.h"
#include "hw/registerfields.h" #include "hw/registerfields.h"
#include "sysemu/block-backend.h" #include "sysemu/block-backend.h"
@@ -2153,35 +2152,11 @@ @@ -2112,35 +2111,11 @@
} }
if (sd->blk) { if (sd->blk) {
- int64_t blk_size; - int64_t blk_size;
- -
if (blk_is_read_only(sd->blk)) { if (!blk_supports_write_perm(sd->blk)) {
error_setg(errp, "Cannot use read-only drive as SD card"); error_setg(errp, "Cannot use read-only drive as SD card");
return; return;
} }
......
qemu-6.0.0-fix_test_timeout.patch 0 → 100644
View file @ 01383064
diff -uNr qemu-6.0.0/tests/qemu-iotests/common.qemu qemu-6.0.0-fix_test_timeout/tests/qemu-iotests/common.qemu
--- qemu-6.0.0/tests/qemu-iotests/common.qemu 2021-04-30 02:48:58.000000000 +0930
+++ qemu-6.0.0-fix_test_timeout/tests/qemu-iotests/common.qemu 2024-02-07 11:30:07.847890210 +1030
@@ -25,7 +25,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
-QEMU_COMM_TIMEOUT=10
+QEMU_COMM_TIMEOUT=30
QEMU_FIFO_IN="${QEMU_TEST_DIR}/qmp-in-$$"
QEMU_FIFO_OUT="${QEMU_TEST_DIR}/qmp-out-$$"
diff -uNr qemu-6.0.0/tests/qemu-iotests/iotests.py qemu-6.0.0-fix_test_timeout/tests/qemu-iotests/iotests.py
--- qemu-6.0.0/tests/qemu-iotests/iotests.py 2021-04-30 02:48:58.000000000 +0930
+++ qemu-6.0.0-fix_test_timeout/tests/qemu-iotests/iotests.py 2024-02-07 11:30:35.690295043 +1030
@@ -1045,7 +1045,7 @@
self.assertTrue(event['data']['type'] in ['mirror', 'commit'])
def pause_wait(self, job_id='job0'):
- with Timeout(3, "Timeout waiting for job to pause"):
+ with Timeout(10, "Timeout waiting for job to pause"):
while True:
result = self.vm.qmp('query-block-jobs')
found = False
qemu-5.2.0-reduce_default_code_gen_buffer.patch → qemu-6.0.0-reduce_default_code_gen_buffer.patch
View file @ 01383064
diff -uNr qemu-5.2.0/accel/tcg/translate-all.c qemu-5.2.0-reduce_default_code_gen_buffer/accel/tcg/translate-all.c diff -uNr qemu-6.0.0/accel/tcg/translate-all.c qemu-6.0.0-reduce_default_code_gen_buffer/accel/tcg/translate-all.c
--- qemu-5.2.0/accel/tcg/translate-all.c 2020-12-09 03:29:44.000000000 +1030 --- qemu-6.0.0/accel/tcg/translate-all.c 2021-04-30 02:48:59.000000000 +0930
+++ qemu-5.2.0-reduce_default_code_gen_buffer/accel/tcg/translate-all.c 2022-03-17 18:41:11.235938587 +1030 +++ qemu-6.0.0-reduce_default_code_gen_buffer/accel/tcg/translate-all.c 2023-08-25 13:26:42.942132213 +0930
@@ -965,7 +965,7 @@ @@ -952,7 +952,7 @@
* Users running large scale system emulation may want to tweak their * Users running large scale system emulation may want to tweak their
* runtime setup via the tb-size control on the command line. * runtime setup via the tb-size control on the command line.
*/ */
......
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