Update to apply with 4.1.0 (only build tested) - pkgsrc-localpatches - leot's pkgsrc LOCALPATCHES
(HTM) hg clone https://bitbucket.org/iamleot/pkgsrc-localpatches
(DIR) Log
(DIR) Files
(DIR) Refs
---
(DIR) changeset a468d52775491e062874b80db517b1fac6aa0dd2
(DIR) parent e5d38dbb4650439b05738b84e6c258d256a1d81f
(HTM) Author: Leonardo Taccari <iamleot@gmail.com>
Date: Fri, 16 Aug 2019 18:30:15
Update to apply with 4.1.0 (only build tested)
Diffstat:
emulators/qemu/patch-nvmm-support | 19 +++++--------------
1 files changed, 5 insertions(+), 14 deletions(-)
---
diff -r e5d38dbb4650 -r a468d5277549 emulators/qemu/patch-nvmm-support
--- a/emulators/qemu/patch-nvmm-support Fri Aug 16 18:07:07 2019 +0200
+++ b/emulators/qemu/patch-nvmm-support Fri Aug 16 18:30:15 2019 +0200
@@ -6,8 +6,11 @@
- configure: nvmm is tried to be recognized automatically in the
configure (s/nvmm="no"/nvmm=""/).
+ - target/i386/helper.c: minor adjustments to apply cleanly to
+ 4.1.0
- target/i386/Makefile.objs: minor adjustments to apply cleanly to
4.0.0
+ - vl.c: removed, no longer needed on 4.1.0
--- accel/stubs/Makefile.objs 2018-12-11 18:44:34.000000000 +0100
+++ accel/stubs/Makefile.objs 2019-05-01 11:53:33.068579985 +0200
@@ -364,8 +367,8 @@
--- target/i386/helper.c 2018-12-11 18:44:34.000000000 +0100
+++ target/i386/helper.c 2019-05-01 11:53:33.093579472 +0200
@@ -986,7 +986,7 @@
- X86CPU *cpu = x86_env_get_cpu(env);
- CPUState *cs = CPU(cpu);
+ X86CPU *cpu = env_archcpu(env);
+ CPUState *cs = env_cpu(env);
- if (kvm_enabled() || whpx_enabled()) {
+ if (kvm_enabled() || whpx_enabled() || nvmm_enabled()) {
@@ -1553,15 +1556,3 @@
+}
+
+type_init(nvmm_type_init);
---- vl.c 2018-12-11 18:44:35.000000000 +0100
-+++ vl.c 2019-05-01 11:53:33.095579431 +0200
-@@ -3653,7 +3653,8 @@
- optarg, true);
- optarg = qemu_opt_get(accel_opts, "accel");
- if (!optarg || is_help_option(optarg)) {
-- error_printf("Possible accelerators: kvm, xen, hax, tcg\n");
-+ error_printf("Possible accelerators: "
-+ "kvm, xen, hax, nvmm, tcg\n");
- exit(0);
- }
- opts = qemu_opts_create(qemu_find_opts("machine"), NULL,