From nobody Fri May 3 13:36:17 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1638463989; cv=none; d=zohomail.com; s=zohoarc; b=GV5HJj76ySd5vR7gdBoxLNLB9b1Iqi0/aG2pmtndEwnsby5WhA8RajTRwsSHT7lqlIhhizBguF+fzE54z4EZHlLsJ8phdlIwNc9ge2+vjEs/Se0oM0mdk/HasmtR3WqR19JYuj8wfu2yxj3bDNoVOIlVcsh/fB0F2me/bdG/+AE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1638463989; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=5vmAM52JfSSXwOMsFRYBUjyjXXmv4Jdz3sFOGF5ZQxQ=; b=gkYj1fCujI/PVhIA/cwDxfzGxBqEoJc6BKi0y86Pn9HwTI5lZw0sI/MYcVoSZX7084PvUQxv/XZCnDjwCDJDHvJiGaeH4W4f2XlsfSnV601nKSrNpc8bYIEINZ0gWm2fwAwtjN1aqXUBA6rMwCh/c0ktgJdgBTxbKtlyNWD3hZI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1638463989388408.61411088091154; Thu, 2 Dec 2021 08:53:09 -0800 (PST) Received: from localhost ([::1]:34140 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mspKW-0007Lr-6v for importer@patchew.org; Thu, 02 Dec 2021 11:53:08 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57358) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mspHT-0004hX-Mt for qemu-devel@nongnu.org; Thu, 02 Dec 2021 11:50:00 -0500 Received: from [2a00:1450:4864:20::42b] (port=37577 helo=mail-wr1-x42b.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mspHL-0005mo-Cb for qemu-devel@nongnu.org; Thu, 02 Dec 2021 11:49:53 -0500 Received: by mail-wr1-x42b.google.com with SMTP id d9so90499wrw.4 for ; Thu, 02 Dec 2021 08:49:50 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id n13sm291805wrt.44.2021.12.02.08.49.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Dec 2021 08:49:46 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 80D691FF96; Thu, 2 Dec 2021 16:49:45 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=5vmAM52JfSSXwOMsFRYBUjyjXXmv4Jdz3sFOGF5ZQxQ=; b=Su3uvgmdJpQ0qBxk67/GpWp7Ec56cKOJmRiPIf/gmd09CeYpOvTRCXtj749xJAjmRJ pmkIjHnS8u+ZPemLwQfsyiIohdmLNKlbhgPojjPgmsgCeYksuGBmSU6FoodL9hdCZNP2 YNACbhBrrrm8k7mBwPZh6LwiyObKeGxaQR0VUTAOTwG3Lm5pFaXG0BDPkiclCvmEif4a KhsiJGLTc+/yyO9UzPWrOetVsYnLV8KEBhxKwWK3KpvWs2WUe8qvhbHhCR96dsl/u5+F wokb/N46T098tCYmO/dnJxie/Vy3zgYllGRI3Ckkrsu4j4jBzmTN5QgOVZr0FjIw3AWc FNPg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=5vmAM52JfSSXwOMsFRYBUjyjXXmv4Jdz3sFOGF5ZQxQ=; b=mwt7kDogqXfxzTEVg5Q05R1/169zk91TyfLgg7dRSZrqNcOJs6/6RmXqH/i8rqYVWz uYRRPeVvKDVXV7glNp7QQ64EWk07QH+5goddEjaCL0WuVE5o3PzUbMWprMTm8tsPJMeo mcsEsOIqVPE47pza9SnW+c7nGt0MVMnBMQefGxBwZ63eu5PwkaS5nfvIwO9cvvzCunw+ pqsbDYMX3uHxhGcbC9Lvgdfdxj96mx3/lvJ8tZ67+5rQOtU+aVULGj+uaZsPYaABnMHn iUkAG4BPd/i6DDreU2+Uk65dGQnOvr30WlA2uguvlP8YOkJme7y4Z0f7eEaD1WiylGZW IWKw== X-Gm-Message-State: AOAM5320ia/780yHnC2O8Py3OBtBt0DO/ZKi4ThDrPcvbq+ynYoGdjGh zx7z/Ie6nvueROL9/bg7EsOzAA== X-Google-Smtp-Source: ABdhPJy5kqVoAGdFOgTglBxewMlwdW8ruFpn9+vILWiVfuwH4mYyoRQK+sRfSjk5X0S6oxgVa3nVkg== X-Received: by 2002:a5d:54c5:: with SMTP id x5mr14934414wrv.607.1638463787415; Thu, 02 Dec 2021 08:49:47 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH for 6.2?] Revert "vga: don't abort when adding a duplicate isa-vga device" Date: Thu, 2 Dec 2021 16:49:29 +0000 Message-Id: <20211202164929.1119036-1-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::42b (failed) Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=2a00:1450:4864:20::42b; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42b.google.com X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, 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=20Benn=C3=A9e?= , Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1638463991305100001 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.git/-/issues/733 --- 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 8cea84f2be..90851e730b 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.30.2