From patchwork Mon Oct 1 22:09:36 2018 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: 977500 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amsat.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="dmSxyLSh"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42PGyc27c5z9s7T for ; Tue, 2 Oct 2018 08:23:36 +1000 (AEST) Received: from localhost ([::1]:40930 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g76bF-0006iX-Rh for incoming@patchwork.ozlabs.org; Mon, 01 Oct 2018 18:23:33 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35160) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g76XT-00041Z-MO for qemu-devel@nongnu.org; Mon, 01 Oct 2018 18:19:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g76OU-0007P2-OC for qemu-devel@nongnu.org; Mon, 01 Oct 2018 18:10:23 -0400 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:43488) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1g76OP-0007N1-6P for qemu-devel@nongnu.org; Mon, 01 Oct 2018 18:10:19 -0400 Received: by mail-wr1-x443.google.com with SMTP id n1-v6so5502586wrt.10 for ; Mon, 01 Oct 2018 15:10:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Q7me9ajxCyC00cbHWSqFbliFeut7xk6aNiYBjOoR1LA=; b=dmSxyLShLeT1tunzS7ZJadtkAry97XQ14mUbPy3nY6B12yimuirk97Wr0e2WvmZNAv Ta/BogcF0cvzfAI40D+bzseBGy4j9ZAvgJLrHjOk9eJ0pOcFjmO8ifaPCAfnnj2WVFf5 l/o54thhc/izY64HsRyqDcat1WLjAY7xG40EKLkVJQXjgLRNV9aTGo6Uv7IGIAf7CQXB NnaNw7/ePoF5RmrgIJctlqMJxAxaJ+k3zrUmMCL2PfAvdniAWCplVl6ee+BQlXa9gn0m RXF+FlZzW4Oevbdi7spmDyLNX+MaZ5TdTIRjM4+wbHZlm8NXmIUpuCwsU1pk08YA4D8V Nsaw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=Q7me9ajxCyC00cbHWSqFbliFeut7xk6aNiYBjOoR1LA=; b=F57ZeTrOSYaJm5OqW/E8TnBoOV81k4ijhlyvNMm15uQx/l8PO2py65ytVEL4bAx86J nBLh/hfh7CwlVqTUuT43fhOOuV8p+XW3hfabILxrEvxhIGuYxiBfx570XWj0j3l7AhiM I3iTR+mYrUtekGRCkjbW+eo0kVbUKJc94CjzDNlQlAFeEKYqaYbQ5Cvvm7rroIFqlagC khzCxLp1NSfALnCrX9JP4EGB0j1loxHeae0oIdF90NN8mphf1aydLnyein2ojWoA6En7 XyWRQrP9ehjmlYqi2N5B5reEto8YEd0jMDwzCSo/MX174v25T+deMVIfoHUABkFkvsFs eyzQ== X-Gm-Message-State: ABuFfoilqbGycdyavXH7iGN0G++c9pAgpD0cN6dDPi370vU+DBBs9ZRw kqiMaJteB+UTR6Kg4BX608A= X-Google-Smtp-Source: ACcGV625/O/XItl2ZmHd4IhpefqjkYZ0nfcFWNuyXEShc/93scJlaZz/cAhYXknHH7dQ8bjoPRBt4Q== X-Received: by 2002:adf:8288:: with SMTP id 8-v6mr8835962wrc.252.1538431812430; Mon, 01 Oct 2018 15:10:12 -0700 (PDT) Received: from x1.local (11.red-88-24-160.staticip.rima-tde.net. [88.24.160.11]) by smtp.gmail.com with ESMTPSA id 185-v6sm13554914wmy.38.2018.10.01.15.10.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 01 Oct 2018 15:10:11 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Peter Maydell , =?utf-8?q?C=C3=A9dric_Le_Goa?= =?utf-8?q?ter?= Date: Tue, 2 Oct 2018 00:09:36 +0200 Message-Id: <20181001220942.2382-10-f4bug@amsat.org> X-Mailer: git-send-email 2.19.0 In-Reply-To: <20181001220942.2382-1-f4bug@amsat.org> References: <20181001220942.2382-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::443 Subject: [Qemu-devel] [PATCH 09/15] hw/mips/malta: Replace 'empty_slot' by 'unimplemented_device' X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Aleksandar Markovic , Aurelien Jarno , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Eduardo Habkost , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" The TYPE_EMPTY_SLOT and TYPE_UNIMPLEMENTED_DEVICE are identical devices, however the later use more recent APIs and is more widely used. Replace 'empty_slot' by 'unimplemented_device' to simplify devices code maintenance. Signed-off-by: Philippe Mathieu-Daudé --- default-configs/mips-softmmu-common.mak | 1 - hw/mips/mips_malta.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/default-configs/mips-softmmu-common.mak b/default-configs/mips-softmmu-common.mak index fae2347ee7..f9d664e120 100644 --- a/default-configs/mips-softmmu-common.mak +++ b/default-configs/mips-softmmu-common.mak @@ -32,7 +32,6 @@ CONFIG_PFLASH_CFI01=y CONFIG_I8259=y CONFIG_MC146818RTC=y CONFIG_ISA_TESTDEV=y -CONFIG_EMPTY_SLOT=y CONFIG_MIPS_CPS=y CONFIG_MIPS_ITU=y CONFIG_I2C=y diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c index 40041d5ec0..4ccfa87c35 100644 --- a/hw/mips/mips_malta.c +++ b/hw/mips/mips_malta.c @@ -53,7 +53,7 @@ #include "sysemu/qtest.h" #include "qapi/error.h" #include "qemu/error-report.h" -#include "hw/empty_slot.h" +#include "hw/misc/unimp.h" #include "sysemu/kvm.h" #include "exec/semihost.h" #include "hw/mips/cps.h" @@ -1216,7 +1216,7 @@ void mips_malta_init(MachineState *machine) /* The whole address space decoded by the GT-64120A doesn't generate exception when accessing invalid memory. Create an empty slot to emulate this feature. */ - empty_slot_init(0, 0x20000000); + create_unimplemented_device("gt64120-SysAD", 0, 0x20000000); qdev_init_nofail(dev);