From nobody Mon Feb 9 06:05:49 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1563801319; cv=none; d=zoho.com; s=zohoarc; b=bk98fu/WlNRrCMGyh34w/j8TlcKBpk4SFqibCtSsVwY81kDX6IarQtAt+F8jjfFpOZMipugvJzLcQJ5f7MHG8Wazhacdkr/08n2OyKLUJ6BU+hZXF8BNu5GQ0MXzQkxCPTo9sZ8qX1FOxias84fhhJFSIlLX5Dk34slRI2yxGNg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1563801319; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=GzeCjbtXLdqWVGSKySjABkNnwqpyaiVuNILnUkbYPsw=; b=dclUHNeCZW7eZFhOhe8EL6uSvQaQEwm2cyjj6uS6FaCU/fbc+Sx5AVvmaGKG9Gx3vGeD3FmCQJToLasQOeLnf03nd48NcyeHr0SwKHd3C3OC/4d5Of5Aup4l/8EHwhGDn82MILtgczoE78/x+seVE7Xz/mj+avBe0D+9jBnCKDw= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1563801318988735.168609135829; Mon, 22 Jul 2019 06:15:18 -0700 (PDT) Received: from localhost ([::1]:33408 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hpY9k-0000LY-5I for importer@patchew.org; Mon, 22 Jul 2019 09:15:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47603) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hpY9B-0007Ny-H3 for qemu-devel@nongnu.org; Mon, 22 Jul 2019 09:14:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hpY9A-00034f-H6 for qemu-devel@nongnu.org; Mon, 22 Jul 2019 09:14:33 -0400 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]:54279) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hpY9A-00033z-BA for qemu-devel@nongnu.org; Mon, 22 Jul 2019 09:14:32 -0400 Received: by mail-wm1-x336.google.com with SMTP id p74so35118453wme.4 for ; Mon, 22 Jul 2019 06:14:32 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id f12sm42207217wrg.5.2019.07.22.06.14.30 for (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 22 Jul 2019 06:14:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=GzeCjbtXLdqWVGSKySjABkNnwqpyaiVuNILnUkbYPsw=; b=yRijLWEG7gpaqi6/bGZUuADYOKXuwlIG5GTnp/YPnmHFlULLz2p6q5oES24a/UiNDo z8wvN79LI8wWOBmstyjFBqDo5YCN5JlJZLJvlE2k4YyoX6e53uR68AMN9AnpWxKTCtnI C2iqwQ+hpw5CD4LTvCJ8uSH+AHDqWdo8QtpLjVNOpLJrnY0WDmd35Z6cygKxsnlKIIII ef08ZWukToD6q+86XyY7W9Fdt6G0/u2LGHkRFrX4H3DORtzUJFMPht3tX7iG+rTfBYsS qXwviHJpuQz59aoWJqhy6rrA24mB0t6KPlVHo8OQt8aH9E7JD2VDY58sFn26T5nhwg8l rhaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=GzeCjbtXLdqWVGSKySjABkNnwqpyaiVuNILnUkbYPsw=; b=HGYbpkqxe5qS103JRpibgkaQ33+rF3x9akTqQSrHOTiZrmU40LDisKz6N5AQcRQaU3 nYKxWMK3XRbJtKV1lS5RpSovcKLjK7/yYL79UautjtYSDoel1w/jCf1JsW/kqZHDlWz3 apq2uIFaALBoMpbG8HbzXB/VmMNH1IeVIuIMhGimlHVGPbyynFxbe68vw+Ri1KlZnstl chMfU3si7EhuaDO5LpEEPGKsI9Q0e/sATulrbX2VQP8f1opbDfLYfGrE3Iorw+sjwmZv 89HP5BHsnmlpRRon9Jx8iU80SEDd0Azz1U5AsCPSFz0tZYxQenddDr41FdyG+TlZKxFK fNmw== X-Gm-Message-State: APjAAAVefrhva69toxQScj/Nnzz0vxf5Vu7I0FJNxW/AUJp17pbZb1gk HAfwXmEKhVnJri3BwhtRx0yWpHhm7N54yg== X-Google-Smtp-Source: APXvYqzFewCPsLWBZ4vxLH6AdAMWX4Ou4foab2QGEXLCZ/xZAdzQ0r8QtUHB2jZ1E6EufzUIv4Cy2Q== X-Received: by 2002:a1c:c188:: with SMTP id r130mr60520677wmf.73.1563801270907; Mon, 22 Jul 2019 06:14:30 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Date: Mon, 22 Jul 2019 14:14:23 +0100 Message-Id: <20190722131427.2669-2-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190722131427.2669-1-peter.maydell@linaro.org> References: <20190722131427.2669-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::336 Subject: [Qemu-devel] [PULL 1/5] target/arm: Add missing break statement for Hypervisor Trap Exception X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Philippe Mathieu-Daud=C3=A9 Reported by GCC9 when building with -Wimplicit-fallthrough=3D2: target/arm/helper.c: In function =E2=80=98arm_cpu_do_interrupt_aarch32_hy= p=E2=80=99: target/arm/helper.c:7958:14: error: this statement may fall through [-Wer= ror=3Dimplicit-fallthrough=3D] 7958 | addr =3D 0x14; | ~~~~~^~~~~~ target/arm/helper.c:7959:5: note: here 7959 | default: | ^~~~~~~ cc1: all warnings being treated as errors Fixes: b9bc21ff9f9 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reported-by: Stefan Weil Reviewed-by: Peter Maydell Message-id: 20190719111451.12406-1-philmd@redhat.com Signed-off-by: Peter Maydell --- target/arm/helper.c | 1 + 1 file changed, 1 insertion(+) diff --git a/target/arm/helper.c b/target/arm/helper.c index 20f8728be11..b74c23a9bc0 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -7956,6 +7956,7 @@ static void arm_cpu_do_interrupt_aarch32_hyp(CPUState= *cs) break; case EXCP_HYP_TRAP: addr =3D 0x14; + break; default: cpu_abort(cs, "Unhandled exception 0x%x\n", cs->exception_index); } --=20 2.20.1 From nobody Mon Feb 9 06:05:49 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1563801319; cv=none; d=zoho.com; s=zohoarc; b=Gl/EjtrGGZrLxwBPMdxcWy5+GVQBb3tC5S64aBca93/cxeGRSQI/vh7cDnW2XTbTynhBL0TJMDOGIGY8tXq2dk2bQdAo9Bai4FZApa6Sz7/MtYZZPGkhDNT9B6e4EE1HmLzU7drKUzkUrkzR2sObAZSxOeKPk8T1JrbrLbXP2tI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1563801319; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=l5k8gNjzcUVX6OXyFMM4mDjUBLlyPFiurmFGH7h+8m8=; b=JPqiFjv8zCkbV0Hhyt3SbPVGC4pkm9sayuhMmiEGKr8AwIN/7cuUYYOQzYs/D6nKEcvVdqcjINqcoNkbJrQle3y5gS39awaLiyg+76tkzG7ypySPmlTsjYKSrvtYdPuS+O+O12qriqbWcos9BgFSPfSXJBx+TKCDpvRxKpF20F0= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1563801319421270.32303656722854; Mon, 22 Jul 2019 06:15:19 -0700 (PDT) Received: from localhost ([::1]:33418 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hpY9q-0000j8-Ie for importer@patchew.org; Mon, 22 Jul 2019 09:15:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47632) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hpY9D-0007OC-3N for qemu-devel@nongnu.org; Mon, 22 Jul 2019 09:14:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hpY9B-000362-Qv for qemu-devel@nongnu.org; Mon, 22 Jul 2019 09:14:35 -0400 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:52004) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hpY9B-000358-KA for qemu-devel@nongnu.org; Mon, 22 Jul 2019 09:14:33 -0400 Received: by mail-wm1-x342.google.com with SMTP id 207so35145051wma.1 for ; Mon, 22 Jul 2019 06:14:33 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id f12sm42207217wrg.5.2019.07.22.06.14.30 for (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 22 Jul 2019 06:14:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=l5k8gNjzcUVX6OXyFMM4mDjUBLlyPFiurmFGH7h+8m8=; b=UK2fS7UYYw+TzEarLn+wyi1DN4JuoZGYkROeZKGn3ItsmGi6VastmbnbZrusZg8ErG X0PIjrDmtKwl6uqxwWa93AU+z62o2RBeHoC/eRo3CArrMOFPlkcA9IpgqGsaEd5WV4ff Xc6GQOuDUwlLEp9BF9YNXg8WqObqFrhJagMElLq/+G4rxVlG707Qg+OxorYqpBj/OUim w6RJETvBSpn8q/Mw7qnOvGubc3NnSt/fBjqnvousmuGm0O+eIg9RHhCdrou18ZkNQCT2 XSDFpsSyugw3Wwwg3QeM4cLnsRxglAbXZ/JDNA2bwy2gdCLg7VaDBCAyVnpEporbtuP2 Dfew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=l5k8gNjzcUVX6OXyFMM4mDjUBLlyPFiurmFGH7h+8m8=; b=J8/ZqZhmFyoZ81WOx0CjEhiUYmNkKVAD3RO/ImPAEhqCIGjkpMARSA0j9YWYCDdpTs pm7U6qLs9kug3DiPDm39rLG9Kz5ZkeYomkQNxhQ1/ISc1CGQahFFDIYPoBIBvLTmDyX5 pXCf0V8QdhzpSkrK8tPKG0z9mVEXJuw/zOwPJkErvWmh/XHoU9LKaYG1cvpwi129qiYD 9hhfnY2VGKuzyugJ19cJ0Q0r1ligImiZ/8UVJmMz34xOAv8EMQOti9y/YAQXIW1LKgmT MIYmlAb+XX+zZ1DUlMT3Bgd39ZAQXjzZCvfbvyfu6NcOhaEPUG9l+Yv00hRn26y2jLow RzNQ== X-Gm-Message-State: APjAAAV+8c3evraclFYp3+8tw5dcx9uJLODqIiQf0lEruuSGtTzovzBx KunbJMj7bIDNUTBo3pCP8g5LBHfA8oXK5Q== X-Google-Smtp-Source: APXvYqy9y+qqTy8W6eZat68QDU0fZ+fI2SiLETlIDe8mchLun6rsMt6ILoKDya+l3jE0FZs7y0DH9w== X-Received: by 2002:a7b:ce88:: with SMTP id q8mr64471414wmj.89.1563801272399; Mon, 22 Jul 2019 06:14:32 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Date: Mon, 22 Jul 2019 14:14:24 +0100 Message-Id: <20190722131427.2669-3-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190722131427.2669-1-peter.maydell@linaro.org> References: <20190722131427.2669-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::342 Subject: [Qemu-devel] [PULL 2/5] hw/arm/fsl-imx6ul.c: Remove dead SMP-related code X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) The i.MX6UL always has a single Cortex-A7 CPU (we set FSL_IMX6UL_NUM_CPUS to 1 in line with this). This means that all the code in fsl-imx6ul.c to handle multiple CPUs is dead code, and Coverity is now complaining that it is unreachable (CID 1403008, 1403011). Remove the unreachable code and the only-executes-once loops, and replace the single-entry cpu[] array in the FSLIMX6ULState with a simple cpu member. Signed-off-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 Message-id: 20190712115030.26895-1-peter.maydell@linaro.org --- include/hw/arm/fsl-imx6ul.h | 2 +- hw/arm/fsl-imx6ul.c | 62 +++++++++++-------------------------- hw/arm/mcimx6ul-evk.c | 2 +- 3 files changed, 20 insertions(+), 46 deletions(-) diff --git a/include/hw/arm/fsl-imx6ul.h b/include/hw/arm/fsl-imx6ul.h index 9e94e98f8ee..eda389aec7d 100644 --- a/include/hw/arm/fsl-imx6ul.h +++ b/include/hw/arm/fsl-imx6ul.h @@ -61,7 +61,7 @@ typedef struct FslIMX6ULState { DeviceState parent_obj; =20 /*< public >*/ - ARMCPU cpu[FSL_IMX6UL_NUM_CPUS]; + ARMCPU cpu; A15MPPrivState a7mpcore; IMXGPTState gpt[FSL_IMX6UL_NUM_GPTS]; IMXEPITState epit[FSL_IMX6UL_NUM_EPITS]; diff --git a/hw/arm/fsl-imx6ul.c b/hw/arm/fsl-imx6ul.c index f8601654388..b074177a71d 100644 --- a/hw/arm/fsl-imx6ul.c +++ b/hw/arm/fsl-imx6ul.c @@ -29,16 +29,12 @@ =20 static void fsl_imx6ul_init(Object *obj) { - MachineState *ms =3D MACHINE(qdev_get_machine()); FslIMX6ULState *s =3D FSL_IMX6UL(obj); char name[NAME_SIZE]; int i; =20 - for (i =3D 0; i < MIN(ms->smp.cpus, FSL_IMX6UL_NUM_CPUS); i++) { - snprintf(name, NAME_SIZE, "cpu%d", i); - object_initialize_child(obj, name, &s->cpu[i], sizeof(s->cpu[i]), - "cortex-a7-" TYPE_ARM_CPU, &error_abort, N= ULL); - } + object_initialize_child(obj, "cpu0", &s->cpu, sizeof(s->cpu), + "cortex-a7-" TYPE_ARM_CPU, &error_abort, NULL); =20 /* * A7MPCORE @@ -161,42 +157,25 @@ static void fsl_imx6ul_realize(DeviceState *dev, Erro= r **errp) MachineState *ms =3D MACHINE(qdev_get_machine()); FslIMX6ULState *s =3D FSL_IMX6UL(dev); int i; - qemu_irq irq; char name[NAME_SIZE]; - unsigned int smp_cpus =3D ms->smp.cpus; + SysBusDevice *sbd; + DeviceState *d; =20 - if (smp_cpus > FSL_IMX6UL_NUM_CPUS) { - error_setg(errp, "%s: Only %d CPUs are supported (%d requested)", - TYPE_FSL_IMX6UL, FSL_IMX6UL_NUM_CPUS, smp_cpus); + if (ms->smp.cpus > 1) { + error_setg(errp, "%s: Only a single CPU is supported (%d requested= )", + TYPE_FSL_IMX6UL, ms->smp.cpus); return; } =20 - for (i =3D 0; i < smp_cpus; i++) { - Object *o =3D OBJECT(&s->cpu[i]); - - object_property_set_int(o, QEMU_PSCI_CONDUIT_SMC, - "psci-conduit", &error_abort); - - /* On uniprocessor, the CBAR is set to 0 */ - if (smp_cpus > 1) { - object_property_set_int(o, FSL_IMX6UL_A7MPCORE_ADDR, - "reset-cbar", &error_abort); - } - - if (i) { - /* Secondary CPUs start in PSCI powered-down state */ - object_property_set_bool(o, true, - "start-powered-off", &error_abort); - } - - object_property_set_bool(o, true, "realized", &error_abort); - } + object_property_set_int(OBJECT(&s->cpu), QEMU_PSCI_CONDUIT_SMC, + "psci-conduit", &error_abort); + object_property_set_bool(OBJECT(&s->cpu), true, + "realized", &error_abort); =20 /* * A7MPCORE */ - object_property_set_int(OBJECT(&s->a7mpcore), smp_cpus, "num-cpu", - &error_abort); + object_property_set_int(OBJECT(&s->a7mpcore), 1, "num-cpu", &error_abo= rt); object_property_set_int(OBJECT(&s->a7mpcore), FSL_IMX6UL_MAX_IRQ + GIC_INTERNAL, "num-irq", &error_abort); @@ -204,18 +183,13 @@ static void fsl_imx6ul_realize(DeviceState *dev, Erro= r **errp) &error_abort); sysbus_mmio_map(SYS_BUS_DEVICE(&s->a7mpcore), 0, FSL_IMX6UL_A7MPCORE_A= DDR); =20 - for (i =3D 0; i < smp_cpus; i++) { - SysBusDevice *sbd =3D SYS_BUS_DEVICE(&s->a7mpcore); - DeviceState *d =3D DEVICE(qemu_get_cpu(i)); + sbd =3D SYS_BUS_DEVICE(&s->a7mpcore); + d =3D DEVICE(&s->cpu); =20 - irq =3D qdev_get_gpio_in(d, ARM_CPU_IRQ); - sysbus_connect_irq(sbd, i, irq); - sysbus_connect_irq(sbd, i + smp_cpus, qdev_get_gpio_in(d, ARM_CPU_= FIQ)); - sysbus_connect_irq(sbd, i + 2 * smp_cpus, - qdev_get_gpio_in(d, ARM_CPU_VIRQ)); - sysbus_connect_irq(sbd, i + 3 * smp_cpus, - qdev_get_gpio_in(d, ARM_CPU_VFIQ)); - } + sysbus_connect_irq(sbd, 0, qdev_get_gpio_in(d, ARM_CPU_IRQ)); + sysbus_connect_irq(sbd, 1, qdev_get_gpio_in(d, ARM_CPU_FIQ)); + sysbus_connect_irq(sbd, 2, qdev_get_gpio_in(d, ARM_CPU_VIRQ)); + sysbus_connect_irq(sbd, 3, qdev_get_gpio_in(d, ARM_CPU_VFIQ)); =20 /* * A7MPCORE DAP diff --git a/hw/arm/mcimx6ul-evk.c b/hw/arm/mcimx6ul-evk.c index bbffb11c2a8..1f6f4aed97c 100644 --- a/hw/arm/mcimx6ul-evk.c +++ b/hw/arm/mcimx6ul-evk.c @@ -71,7 +71,7 @@ static void mcimx6ul_evk_init(MachineState *machine) } =20 if (!qtest_enabled()) { - arm_load_kernel(&s->soc.cpu[0], &boot_info); + arm_load_kernel(&s->soc.cpu, &boot_info); } } =20 --=20 2.20.1 From nobody Mon Feb 9 06:05:49 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1563801320; cv=none; d=zoho.com; s=zohoarc; b=SYdypgi2rsJbXBWix4w8fRJT9fV0TJADd8YY1b+9J/vQIrq0DKMKbAuOk7IWLLdh9VOHH5yBtUVYMh7FZnPKFMGKOnlB7vjuKH14k8AU7o2PwvdhNPvOxYD/EL1aj49FCYA3223MQV9LvRssupTYVvt9ncaP8KQs/rO/S9uQVIM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1563801320; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=JCIUgbCXYRFhL/tzoxMmaDrpmhwWT1hxcCQiVglgdPQ=; b=Y2Y6NKgw2XcUY78rKHdNeNZHoFCyTD8ncT5cgNhw839i5FkXFmxX32QcMeycr9SdPAijQhbQmApnpSAxhcqOLEONWM18wxYxnnZqtIyAK/pHt3rGS9AtrRZ6j1r4KDxMwC8CvEI8577UFWGhvUBdaG59wo2GyksXOoYwAeKj2OI= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1563801320808516.6751630203137; Mon, 22 Jul 2019 06:15:20 -0700 (PDT) Received: from localhost ([::1]:33420 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hpY9t-0000ow-8G for importer@patchew.org; Mon, 22 Jul 2019 09:15:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47645) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hpY9E-0007Oc-17 for qemu-devel@nongnu.org; Mon, 22 Jul 2019 09:14:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hpY9C-00036r-KU for qemu-devel@nongnu.org; Mon, 22 Jul 2019 09:14:35 -0400 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:34210) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hpY9C-00035y-EB for qemu-devel@nongnu.org; Mon, 22 Jul 2019 09:14:34 -0400 Received: by mail-wm1-x343.google.com with SMTP id w9so28766654wmd.1 for ; Mon, 22 Jul 2019 06:14:34 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id f12sm42207217wrg.5.2019.07.22.06.14.32 for (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 22 Jul 2019 06:14:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=JCIUgbCXYRFhL/tzoxMmaDrpmhwWT1hxcCQiVglgdPQ=; b=TRCNQ/XY/5ZNbLM99j7leegvf79WbbGiK0ZAduWlBgZmZUIarBneZDKwVrc4Ps/Tmu lgiayF1GNuq365xEvUEq6x53zVZbXkraMG7vx4/+ZLTyALx3XuybD5X1oo+IPSqq24k+ UXZjlbkHbp5Hgf1PSIEv/dePVM4G6gbE4Rp2k5kBzd04qGB7aVQ5jzy9KgEXPWCKc1Jq IpZ7mfMARXpla4TIp2RD/1qsdx+grMxSgXplOHuij4XuHGBVLiqshIcQWCDj8okZlTro 8MRzFI8JunujmLDpyGb1jsiSeMoa6c5jJ72KmKAthCEKQeixTbYXWv9+6n1ov5JNwYif tZ/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=JCIUgbCXYRFhL/tzoxMmaDrpmhwWT1hxcCQiVglgdPQ=; b=el8q35y20MzLmNvgEx23kKk0gdFJjOVEBIu2rVQtx0PZ7ihL1EWfFwo6MtMb8Q3W/Y qUnYr9IEF4iVtUOWU2JXXEEDZVZXjq8FEN12pCRFh+VJW31cQWg0wupg842HHoWzgCj1 AuHw0RzvoPMDwS1XGb9iMzjuIlQ0oSinP0exjB3gfGsFC6ut6ixq2QUxUBw5rJxBX9XW G7rPcckq+PbMpus6Z0/EgoBL0wuMcg5bsbkESaXik7NvG2JaOeZDSJwyjiCOqM1iLQJE evie1K7eIzD2yWhyR8oX/mTexeC/TtaK1qk3Snz8CkT0xRGPZ9erO9MkJRse++9QBvxq HhMw== X-Gm-Message-State: APjAAAVEyZQQlN7Lu3LV9GkF1jJycnUee543UGOIp1PoYk/+Fynqr7KR D5RSYPf/eu6auv3c3CLo5R2XGRCtOpqirQ== X-Google-Smtp-Source: APXvYqxXCwpjNf9I5fs+2p/dbbA0GWf4CVwF0EI2zSmOTg1nqY+4KaIraK9Jr3VFSAwIBp3nJDwPhg== X-Received: by 2002:a1c:305:: with SMTP id 5mr33080448wmd.101.1563801273238; Mon, 22 Jul 2019 06:14:33 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Date: Mon, 22 Jul 2019 14:14:25 +0100 Message-Id: <20190722131427.2669-4-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190722131427.2669-1-peter.maydell@linaro.org> References: <20190722131427.2669-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::343 Subject: [Qemu-devel] [PULL 3/5] target/arm: Limit ID register assertions to TCG X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) In arm_cpu_realizefn() we make several assertions about the values of guest ID registers: * if the CPU provides AArch32 v7VE or better it must advertise the ARM_DIV feature * if the CPU provides AArch32 A-profile v6 or better it must advertise the Jazelle feature These are essentially consistency checks that our ID register specifications in cpu.c didn't accidentally miss out a feature, because increasingly the TCG emulation gates features on the values in ID registers rather than using old-style checks of ARM_FEATURE_FOO bits. Unfortunately, these asserts can cause problems if we're running KVM, because in that case we don't control the values of the ID registers -- we read them from the host kernel. In particular, if the host kernel is older than 4.15 then it doesn't expose the ID registers via the KVM_GET_ONE_REG ioctl, and we set up dummy values for some registers and leave the rest at zero. (See the comment in target/arm/kvm64.c kvm_arm_get_host_cpu_features().) This set of dummy values is not sufficient to pass our assertions, and so on those kernels running an AArch32 guest on AArch64 will assert. We could provide a more sophisticated set of dummy ID registers in this case, but that still leaves the possibility of a host CPU which reports bogus ID register values that would cause us to assert. It's more robust to only do these ID register checks if we're using TCG, as that is the only case where this is truly a QEMU code bug. Reported-by: Laszlo Ersek Reviewed-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Laszlo Ersek Signed-off-by: Peter Maydell Message-id: 20190718125928.20147-1-peter.maydell@linaro.org Fixes: https://bugs.launchpad.net/qemu/+bug/1830864 Signed-off-by: Peter Maydell --- target/arm/cpu.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/target/arm/cpu.c b/target/arm/cpu.c index 1959467fdc8..9eb40ff755f 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -1369,6 +1369,9 @@ static void arm_cpu_realizefn(DeviceState *dev, Error= **errp) * There exist AArch64 cpus without AArch32 support. When KVM * queries ID_ISAR0_EL1 on such a host, the value is UNKNOWN. * Similarly, we cannot check ID_AA64PFR0 without AArch64 support. + * As a general principle, we also do not make ID register + * consistency checks anywhere unless using TCG, because only + * for TCG would a consistency-check failure be a QEMU bug. */ if (arm_feature(&cpu->env, ARM_FEATURE_AARCH64)) { no_aa32 =3D !cpu_isar_feature(aa64_aa32, cpu); @@ -1383,7 +1386,7 @@ static void arm_cpu_realizefn(DeviceState *dev, Error= **errp) * Presence of EL2 itself is ARM_FEATURE_EL2, and of the * Security Extensions is ARM_FEATURE_EL3. */ - assert(no_aa32 || cpu_isar_feature(arm_div, cpu)); + assert(!tcg_enabled() || no_aa32 || cpu_isar_feature(arm_div, cpu)= ); set_feature(env, ARM_FEATURE_LPAE); set_feature(env, ARM_FEATURE_V7); } @@ -1409,7 +1412,7 @@ static void arm_cpu_realizefn(DeviceState *dev, Error= **errp) if (arm_feature(env, ARM_FEATURE_V6)) { set_feature(env, ARM_FEATURE_V5); if (!arm_feature(env, ARM_FEATURE_M)) { - assert(no_aa32 || cpu_isar_feature(jazelle, cpu)); + assert(!tcg_enabled() || no_aa32 || cpu_isar_feature(jazelle, = cpu)); set_feature(env, ARM_FEATURE_AUXCR); } } --=20 2.20.1 From nobody Mon Feb 9 06:05:49 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1563801349; cv=none; d=zoho.com; s=zohoarc; b=bjgNoTL5bvq0xsWKHRVzmgoftoT4T5uKVFqH6FkA/Xv+LTElRFZ4j32nBp3bjBcZd6a586COHICN5v8s7rzZbOzgYgkqtlt2XH/t5th6MNHlnnqKvlU1cdeAJsp2OqjGEZUdCHSja4nEx6BbP4xhykVw8KHN5RIDWvjUZeRi4A8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1563801349; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=Hw14cIX/3NJAwOvSYtbBmj2PFTe9lFHEo4DMf5Anj/o=; b=T1TpPY8o90ibK8+PpGf7+20w2kG4AIp0PJipV1tOO6oCN+sHbxL9F2d1BtTPbizM/fqbx/+J5eIvUqOL+4aPFNftBxtp2leBH06x0dKP6zGGP7y2iHgAbOpjfXvO3EWHJ+CdiEeK2Ww1VhN+sJmJFPS58UOLQvnhloQ66L/Y1PY= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1563801349396574.6807887993222; Mon, 22 Jul 2019 06:15:49 -0700 (PDT) Received: from localhost ([::1]:33440 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hpYAO-00036k-Ag for importer@patchew.org; Mon, 22 Jul 2019 09:15:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47659) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hpY9E-0007RS-N0 for qemu-devel@nongnu.org; Mon, 22 Jul 2019 09:14:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hpY9D-00037o-Ia for qemu-devel@nongnu.org; Mon, 22 Jul 2019 09:14:36 -0400 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]:41467) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hpY9D-000371-CY for qemu-devel@nongnu.org; Mon, 22 Jul 2019 09:14:35 -0400 Received: by mail-wr1-x434.google.com with SMTP id c2so36180355wrm.8 for ; Mon, 22 Jul 2019 06:14:35 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id f12sm42207217wrg.5.2019.07.22.06.14.33 for (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 22 Jul 2019 06:14:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=Hw14cIX/3NJAwOvSYtbBmj2PFTe9lFHEo4DMf5Anj/o=; b=ivZBtC0T4v9meXB6zStybRdUhUQ00MxzlnrhUbOVPKmnVHVWHaVYRs8Cp8WWc4AGor BtTRNz5y5n9JeqPI0ynz8TMkru/C+0dzZ9zM0CjqE2KlPfiZCWB1y7+hiqGZgmdb5Cr5 99a31K19Qjta8VP3t0meiNe7NQ1lZWMBmruXAICTHmvLZSWpcf1tRAwCJYv9ZFcAJ/sL 8L+eHRnAbR9Zoml/gE5o1R5zG5V4UXptTd5qodZaTILCQ2NOaoo2CWNGEDhXiwT08mrg R8W1d/K6OIgZipL7y4X1X4Cckw6m3DpmcHa4kBFEgS78R7NMFItvduDgFKqavgJgZNqM BG7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Hw14cIX/3NJAwOvSYtbBmj2PFTe9lFHEo4DMf5Anj/o=; b=WBkEM7g/9NMi2fPX6vZFS+4nvrCTAeG+mgIPIqzwOVwSxhAMieMeAOQuQdZu+ktNAu dPEKspWKGY3Bi4Ap3m8vze51+yR1d3/5PVmwz2MLWvxSq98yfnyxN4jSSYOgXtPKa+3J PN+RELiUXJCzUgSfDNv9pES33mNpgBA2pMBbPveHsmbQGKFYChMMpCdjk2eRJxSRcGX/ Ly/8Zj2W9HAZRiWIlTU6awBPBzPoM8Na/D77pe6xxnKDsuiCvTq19Nmky5WfGzQxpJ9e uAPdmtvy2FMEQEFnMEs4x4ubsVaPXrlNMeoUfFnh1dJaXX02YIVxBpuesW5Smqe04i26 MRBQ== X-Gm-Message-State: APjAAAVTY3uzgWjvg85JaA3DCp3y8xlWRnhAKFGDWsBC2GicZJ1NDy6W Kzw3wv335y8I4dZjrRFyuAOAVQEqMJTYZA== X-Google-Smtp-Source: APXvYqxyrJQ0xL99dnCU0g9qhLBQDYCGirYBrPM36O7NPRKcxS4qDYjocZ352ymfeA1mfu9E7DGHRg== X-Received: by 2002:adf:ff84:: with SMTP id j4mr71517193wrr.71.1563801274236; Mon, 22 Jul 2019 06:14:34 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Date: Mon, 22 Jul 2019 14:14:26 +0100 Message-Id: <20190722131427.2669-5-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190722131427.2669-1-peter.maydell@linaro.org> References: <20190722131427.2669-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::434 Subject: [Qemu-devel] [PULL 4/5] configure: Clarify URL to source downloads X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) If configure detects that it's being run on a source tree which is missing git modules, it prints an error messages suggesting that the user downloads a correct source archive from the project website. However https://www.qemu.org/download/ is a link to a page with multiple tabs, with the default being the one telling users how to get binaries from their distro. Clarify the URL we print to include the #source anchor, so that the browser will go directly to the source-tarball instructions. Reported-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Stefan Weil Tested-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Peter Maydell Message-id: 20190718131659.20783-1-peter.maydell@linaro.org Suggested-by: Stefan Weil Signed-off-by: Peter Maydell --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index 99c64be6b74..4d991511220 100755 --- a/configure +++ b/configure @@ -323,7 +323,7 @@ else echo "to acquire QEMU source archives. Non-GIT builds are only" echo "supported with source archives linked from:" echo - echo " https://www.qemu.org/download/" + echo " https://www.qemu.org/download/#source" echo echo "Developers working with GIT can use scripts/archive-source.s= h" echo "if they need to create valid source archives." --=20 2.20.1 From nobody Mon Feb 9 06:05:49 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1563801363; cv=none; d=zoho.com; s=zohoarc; b=RKjQVx1b7KufJ+FFzSKbjqM1ud/b+fwHguy8munEViH8B8gxx4QTP62PdR+jCk9UOvvX5TO8PRztyko8xIcazTMhX632sPUFX8cWOG79gYcnnlv52HuuAlRFuqN1XWELi+D2Ry7hlvR99D5MK9b5EjAj+F9+mNbufe8XIkmJEpM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1563801363; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=017UTObH7jJptsckGJh0SSq+6RtfkpOFjT0jK0dZ1dQ=; b=icc9M2I3eNGz4aNItTyw/nFtSd9LOI5j/H9SVAhJxIFxAhwgmf9rbZ9pzwpJfebTZEtN5t5hlhH9Mh5UZrreagwcqLdZZXkpLkBlKquQ3KrT+aD+lQywFUQaAt5841cm+Jlb+JwdmDbazGMrI7aw0+NxffmJqL3AZwClQCotrN8= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1563801363338513.3146057154306; Mon, 22 Jul 2019 06:16:03 -0700 (PDT) Received: from localhost ([::1]:33446 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hpYAc-0003vX-Cw for importer@patchew.org; Mon, 22 Jul 2019 09:16:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47673) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hpY9F-0007Us-LB for qemu-devel@nongnu.org; Mon, 22 Jul 2019 09:14:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hpY9E-00038h-Fs for qemu-devel@nongnu.org; Mon, 22 Jul 2019 09:14:37 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]:46984) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hpY9E-00037u-A0 for qemu-devel@nongnu.org; Mon, 22 Jul 2019 09:14:36 -0400 Received: by mail-wr1-x42a.google.com with SMTP id z1so39347024wru.13 for ; Mon, 22 Jul 2019 06:14:36 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id f12sm42207217wrg.5.2019.07.22.06.14.34 for (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 22 Jul 2019 06:14:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=017UTObH7jJptsckGJh0SSq+6RtfkpOFjT0jK0dZ1dQ=; b=Q7KSpSycvGW1FzeKrPMcA2A/oQvg2gbdlUzkA3G2uCqAgt+j/316NUze2KJpvwqNNC q60WTpcaxvw4Kmlz7rsBSketIwVarjAsMSfi6rWC17GhMSDIXVrp8cNoVOE2D29T8LRA 0TC3VyDOS1mSjVAM2s8Cx+0BNamqrJmAU92PXeCednaL2qREsU+p9VnHVwIRquv4d+d7 mpDiOZevmsuWJYKBazktdWYV184IFF4RtzAYunuBHuMOejcYoFLLlajKzJ8eHpzNGHNH qqVLq6SISTG49+CjBrS5JbpDe8UR0VQpzxrA0jn+/Lfbap2aZy9rQSi2KknFIa1VCi3T YKTQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=017UTObH7jJptsckGJh0SSq+6RtfkpOFjT0jK0dZ1dQ=; b=mbNzblwT+9rlQq3YBA8rl5VJnLs0rygXkRVBWqWiErY3E10Ty1Y/HPzUEQtO3gAc0U dGxtlUK/ypq4Xtw22yZjsHxAEh5v0K/7iugFJ65dhbAYaZaSsiFbQslLOAunpG3pbNfH lkambSmoVqNicf8qXr2fDWKBX9yMRs5g4hwVsnr9WT29J3KJWaG6E+GV6Kfjo1dwJ2pH OmcwE+wd6id3WVHj+ZdrL6GgWGuUay4jYtsJdUtmd6D+R1Dlv62svg7xS+qJDXTRNQz+ yZWKI+YYVN/Ll1K+oRzuxr1bb4hd7oX/Y7qYrSW6UMClj9DLow1MMCcpeep8R360qtbK ZFbw== X-Gm-Message-State: APjAAAUDjPtqQEoYEvxsiMPt7YFUfXNMMS5Aq5bas1O5rhkwJaTGP0bG /4HvJHPhTu6uhox7r4YfPp+3oUQbsTxW1g== X-Google-Smtp-Source: APXvYqxy7UsRxuGRjsbE2rM+oFc3LiqFpwZIhg05sg2EfE2NAiEq9b1iWkMjB8fSyi9XmyfzaqLwqw== X-Received: by 2002:a5d:5012:: with SMTP id e18mr46752005wrt.166.1563801275126; Mon, 22 Jul 2019 06:14:35 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Date: Mon, 22 Jul 2019 14:14:27 +0100 Message-Id: <20190722131427.2669-6-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190722131427.2669-1-peter.maydell@linaro.org> References: <20190722131427.2669-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42a Subject: [Qemu-devel] [PULL 5/5] contrib/elf2dmp: Build download.o with CURL_CFLAGS X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) contrib/elf2dmp has a source file which uses curl/curl.h; although we link the final executable with CURL_LIBS, we forgot to build this source file with CURL_CFLAGS, so if the curl header is in a place that's not already on the system include path then it will fail to build. Add a line specifying the cflags needed for download.o; while we are here, bring the specification of the libs into line with this, since using a per-object variable setting is preferred over adding them to the final executable link line. Signed-off-by: Peter Maydell Reviewed-by: Marc-Andr=C3=A9 Lureau Message-id: 20190719100955.17180-1-peter.maydell@linaro.org --- Makefile | 1 - contrib/elf2dmp/Makefile.objs | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 386e13a6ea0..ecb788b2ce3 100644 --- a/Makefile +++ b/Makefile @@ -626,7 +626,6 @@ ifneq ($(EXESUF),) qemu-ga: qemu-ga$(EXESUF) $(QGA_VSS_PROVIDER) $(QEMU_GA_MSI) endif =20 -elf2dmp$(EXESUF): LIBS +=3D $(CURL_LIBS) elf2dmp$(EXESUF): $(elf2dmp-obj-y) $(call LINK, $^) =20 diff --git a/contrib/elf2dmp/Makefile.objs b/contrib/elf2dmp/Makefile.objs index e3140f58cf7..15057169160 100644 --- a/contrib/elf2dmp/Makefile.objs +++ b/contrib/elf2dmp/Makefile.objs @@ -1 +1,4 @@ elf2dmp-obj-y =3D main.o addrspace.o download.o pdb.o qemu_elf.o + +download.o-cflags :=3D $(CURL_CFLAGS) +download.o-libs :=3D $(CURL_LIBS) --=20 2.20.1