Package init

ARM64-record-vtimer-tick-when-cpu-is-stopped.patch

@@ -1,4 +1,4 @@
-From b341b4c1b514d1ca41b39bdf4d4bc4b0267350a3 Mon Sep 17 00:00:00 2001
+From d2fd6d1a5200b9a58863839d21d291cd4f76ac31 Mon Sep 17 00:00:00 2001
 From: Ying Fang <fangying1@huawei.com>
 Date: Mon, 29 Jul 2019 15:47:27 +0800
 Subject: [PATCH] ARM64: record vtimer tick when cpu is stopped
@@ -11,13 +11,13 @@ Signed-off-by: Hao Hong <honghao5@huawei.com>
 Signed-off-by: Haibin Wang <wanghaibin.wang@huawei.com>
 Signed-off-by: Ying Fang <fangying1@huawei.com>
 ---
- cpus.c               | 59 ++++++++++++++++++++++++++++++++++++++++++++
+ cpus.c               | 58 ++++++++++++++++++++++++++++++++++++++++++++
  target/arm/cpu.h     |  2 ++
  target/arm/machine.c |  1 +
- 3 files changed, 62 insertions(+)
+ 3 files changed, 61 insertions(+)
 
 diff --git a/cpus.c b/cpus.c
-index e83f72b4..94c3b8ca 100644
+index e83f72b4..f6ec48a2 100644
 --- a/cpus.c
 +++ b/cpus.c
 @@ -1063,6 +1063,28 @@ void cpu_synchronize_all_pre_loadvm(void)
@@ -61,7 +61,7 @@ index e83f72b4..94c3b8ca 100644
          runstate_set(state);
          vm_state_notify(0, state);
          if (send_stop) {
-@@ -1909,11 +1936,43 @@ void cpu_resume(CPUState *cpu)
+@@ -1909,11 +1936,42 @@ void cpu_resume(CPUState *cpu)
      qemu_cpu_kick(cpu);
  }
  
@@ -71,7 +71,6 @@ index e83f72b4..94c3b8ca 100644
 +    CPUARMState *env = &ARM_CPU(cs)->env;
 +
 +    if (env->vtimer == 0) {
-+        error_report("Do not set vcpu tick.");
 +        return;
 +    }
 +
@@ -131,5 +130,5 @@ index b2925496..d64a0057 100644
          VMSTATE_TIMER_PTR(gt_timer[GTIMER_VIRT], ARMCPU),
          {
 -- 
-2.19.1
+2.23.0
 

qemu.spec

@@ -76,13 +76,11 @@ BuildRequires: gtk3-devel
 BuildRequires: gnutls-devel
 BuildRequires: numactl-devel
 BuildRequires: device-mapper-multipath-devel
-BuildRequires: libfdt-devel
 BuildRequires: rdma-core-devel
 BuildRequires: libcap-devel
 BuildRequires: libcap-ng-devel
 BuildRequires: cyrus-sasl-devel
 BuildRequires: libaio-devel
-BuildRequires: virglrenderer-devel
 BuildRequires: usbredir-devel >= 0.5.2
 BuildRequires: libseccomp-devel >= 2.3.0
 BuildRequires: systemd-devel
@@ -101,13 +99,14 @@ BuildRequires: bzip2-devel
 BuildRequires: libepoxy-devel
 BuildRequires: libtasn1-devel
 BuildRequires: libxml2-devel
-%ifarch x86_64
-BuildRequires: libpmem-devel
-%endif
 BuildRequires: libudev-devel
 BuildRequires: pam-devel
 BuildRequires: perl-Test-Harness
 BuildRequires: python3-devel
+%ifarch aarch64
+BuildRequires: libfdt-devel
+BuildRequires: virglrenderer-devel
+%endif
 
 Requires(post): /usr/bin/getent
 Requires(post): /usr/sbin/groupadd
@@ -151,6 +150,13 @@ Summary: QEMU command line tool for manipulating disk images
 %description img
 This package provides a command line tool for manipulating disk images
 
+%ifarch %{ix86} x86_64
+%package seabios
+Summary: QEMU seabios
+%description seabios
+This package include bios-256k.bin and bios.bin of seabios
+%endif
+
 %prep
 %setup -q -n qemu-%{version}%{?rcstr}
 %autopatch -p1
@@ -190,14 +196,16 @@ buildldflags="VL_LDFLAGS=-Wl,--build-id"
     --enable-mpath \
     --disable-libnfs \
     --disable-bzip2 \
-    --enable-fdt \
     --enable-kvm \
     --enable-tcg \
     --enable-rdma \
     --enable-linux-aio \
     --enable-cap-ng \
     --enable-vhost-user \
+%ifarch aarch64
+    --enable-fdt \
     --enable-virglrenderer \
+%endif
     --enable-cap-ng \
     --enable-libusb \
     --disable-bluez \
@@ -377,6 +385,11 @@ getent passwd qemu >/dev/null || \
 %{_bindir}/qemu-io
 %{_bindir}/qemu-nbd
 
+%ifarch %{ix86} x86_64
+%files seabios
+%{_datadir}/%{name}/bios-256k.bin
+%{_datadir}/%{name}/bios.bin
+%endif
 
 %changelog
 * Thu Oct 17 2019 backport from qemu upstream