From nobody Tue Feb 10 05:44:54 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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 ARC-Seal: i=1; a=rsa-sha256; t=1589124754; cv=none; d=zohomail.com; s=zohoarc; b=gVtr3lHnviAzmzbVkb7cx+YjP6r1soi5/lRj9roQKrlVkGAnNed+PjZ6pLmNgsl/4k9w9cpSxSufJnEDJ42Q5X8a/E0izr87Te/oXAjJ7G4rykghOYACa/W5MYJPYEoUPBCl9nDXJT5vlc7ZfY4B+OIQcoJZIwR/COFjAc+qb+M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589124754; h=Content-Type:Content-Transfer-Encoding:Cc: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; bh=82V5GgTEA4sxu6tyoxHnsvtnkbf5Xt52I34BpoyJ+2A=; b=QANHdFTfw2DD5thb1Kb3P8mMhXVngnMmFfDDC679f7C7xdX4M2B0vUzamzd2Rb99xReocFIR7FXNNkBgG8zg5A7B97iZzU5lyTpjAIm7OHCwJH8jvabt+j1uFw6TAFCS0VUnkBxmqmCdpmHG5JccowWj0vbpNoC1G4NDvV91IKE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1589124754430247.19907753119367; Sun, 10 May 2020 08:32:34 -0700 (PDT) Received: from localhost ([::1]:49484 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jXnwO-0002ij-S3 for importer@patchew.org; Sun, 10 May 2020 11:32:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52544) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jXnsu-0006MS-Qx for qemu-devel@nongnu.org; Sun, 10 May 2020 11:28:56 -0400 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:44554) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jXnst-0000zQ-Ts for qemu-devel@nongnu.org; Sun, 10 May 2020 11:28:56 -0400 Received: by mail-wr1-x442.google.com with SMTP id 50so7200036wrc.11 for ; Sun, 10 May 2020 08:28:55 -0700 (PDT) Received: from localhost.localdomain (17.red-88-21-202.staticip.rima-tde.net. [88.21.202.17]) by smtp.gmail.com with ESMTPSA id a67sm24186702wmc.30.2020.05.10.08.28.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 10 May 2020 08:28:53 -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=82V5GgTEA4sxu6tyoxHnsvtnkbf5Xt52I34BpoyJ+2A=; b=s8/t+AXDzFapMBJaejE4iS/+aa9AUbDl/Kv5o7QC57UgNNFx7NOGe+t7slzhXNXaaR +pEkseERB9TJ5R0qHYOWuSPqOrgbm0tPirxXxagTgPzbnqACNKo63iW4aufJjv0LfdKh 0J3mqTzNTkj6fU2n+aslI9InJZ2o8NlH4Oq+p7mGFTmRdFFo7RLGkw1VrArpMrCsR/B3 Gr0dRjjSiCm089qKpTfIteMuD7X0lf+/YRELI9aPYhcsPoDPjNy9h6iwEUXiXx6iH1BS aGciz3J96IJQe5HEbmOlXttULKR+BUkxwf3jDxpIwE0lKj7aWMhAowHRi4pB17Y+WyIf 8LNw== 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=82V5GgTEA4sxu6tyoxHnsvtnkbf5Xt52I34BpoyJ+2A=; b=iLD1QGrSkBDKGVdl0+AgtydB1C7xgcQnptOO+6SOfE7jWvjP1Mu6PaRD9ggHIrVUnc GX9s/KaNPHHOaAPba1yDLuS7eOSbc4R3wDxcpp7yIyUUWw1KyFlepwtANESVZLhLKRiR yDCy6Z3z7Wuwcc7c76lC1p2MPjcIkSk39Mjwfynw86TVNCstqQk7R9XjM1A359aBa2KG UT9dEnrXIE0xeLIZ7LzCfenm6Wm9YNtpZTelABVzlds8ON5HoeODxRKmfABbFo42aPfO 3dncGhUvA1+EnLVAui4PyG5vH1qo7Wq2yy0K734/zMCEDSi6k8QekGExwPgfI6FOZQft UYlQ== X-Gm-Message-State: AGi0PuZZY8LVOr+BZmZlwQ6gl0DprmXE3mto/VsJONq+YYgJ6XFD5pf8 x4T+k1aRBVjJGZaL++gC0VDpIiQG9j4= X-Google-Smtp-Source: APiQypIsczIcP/H/5AiuZU7eoBu3/brk1uLl/8diOImqPIOpoS0cExtEnrCCYMp+TCBILR8JsOcdVA== X-Received: by 2002:adf:e388:: with SMTP id e8mr13716723wrm.174.1589124534279; Sun, 10 May 2020 08:28:54 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 6/7] hw/misc/empty_slot: Move the 'hw/misc' and cover in MAINTAINERS Date: Sun, 10 May 2020 17:28:39 +0200 Message-Id: <20200510152840.13558-7-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200510152840.13558-1-f4bug@amsat.org> References: <20200510152840.13558-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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::442; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x442.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.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.001, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action 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: , Cc: Peter Maydell , Mark Cave-Ayland , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aleksandar Markovic , Artyom Tarasenko , Aleksandar Rikalo , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aurelien Jarno Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) As this device model is very similar to the UnimplementedDevice, maintain them altogether. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/empty_slot.h | 9 --------- include/hw/misc/empty_slot.h | 19 +++++++++++++++++++ hw/mips/mips_malta.c | 2 +- hw/{core =3D> misc}/empty_slot.c | 4 ++-- hw/sparc/sun4m.c | 2 +- MAINTAINERS | 4 +++- hw/core/Makefile.objs | 1 - hw/core/trace-events | 4 ---- hw/misc/Makefile.objs | 1 + hw/misc/trace-events | 4 ++++ 10 files changed, 31 insertions(+), 19 deletions(-) delete mode 100644 include/hw/empty_slot.h create mode 100644 include/hw/misc/empty_slot.h rename hw/{core =3D> misc}/empty_slot.c (96%) diff --git a/include/hw/empty_slot.h b/include/hw/empty_slot.h deleted file mode 100644 index cb9a221aa6..0000000000 --- a/include/hw/empty_slot.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef HW_EMPTY_SLOT_H -#define HW_EMPTY_SLOT_H - -#include "exec/hwaddr.h" - -/* empty_slot.c */ -void empty_slot_init(hwaddr addr, uint64_t slot_size); - -#endif diff --git a/include/hw/misc/empty_slot.h b/include/hw/misc/empty_slot.h new file mode 100644 index 0000000000..b023bc2d91 --- /dev/null +++ b/include/hw/misc/empty_slot.h @@ -0,0 +1,19 @@ +/* + * QEMU Empty Slot + * + * The empty_slot device emulates known to a bus but not connected devices. + * + * Copyright (c) 2010 Artyom Tarasenko + * + * This code is licensed under the GNU GPL v2 or (at your option) any later + * version. + */ + +#ifndef HW_EMPTY_SLOT_H +#define HW_EMPTY_SLOT_H + +#include "exec/hwaddr.h" + +void empty_slot_init(hwaddr addr, uint64_t slot_size); + +#endif diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c index e4c4de1b4e..30ed3c1538 100644 --- a/hw/mips/mips_malta.c +++ b/hw/mips/mips_malta.c @@ -52,7 +52,7 @@ #include "sysemu/runstate.h" #include "qapi/error.h" #include "qemu/error-report.h" -#include "hw/empty_slot.h" +#include "hw/misc/empty_slot.h" #include "sysemu/kvm.h" #include "hw/semihosting/semihost.h" #include "hw/mips/cps.h" diff --git a/hw/core/empty_slot.c b/hw/misc/empty_slot.c similarity index 96% rename from hw/core/empty_slot.c rename to hw/misc/empty_slot.c index d28f7f99c9..54be085189 100644 --- a/hw/core/empty_slot.c +++ b/hw/misc/empty_slot.c @@ -11,9 +11,8 @@ =20 #include "qemu/osdep.h" #include "hw/sysbus.h" -#include "qemu/module.h" #include "hw/qdev-properties.h" -#include "hw/empty_slot.h" +#include "hw/misc/empty_slot.h" #include "trace.h" =20 #define TYPE_EMPTY_SLOT "empty_slot" @@ -90,6 +89,7 @@ static void empty_slot_class_init(ObjectClass *klass, voi= d *data) =20 dc->realize =3D empty_slot_realize; device_class_set_props(dc, empty_slot_properties); + set_bit(DEVICE_CATEGORY_MISC, dc->categories); } =20 static const TypeInfo empty_slot_info =3D { diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c index f1494907b0..6030900124 100644 --- a/hw/sparc/sun4m.c +++ b/hw/sparc/sun4m.c @@ -46,7 +46,7 @@ #include "hw/nvram/chrp_nvram.h" #include "hw/nvram/fw_cfg.h" #include "hw/char/escc.h" -#include "hw/empty_slot.h" +#include "hw/misc/empty_slot.h" #include "hw/misc/unimp.h" #include "hw/irq.h" #include "hw/loader.h" diff --git a/MAINTAINERS b/MAINTAINERS index 1f84e3ae2c..3e0c2089f1 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1829,11 +1829,13 @@ F: docs/specs/vmgenid.txt F: tests/qtest/vmgenid-test.c F: stubs/vmgenid.c =20 -Unimplemented device +Unimplemented device and empty slot M: Peter Maydell R: Philippe Mathieu-Daud=C3=A9 S: Maintained +F: include/hw/misc/empty_slot.h F: include/hw/misc/unimp.h +F: hw/misc/empty_slot.c F: hw/misc/unimp.c =20 Standard VGA diff --git a/hw/core/Makefile.objs b/hw/core/Makefile.objs index 1d540ed6e7..d8fee8effe 100644 --- a/hw/core/Makefile.objs +++ b/hw/core/Makefile.objs @@ -24,7 +24,6 @@ common-obj-$(CONFIG_SOFTMMU) +=3D numa.o common-obj-$(CONFIG_SOFTMMU) +=3D clock-vmstate.o obj-$(CONFIG_SOFTMMU) +=3D machine-qmp-cmds.o =20 -common-obj-$(CONFIG_EMPTY_SLOT) +=3D empty_slot.o common-obj-$(CONFIG_XILINX_AXI) +=3D stream.o common-obj-$(CONFIG_PTIMER) +=3D ptimer.o common-obj-$(CONFIG_FITLOADER) +=3D loader-fit.o diff --git a/hw/core/trace-events b/hw/core/trace-events index bbb68fb6f0..1ac60ede6b 100644 --- a/hw/core/trace-events +++ b/hw/core/trace-events @@ -34,7 +34,3 @@ clock_disconnect(const char *clk) "'%s'" clock_set(const char *clk, uint64_t old, uint64_t new) "'%s', ns=3D%"PRIu6= 4"->%"PRIu64 clock_propagate(const char *clk) "'%s'" clock_update(const char *clk, const char *src, uint64_t val, int cb) "'%s'= , src=3D'%s', ns=3D%"PRIu64", cb=3D%d" - -# empty_slot.c -empty_slot_read(uint64_t addr, unsigned width, uint64_t value, unsigned si= ze, const char *name) "rd addr:0x%04"PRIx64" data:0x%0*"PRIx64" size %u [%s= ]" -empty_slot_write(uint64_t addr, unsigned width, uint64_t value, unsigned s= ize, const char *name) "wr addr:0x%04"PRIx64" data:0x%0*"PRIx64" size %u [%= s]" diff --git a/hw/misc/Makefile.objs b/hw/misc/Makefile.objs index 68aae2eabb..e377842920 100644 --- a/hw/misc/Makefile.objs +++ b/hw/misc/Makefile.objs @@ -10,6 +10,7 @@ common-obj-$(CONFIG_EDU) +=3D edu.o common-obj-$(CONFIG_PCA9552) +=3D pca9552.o =20 common-obj-$(CONFIG_UNIMP) +=3D unimp.o +common-obj-$(CONFIG_EMPTY_SLOT) +=3D empty_slot.o common-obj-$(CONFIG_FW_CFG_DMA) +=3D vmcoreinfo.o =20 # ARM devices diff --git a/hw/misc/trace-events b/hw/misc/trace-events index a5862b2bed..0cb4c64ae7 100644 --- a/hw/misc/trace-events +++ b/hw/misc/trace-events @@ -39,6 +39,10 @@ ecc_mem_readl_ecr1(uint32_t ret) "Read event count 2 0x%= 08x" ecc_diag_mem_writeb(uint64_t addr, uint32_t val) "Write diagnostic %"PRId6= 4" =3D 0x%02x" ecc_diag_mem_readb(uint64_t addr, uint32_t ret) "Read diagnostic %"PRId64"= =3D 0x%02x" =20 +# empty_slot.c +empty_slot_read(uint64_t addr, unsigned width, uint64_t value, unsigned si= ze, const char *name) "rd addr:0x%04"PRIx64" data:0x%0*"PRIx64" size %u [%s= ]" +empty_slot_write(uint64_t addr, unsigned width, uint64_t value, unsigned s= ize, const char *name) "wr addr:0x%04"PRIx64" data:0x%0*"PRIx64" size %u [%= s]" + # slavio_misc.c slavio_misc_update_irq_raise(void) "Raise IRQ" slavio_misc_update_irq_lower(void) "Lower IRQ" --=20 2.21.3