From patchwork Mon Dec 6 11:07:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12658207 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 464C4C433EF for ; Mon, 6 Dec 2021 11:09:31 +0000 (UTC) Received: from localhost ([::1]:37656 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1muBsA-0000eD-41 for qemu-devel@archiver.kernel.org; Mon, 06 Dec 2021 06:09:30 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52324) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1muBqe-0006sQ-JV for qemu-devel@nongnu.org; Mon, 06 Dec 2021 06:07:56 -0500 Received: from [2a00:1450:4864:20::430] (port=35701 helo=mail-wr1-x430.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1muBqc-0003Lk-RF for qemu-devel@nongnu.org; Mon, 06 Dec 2021 06:07:56 -0500 Received: by mail-wr1-x430.google.com with SMTP id i5so21645708wrb.2 for ; Mon, 06 Dec 2021 03:07:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=wFti5fdBWZt65wfSGIAT9DbbN09hWoSYxokOwb1uXUk=; b=JrwDyYOvtd3SFwLOEEz/GDqvsEVLWLZWQDqwtqbk/kb+dc1DU0E5RGDTCzYiosMrFW 4rz32tQe7gf/K07v+YVBgBcw8WeGAymFpdvsQG6jvJi++WgFyfGONo71ZojEANfakiCy FcNFzhcFY1r9tldwubip00zn9hLFt7M9sv06y+CZn0Pj2TpWRZhYFIvkeWnnAapARgvN rPsD7qdxdqMCj7tAICsXeuotShqsoOwUFdBI4FnNOcpiUfnn8Ck2E4kUHh9VGCWJ0pzn hbCy2B9GytDNHkkpyfUC3FLlMd8u07Zl0Ld24khNPlNjFLiDgD9GgYVhDhceZS2cRbsk X/nQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=wFti5fdBWZt65wfSGIAT9DbbN09hWoSYxokOwb1uXUk=; b=x1Hp1xGRI21lTCY2ehptnhgZU96I7S5t5Tqk9D4fJjBqX11HU2KKt0zEjQvJYLqGcr xHZ1qk2Z4o0A+8N+C1BHI23CvCyONaP6qDdRGsSIRXfpuSj1xB0Ns/4BJ5CzJ0pyYqzU /GC57a7m7slC9jpt5op2+8Iq1xvOI/yDN2QHIqh5GJgeir/Z6My3J0Om3eEhbe48QWCN 3J3XPpJHjUnzVYhnrgKUySFmpk/CzJRMDNq70Z9GV/V1hecp9002BbTkkBoGCsUAz4U9 GvzOPwpbvNGYgfqYM0dfZVu4+b5wEVA3C4DegpRpq2hWIjhr2mnVy1vfqVZwz8n1D1w7 8hpQ== X-Gm-Message-State: AOAM533mmVNSxlZd/4J+397sDwFw9Zcm9YJ2XEKyeP+jVXMnH+hYyamZ 46RI8Ph5Bx8MgrXcF1RJnHCkhgmUTS0= X-Google-Smtp-Source: ABdhPJwkK9o1u8HPK41xRuX7qBNU8HP4iWVhiyct5f4qJgs5J9IjZjIPkk4VMKUk5kL/BTNmcXN3Tg== X-Received: by 2002:adf:d091:: with SMTP id y17mr44639063wrh.418.1638788873266; Mon, 06 Dec 2021 03:07:53 -0800 (PST) Received: from x1w.. (82.red-83-50-95.dynamicip.rima-tde.net. [83.50.95.82]) by smtp.gmail.com with ESMTPSA id b10sm11021836wrt.36.2021.12.06.03.07.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Dec 2021 03:07:52 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 1/3] hw/mips/bootloader: Fix write_ulong() Date: Mon, 6 Dec 2021 12:07:44 +0100 Message-Id: <20211206110746.360608-2-f4bug@amsat.org> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211206110746.360608-1-f4bug@amsat.org> References: <20211206110746.360608-1-f4bug@amsat.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::430 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::430; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x430.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Paul Burton , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Jiaxun Yang bl_gen_write_ulong uses sd for both 32 and 64 bit CPU, while sd is illegal on 32 bit CPUs. Replace sd with sw on 32bit CPUs. Fixes: 3ebbf86128f ("hw/mips: Add a bootloader helper") Signed-off-by: Jiaxun Yang Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20211130211729.7116-2-jiaxun.yang@flygoat.com> Signed-off-by: Philippe Mathieu-Daudé --- hw/mips/bootloader.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/hw/mips/bootloader.c b/hw/mips/bootloader.c index 6ec83144909..99991f8b2b5 100644 --- a/hw/mips/bootloader.c +++ b/hw/mips/bootloader.c @@ -182,7 +182,11 @@ void bl_gen_write_ulong(uint32_t **p, target_ulong addr, target_ulong val) { bl_gen_load_ulong(p, BL_REG_K0, val); bl_gen_load_ulong(p, BL_REG_K1, addr); - bl_gen_sd(p, BL_REG_K0, BL_REG_K1, 0x0); + if (bootcpu_supports_isa(ISA_MIPS3)) { + bl_gen_sd(p, BL_REG_K0, BL_REG_K1, 0x0); + } else { + bl_gen_sw(p, BL_REG_K0, BL_REG_K1, 0x0); + } } void bl_gen_write_u32(uint32_t **p, target_ulong addr, uint32_t val) From patchwork Mon Dec 6 11:07:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12658215 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 219E6C433F5 for ; Mon, 6 Dec 2021 11:15:58 +0000 (UTC) Received: from localhost ([::1]:48530 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1muByN-0008Cz-Bd for qemu-devel@archiver.kernel.org; Mon, 06 Dec 2021 06:15:55 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52362) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1muBqj-00078f-DQ for qemu-devel@nongnu.org; Mon, 06 Dec 2021 06:08:01 -0500 Received: from [2a00:1450:4864:20::335] (port=46834 helo=mail-wm1-x335.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1muBqh-0003M1-Le for qemu-devel@nongnu.org; Mon, 06 Dec 2021 06:08:01 -0500 Received: by mail-wm1-x335.google.com with SMTP id c6-20020a05600c0ac600b0033c3aedd30aso7294338wmr.5 for ; Mon, 06 Dec 2021 03:07:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=/DJj/gxHt6m4FCr9Z7lcL4/ZOvmbUdkOohUSBXdWb/M=; b=gihBjoMmWb0BRGjgXPVlYMzOUanXZ9OU6pIBOEAWIgxwTh9nKo5cR45jwRAP9X3lnL KJ38ANT3x6J6KaWgCq8WrfmXKcEXPlqp+Za+D58rrGWwmgGGp17ORvTN0vBJYZQw4nfP l3lhwKwOZAMDPYo7/GR+90yU7wY2InZU+ZQeDKhDaRtnLwPbjN31uOJEyHjCXujDEkfl kLIpqrvzgpmywiZKeujrfSNjR4nzRFXKph2lKnoGb5Ztbx2IvkYC3PVtu+AG8PpOQQdK Ee5OrNolICzgr/U10pq4BRFX+8wZA2MgEOCZ31GOlwbIqrNHspV/XFPlOHX8WW3pYcuz MAyA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=/DJj/gxHt6m4FCr9Z7lcL4/ZOvmbUdkOohUSBXdWb/M=; b=Tq8DeHzOxbJSrm2sM1epaFdfGECRKcg0m4z63E1y3EYm8Y4p3tuIzkm2cOVuo1Ie1j pfnofTpNXfBFMlta9V34r2XJUox+QINAPnQI9aRWYEJHudurIMTIfr4DTo2Izi/waVXL QHmCfkPcdFHkgddyTImQ84Wx+y/bGmkyhKZd71kNDgcHLJmBbBb3LVXAvt/ZlqsSOGV6 7mmF4zJPHNLoXiYexHyqS41UiqVUYarwytXUO8/eyQOR/bMoRUeT0eIlD6EKyd7Jd97P 7c17qyBsV+9uYsmr1rv+IrsuVzE83cXt6UeHZlZcbyaGMB/WvRPWKs/koitEBplZgaV0 SjvA== X-Gm-Message-State: AOAM531Ola4DQpmAEaRudQN1+gbbOvlg52DCTad2OyVSTIYIt7/rJL5I 2HaeRi9MxRZaRlGWp6q9kg7yiXf2vWk= X-Google-Smtp-Source: ABdhPJxCBO4b54gH0DVzft2o3jY6g7d1iOtzEKmAxbQpaDWjiXzn9Cgbpi1oMkBRrJxlFB0Uaw9eMA== X-Received: by 2002:a1c:448b:: with SMTP id r133mr38461274wma.85.1638788877970; Mon, 06 Dec 2021 03:07:57 -0800 (PST) Received: from x1w.. (82.red-83-50-95.dynamicip.rima-tde.net. [83.50.95.82]) by smtp.gmail.com with ESMTPSA id d6sm11222010wrn.53.2021.12.06.03.07.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Dec 2021 03:07:57 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 2/3] hw/mips/boston: Fix load_elf() error detection Date: Mon, 6 Dec 2021 12:07:45 +0100 Message-Id: <20211206110746.360608-3-f4bug@amsat.org> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211206110746.360608-1-f4bug@amsat.org> References: <20211206110746.360608-1-f4bug@amsat.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::335 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::335; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-x335.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Paul Burton , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Jiaxun Yang load_elf() gives negative return in case of error, not zero. Fixes: 10e3f30ff73 ("hw/mips/boston: Allow loading elf kernel and dtb") Signed-off-by: Jiaxun Yang Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20211130211729.7116-3-jiaxun.yang@flygoat.com> Signed-off-by: Philippe Mathieu-Daudé --- hw/mips/boston.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/hw/mips/boston.c b/hw/mips/boston.c index 0e3cca55118..59ca08b93a9 100644 --- a/hw/mips/boston.c +++ b/hw/mips/boston.c @@ -777,14 +777,15 @@ static void boston_mach_init(MachineState *machine) exit(1); } } else if (machine->kernel_filename) { - uint64_t kernel_entry, kernel_high, kernel_size; + uint64_t kernel_entry, kernel_high; + ssize_t kernel_size; kernel_size = load_elf(machine->kernel_filename, NULL, cpu_mips_kseg0_to_phys, NULL, &kernel_entry, NULL, &kernel_high, NULL, 0, EM_MIPS, 1, 0); - if (kernel_size) { + if (kernel_size > 0) { int dt_size; g_autofree const void *dtb_file_data, *dtb_load_data; hwaddr dtb_paddr = QEMU_ALIGN_UP(kernel_high, 64 * KiB); From patchwork Mon Dec 6 11:07:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12658209 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id F3CD7C433EF for ; Mon, 6 Dec 2021 11:09:53 +0000 (UTC) Received: from localhost ([::1]:38168 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1muBsU-0000z1-UJ for qemu-devel@archiver.kernel.org; Mon, 06 Dec 2021 06:09:50 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52384) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1muBqo-0007BR-7g for qemu-devel@nongnu.org; Mon, 06 Dec 2021 06:08:06 -0500 Received: from [2a00:1450:4864:20::32c] (port=53827 helo=mail-wm1-x32c.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1muBqm-0003Md-2v for qemu-devel@nongnu.org; Mon, 06 Dec 2021 06:08:05 -0500 Received: by mail-wm1-x32c.google.com with SMTP id y196so7799916wmc.3 for ; Mon, 06 Dec 2021 03:08:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=rQLNgDkVXYZwEW1Uu7rHJimRg2dieloG0z+rLGhTp5Y=; b=jOc4ISS2cWzVlHqw482AK/qGFaX/NbQMaSB31s5DcFyfHumwjP06rMqUL3A60y0isa KoE+DrAAUbQ2fNu7zNWJvexJp76rdBHwUw6NiHANeQAt12DeE5SqHAf3pX7vV/C1T4Gf yaZls/QyEkbu39bj2ElkOxqUuSU6J5CFX1jOohs2ez6Q/9fNbTbtIId28yrYfSL63PyP s+OWRT1cSeNQbeg1nYdmMBQnwbVPws6LBJM5zIO16qBaEVSK3lUWnnpJJDrVRdoJ6D0Z BZEKTwwadQXm3yjWvn4QeFVYvaFu+2d19Tp7R/54qU1TDEa71HQ5X3iBSbuOZskC6RC4 bd5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=rQLNgDkVXYZwEW1Uu7rHJimRg2dieloG0z+rLGhTp5Y=; b=nTQkF9Mb3t2DZ6PuIKlfQXiJ2xNJDeZXr3ORvuwRporqZHgeDJO8tSMdlRYIhOVBbC QXhROEo5YZKKJmVrcAi81mtSRyM9ptqFv62w/tdoJ3oTj39+ND813ZQinycGijqepoms tSmkxotZMYWFzQFv9VJI4t/SCn0C10yDt2DFbIQIV6jjIhFwmquk0TPMzPGriXPMjPsc VyeUSsAo2bwTxtUZe4rLL19/XyUzXy8AXx7slTSESl3jeRJipKNU+fDaMX51iizYLHJz cvmQgbIWfpqbNz+jg+ENBy1GUpjn+emHGM9nDTiWVSg7S+2h0qcDoqedPbMjmfGEt1cb vZog== X-Gm-Message-State: AOAM532zGr+sMreMDFqteYKzLk3PARmPUddgsZzGKRkrQhhio4lmxILY 7M4XnX3K457iZ8w931WqpcdRQVf3cRc= X-Google-Smtp-Source: ABdhPJwePLULPzGNu2IBcRD54VkjYyrz7DlrqajAIBcgsCaphpdZb7TYH4v1lZ810gn/ueEnMF12nw== X-Received: by 2002:a05:600c:214f:: with SMTP id v15mr37266271wml.194.1638788882652; Mon, 06 Dec 2021 03:08:02 -0800 (PST) Received: from x1w.. (82.red-83-50-95.dynamicip.rima-tde.net. [83.50.95.82]) by smtp.gmail.com with ESMTPSA id g19sm13847705wmg.12.2021.12.06.03.08.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Dec 2021 03:08:02 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 3/3] Revert "vga: don't abort when adding a duplicate isa-vga device" Date: Mon, 6 Dec 2021 12:07:46 +0100 Message-Id: <20211206110746.360608-4-f4bug@amsat.org> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211206110746.360608-1-f4bug@amsat.org> References: <20211206110746.360608-1-f4bug@amsat.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::32c (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::32c; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-x32c.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Daniel_P_=2E_Berrang=C3=A9?= , =?utf-8?q?Alex_Benn=C3=A9e?= , Paul Burton , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Alex Bennée This reverts commit 7852a77f598635a67a222b6c1463c8b46098aed2. The check is bogus as it ends up finding itself and falling over. Signed-off-by: Alex Bennée Resolves: https://gitlab.com/qemu-project/qemu/-/issues/733 Reviewed-by: Daniel P. Berrangé Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20211206095209.2332376-1-alex.bennee@linaro.org> Signed-off-by: Philippe Mathieu-Daudé --- hw/display/vga-isa.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/hw/display/vga-isa.c b/hw/display/vga-isa.c index 8cea84f2bea..90851e730bc 100644 --- a/hw/display/vga-isa.c +++ b/hw/display/vga-isa.c @@ -33,7 +33,6 @@ #include "hw/loader.h" #include "hw/qdev-properties.h" #include "qom/object.h" -#include "qapi/error.h" #define TYPE_ISA_VGA "isa-vga" OBJECT_DECLARE_SIMPLE_TYPE(ISAVGAState, ISA_VGA) @@ -62,15 +61,6 @@ static void vga_isa_realizefn(DeviceState *dev, Error **errp) MemoryRegion *vga_io_memory; const MemoryRegionPortio *vga_ports, *vbe_ports; - /* - * make sure this device is not being added twice, if so - * exit without crashing qemu - */ - if (object_resolve_path_type("", TYPE_ISA_VGA, NULL)) { - error_setg(errp, "at most one %s device is permitted", TYPE_ISA_VGA); - return; - } - s->global_vmstate = true; vga_common_init(s, OBJECT(dev)); s->legacy_address_space = isa_address_space(isadev);