1 | v2: dropped a couple of cadence_gem changes to ID regs that | 1 | target-arm queue for rc2. This has 3 Arm related bug fixes, |
---|---|---|---|
2 | caused new clang sanitizer warnings. | 2 | and a couple of non-arm patches which don't have an obviously |
3 | better route into the tree. | ||
3 | 4 | ||
5 | thanks | ||
4 | -- PMM | 6 | -- PMM |
5 | 7 | ||
6 | The following changes since commit dddb37495b844270088e68e3bf30b764d48d863f: | 8 | The following changes since commit b9e02bb3f98174209dbd5c96858e65a31723221b: |
7 | 9 | ||
8 | Merge remote-tracking branch 'remotes/awilliam/tags/vfio-updates-20181015.0' into staging (2018-10-15 18:44:04 +0100) | 10 | Merge remote-tracking branch 'remotes/ericb/tags/pull-nbd-2019-07-19' into staging (2019-07-22 10:11:28 +0100) |
9 | 11 | ||
10 | are available in the Git repository at: | 12 | are available in the Git repository at: |
11 | 13 | ||
12 | https://git.linaro.org/people/pmaydell/qemu-arm.git tags/pull-target-arm-20181016-1 | 14 | https://git.linaro.org/people/pmaydell/qemu-arm.git tags/pull-target-arm-20190722 |
13 | 15 | ||
14 | for you to fetch changes up to 2ef297af07196c29446556537861f8e7dfeeae7b: | 16 | for you to fetch changes up to ddb45afbfbc639365d6c934e4e29f6de5e5e2a0e: |
15 | 17 | ||
16 | coccinelle: new inplace-byteswaps.cocci to remove inplace-byteswapping calls (2018-10-16 17:14:55 +0100) | 18 | contrib/elf2dmp: Build download.o with CURL_CFLAGS (2019-07-22 14:07:39 +0100) |
17 | 19 | ||
18 | ---------------------------------------------------------------- | 20 | ---------------------------------------------------------------- |
19 | target-arm queue: | 21 | target-arm queue: |
20 | * hw/arm/virt: add DT property /secure-chosen/stdout-path indicating secure UART | 22 | * target/arm: Add missing break statement for Hypervisor Trap Exception |
21 | * target/arm: Fix aarch64_sve_change_el wrt EL0 | 23 | (fixes handling of SMC insn taken to AArch32 Hyp mode via HCR.TSC) |
22 | * target/arm: Define fields of ISAR registers | 24 | * hw/arm/fsl-imx6ul.c: Remove dead SMP-related code |
23 | * target/arm: Align cortex-r5 id_isar0 | 25 | * target/arm: Limit ID register assertions to TCG |
24 | * target/arm: Fix cortex-a7 id_isar0 | 26 | * configure: Clarify URL to source downloads |
25 | * net/cadence_gem: Fix various bugs, add support for new | 27 | * contrib/elf2dmp: Build download.o with CURL_CFLAGS |
26 | features that will be used by the Xilinx Versal board | ||
27 | * target-arm: powerctl: Enable HVC when starting CPUs to EL2 | ||
28 | * target/arm: Add the Cortex-A72 | ||
29 | * target/arm: Mark PMINTENCLR and PMINTENCLR_EL1 accesses as possibly doing IO | ||
30 | * target/arm: Mask PMOVSR writes based on supported counters | ||
31 | * target/arm: Initialize ARMMMUFaultInfo in v7m_stack_read/write | ||
32 | * coccinelle: new inplace-byteswaps.cocci to remove inplace-byteswapping calls | ||
33 | 28 | ||
34 | ---------------------------------------------------------------- | 29 | ---------------------------------------------------------------- |
35 | Aaron Lindsay (2): | 30 | Peter Maydell (4): |
36 | target/arm: Mark PMINTENCLR and PMINTENCLR_EL1 accesses as possibly doing IO | 31 | hw/arm/fsl-imx6ul.c: Remove dead SMP-related code |
37 | target/arm: Mask PMOVSR writes based on supported counters | 32 | target/arm: Limit ID register assertions to TCG |
33 | configure: Clarify URL to source downloads | ||
34 | contrib/elf2dmp: Build download.o with CURL_CFLAGS | ||
38 | 35 | ||
39 | Edgar E. Iglesias (8): | 36 | Philippe Mathieu-Daudé (1): |
40 | net: cadence_gem: Disable TSU feature bit | 37 | target/arm: Add missing break statement for Hypervisor Trap Exception |
41 | net: cadence_gem: Use uint32_t for 32bit descriptor words | ||
42 | net: cadence_gem: Add macro with max number of descriptor words | ||
43 | net: cadence_gem: Add support for extended descriptors | ||
44 | net: cadence_gem: Add support for selecting the DMA MemoryRegion | ||
45 | net: cadence_gem: Implement support for 64bit descriptor addresses | ||
46 | target-arm: powerctl: Enable HVC when starting CPUs to EL2 | ||
47 | target/arm: Add the Cortex-A72 | ||
48 | 38 | ||
49 | Jerome Forissier (1): | 39 | configure | 2 +- |
50 | hw/arm/virt: add DT property /secure-chosen/stdout-path indicating secure UART | 40 | Makefile | 1 - |
41 | contrib/elf2dmp/Makefile.objs | 3 +++ | ||
42 | include/hw/arm/fsl-imx6ul.h | 2 +- | ||
43 | hw/arm/fsl-imx6ul.c | 62 +++++++++++++------------------------------ | ||
44 | hw/arm/mcimx6ul-evk.c | 2 +- | ||
45 | target/arm/cpu.c | 7 +++-- | ||
46 | target/arm/helper.c | 1 + | ||
47 | 8 files changed, 30 insertions(+), 50 deletions(-) | ||
51 | 48 | ||
52 | Peter Maydell (2): | ||
53 | target/arm: Initialize ARMMMUFaultInfo in v7m_stack_read/write | ||
54 | coccinelle: new inplace-byteswaps.cocci to remove inplace-byteswapping calls | ||
55 | |||
56 | Richard Henderson (4): | ||
57 | target/arm: Fix aarch64_sve_change_el wrt EL0 | ||
58 | target/arm: Define fields of ISAR registers | ||
59 | target/arm: Align cortex-r5 id_isar0 | ||
60 | target/arm: Fix cortex-a7 id_isar0 | ||
61 | |||
62 | include/hw/net/cadence_gem.h | 7 +- | ||
63 | target/arm/cpu.h | 95 ++++++++++++++- | ||
64 | hw/arm/virt.c | 4 + | ||
65 | hw/net/cadence_gem.c | 185 ++++++++++++++++++++--------- | ||
66 | target/arm/arm-powerctl.c | 10 ++ | ||
67 | target/arm/cpu.c | 7 +- | ||
68 | target/arm/cpu64.c | 66 +++++++++- | ||
69 | target/arm/helper.c | 27 +++-- | ||
70 | target/arm/op_helper.c | 6 +- | ||
71 | scripts/coccinelle/inplace-byteswaps.cocci | 65 ++++++++++ | ||
72 | 10 files changed, 402 insertions(+), 70 deletions(-) | ||
73 | create mode 100644 scripts/coccinelle/inplace-byteswaps.cocci | ||
74 | diff view generated by jsdifflib |
New patch | |||
---|---|---|---|
1 | From: Philippe Mathieu-Daudé <philmd@redhat.com> | ||
1 | 2 | ||
3 | Reported by GCC9 when building with -Wimplicit-fallthrough=2: | ||
4 | |||
5 | target/arm/helper.c: In function ‘arm_cpu_do_interrupt_aarch32_hyp’: | ||
6 | target/arm/helper.c:7958:14: error: this statement may fall through [-Werror=implicit-fallthrough=] | ||
7 | 7958 | addr = 0x14; | ||
8 | | ~~~~~^~~~~~ | ||
9 | target/arm/helper.c:7959:5: note: here | ||
10 | 7959 | default: | ||
11 | | ^~~~~~~ | ||
12 | cc1: all warnings being treated as errors | ||
13 | |||
14 | Fixes: b9bc21ff9f9 | ||
15 | Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> | ||
16 | Reported-by: Stefan Weil <sw@weilnetz.de> | ||
17 | Reviewed-by: Peter Maydell <peter.maydell@linaro.org> | ||
18 | Message-id: 20190719111451.12406-1-philmd@redhat.com | ||
19 | Signed-off-by: Peter Maydell <peter.maydell@linaro.org> | ||
20 | --- | ||
21 | target/arm/helper.c | 1 + | ||
22 | 1 file changed, 1 insertion(+) | ||
23 | |||
24 | diff --git a/target/arm/helper.c b/target/arm/helper.c | ||
25 | index XXXXXXX..XXXXXXX 100644 | ||
26 | --- a/target/arm/helper.c | ||
27 | +++ b/target/arm/helper.c | ||
28 | @@ -XXX,XX +XXX,XX @@ static void arm_cpu_do_interrupt_aarch32_hyp(CPUState *cs) | ||
29 | break; | ||
30 | case EXCP_HYP_TRAP: | ||
31 | addr = 0x14; | ||
32 | + break; | ||
33 | default: | ||
34 | cpu_abort(cs, "Unhandled exception 0x%x\n", cs->exception_index); | ||
35 | } | ||
36 | -- | ||
37 | 2.20.1 | ||
38 | |||
39 | diff view generated by jsdifflib |
New patch | |||
---|---|---|---|
1 | The i.MX6UL always has a single Cortex-A7 CPU (we set FSL_IMX6UL_NUM_CPUS | ||
2 | to 1 in line with this). This means that all the code in fsl-imx6ul.c to | ||
3 | handle multiple CPUs is dead code, and Coverity is now complaining that | ||
4 | it is unreachable (CID 1403008, 1403011). | ||
1 | 5 | ||
6 | Remove the unreachable code and the only-executes-once loops, | ||
7 | and replace the single-entry cpu[] array in the FSLIMX6ULState | ||
8 | with a simple cpu member. | ||
9 | |||
10 | Signed-off-by: Peter Maydell <peter.maydell@linaro.org> | ||
11 | Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> | ||
12 | Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com> | ||
13 | Message-id: 20190712115030.26895-1-peter.maydell@linaro.org | ||
14 | --- | ||
15 | include/hw/arm/fsl-imx6ul.h | 2 +- | ||
16 | hw/arm/fsl-imx6ul.c | 62 +++++++++++-------------------------- | ||
17 | hw/arm/mcimx6ul-evk.c | 2 +- | ||
18 | 3 files changed, 20 insertions(+), 46 deletions(-) | ||
19 | |||
20 | diff --git a/include/hw/arm/fsl-imx6ul.h b/include/hw/arm/fsl-imx6ul.h | ||
21 | index XXXXXXX..XXXXXXX 100644 | ||
22 | --- a/include/hw/arm/fsl-imx6ul.h | ||
23 | +++ b/include/hw/arm/fsl-imx6ul.h | ||
24 | @@ -XXX,XX +XXX,XX @@ typedef struct FslIMX6ULState { | ||
25 | DeviceState parent_obj; | ||
26 | |||
27 | /*< public >*/ | ||
28 | - ARMCPU cpu[FSL_IMX6UL_NUM_CPUS]; | ||
29 | + ARMCPU cpu; | ||
30 | A15MPPrivState a7mpcore; | ||
31 | IMXGPTState gpt[FSL_IMX6UL_NUM_GPTS]; | ||
32 | IMXEPITState epit[FSL_IMX6UL_NUM_EPITS]; | ||
33 | diff --git a/hw/arm/fsl-imx6ul.c b/hw/arm/fsl-imx6ul.c | ||
34 | index XXXXXXX..XXXXXXX 100644 | ||
35 | --- a/hw/arm/fsl-imx6ul.c | ||
36 | +++ b/hw/arm/fsl-imx6ul.c | ||
37 | @@ -XXX,XX +XXX,XX @@ | ||
38 | |||
39 | static void fsl_imx6ul_init(Object *obj) | ||
40 | { | ||
41 | - MachineState *ms = MACHINE(qdev_get_machine()); | ||
42 | FslIMX6ULState *s = FSL_IMX6UL(obj); | ||
43 | char name[NAME_SIZE]; | ||
44 | int i; | ||
45 | |||
46 | - for (i = 0; i < MIN(ms->smp.cpus, FSL_IMX6UL_NUM_CPUS); i++) { | ||
47 | - snprintf(name, NAME_SIZE, "cpu%d", i); | ||
48 | - object_initialize_child(obj, name, &s->cpu[i], sizeof(s->cpu[i]), | ||
49 | - "cortex-a7-" TYPE_ARM_CPU, &error_abort, NULL); | ||
50 | - } | ||
51 | + object_initialize_child(obj, "cpu0", &s->cpu, sizeof(s->cpu), | ||
52 | + "cortex-a7-" TYPE_ARM_CPU, &error_abort, NULL); | ||
53 | |||
54 | /* | ||
55 | * A7MPCORE | ||
56 | @@ -XXX,XX +XXX,XX @@ static void fsl_imx6ul_realize(DeviceState *dev, Error **errp) | ||
57 | MachineState *ms = MACHINE(qdev_get_machine()); | ||
58 | FslIMX6ULState *s = FSL_IMX6UL(dev); | ||
59 | int i; | ||
60 | - qemu_irq irq; | ||
61 | char name[NAME_SIZE]; | ||
62 | - unsigned int smp_cpus = ms->smp.cpus; | ||
63 | + SysBusDevice *sbd; | ||
64 | + DeviceState *d; | ||
65 | |||
66 | - if (smp_cpus > FSL_IMX6UL_NUM_CPUS) { | ||
67 | - error_setg(errp, "%s: Only %d CPUs are supported (%d requested)", | ||
68 | - TYPE_FSL_IMX6UL, FSL_IMX6UL_NUM_CPUS, smp_cpus); | ||
69 | + if (ms->smp.cpus > 1) { | ||
70 | + error_setg(errp, "%s: Only a single CPU is supported (%d requested)", | ||
71 | + TYPE_FSL_IMX6UL, ms->smp.cpus); | ||
72 | return; | ||
73 | } | ||
74 | |||
75 | - for (i = 0; i < smp_cpus; i++) { | ||
76 | - Object *o = OBJECT(&s->cpu[i]); | ||
77 | - | ||
78 | - object_property_set_int(o, QEMU_PSCI_CONDUIT_SMC, | ||
79 | - "psci-conduit", &error_abort); | ||
80 | - | ||
81 | - /* On uniprocessor, the CBAR is set to 0 */ | ||
82 | - if (smp_cpus > 1) { | ||
83 | - object_property_set_int(o, FSL_IMX6UL_A7MPCORE_ADDR, | ||
84 | - "reset-cbar", &error_abort); | ||
85 | - } | ||
86 | - | ||
87 | - if (i) { | ||
88 | - /* Secondary CPUs start in PSCI powered-down state */ | ||
89 | - object_property_set_bool(o, true, | ||
90 | - "start-powered-off", &error_abort); | ||
91 | - } | ||
92 | - | ||
93 | - object_property_set_bool(o, true, "realized", &error_abort); | ||
94 | - } | ||
95 | + object_property_set_int(OBJECT(&s->cpu), QEMU_PSCI_CONDUIT_SMC, | ||
96 | + "psci-conduit", &error_abort); | ||
97 | + object_property_set_bool(OBJECT(&s->cpu), true, | ||
98 | + "realized", &error_abort); | ||
99 | |||
100 | /* | ||
101 | * A7MPCORE | ||
102 | */ | ||
103 | - object_property_set_int(OBJECT(&s->a7mpcore), smp_cpus, "num-cpu", | ||
104 | - &error_abort); | ||
105 | + object_property_set_int(OBJECT(&s->a7mpcore), 1, "num-cpu", &error_abort); | ||
106 | object_property_set_int(OBJECT(&s->a7mpcore), | ||
107 | FSL_IMX6UL_MAX_IRQ + GIC_INTERNAL, | ||
108 | "num-irq", &error_abort); | ||
109 | @@ -XXX,XX +XXX,XX @@ static void fsl_imx6ul_realize(DeviceState *dev, Error **errp) | ||
110 | &error_abort); | ||
111 | sysbus_mmio_map(SYS_BUS_DEVICE(&s->a7mpcore), 0, FSL_IMX6UL_A7MPCORE_ADDR); | ||
112 | |||
113 | - for (i = 0; i < smp_cpus; i++) { | ||
114 | - SysBusDevice *sbd = SYS_BUS_DEVICE(&s->a7mpcore); | ||
115 | - DeviceState *d = DEVICE(qemu_get_cpu(i)); | ||
116 | + sbd = SYS_BUS_DEVICE(&s->a7mpcore); | ||
117 | + d = DEVICE(&s->cpu); | ||
118 | |||
119 | - irq = qdev_get_gpio_in(d, ARM_CPU_IRQ); | ||
120 | - sysbus_connect_irq(sbd, i, irq); | ||
121 | - sysbus_connect_irq(sbd, i + smp_cpus, qdev_get_gpio_in(d, ARM_CPU_FIQ)); | ||
122 | - sysbus_connect_irq(sbd, i + 2 * smp_cpus, | ||
123 | - qdev_get_gpio_in(d, ARM_CPU_VIRQ)); | ||
124 | - sysbus_connect_irq(sbd, i + 3 * smp_cpus, | ||
125 | - qdev_get_gpio_in(d, ARM_CPU_VFIQ)); | ||
126 | - } | ||
127 | + sysbus_connect_irq(sbd, 0, qdev_get_gpio_in(d, ARM_CPU_IRQ)); | ||
128 | + sysbus_connect_irq(sbd, 1, qdev_get_gpio_in(d, ARM_CPU_FIQ)); | ||
129 | + sysbus_connect_irq(sbd, 2, qdev_get_gpio_in(d, ARM_CPU_VIRQ)); | ||
130 | + sysbus_connect_irq(sbd, 3, qdev_get_gpio_in(d, ARM_CPU_VFIQ)); | ||
131 | |||
132 | /* | ||
133 | * A7MPCORE DAP | ||
134 | diff --git a/hw/arm/mcimx6ul-evk.c b/hw/arm/mcimx6ul-evk.c | ||
135 | index XXXXXXX..XXXXXXX 100644 | ||
136 | --- a/hw/arm/mcimx6ul-evk.c | ||
137 | +++ b/hw/arm/mcimx6ul-evk.c | ||
138 | @@ -XXX,XX +XXX,XX @@ static void mcimx6ul_evk_init(MachineState *machine) | ||
139 | } | ||
140 | |||
141 | if (!qtest_enabled()) { | ||
142 | - arm_load_kernel(&s->soc.cpu[0], &boot_info); | ||
143 | + arm_load_kernel(&s->soc.cpu, &boot_info); | ||
144 | } | ||
145 | } | ||
146 | |||
147 | -- | ||
148 | 2.20.1 | ||
149 | |||
150 | diff view generated by jsdifflib |
New patch | |||
---|---|---|---|
1 | In arm_cpu_realizefn() we make several assertions about the values of | ||
2 | guest ID registers: | ||
3 | * if the CPU provides AArch32 v7VE or better it must advertise the | ||
4 | ARM_DIV feature | ||
5 | * if the CPU provides AArch32 A-profile v6 or better it must | ||
6 | advertise the Jazelle feature | ||
1 | 7 | ||
8 | These are essentially consistency checks that our ID register | ||
9 | specifications in cpu.c didn't accidentally miss out a feature, | ||
10 | because increasingly the TCG emulation gates features on the values | ||
11 | in ID registers rather than using old-style checks of ARM_FEATURE_FOO | ||
12 | bits. | ||
13 | |||
14 | Unfortunately, these asserts can cause problems if we're running KVM, | ||
15 | because in that case we don't control the values of the ID registers | ||
16 | -- we read them from the host kernel. In particular, if the host | ||
17 | kernel is older than 4.15 then it doesn't expose the ID registers via | ||
18 | the KVM_GET_ONE_REG ioctl, and we set up dummy values for some | ||
19 | registers and leave the rest at zero. (See the comment in | ||
20 | target/arm/kvm64.c kvm_arm_get_host_cpu_features().) This set of | ||
21 | dummy values is not sufficient to pass our assertions, and so on | ||
22 | those kernels running an AArch32 guest on AArch64 will assert. | ||
23 | |||
24 | We could provide a more sophisticated set of dummy ID registers in | ||
25 | this case, but that still leaves the possibility of a host CPU which | ||
26 | reports bogus ID register values that would cause us to assert. It's | ||
27 | more robust to only do these ID register checks if we're using TCG, | ||
28 | as that is the only case where this is truly a QEMU code bug. | ||
29 | |||
30 | Reported-by: Laszlo Ersek <lersek@redhat.com> | ||
31 | Reviewed-by: Richard Henderson <richard.henderson@linaro.org> | ||
32 | Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> | ||
33 | Tested-by: Laszlo Ersek <lersek@redhat.com> | ||
34 | Signed-off-by: Peter Maydell <peter.maydell@linaro.org> | ||
35 | Message-id: 20190718125928.20147-1-peter.maydell@linaro.org | ||
36 | Fixes: https://bugs.launchpad.net/qemu/+bug/1830864 | ||
37 | Signed-off-by: Peter Maydell <peter.maydell@linaro.org> | ||
38 | --- | ||
39 | target/arm/cpu.c | 7 +++++-- | ||
40 | 1 file changed, 5 insertions(+), 2 deletions(-) | ||
41 | |||
42 | diff --git a/target/arm/cpu.c b/target/arm/cpu.c | ||
43 | index XXXXXXX..XXXXXXX 100644 | ||
44 | --- a/target/arm/cpu.c | ||
45 | +++ b/target/arm/cpu.c | ||
46 | @@ -XXX,XX +XXX,XX @@ static void arm_cpu_realizefn(DeviceState *dev, Error **errp) | ||
47 | * There exist AArch64 cpus without AArch32 support. When KVM | ||
48 | * queries ID_ISAR0_EL1 on such a host, the value is UNKNOWN. | ||
49 | * Similarly, we cannot check ID_AA64PFR0 without AArch64 support. | ||
50 | + * As a general principle, we also do not make ID register | ||
51 | + * consistency checks anywhere unless using TCG, because only | ||
52 | + * for TCG would a consistency-check failure be a QEMU bug. | ||
53 | */ | ||
54 | if (arm_feature(&cpu->env, ARM_FEATURE_AARCH64)) { | ||
55 | no_aa32 = !cpu_isar_feature(aa64_aa32, cpu); | ||
56 | @@ -XXX,XX +XXX,XX @@ static void arm_cpu_realizefn(DeviceState *dev, Error **errp) | ||
57 | * Presence of EL2 itself is ARM_FEATURE_EL2, and of the | ||
58 | * Security Extensions is ARM_FEATURE_EL3. | ||
59 | */ | ||
60 | - assert(no_aa32 || cpu_isar_feature(arm_div, cpu)); | ||
61 | + assert(!tcg_enabled() || no_aa32 || cpu_isar_feature(arm_div, cpu)); | ||
62 | set_feature(env, ARM_FEATURE_LPAE); | ||
63 | set_feature(env, ARM_FEATURE_V7); | ||
64 | } | ||
65 | @@ -XXX,XX +XXX,XX @@ static void arm_cpu_realizefn(DeviceState *dev, Error **errp) | ||
66 | if (arm_feature(env, ARM_FEATURE_V6)) { | ||
67 | set_feature(env, ARM_FEATURE_V5); | ||
68 | if (!arm_feature(env, ARM_FEATURE_M)) { | ||
69 | - assert(no_aa32 || cpu_isar_feature(jazelle, cpu)); | ||
70 | + assert(!tcg_enabled() || no_aa32 || cpu_isar_feature(jazelle, cpu)); | ||
71 | set_feature(env, ARM_FEATURE_AUXCR); | ||
72 | } | ||
73 | } | ||
74 | -- | ||
75 | 2.20.1 | ||
76 | |||
77 | diff view generated by jsdifflib |
New patch | |||
---|---|---|---|
1 | If configure detects that it's being run on a source tree which | ||
2 | is missing git modules, it prints an error messages suggesting | ||
3 | that the user downloads a correct source archive from the project | ||
4 | website. However https://www.qemu.org/download/ is a link to a | ||
5 | page with multiple tabs, with the default being the one telling | ||
6 | users how to get binaries from their distro. Clarify the URL | ||
7 | we print to include the #source anchor, so that the browser will | ||
8 | go directly to the source-tarball instructions. | ||
1 | 9 | ||
10 | Reported-by: Philippe Mathieu-Daudé <philmd@redhat.com> | ||
11 | Reviewed-by: Thomas Huth <thuth@redhat.com> | ||
12 | Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> | ||
13 | Reviewed-by: Stefan Weil <sw@weilnetz.de> | ||
14 | Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com> | ||
15 | Signed-off-by: Peter Maydell <peter.maydell@linaro.org> | ||
16 | Message-id: 20190718131659.20783-1-peter.maydell@linaro.org | ||
17 | Suggested-by: Stefan Weil <sw@weilnetz.de> | ||
18 | Signed-off-by: Peter Maydell <peter.maydell@linaro.org> | ||
19 | --- | ||
20 | configure | 2 +- | ||
21 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
22 | |||
23 | diff --git a/configure b/configure | ||
24 | index XXXXXXX..XXXXXXX 100755 | ||
25 | --- a/configure | ||
26 | +++ b/configure | ||
27 | @@ -XXX,XX +XXX,XX @@ else | ||
28 | echo "to acquire QEMU source archives. Non-GIT builds are only" | ||
29 | echo "supported with source archives linked from:" | ||
30 | echo | ||
31 | - echo " https://www.qemu.org/download/" | ||
32 | + echo " https://www.qemu.org/download/#source" | ||
33 | echo | ||
34 | echo "Developers working with GIT can use scripts/archive-source.sh" | ||
35 | echo "if they need to create valid source archives." | ||
36 | -- | ||
37 | 2.20.1 | ||
38 | |||
39 | diff view generated by jsdifflib |
New patch | |||
---|---|---|---|
1 | contrib/elf2dmp has a source file which uses curl/curl.h; | ||
2 | although we link the final executable with CURL_LIBS, we | ||
3 | forgot to build this source file with CURL_CFLAGS, so if | ||
4 | the curl header is in a place that's not already on the | ||
5 | system include path then it will fail to build. | ||
1 | 6 | ||
7 | Add a line specifying the cflags needed for download.o; | ||
8 | while we are here, bring the specification of the libs | ||
9 | into line with this, since using a per-object variable | ||
10 | setting is preferred over adding them to the final | ||
11 | executable link line. | ||
12 | |||
13 | Signed-off-by: Peter Maydell <peter.maydell@linaro.org> | ||
14 | Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com> | ||
15 | Message-id: 20190719100955.17180-1-peter.maydell@linaro.org | ||
16 | --- | ||
17 | Makefile | 1 - | ||
18 | contrib/elf2dmp/Makefile.objs | 3 +++ | ||
19 | 2 files changed, 3 insertions(+), 1 deletion(-) | ||
20 | |||
21 | diff --git a/Makefile b/Makefile | ||
22 | index XXXXXXX..XXXXXXX 100644 | ||
23 | --- a/Makefile | ||
24 | +++ b/Makefile | ||
25 | @@ -XXX,XX +XXX,XX @@ ifneq ($(EXESUF),) | ||
26 | qemu-ga: qemu-ga$(EXESUF) $(QGA_VSS_PROVIDER) $(QEMU_GA_MSI) | ||
27 | endif | ||
28 | |||
29 | -elf2dmp$(EXESUF): LIBS += $(CURL_LIBS) | ||
30 | elf2dmp$(EXESUF): $(elf2dmp-obj-y) | ||
31 | $(call LINK, $^) | ||
32 | |||
33 | diff --git a/contrib/elf2dmp/Makefile.objs b/contrib/elf2dmp/Makefile.objs | ||
34 | index XXXXXXX..XXXXXXX 100644 | ||
35 | --- a/contrib/elf2dmp/Makefile.objs | ||
36 | +++ b/contrib/elf2dmp/Makefile.objs | ||
37 | @@ -1 +1,4 @@ | ||
38 | elf2dmp-obj-y = main.o addrspace.o download.o pdb.o qemu_elf.o | ||
39 | + | ||
40 | +download.o-cflags := $(CURL_CFLAGS) | ||
41 | +download.o-libs := $(CURL_LIBS) | ||
42 | -- | ||
43 | 2.20.1 | ||
44 | |||
45 | diff view generated by jsdifflib |