Accepting request 493037 from home:bfrogers:branches:Virtualization
Fix build issues for some older distros. Also includes fixing broken parts of spec file when not building x86 firmware. OBS-URL: https://build.opensuse.org/request/show/493037 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=338
This commit is contained in:
parent
696d75f1f9
commit
f099b2fad1
@ -8,7 +8,7 @@ Subject: [PATCH] XXX dont dump core on sigabort
|
||||
1 file changed, 6 insertions(+)
|
||||
|
||||
diff --git a/linux-user/signal.c b/linux-user/signal.c
|
||||
index a67db04..a11728f 100644
|
||||
index a67db04e1a..a11728f6e0 100644
|
||||
--- a/linux-user/signal.c
|
||||
+++ b/linux-user/signal.c
|
||||
@@ -560,6 +560,10 @@ static void QEMU_NORETURN dump_core_and_abort(int target_sig)
|
||||
|
@ -14,7 +14,7 @@ Signed-off-by: Andreas Färber <afaerber@suse.de>
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/scripts/qemu-binfmt-conf.sh b/scripts/qemu-binfmt-conf.sh
|
||||
index 0f1aa63..9fcd95a 100755
|
||||
index 0f1aa63872..9fcd95a435 100755
|
||||
--- a/scripts/qemu-binfmt-conf.sh
|
||||
+++ b/scripts/qemu-binfmt-conf.sh
|
||||
@@ -264,7 +264,7 @@ BINFMT_SET=qemu_register_interpreter
|
||||
|
@ -13,7 +13,7 @@ Signed-off-by: Ulrich Hecht <uli@suse.de>
|
||||
2 files changed, 24 insertions(+)
|
||||
|
||||
diff --git a/include/exec/user/thunk.h b/include/exec/user/thunk.h
|
||||
index f19ef4b..b2659e0 100644
|
||||
index f19ef4b230..b2659e0def 100644
|
||||
--- a/include/exec/user/thunk.h
|
||||
+++ b/include/exec/user/thunk.h
|
||||
@@ -37,6 +37,7 @@ typedef enum argtype {
|
||||
@ -41,7 +41,7 @@ index f19ef4b..b2659e0 100644
|
||||
case TYPE_LONGLONG:
|
||||
case TYPE_ULONGLONG:
|
||||
diff --git a/thunk.c b/thunk.c
|
||||
index 2dac366..0eb7286 100644
|
||||
index 2dac36666d..0eb72861fe 100644
|
||||
--- a/thunk.c
|
||||
+++ b/thunk.c
|
||||
@@ -37,6 +37,7 @@ static inline const argtype *thunk_type_next(const argtype *type_ptr)
|
||||
|
@ -27,7 +27,7 @@ Signed-off-by: Bruce Rogers <brogers@suse.com>
|
||||
create mode 100644 linux-user/syscall_types_alsa.h
|
||||
|
||||
diff --git a/linux-user/ioctls.h b/linux-user/ioctls.h
|
||||
index e6997ff..ea335de 100644
|
||||
index e6997ff230..ea335de680 100644
|
||||
--- a/linux-user/ioctls.h
|
||||
+++ b/linux-user/ioctls.h
|
||||
@@ -359,6 +359,11 @@
|
||||
@ -44,7 +44,7 @@ index e6997ff..ea335de 100644
|
||||
IOCTL(LOOP_SET_STATUS, IOC_W, MK_PTR(MK_STRUCT(STRUCT_loop_info)))
|
||||
diff --git a/linux-user/ioctls_alsa.h b/linux-user/ioctls_alsa.h
|
||||
new file mode 100644
|
||||
index 0000000..c2aa542
|
||||
index 0000000000..c2aa542c3b
|
||||
--- /dev/null
|
||||
+++ b/linux-user/ioctls_alsa.h
|
||||
@@ -0,0 +1,467 @@
|
||||
@ -517,7 +517,7 @@ index 0000000..c2aa542
|
||||
+IOCTL( SND_SSCAPE_LOAD_MCODE , IOC_W, MK_PTR(MK_STRUCT(STRUCT_sscape_microcode)) )
|
||||
diff --git a/linux-user/ioctls_alsa_structs.h b/linux-user/ioctls_alsa_structs.h
|
||||
new file mode 100644
|
||||
index 0000000..e09a30d
|
||||
index 0000000000..e09a30defb
|
||||
--- /dev/null
|
||||
+++ b/linux-user/ioctls_alsa_structs.h
|
||||
@@ -0,0 +1,1740 @@
|
||||
@ -2262,7 +2262,7 @@ index 0000000..e09a30d
|
||||
+ unsigned char *code;
|
||||
+};
|
||||
diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h
|
||||
index 40c5027..a34551d 100644
|
||||
index 40c5027e93..a34551debc 100644
|
||||
--- a/linux-user/syscall_defs.h
|
||||
+++ b/linux-user/syscall_defs.h
|
||||
@@ -2802,6 +2802,8 @@ struct target_ucred {
|
||||
@ -2275,7 +2275,7 @@ index 40c5027..a34551d 100644
|
||||
|
||||
#define TARGET_SIGEV_MAX_SIZE 64
|
||||
diff --git a/linux-user/syscall_types.h b/linux-user/syscall_types.h
|
||||
index 24631b0..80ac53a 100644
|
||||
index 24631b09be..80ac53a8ed 100644
|
||||
--- a/linux-user/syscall_types.h
|
||||
+++ b/linux-user/syscall_types.h
|
||||
@@ -89,6 +89,11 @@ STRUCT(buffmem_desc,
|
||||
@ -2292,7 +2292,7 @@ index 24631b0..80ac53a 100644
|
||||
TYPE_INT, /* lo_number */
|
||||
diff --git a/linux-user/syscall_types_alsa.h b/linux-user/syscall_types_alsa.h
|
||||
new file mode 100644
|
||||
index 0000000..fa7a18d
|
||||
index 0000000000..fa7a18d755
|
||||
--- /dev/null
|
||||
+++ b/linux-user/syscall_types_alsa.h
|
||||
@@ -0,0 +1,1330 @@
|
||||
|
@ -12,7 +12,7 @@ Signed-off-by: Ulrich Hecht <uli@suse.de>
|
||||
1 file changed, 14 insertions(+)
|
||||
|
||||
diff --git a/linux-user/mmap.c b/linux-user/mmap.c
|
||||
index 4888f53..a3fcea2 100644
|
||||
index 4888f53139..a3fcea263f 100644
|
||||
--- a/linux-user/mmap.c
|
||||
+++ b/linux-user/mmap.c
|
||||
@@ -357,6 +357,9 @@ abi_ulong mmap_find_vma(abi_ulong start, abi_ulong size)
|
||||
|
@ -9,7 +9,7 @@ No clue what this is for.
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
|
||||
index cec8428..03c3576 100644
|
||||
index cec8428589..03c3576dab 100644
|
||||
--- a/linux-user/syscall.c
|
||||
+++ b/linux-user/syscall.c
|
||||
@@ -8914,6 +8914,8 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
|
||||
|
@ -12,7 +12,7 @@ Signed-off-by: Ulrich Hecht <uli@suse.de>
|
||||
1 file changed, 6 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
|
||||
index 03c3576..891ee1c 100644
|
||||
index 03c3576dab..891ee1c6ea 100644
|
||||
--- a/linux-user/syscall.c
|
||||
+++ b/linux-user/syscall.c
|
||||
@@ -5611,7 +5611,12 @@ static abi_long do_ioctl(int fd, int cmd, abi_long arg)
|
||||
|
@ -15,7 +15,7 @@ Signed-off-by: Ulrich Hecht <uli@suse.de>
|
||||
1 file changed, 6 insertions(+)
|
||||
|
||||
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
|
||||
index 891ee1c..2f82a7d 100644
|
||||
index 891ee1c6ea..2f82a7d1a6 100644
|
||||
--- a/linux-user/syscall.c
|
||||
+++ b/linux-user/syscall.c
|
||||
@@ -5648,6 +5648,11 @@ static abi_long do_ioctl(int fd, int cmd, abi_long arg)
|
||||
|
@ -37,7 +37,7 @@ Signed-off-by: Andreas Färber <afaerber@suse.de>
|
||||
create mode 100644 linux-user/binfmt.c
|
||||
|
||||
diff --git a/Makefile.target b/Makefile.target
|
||||
index 7df2b8c..85ae084 100644
|
||||
index 7df2b8c149..85ae084545 100644
|
||||
--- a/Makefile.target
|
||||
+++ b/Makefile.target
|
||||
@@ -36,6 +36,10 @@ endif
|
||||
@ -83,7 +83,7 @@ index 7df2b8c..85ae084 100644
|
||||
$(call quiet-command,rm -f $@ && $(SHELL) $(SRC_PATH)/scripts/feature_to_c.sh $@ $(TARGET_XML_FILES),"GEN","$(TARGET_DIR)$@")
|
||||
|
||||
diff --git a/linux-user/Makefile.objs b/linux-user/Makefile.objs
|
||||
index 8c93058..607ca2d 100644
|
||||
index 8c93058100..607ca2dc92 100644
|
||||
--- a/linux-user/Makefile.objs
|
||||
+++ b/linux-user/Makefile.objs
|
||||
@@ -6,3 +6,5 @@ obj-$(TARGET_HAS_BFLT) += flatload.o
|
||||
@ -94,7 +94,7 @@ index 8c93058..607ca2d 100644
|
||||
+obj-binfmt-y = binfmt.o
|
||||
diff --git a/linux-user/binfmt.c b/linux-user/binfmt.c
|
||||
new file mode 100644
|
||||
index 0000000..cd1f513
|
||||
index 0000000000..cd1f513b33
|
||||
--- /dev/null
|
||||
+++ b/linux-user/binfmt.c
|
||||
@@ -0,0 +1,42 @@
|
||||
|
@ -13,7 +13,7 @@ KVM guests work there, even if possibly racy in some odd circumstances.
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/exec.c b/exec.c
|
||||
index c97ef4a..b47b3f9 100644
|
||||
index c97ef4a8da..b47b3f9096 100644
|
||||
--- a/exec.c
|
||||
+++ b/exec.c
|
||||
@@ -1362,11 +1362,13 @@ static void *file_ram_alloc(RAMBlock *block,
|
||||
|
@ -26,7 +26,7 @@ Signed-off-by: Andreas Färber <afaerber@suse.de>
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/user-exec.c b/user-exec.c
|
||||
index a8f95fa..c262653 100644
|
||||
index a8f95fa1e1..c262653604 100644
|
||||
--- a/user-exec.c
|
||||
+++ b/user-exec.c
|
||||
@@ -78,6 +78,10 @@ static inline int handle_cpu_signal(uintptr_t pc, unsigned long address,
|
||||
|
@ -12,7 +12,7 @@ Signed-off-by: Alexander Graf <agraf@suse.de>
|
||||
1 file changed, 26 insertions(+)
|
||||
|
||||
diff --git a/linux-user/binfmt.c b/linux-user/binfmt.c
|
||||
index cd1f513..458f136 100644
|
||||
index cd1f513b33..458f136fb4 100644
|
||||
--- a/linux-user/binfmt.c
|
||||
+++ b/linux-user/binfmt.c
|
||||
@@ -5,6 +5,9 @@
|
||||
|
@ -22,7 +22,7 @@ Signed-off-by: Andreas Färber <afaerber@suse.de>
|
||||
1 file changed, 20 insertions(+)
|
||||
|
||||
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
|
||||
index 2f82a7d..37b49bd 100644
|
||||
index 2f82a7d1a6..37b49bd406 100644
|
||||
--- a/linux-user/syscall.c
|
||||
+++ b/linux-user/syscall.c
|
||||
@@ -7503,6 +7503,25 @@ static int open_self_stat(void *cpu_env, int fd)
|
||||
|
@ -9,7 +9,7 @@ agraf: fiemap breaks in libarchive. Disable it for now.
|
||||
1 file changed, 5 insertions(+)
|
||||
|
||||
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
|
||||
index 37b49bd..983475a 100644
|
||||
index 37b49bd406..983475a0b9 100644
|
||||
--- a/linux-user/syscall.c
|
||||
+++ b/linux-user/syscall.c
|
||||
@@ -5076,6 +5076,11 @@ static abi_long do_ioctl_fs_ioc_fiemap(const IOCTLEntry *ie, uint8_t *buf_temp,
|
||||
|
@ -12,7 +12,7 @@ TBD (from SUSE Studio team)
|
||||
4 files changed, 39 insertions(+)
|
||||
|
||||
diff --git a/qemu-options.hx b/qemu-options.hx
|
||||
index 99af8ed..4712277 100644
|
||||
index 99af8edf5f..4712277d7c 100644
|
||||
--- a/qemu-options.hx
|
||||
+++ b/qemu-options.hx
|
||||
@@ -3215,6 +3215,16 @@ Store the QEMU process PID in @var{file}. It is useful if you launch QEMU
|
||||
@ -33,7 +33,7 @@ index 99af8ed..4712277 100644
|
||||
"-singlestep always run in singlestep mode\n", QEMU_ARCH_ALL)
|
||||
STEXI
|
||||
diff --git a/slirp/socket.c b/slirp/socket.c
|
||||
index 8692772..5c89064 100644
|
||||
index 86927722e1..5c89064e15 100644
|
||||
--- a/slirp/socket.c
|
||||
+++ b/slirp/socket.c
|
||||
@@ -625,6 +625,8 @@ sorecvfrom(struct socket *so)
|
||||
@ -59,7 +59,7 @@ index 8692772..5c89064 100644
|
||||
ret = sendto(so->s, m->m_data, m->m_len, 0,
|
||||
(struct sockaddr *)&addr, sockaddr_size(&addr));
|
||||
diff --git a/slirp/tcp_subr.c b/slirp/tcp_subr.c
|
||||
index ed16e18..b2c7a8c 100644
|
||||
index ed16e1807f..b2c7a8cba0 100644
|
||||
--- a/slirp/tcp_subr.c
|
||||
+++ b/slirp/tcp_subr.c
|
||||
@@ -391,6 +391,8 @@ tcp_sockclosed(struct tcpcb *tp)
|
||||
@ -96,7 +96,7 @@ index ed16e18..b2c7a8c 100644
|
||||
socket_set_fast_reuse(s);
|
||||
opt = 1;
|
||||
diff --git a/vl.c b/vl.c
|
||||
index 0b4ed52..e0f2ec8 100644
|
||||
index 0b4ed5241c..e0f2ec86a9 100644
|
||||
--- a/vl.c
|
||||
+++ b/vl.c
|
||||
@@ -168,6 +168,7 @@ int smp_threads = 1;
|
||||
|
@ -9,7 +9,7 @@ TBD (from SUSE Studio team)
|
||||
1 file changed, 55 insertions(+)
|
||||
|
||||
diff --git a/ui/vnc.c b/ui/vnc.c
|
||||
index 349cfc9..486d275 100644
|
||||
index 349cfc9d86..486d2759e4 100644
|
||||
--- a/ui/vnc.c
|
||||
+++ b/ui/vnc.c
|
||||
@@ -59,6 +59,8 @@ static const struct timeval VNC_REFRESH_LOSSY = { 2, 0 };
|
||||
|
@ -17,7 +17,7 @@ Signed-off-by: Alexander Graf <agraf@suse.de>
|
||||
2 files changed, 8 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/linux-user/qemu.h b/linux-user/qemu.h
|
||||
index 4edd7d0..2520864 100644
|
||||
index 4edd7d0c08..25208645e9 100644
|
||||
--- a/linux-user/qemu.h
|
||||
+++ b/linux-user/qemu.h
|
||||
@@ -196,10 +196,10 @@ abi_long memcpy_to_target(abi_ulong dest, const void *src,
|
||||
@ -36,7 +36,7 @@ index 4edd7d0..2520864 100644
|
||||
extern THREAD CPUState *thread_cpu;
|
||||
void cpu_loop(CPUArchState *env);
|
||||
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
|
||||
index 983475a..1472d72 100644
|
||||
index 983475a0b9..1472d72f27 100644
|
||||
--- a/linux-user/syscall.c
|
||||
+++ b/linux-user/syscall.c
|
||||
@@ -7710,10 +7710,10 @@ static target_timer_t get_timer_id(abi_long arg)
|
||||
|
@ -47,7 +47,7 @@ Signed-off-by: Andreas Färber <afaerber@suse.de>
|
||||
create mode 100644 block/dictzip.c
|
||||
|
||||
diff --git a/block/Makefile.objs b/block/Makefile.objs
|
||||
index de96f8e..bab24da 100644
|
||||
index de96f8ee80..bab24da2fb 100644
|
||||
--- a/block/Makefile.objs
|
||||
+++ b/block/Makefile.objs
|
||||
@@ -21,6 +21,7 @@ block-obj-$(CONFIG_RBD) += rbd.o
|
||||
@ -60,7 +60,7 @@ index de96f8e..bab24da 100644
|
||||
block-obj-$(CONFIG_REPLICATION) += replication.o
|
||||
diff --git a/block/dictzip.c b/block/dictzip.c
|
||||
new file mode 100644
|
||||
index 0000000..4b7e2db
|
||||
index 0000000000..4b7e2db817
|
||||
--- /dev/null
|
||||
+++ b/block/dictzip.c
|
||||
@@ -0,0 +1,580 @@
|
||||
|
@ -48,7 +48,7 @@ Signed-off-by: Andreas Färber <afaerber@suse.de>
|
||||
create mode 100644 block/tar.c
|
||||
|
||||
diff --git a/block/Makefile.objs b/block/Makefile.objs
|
||||
index bab24da..73c7b55 100644
|
||||
index bab24da2fb..73c7b55871 100644
|
||||
--- a/block/Makefile.objs
|
||||
+++ b/block/Makefile.objs
|
||||
@@ -22,6 +22,7 @@ block-obj-$(CONFIG_GLUSTERFS) += gluster.o
|
||||
@ -61,7 +61,7 @@ index bab24da..73c7b55 100644
|
||||
block-obj-$(CONFIG_REPLICATION) += replication.o
|
||||
diff --git a/block/tar.c b/block/tar.c
|
||||
new file mode 100644
|
||||
index 0000000..508265e
|
||||
index 0000000000..508265ed5e
|
||||
--- /dev/null
|
||||
+++ b/block/tar.c
|
||||
@@ -0,0 +1,370 @@
|
||||
|
@ -8,7 +8,7 @@ Subject: [PATCH] Legacy Patch kvm-qemu-preXX-dictzip3.patch
|
||||
1 file changed, 11 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/block/tar.c b/block/tar.c
|
||||
index 508265e..734082a 100644
|
||||
index 508265ed5e..734082a011 100644
|
||||
--- a/block/tar.c
|
||||
+++ b/block/tar.c
|
||||
@@ -73,7 +73,8 @@ static int str_ends(char *str, const char *end)
|
||||
|
@ -16,7 +16,7 @@ Signed-off-by: Alexander Graf <agraf@suse.de>
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/ui/console.c b/ui/console.c
|
||||
index 419b098..9688457 100644
|
||||
index 419b098c11..9688457480 100644
|
||||
--- a/ui/console.c
|
||||
+++ b/ui/console.c
|
||||
@@ -880,7 +880,7 @@ static void console_putchar(QemuConsole *s, int ch)
|
||||
|
@ -25,7 +25,7 @@ This patch fixes input when using -nographic on s390 for me.
|
||||
2 files changed, 16 insertions(+)
|
||||
|
||||
diff --git a/chardev/char-mux.c b/chardev/char-mux.c
|
||||
index 5547a36..7b80dc8 100644
|
||||
index 5547a36a0a..7b80dc8ad7 100644
|
||||
--- a/chardev/char-mux.c
|
||||
+++ b/chardev/char-mux.c
|
||||
@@ -179,6 +179,15 @@ static void mux_chr_accept_input(Chardev *chr)
|
||||
@ -56,7 +56,7 @@ index 5547a36..7b80dc8 100644
|
||||
* set of muxes
|
||||
*/
|
||||
diff --git a/chardev/char-mux.h b/chardev/char-mux.h
|
||||
index 9a2fffc..d5f419c 100644
|
||||
index 9a2fffce91..d5f419c8a9 100644
|
||||
--- a/chardev/char-mux.h
|
||||
+++ b/chardev/char-mux.h
|
||||
@@ -35,6 +35,9 @@ typedef struct MuxChardev {
|
||||
|
@ -16,7 +16,7 @@ Signed-off-by: Alexander Graf <agraf@suse.de>
|
||||
1 file changed, 7 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
|
||||
index 1472d72..71d4f06 100644
|
||||
index 1472d72f27..71d4f06bdb 100644
|
||||
--- a/linux-user/syscall.c
|
||||
+++ b/linux-user/syscall.c
|
||||
@@ -8076,9 +8076,14 @@ abi_long do_syscall(void *cpu_env, int num, abi_ulong arg1,
|
||||
|
@ -14,7 +14,7 @@ Signed-off-by: Andreas Färber <afaerber@suse.de>
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/configure b/configure
|
||||
index be4d326..3308560 100755
|
||||
index be4d326ae0..3308560f78 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -1600,7 +1600,7 @@ fi
|
||||
|
@ -21,7 +21,7 @@ Signed-off-by: Alexander Graf <agraf@suse.de>
|
||||
1 file changed, 6 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/util/thread-pool.c b/util/thread-pool.c
|
||||
index 610646d..2e34e98 100644
|
||||
index 610646d131..2e34e9846d 100644
|
||||
--- a/util/thread-pool.c
|
||||
+++ b/util/thread-pool.c
|
||||
@@ -308,7 +308,12 @@ static void thread_pool_init_one(ThreadPool *pool, AioContext *ctx)
|
||||
|
@ -21,7 +21,7 @@ Signed-off-by: Andreas Färber <afaerber@suse.de>
|
||||
1 file changed, 28 insertions(+), 22 deletions(-)
|
||||
|
||||
diff --git a/block/dictzip.c b/block/dictzip.c
|
||||
index 4b7e2db..3235337 100644
|
||||
index 4b7e2db817..3235337164 100644
|
||||
--- a/block/dictzip.c
|
||||
+++ b/block/dictzip.c
|
||||
@@ -156,6 +156,7 @@ static int dictzip_open(BlockDriverState *bs, QDict *options, int flags, Error *
|
||||
|
@ -17,7 +17,7 @@ Signed-off-by: Olaf Hering <olaf@aepfle.de>
|
||||
1 file changed, 15 insertions(+)
|
||||
|
||||
diff --git a/hw/block/xen_disk.c b/hw/block/xen_disk.c
|
||||
index 456a2d5..94e755d 100644
|
||||
index 456a2d5694..94e755d3e8 100644
|
||||
--- a/hw/block/xen_disk.c
|
||||
+++ b/hw/block/xen_disk.c
|
||||
@@ -111,6 +111,7 @@ struct XenBlkDev {
|
||||
|
@ -19,7 +19,7 @@ Signed-off-by: Andreas Färber <afaerber@suse.de>
|
||||
1 file changed, 24 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/qemu-bridge-helper.c b/qemu-bridge-helper.c
|
||||
index 5396fbf..f3710b8 100644
|
||||
index 5396fbfbb6..f3710b80a3 100644
|
||||
--- a/qemu-bridge-helper.c
|
||||
+++ b/qemu-bridge-helper.c
|
||||
@@ -110,7 +110,12 @@ static int parse_acl_file(const char *filename, ACLList *acl_list)
|
||||
|
@ -13,7 +13,7 @@ Signed-off-by: Andreas Färber <afaerber@suse.de>
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/scripts/qemu-binfmt-conf.sh b/scripts/qemu-binfmt-conf.sh
|
||||
index 9fcd95a..f14a6ef 100755
|
||||
index 9fcd95a435..f14a6ef37b 100755
|
||||
--- a/scripts/qemu-binfmt-conf.sh
|
||||
+++ b/scripts/qemu-binfmt-conf.sh
|
||||
@@ -206,7 +206,7 @@ qemu_check_systemd() {
|
||||
|
@ -13,7 +13,7 @@ Signed-off-by: Andreas Färber <afaerber@suse.de>
|
||||
1 file changed, 3 insertions(+)
|
||||
|
||||
diff --git a/configure b/configure
|
||||
index 3308560..cb7589a 100755
|
||||
index 3308560f78..cb7589a8e7 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -1961,6 +1961,9 @@ if test "$seccomp" != "no" ; then
|
||||
|
@ -16,7 +16,7 @@ Signed-off-by: Andreas Schwab <schwab@suse.de>
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
|
||||
index 71d4f06..78f0ea4 100644
|
||||
index 71d4f06bdb..78f0ea4c58 100644
|
||||
--- a/linux-user/syscall.c
|
||||
+++ b/linux-user/syscall.c
|
||||
@@ -10204,7 +10204,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_ulong arg1,
|
||||
|
@ -17,7 +17,7 @@ Signed-off-by: Andreas Färber <afaerber@suse.de>
|
||||
1 file changed, 7 insertions(+), 40 deletions(-)
|
||||
|
||||
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
|
||||
index 78f0ea4..1e56583 100644
|
||||
index 78f0ea4c58..1e56583d63 100644
|
||||
--- a/linux-user/syscall.c
|
||||
+++ b/linux-user/syscall.c
|
||||
@@ -7374,52 +7374,19 @@ int host_to_target_waitstatus(int status)
|
||||
|
@ -20,7 +20,7 @@ Signed-off-by: Bruce Rogers <brogers@suse.com>
|
||||
1 file changed, 12 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/roms/Makefile b/roms/Makefile
|
||||
index b5e5a69..89d69eb 100644
|
||||
index b5e5a69e91..89d69eb350 100644
|
||||
--- a/roms/Makefile
|
||||
+++ b/roms/Makefile
|
||||
@@ -52,6 +52,12 @@ SEABIOS_EXTRAVERSION="-prebuilt.qemu-project.org"
|
||||
|
@ -17,7 +17,7 @@ Signed-off-by: Bruce Rogers <brogers@suse.com>
|
||||
1 file changed, 12 insertions(+)
|
||||
|
||||
diff --git a/vl.c b/vl.c
|
||||
index e0f2ec8..caad3f9 100644
|
||||
index e0f2ec86a9..caad3f93b3 100644
|
||||
--- a/vl.c
|
||||
+++ b/vl.c
|
||||
@@ -26,6 +26,7 @@
|
||||
|
@ -19,7 +19,7 @@ Signed-off-by: Andreas Färber <afaerber@suse.de>
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/target/i386/cpu.h b/target/i386/cpu.h
|
||||
index c4602ca..81c02c5 100644
|
||||
index c4602ca80d..81c02c5a3b 100644
|
||||
--- a/target/i386/cpu.h
|
||||
+++ b/target/i386/cpu.h
|
||||
@@ -1488,7 +1488,7 @@ uint64_t cpu_get_tsc(CPUX86State *env);
|
||||
|
@ -25,7 +25,7 @@ Signed-off-by: Bruce Rogers <brogers@suse.com>
|
||||
1 file changed, 26 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
|
||||
index 9f102aa..1c09005 100644
|
||||
index 9f102aa388..1c09005293 100644
|
||||
--- a/hw/i386/pc_piix.c
|
||||
+++ b/hw/i386/pc_piix.c
|
||||
@@ -779,7 +779,32 @@ DEFINE_I440FX_MACHINE(v1_0, "pc-1.0", pc_compat_1_2,
|
||||
|
@ -17,7 +17,7 @@ Signed-off-by: Andreas Färber <afaerber@suse.de>
|
||||
1 file changed, 7 insertions(+)
|
||||
|
||||
diff --git a/hw/timer/i8254_common.c b/hw/timer/i8254_common.c
|
||||
index e18299a..bc676c4 100644
|
||||
index e18299a482..bc676c4664 100644
|
||||
--- a/hw/timer/i8254_common.c
|
||||
+++ b/hw/timer/i8254_common.c
|
||||
@@ -258,6 +258,12 @@ static int pit_dispatch_post_load(void *opaque, int version_id)
|
||||
|
@ -17,7 +17,7 @@ Signed-off-by: Andreas Färber <afaerber@suse.de>
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c
|
||||
index a553a7e..c34f761 100644
|
||||
index a553a7e110..c34f761175 100644
|
||||
--- a/hw/acpi/piix4.c
|
||||
+++ b/hw/acpi/piix4.c
|
||||
@@ -311,7 +311,7 @@ static const VMStateDescription vmstate_cpuhp_state = {
|
||||
|
@ -24,7 +24,7 @@ Signed-off-by: Chunyan Liu <cyliu@suse.com>
|
||||
1 file changed, 19 insertions(+)
|
||||
|
||||
diff --git a/ui/vnc.c b/ui/vnc.c
|
||||
index 486d275..51d6f23 100644
|
||||
index 486d2759e4..51d6f2353f 100644
|
||||
--- a/ui/vnc.c
|
||||
+++ b/ui/vnc.c
|
||||
@@ -1668,6 +1668,25 @@ static void do_key_event(VncState *vs, int down, int keycode, int sym)
|
||||
|
@ -29,7 +29,7 @@ Signed-off-by: Chunyan Liu <cyliu@suse.com>
|
||||
1 file changed, 5 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/hw/core/loader.c b/hw/core/loader.c
|
||||
index bf17b42..14dc6e1 100644
|
||||
index bf17b42cbe..14dc6e116f 100644
|
||||
--- a/hw/core/loader.c
|
||||
+++ b/hw/core/loader.c
|
||||
@@ -55,6 +55,7 @@
|
||||
|
@ -22,7 +22,7 @@ Signed-off-by: Andreas Färber <afaerber@suse.de>
|
||||
1 file changed, 50 insertions(+), 13 deletions(-)
|
||||
|
||||
diff --git a/qapi/string-input-visitor.c b/qapi/string-input-visitor.c
|
||||
index c089491..fedbda7 100644
|
||||
index c089491c24..fedbda7895 100644
|
||||
--- a/qapi/string-input-visitor.c
|
||||
+++ b/qapi/string-input-visitor.c
|
||||
@@ -43,7 +43,8 @@ static void free_range(void *range, void *dummy)
|
||||
|
@ -14,7 +14,7 @@ Signed-off-by: Andreas Färber <afaerber@suse.de>
|
||||
1 file changed, 8 insertions(+)
|
||||
|
||||
diff --git a/tests/test-string-input-visitor.c b/tests/test-string-input-visitor.c
|
||||
index 79313a7..e00194a 100644
|
||||
index 79313a7f7a..e00194a649 100644
|
||||
--- a/tests/test-string-input-visitor.c
|
||||
+++ b/tests/test-string-input-visitor.c
|
||||
@@ -58,6 +58,14 @@ static void test_visitor_in_int(TestInputVisitorData *data,
|
||||
|
@ -15,7 +15,7 @@ Signed-off-by: Andreas Färber <afaerber@suse.de>
|
||||
1 file changed, 23 insertions(+)
|
||||
|
||||
diff --git a/tests/test-string-input-visitor.c b/tests/test-string-input-visitor.c
|
||||
index e00194a..5587827 100644
|
||||
index e00194a649..558782796a 100644
|
||||
--- a/tests/test-string-input-visitor.c
|
||||
+++ b/tests/test-string-input-visitor.c
|
||||
@@ -78,6 +78,27 @@ static void test_visitor_in_int(TestInputVisitorData *data,
|
||||
|
@ -17,7 +17,7 @@ Signed-off-by: Andreas Färber <afaerber@suse.de>
|
||||
create mode 100644 tests/check-qom-props.c
|
||||
|
||||
diff --git a/MAINTAINERS b/MAINTAINERS
|
||||
index c60235e..a023f5d 100644
|
||||
index c60235eaf6..a023f5d70e 100644
|
||||
--- a/MAINTAINERS
|
||||
+++ b/MAINTAINERS
|
||||
@@ -1419,6 +1419,7 @@ F: qom/
|
||||
@ -29,7 +29,7 @@ index c60235e..a023f5d 100644
|
||||
|
||||
QMP
|
||||
diff --git a/tests/Makefile.include b/tests/Makefile.include
|
||||
index f3de81f..ca8f859 100644
|
||||
index f3de81fcfb..ca8f859f79 100644
|
||||
--- a/tests/Makefile.include
|
||||
+++ b/tests/Makefile.include
|
||||
@@ -92,6 +92,8 @@ check-unit-y += tests/check-qom-interface$(EXESUF)
|
||||
@ -51,7 +51,7 @@ index f3de81f..ca8f859 100644
|
||||
tests/test-coroutine$(EXESUF): tests/test-coroutine.o $(test-block-obj-y)
|
||||
diff --git a/tests/check-qom-props.c b/tests/check-qom-props.c
|
||||
new file mode 100644
|
||||
index 0000000..681e121
|
||||
index 0000000000..681e121c07
|
||||
--- /dev/null
|
||||
+++ b/tests/check-qom-props.c
|
||||
@@ -0,0 +1,122 @@
|
||||
|
@ -20,7 +20,7 @@ Signed-off-by: Andreas Färber <afaerber@suse.de>
|
||||
create mode 100644 tests/scsi-disk-test.c
|
||||
|
||||
diff --git a/MAINTAINERS b/MAINTAINERS
|
||||
index a023f5d..9840d5b 100644
|
||||
index a023f5d70e..9840d5bb68 100644
|
||||
--- a/MAINTAINERS
|
||||
+++ b/MAINTAINERS
|
||||
@@ -957,6 +957,7 @@ M: Paolo Bonzini <pbonzini@redhat.com>
|
||||
@ -32,7 +32,7 @@ index a023f5d..9840d5b 100644
|
||||
T: git git://github.com/bonzini/qemu.git scsi-next
|
||||
|
||||
diff --git a/tests/Makefile.include b/tests/Makefile.include
|
||||
index ca8f859..85187d4 100644
|
||||
index ca8f859f79..85187d4b8c 100644
|
||||
--- a/tests/Makefile.include
|
||||
+++ b/tests/Makefile.include
|
||||
@@ -161,6 +161,8 @@ check-qtest-virtio-y += tests/virtio-rng-test$(EXESUF)
|
||||
@ -54,7 +54,7 @@ index ca8f859..85187d4 100644
|
||||
tests/test-keyval$(EXESUF): tests/test-keyval.o $(test-util-obj-y) $(test-qapi-obj-y)
|
||||
diff --git a/tests/scsi-disk-test.c b/tests/scsi-disk-test.c
|
||||
new file mode 100644
|
||||
index 0000000..f19f93d
|
||||
index 0000000000..f19f93d97a
|
||||
--- /dev/null
|
||||
+++ b/tests/scsi-disk-test.c
|
||||
@@ -0,0 +1,82 @@
|
||||
|
@ -15,7 +15,7 @@ Signed-off-by: Alexander Graf <agraf@suse.de>
|
||||
3 files changed, 12 insertions(+)
|
||||
|
||||
diff --git a/linux-headers/asm-arm/kvm.h b/linux-headers/asm-arm/kvm.h
|
||||
index 1101d55..8a1654a 100644
|
||||
index 1101d55d2f..8a1654a55b 100644
|
||||
--- a/linux-headers/asm-arm/kvm.h
|
||||
+++ b/linux-headers/asm-arm/kvm.h
|
||||
@@ -114,6 +114,8 @@ struct kvm_debug_exit_arch {
|
||||
@ -28,7 +28,7 @@ index 1101d55..8a1654a 100644
|
||||
|
||||
struct kvm_arch_memory_slot {
|
||||
diff --git a/linux-headers/asm-arm64/kvm.h b/linux-headers/asm-arm64/kvm.h
|
||||
index 651ec30..1bc8346 100644
|
||||
index 651ec30040..1bc8346f0d 100644
|
||||
--- a/linux-headers/asm-arm64/kvm.h
|
||||
+++ b/linux-headers/asm-arm64/kvm.h
|
||||
@@ -143,6 +143,8 @@ struct kvm_debug_exit_arch {
|
||||
@ -41,7 +41,7 @@ index 651ec30..1bc8346 100644
|
||||
|
||||
struct kvm_arch_memory_slot {
|
||||
diff --git a/linux-headers/linux/kvm.h b/linux-headers/linux/kvm.h
|
||||
index 4e082a8..72f0d21 100644
|
||||
index 4e082a81b4..72f0d21103 100644
|
||||
--- a/linux-headers/linux/kvm.h
|
||||
+++ b/linux-headers/linux/kvm.h
|
||||
@@ -883,6 +883,7 @@ struct kvm_ppc_resize_hpt {
|
||||
|
@ -20,7 +20,7 @@ Signed-off-by: Alexander Graf <agraf@suse.de>
|
||||
3 files changed, 43 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
|
||||
index 5f62a03..a1d24a4 100644
|
||||
index 5f62a0321e..a1d24a4db6 100644
|
||||
--- a/hw/arm/virt.c
|
||||
+++ b/hw/arm/virt.c
|
||||
@@ -609,6 +609,16 @@ static void create_gic(VirtMachineState *vms, qemu_irq *pic)
|
||||
@ -41,7 +41,7 @@ index 5f62a03..a1d24a4 100644
|
||||
|
||||
static void create_uart(const VirtMachineState *vms, qemu_irq *pic, int uart,
|
||||
diff --git a/target/arm/cpu.h b/target/arm/cpu.h
|
||||
index a8aabce..19cb596 100644
|
||||
index a8aabce7dd..19cb596449 100644
|
||||
--- a/target/arm/cpu.h
|
||||
+++ b/target/arm/cpu.h
|
||||
@@ -702,6 +702,9 @@ struct ARMCPU {
|
||||
@ -55,7 +55,7 @@ index a8aabce..19cb596 100644
|
||||
|
||||
static inline ARMCPU *arm_env_get_cpu(CPUARMState *env)
|
||||
diff --git a/target/arm/kvm.c b/target/arm/kvm.c
|
||||
index 4555468..dccb326 100644
|
||||
index 45554682f2..dccb326615 100644
|
||||
--- a/target/arm/kvm.c
|
||||
+++ b/target/arm/kvm.c
|
||||
@@ -174,6 +174,12 @@ int kvm_arch_init(MachineState *ms, KVMState *s)
|
||||
|
@ -20,7 +20,7 @@ Signed-off-by: Bruce Rogers <brogers@suse.com>
|
||||
2 files changed, 5 insertions(+)
|
||||
|
||||
diff --git a/hw/input/hid.c b/hw/input/hid.c
|
||||
index fa9cc4c..93887ec 100644
|
||||
index fa9cc4c616..93887ecc43 100644
|
||||
--- a/hw/input/hid.c
|
||||
+++ b/hw/input/hid.c
|
||||
@@ -256,6 +256,10 @@ static void hid_keyboard_process_keycode(HIDState *hs)
|
||||
@ -35,7 +35,7 @@ index fa9cc4c..93887ec 100644
|
||||
index = key | ((hs->kbd.modifiers & (1 << 8)) >> 1);
|
||||
hid_code = hid_usage_keys[index];
|
||||
diff --git a/hw/input/trace-events b/hw/input/trace-events
|
||||
index f3bfbed..5a87818 100644
|
||||
index f3bfbede5c..5a87818b49 100644
|
||||
--- a/hw/input/trace-events
|
||||
+++ b/hw/input/trace-events
|
||||
@@ -24,6 +24,7 @@ milkymist_softusb_pulse_irq(void) "Pulse IRQ"
|
||||
|
@ -17,7 +17,7 @@ Signed-off-by: Bruce Rogers <brogers@suse.com>
|
||||
1 file changed, 8 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c
|
||||
index c34f761..ae1cb26 100644
|
||||
index c34f761175..ae1cb26a82 100644
|
||||
--- a/hw/acpi/piix4.c
|
||||
+++ b/hw/acpi/piix4.c
|
||||
@@ -385,7 +385,10 @@ static void piix4_device_plug_cb(HotplugHandler *hotplug_dev,
|
||||
|
@ -22,7 +22,7 @@ Signed-off-by: Alexander Graf <agraf@suse.de>
|
||||
2 files changed, 25 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/target/i386/cpu.c b/target/i386/cpu.c
|
||||
index 13c0985..6105fc5 100644
|
||||
index 13c0985f11..6105fc513e 100644
|
||||
--- a/target/i386/cpu.c
|
||||
+++ b/target/i386/cpu.c
|
||||
@@ -2229,7 +2229,7 @@ void x86_cpu_list(FILE *f, fprintf_function cpu_fprintf)
|
||||
@ -87,7 +87,7 @@ index 13c0985..6105fc5 100644
|
||||
error_propagate(errp, local_err);
|
||||
return;
|
||||
diff --git a/target/i386/cpu.h b/target/i386/cpu.h
|
||||
index 81c02c5..a458c3a 100644
|
||||
index 81c02c5a3b..a458c3af9b 100644
|
||||
--- a/target/i386/cpu.h
|
||||
+++ b/target/i386/cpu.h
|
||||
@@ -1230,6 +1230,9 @@ struct X86CPU {
|
||||
|
@ -1,3 +1,13 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu May 4 20:14:25 UTC 2017 - brogers@suse.com
|
||||
|
||||
- Fix building packages for some older distros.
|
||||
- Further refine our handling of building firmware (or not) for
|
||||
the various arch's and distro versions we build for. Note that
|
||||
if we don't build x86 firmware, (eg: x86 Leap 42.1) the upstream
|
||||
binary blobs are used, which may have migration incompatibilities
|
||||
with previous versions of qemu provided.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Apr 27 20:09:38 UTC 2017 - brogers@suse.com
|
||||
|
||||
|
@ -25,7 +25,7 @@
|
||||
|
||||
%ifarch %ix86 x86_64
|
||||
# choice of building all from source or using provided binary x86 blobs
|
||||
%if 0%{?suse_version} >= 1310
|
||||
%if 0%{?suse_version} > 1320 || ( 0%{?suse_version} == 1315 && 0%{?sle_version} > 120100 )
|
||||
%define build_x86_firmware_from_source 1
|
||||
%endif
|
||||
%endif
|
||||
@ -280,11 +280,17 @@ BuildRequires: libjpeg-devel
|
||||
%if 0%{?suse_version} >= 1310
|
||||
BuildRequires: libnettle-devel
|
||||
%endif
|
||||
%ifarch %ix86 aarch64
|
||||
%ifarch %ix86 x86_64
|
||||
%if 0%{?suse_version} > 1320 || 0%{?suse_version} == 1315
|
||||
BuildRequires: libnuma-devel
|
||||
%endif
|
||||
%else
|
||||
%ifarch aarch64
|
||||
%if 0%{?suse_version} > 1320 || ( 0%{?suse_version} == 1315 && 0%{?sle_version} > 120100 )
|
||||
BuildRequires: libnuma-devel
|
||||
%endif
|
||||
%endif
|
||||
%else
|
||||
%ifnarch %arm s390x
|
||||
BuildRequires: libnuma-devel
|
||||
%endif
|
||||
@ -965,13 +971,21 @@ echo '%{version}' > roms/seabios/.version
|
||||
--enable-linux-aio \
|
||||
--enable-lzo \
|
||||
--disable-netmap \
|
||||
%ifarch %ix86 aarch64
|
||||
%ifarch %ix86 x86_64
|
||||
%if 0%{?suse_version} > 1320 || 0%{?suse_version} == 1315
|
||||
--enable-numa \
|
||||
%else
|
||||
--disable-numa \
|
||||
%endif
|
||||
%else
|
||||
%ifarch aarch64
|
||||
%if 0%{?suse_version} > 1320 || ( 0%{?suse_version} == 1315 && 0%{?sle_version} > 120100 )
|
||||
--enable-numa \
|
||||
%endif
|
||||
%else
|
||||
--disable-numa \
|
||||
%endif
|
||||
%else
|
||||
%ifarch %arm s390x
|
||||
--disable-numa \
|
||||
%else
|
||||
@ -1053,15 +1067,33 @@ make %{?_smp_mflags} V=1
|
||||
# Firmware
|
||||
|
||||
%ifarch s390x
|
||||
cp pc-bios/s390-ccw/s390-ccw.img pc-bios/
|
||||
for i in %s390x_default_built_firmware
|
||||
do
|
||||
cp pc-bios/s390-ccw/$i pc-bios/
|
||||
done
|
||||
%endif
|
||||
|
||||
%ifarch ppc64
|
||||
cp pc-bios/spapr-rtas/spapr-rtas.bin pc-bios/
|
||||
for i in %ppc64_only_default_built_firmware
|
||||
do
|
||||
cp pc-bios/spapr-rtas/$i pc-bios/
|
||||
done
|
||||
%endif
|
||||
|
||||
%ifarch %ix86 x86_64
|
||||
for i in %x86_default_built_firmware
|
||||
do
|
||||
cp pc-bios/optionrom/$i pc-bios/
|
||||
done
|
||||
%ifarch x86_64
|
||||
for i in %x86_64_only_default_built_firmware
|
||||
do
|
||||
cp pc-bios/optionrom/$i pc-bios/
|
||||
done
|
||||
%endif
|
||||
%endif
|
||||
|
||||
%if %{build_x86_firmware_from_source}
|
||||
cp pc-bios/optionrom/{multiboot.bin,linuxboot.bin,linuxboot_dma.bin,kvmvapic.bin} pc-bios/
|
||||
make %{?_smp_mflags} -C roms bios
|
||||
|
||||
make %{?_smp_mflags} -C roms seavgabios
|
||||
@ -1496,7 +1528,7 @@ fi
|
||||
%files lang -f %name.lang
|
||||
%defattr(-, root, root)
|
||||
|
||||
%if %{build_x86_firmware_from_source}
|
||||
%ifarch %ix86 x86_64
|
||||
%files seabios
|
||||
%defattr(-, root, root)
|
||||
%dir %_datadir/%name
|
||||
|
10
qemu.changes
10
qemu.changes
@ -1,3 +1,13 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu May 4 20:14:25 UTC 2017 - brogers@suse.com
|
||||
|
||||
- Fix building packages for some older distros.
|
||||
- Further refine our handling of building firmware (or not) for
|
||||
the various arch's and distro versions we build for. Note that
|
||||
if we don't build x86 firmware, (eg: x86 Leap 42.1) the upstream
|
||||
binary blobs are used, which may have migration incompatibilities
|
||||
with previous versions of qemu provided.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Apr 27 20:09:38 UTC 2017 - brogers@suse.com
|
||||
|
||||
|
46
qemu.spec
46
qemu.spec
@ -25,7 +25,7 @@
|
||||
|
||||
%ifarch %ix86 x86_64
|
||||
# choice of building all from source or using provided binary x86 blobs
|
||||
%if 0%{?suse_version} >= 1310
|
||||
%if 0%{?suse_version} > 1320 || ( 0%{?suse_version} == 1315 && 0%{?sle_version} > 120100 )
|
||||
%define build_x86_firmware_from_source 1
|
||||
%endif
|
||||
%endif
|
||||
@ -280,11 +280,17 @@ BuildRequires: libjpeg-devel
|
||||
%if 0%{?suse_version} >= 1310
|
||||
BuildRequires: libnettle-devel
|
||||
%endif
|
||||
%ifarch %ix86 aarch64
|
||||
%ifarch %ix86 x86_64
|
||||
%if 0%{?suse_version} > 1320 || 0%{?suse_version} == 1315
|
||||
BuildRequires: libnuma-devel
|
||||
%endif
|
||||
%else
|
||||
%ifarch aarch64
|
||||
%if 0%{?suse_version} > 1320 || ( 0%{?suse_version} == 1315 && 0%{?sle_version} > 120100 )
|
||||
BuildRequires: libnuma-devel
|
||||
%endif
|
||||
%endif
|
||||
%else
|
||||
%ifnarch %arm s390x
|
||||
BuildRequires: libnuma-devel
|
||||
%endif
|
||||
@ -965,13 +971,21 @@ echo '%{version}' > roms/seabios/.version
|
||||
--enable-linux-aio \
|
||||
--enable-lzo \
|
||||
--disable-netmap \
|
||||
%ifarch %ix86 aarch64
|
||||
%ifarch %ix86 x86_64
|
||||
%if 0%{?suse_version} > 1320 || 0%{?suse_version} == 1315
|
||||
--enable-numa \
|
||||
%else
|
||||
--disable-numa \
|
||||
%endif
|
||||
%else
|
||||
%ifarch aarch64
|
||||
%if 0%{?suse_version} > 1320 || ( 0%{?suse_version} == 1315 && 0%{?sle_version} > 120100 )
|
||||
--enable-numa \
|
||||
%endif
|
||||
%else
|
||||
--disable-numa \
|
||||
%endif
|
||||
%else
|
||||
%ifarch %arm s390x
|
||||
--disable-numa \
|
||||
%else
|
||||
@ -1053,15 +1067,33 @@ make %{?_smp_mflags} V=1
|
||||
# Firmware
|
||||
|
||||
%ifarch s390x
|
||||
cp pc-bios/s390-ccw/s390-ccw.img pc-bios/
|
||||
for i in %s390x_default_built_firmware
|
||||
do
|
||||
cp pc-bios/s390-ccw/$i pc-bios/
|
||||
done
|
||||
%endif
|
||||
|
||||
%ifarch ppc64
|
||||
cp pc-bios/spapr-rtas/spapr-rtas.bin pc-bios/
|
||||
for i in %ppc64_only_default_built_firmware
|
||||
do
|
||||
cp pc-bios/spapr-rtas/$i pc-bios/
|
||||
done
|
||||
%endif
|
||||
|
||||
%ifarch %ix86 x86_64
|
||||
for i in %x86_default_built_firmware
|
||||
do
|
||||
cp pc-bios/optionrom/$i pc-bios/
|
||||
done
|
||||
%ifarch x86_64
|
||||
for i in %x86_64_only_default_built_firmware
|
||||
do
|
||||
cp pc-bios/optionrom/$i pc-bios/
|
||||
done
|
||||
%endif
|
||||
%endif
|
||||
|
||||
%if %{build_x86_firmware_from_source}
|
||||
cp pc-bios/optionrom/{multiboot.bin,linuxboot.bin,linuxboot_dma.bin,kvmvapic.bin} pc-bios/
|
||||
make %{?_smp_mflags} -C roms bios
|
||||
|
||||
make %{?_smp_mflags} -C roms seavgabios
|
||||
@ -1496,7 +1528,7 @@ fi
|
||||
%files lang -f %name.lang
|
||||
%defattr(-, root, root)
|
||||
|
||||
%if %{build_x86_firmware_from_source}
|
||||
%ifarch %ix86 x86_64
|
||||
%files seabios
|
||||
%defattr(-, root, root)
|
||||
%dir %_datadir/%name
|
||||
|
46
qemu.spec.in
46
qemu.spec.in
@ -24,7 +24,7 @@
|
||||
|
||||
%ifarch %ix86 x86_64
|
||||
# choice of building all from source or using provided binary x86 blobs
|
||||
%if 0%{?suse_version} >= 1310
|
||||
%if 0%{?suse_version} > 1320 || ( 0%{?suse_version} == 1315 && 0%{?sle_version} > 120100 )
|
||||
%define build_x86_firmware_from_source 1
|
||||
%endif
|
||||
%endif
|
||||
@ -231,11 +231,17 @@ BuildRequires: libjpeg-devel
|
||||
%if 0%{?suse_version} >= 1310
|
||||
BuildRequires: libnettle-devel
|
||||
%endif
|
||||
%ifarch %ix86 aarch64
|
||||
%ifarch %ix86 x86_64
|
||||
%if 0%{?suse_version} > 1320 || 0%{?suse_version} == 1315
|
||||
BuildRequires: libnuma-devel
|
||||
%endif
|
||||
%else
|
||||
%ifarch aarch64
|
||||
%if 0%{?suse_version} > 1320 || ( 0%{?suse_version} == 1315 && 0%{?sle_version} > 120100 )
|
||||
BuildRequires: libnuma-devel
|
||||
%endif
|
||||
%endif
|
||||
%else
|
||||
%ifnarch %arm s390x
|
||||
BuildRequires: libnuma-devel
|
||||
%endif
|
||||
@ -867,13 +873,21 @@ echo '%{version}' > roms/seabios/.version
|
||||
--enable-linux-aio \
|
||||
--enable-lzo \
|
||||
--disable-netmap \
|
||||
%ifarch %ix86 aarch64
|
||||
%ifarch %ix86 x86_64
|
||||
%if 0%{?suse_version} > 1320 || 0%{?suse_version} == 1315
|
||||
--enable-numa \
|
||||
%else
|
||||
--disable-numa \
|
||||
%endif
|
||||
%else
|
||||
%ifarch aarch64
|
||||
%if 0%{?suse_version} > 1320 || ( 0%{?suse_version} == 1315 && 0%{?sle_version} > 120100 )
|
||||
--enable-numa \
|
||||
%endif
|
||||
%else
|
||||
--disable-numa \
|
||||
%endif
|
||||
%else
|
||||
%ifarch %arm s390x
|
||||
--disable-numa \
|
||||
%else
|
||||
@ -955,15 +969,33 @@ make %{?_smp_mflags} V=1
|
||||
# Firmware
|
||||
|
||||
%ifarch s390x
|
||||
cp pc-bios/s390-ccw/s390-ccw.img pc-bios/
|
||||
for i in %s390x_default_built_firmware
|
||||
do
|
||||
cp pc-bios/s390-ccw/$i pc-bios/
|
||||
done
|
||||
%endif
|
||||
|
||||
%ifarch ppc64
|
||||
cp pc-bios/spapr-rtas/spapr-rtas.bin pc-bios/
|
||||
for i in %ppc64_only_default_built_firmware
|
||||
do
|
||||
cp pc-bios/spapr-rtas/$i pc-bios/
|
||||
done
|
||||
%endif
|
||||
|
||||
%ifarch %ix86 x86_64
|
||||
for i in %x86_default_built_firmware
|
||||
do
|
||||
cp pc-bios/optionrom/$i pc-bios/
|
||||
done
|
||||
%ifarch x86_64
|
||||
for i in %x86_64_only_default_built_firmware
|
||||
do
|
||||
cp pc-bios/optionrom/$i pc-bios/
|
||||
done
|
||||
%endif
|
||||
%endif
|
||||
|
||||
%if %{build_x86_firmware_from_source}
|
||||
cp pc-bios/optionrom/{multiboot.bin,linuxboot.bin,linuxboot_dma.bin,kvmvapic.bin} pc-bios/
|
||||
make %{?_smp_mflags} -C roms bios
|
||||
|
||||
make %{?_smp_mflags} -C roms seavgabios
|
||||
@ -1398,7 +1430,7 @@ fi
|
||||
%files lang -f %name.lang
|
||||
%defattr(-, root, root)
|
||||
|
||||
%if %{build_x86_firmware_from_source}
|
||||
%ifarch %ix86 x86_64
|
||||
%files seabios
|
||||
%defattr(-, root, root)
|
||||
%dir %_datadir/%name
|
||||
|
Loading…
Reference in New Issue
Block a user