From nobody Wed May 15 10:30:13 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.43 as permitted sender) client-ip=209.85.221.43; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f43.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.43 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1638788875; cv=none; d=zohomail.com; s=zohoarc; b=amCpfXXx8NKhUlFITUG8FaDFZkCEtxD1SUtT8d5K0xvu9KsrUhhngUnfUW9AYdFIkgblo1g28jHijlFbY+2lkb1DeWCrolWfXz6hv+Wg6O9WnTg2SlcKiU6SrW4cKt2OdpRZEM7vjRKww9CggHZCgRVwFgPEE5CcnmkSQ4OR7AU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1638788875; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=wFti5fdBWZt65wfSGIAT9DbbN09hWoSYxokOwb1uXUk=; b=EPQJ4x68oVpAA/5HUe5utTWmVjZTyxCuaSrZqCGp9HHAEvS5kb2I2HHbYqd7C+A1/q4XHhrzJ/LKAkrPsKkovh/wq77wuLUMjzEiJ65W1c2dFdDVGbjqlaJUpKkFXIZA8VXFlTxm7/mbfA/j6TS33unKTXLVLNRpLJQ/HYDDxxM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.43 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f43.google.com (mail-wr1-f43.google.com [209.85.221.43]) by mx.zohomail.com with SMTPS id 1638788875074692.3827295743652; Mon, 6 Dec 2021 03:07:55 -0800 (PST) Received: by mail-wr1-f43.google.com with SMTP id u1so21513775wru.13 for ; Mon, 06 Dec 2021 03:07:54 -0800 (PST) Return-Path: Return-Path: 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) 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=k65710XArUxPG7rURxN2MVuSUa0FwwCAAC9NKaGpn3w8eZPR3CO/pFwCpb8AdxvPKG hF7WFpz+pKcT1EzQTr9eoER3zqYjcVda8ghy28SXUS1r2vGhE4T7BA8b+8Uz1lmj2IET XXDN75+JHDA6VVSmpp8YXZZAgZsR5jNOBI1PijoqRVGfK8i92LcMbG1Cgl7iiuW4q3bL xVLGc8KDkjY7uNJPl8gS2gPBlNR9Fu3A07scOANRw9ONiRbFW1QQF5rXQ6qQKW7Xc7gW bSXqSacCuvwYJYQQWMPJfxcB96tOglUOC/0t0oYow7pqywmaelXNq/1TOQX2kWsUugUL +/KA== X-Gm-Message-State: AOAM531W17d6sCg4b8DkR24QRa0ZJylfd210sxvbNSyyIjCdk19txwke luMhQmCpV6PfhaPp88keAcM= 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) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paul Burton , Jiaxun Yang , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= 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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1638788877061100001 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=C3=A9 Message-Id: <20211130211729.7116-2-jiaxun.yang@flygoat.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- 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 add= r, 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); + } } =20 void bl_gen_write_u32(uint32_t **p, target_ulong addr, uint32_t val) --=20 2.33.1 From nobody Wed May 15 10:30:13 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.45 as permitted sender) client-ip=209.85.128.45; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f45.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.45 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1638788879; cv=none; d=zohomail.com; s=zohoarc; b=P5fwVDyy+ngDKdCHmEkZPsMZnzk+uySKkq7WC8SYTyottMunAA5Fmk8X8DFqeTNNRM25SHxUG/K/XnfcptuOnBTUWuPRxQ2osr2EQq5RBhRTkiFbFHCgDu6P9AM+LF551EE8NBAT9wZtv4+PG7NNnMU1aiuWJUtEIu9/c7KmtrE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1638788879; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=/DJj/gxHt6m4FCr9Z7lcL4/ZOvmbUdkOohUSBXdWb/M=; b=UcUzy3g1rVsRDBxMzyKxp8bYW3vwNH2eI6vhM04Om/qXKo1vIY/pM6rAw48f1bZenY29x1mHMqxKK47uEl9RqOjDE4Kv8duI8UGlvW2HyB9Em1NBZfZjSQWmjHLknJiNdEOflb6KelSeVUt4n5sBDRmIdGnMTUzHTvSlJCuYl68= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.45 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) by mx.zohomail.com with SMTPS id 1638788879752922.584765772974; Mon, 6 Dec 2021 03:07:59 -0800 (PST) Received: by mail-wm1-f45.google.com with SMTP id r9-20020a7bc089000000b00332f4abf43fso7930159wmh.0 for ; Mon, 06 Dec 2021 03:07:59 -0800 (PST) Return-Path: Return-Path: 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) 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=i7F/6Twg11/7VN4ffG7KNUvR6g53y8DNlRmo5VC8hRADwz7+VLwt2ZYcf5698qkCu8 M1CNJsi7Rnagmgv1TannOfC8kdnEgdtSboCKHi5fMv9s6UpvNNa2smaxP2+AvBRmGqFx ak2ME7uNvnjDvf7k7WHgSZFqEnCcVktr2zWwbApQVDSqeQo3SPbz4bymtU6GyyQyxsLl K9pleErIcj9iAliXLR/icyYxSJqmS/qipiqaVLLnVHF4yC1wLQpsgXd8zEkPO/goC/ay 8i7YKtVm4cwNWxJylAlXy8Fj1Nobk1885yaGFYkqQID6TtwS7WF12RTyXiBEaJFV4bmY 6qLA== X-Gm-Message-State: AOAM532axUBsp4eAFtZoco+fwYIZhD/K4IPX16mJHW3reOnQ4W7tHBFr 2pvp2YEFMwReADFdEk8vScY= 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) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paul Burton , Jiaxun Yang , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= 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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1638788881970100001 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=C3=A9 Message-Id: <20211130211729.7116-3-jiaxun.yang@flygoat.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- 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; =20 kernel_size =3D load_elf(machine->kernel_filename, NULL, cpu_mips_kseg0_to_phys, NULL, &kernel_entry, NULL, &kernel_high, NULL, 0, EM_MIPS, 1, 0); =20 - if (kernel_size) { + if (kernel_size > 0) { int dt_size; g_autofree const void *dtb_file_data, *dtb_load_data; hwaddr dtb_paddr =3D QEMU_ALIGN_UP(kernel_high, 64 * KiB); --=20 2.33.1 From nobody Wed May 15 10:30:13 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.45 as permitted sender) client-ip=209.85.128.45; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f45.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.45 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1638788884; cv=none; d=zohomail.com; s=zohoarc; b=QxDX2248KqgJPhpnuYFMhqu84MUqGXEJmAAhTH75oFOWEzQzL3OgruSWXsgubD+8A2nGlYc3DmxnqqXV/Voc3mRJAglFdhqXvzmCJwJqoTHy63GOXDgo152awgshfo4eD4GpuqB/VOZlhMly3U5rN1LA8qXdVYve3QLQyJbKs/E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1638788884; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=rQLNgDkVXYZwEW1Uu7rHJimRg2dieloG0z+rLGhTp5Y=; b=BfVn+OAe0AKs6/Y8Si/dTN+sTGUZGQY/8df8P5rDr2Xav21wK6ky1VFvNqKzOq+95j5uPrBPLjVfFOnnuUykqngokeTSzYBLeURv99Igv5KDwHj48pNfM5neADjRY3s+NNeFwkgfgp3XMQ/bm6/fT96L+I1AmcYjxpjpjNfZzG8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.45 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) by mx.zohomail.com with SMTPS id 1638788884538759.1005031265464; Mon, 6 Dec 2021 03:08:04 -0800 (PST) Received: by mail-wm1-f45.google.com with SMTP id 77-20020a1c0450000000b0033123de3425so10145700wme.0 for ; Mon, 06 Dec 2021 03:08:03 -0800 (PST) Return-Path: Return-Path: 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) 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=oNBEb8RYGMI/WcLpAt5O4wfGqIj6KPqySiqBeldRAJbYibWc9uTEriG0zYTF+Gabrx X+QODQSkfvwa3trU2qgSqdYV94yqYNPHLJhDPuraTQOq+fRTsBLoHAdMNjZbsHqKWARC PNuV/e7I6Rf3360isuSOgD5+vB+ahyFWdmZ2LEdQqIqgpdlhVrOOWK3Af3s0nVOeWHak A1tpBuCJz/PVmGozfJ6HyEWuA/0JOk0BsLe98YKEMY9gaVk83cX9fGe9232/aiaABb+p H1728Y/AJbXk+/nSy73emD9nT5cAQDhdkA7UZ9xa8IB76sWixLvqFR7r0cWNP6RKQOEX T7xg== X-Gm-Message-State: AOAM531SRgqO5+ntKBCZR5Cq7EmPqI/ES/LKaX/1/loQxSktdKXhWsOo u6fqbFWTLR+s8MnVXTGGFus= 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) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paul Burton , Jiaxun Yang , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= 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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1638788886664100001 From: Alex Benn=C3=A9e This reverts commit 7852a77f598635a67a222b6c1463c8b46098aed2. The check is bogus as it ends up finding itself and falling over. Signed-off-by: Alex Benn=C3=A9e Resolves: https://gitlab.com/qemu-project/qemu/-/issues/733 Reviewed-by: Daniel P. Berrang=C3=A9 Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20211206095209.2332376-1-alex.bennee@linaro.org> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- 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" =20 #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; =20 - /* - * 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_VG= A); - return; - } - s->global_vmstate =3D true; vga_common_init(s, OBJECT(dev)); s->legacy_address_space =3D isa_address_space(isadev); --=20 2.33.1