From: "Philippe Mathieu-Daudé" <f4bug@amsat.org>
To: "Peter Maydell" <peter.maydell@linaro.org>,
"Cédric Le Goater" <clg@kaod.org>
Cc: "Philippe Mathieu-Daudé" <f4bug@amsat.org>,
qemu-devel@nongnu.org, "Eduardo Habkost" <ehabkost@redhat.com>,
"Artyom Tarasenko" <atar4qemu@gmail.com>,
"Mark Cave-Ayland" <mark.cave-ayland@ilande.co.uk>
Subject: [Qemu-devel] [PATCH 10/15] hw/sparc64/niagara: Replace 'empty_slot' by 'unimplemented_device'
Date: Tue, 2 Oct 2018 00:09:37 +0200 [thread overview]
Message-ID: <20181001220942.2382-11-f4bug@amsat.org> (raw)
In-Reply-To: <20181001220942.2382-1-f4bug@amsat.org>
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é <f4bug@amsat.org>
---
default-configs/sparc64-softmmu.mak | 1 -
hw/sparc64/niagara.c | 4 ++--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/default-configs/sparc64-softmmu.mak b/default-configs/sparc64-softmmu.mak
index 52edafe547..ce63d47046 100644
--- a/default-configs/sparc64-softmmu.mak
+++ b/default-configs/sparc64-softmmu.mak
@@ -16,5 +16,4 @@ CONFIG_SIMBA=y
CONFIG_SUNHME=y
CONFIG_MC146818RTC=y
CONFIG_ISA_TESTDEV=y
-CONFIG_EMPTY_SLOT=y
CONFIG_SUN4V_RTC=y
diff --git a/hw/sparc64/niagara.c b/hw/sparc64/niagara.c
index 4fa8cb2904..f8a856f611 100644
--- a/hw/sparc64/niagara.c
+++ b/hw/sparc64/niagara.c
@@ -29,7 +29,7 @@
#include "hw/hw.h"
#include "hw/boards.h"
#include "hw/char/serial.h"
-#include "hw/empty_slot.h"
+#include "hw/misc/unimp.h"
#include "hw/loader.h"
#include "hw/sparc/sparc64.h"
#include "hw/timer/sun4v-rtc.h"
@@ -161,7 +161,7 @@ static void niagara_init(MachineState *machine)
serial_mm_init(sysmem, NIAGARA_UART_BASE, 0, NULL, 115200,
serial_hd(0), DEVICE_BIG_ENDIAN);
}
- empty_slot_init(NIAGARA_IOBBASE, NIAGARA_IOBSIZE);
+ create_unimplemented_device("sun4v-iob", NIAGARA_IOBBASE, NIAGARA_IOBSIZE);
sun4v_rtc_init(NIAGARA_RTC_BASE);
}
--
2.19.0
next prev parent reply other threads:[~2018-10-01 22:19 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-01 22:09 [Qemu-devel] [PATCH 00/15] another SysBusDevice::init to Device::realize cleanup Philippe Mathieu-Daudé
2018-10-01 22:09 ` [Qemu-devel] [PATCH 01/15] trace-events: Fix copy/paste typo Philippe Mathieu-Daudé
2018-10-02 13:10 ` Peter Maydell
2018-10-02 15:49 ` Cédric Le Goater
2018-10-01 22:09 ` [Qemu-devel] [PATCH 02/15] hw/timer/sun4v-rtc: Convert from DPRINTF() macro to trace events Philippe Mathieu-Daudé
2018-10-02 11:30 ` Artyom Tarasenko
2018-10-02 15:49 ` Cédric Le Goater
2018-10-01 22:09 ` [Qemu-devel] [PATCH 03/15] hw/timer/sun4v-rtc: Use DeviceState::realize rather than SysBusDevice::init Philippe Mathieu-Daudé
2018-10-02 8:38 ` Thomas Huth
2018-10-02 15:49 ` Cédric Le Goater
2018-10-01 22:09 ` [Qemu-devel] [PATCH 04/15] hw/ssi/xilinx_spi: " Philippe Mathieu-Daudé
2018-10-02 8:40 ` Thomas Huth
2018-10-02 15:49 ` Cédric Le Goater
2018-10-04 17:29 ` Alistair Francis
2018-10-01 22:09 ` [Qemu-devel] [PATCH 05/15] hw/sh4/sh_pci: " Philippe Mathieu-Daudé
2018-10-02 13:13 ` Peter Maydell
2018-10-02 19:59 ` Philippe Mathieu-Daudé
2018-10-02 20:37 ` Marcel Apfelbaum
2018-10-02 20:59 ` Philippe Mathieu-Daudé
2018-10-02 15:49 ` Cédric Le Goater
2018-10-01 22:09 ` [Qemu-devel] [PATCH 06/15] hw/pci-host/bonito: " Philippe Mathieu-Daudé
2018-10-02 21:24 ` Philippe Mathieu-Daudé
2018-10-01 22:09 ` [Qemu-devel] [PATCH 07/15] hw/mips/gt64xxx_pci: Convert gt64120_reset() function into Device reset method Philippe Mathieu-Daudé
2018-10-02 13:15 ` Peter Maydell
2018-10-02 15:49 ` Cédric Le Goater
2018-10-01 22:09 ` [Qemu-devel] [PATCH 08/15] hw/mips/gt64xxx_pci: Mark as bridge device Philippe Mathieu-Daudé
2018-10-02 13:16 ` Peter Maydell
2018-10-02 15:49 ` Cédric Le Goater
2018-10-01 22:09 ` [Qemu-devel] [PATCH 09/15] hw/mips/malta: Replace 'empty_slot' by 'unimplemented_device' Philippe Mathieu-Daudé
2018-10-02 13:23 ` Peter Maydell
2018-10-02 19:40 ` Philippe Mathieu-Daudé
2018-10-03 9:28 ` Peter Maydell
2018-10-01 22:09 ` Philippe Mathieu-Daudé [this message]
2018-10-02 13:24 ` [Qemu-devel] [PATCH 10/15] hw/sparc64/niagara: " Peter Maydell
2018-10-02 15:50 ` Artyom Tarasenko
2018-10-01 22:09 ` [Qemu-devel] [PATCH 11/15] hw/sparc/sun4m: " Philippe Mathieu-Daudé
2018-10-02 8:14 ` Artyom Tarasenko
2018-10-02 21:32 ` Philippe Mathieu-Daudé
2018-10-01 22:09 ` [Qemu-devel] [PATCH 12/15] hw/core: Remove the 'empty_slot' device Philippe Mathieu-Daudé
2018-10-01 22:09 ` [Qemu-devel] [RFC PATCH 13/15] hw/alpha/typhoon: Remove unuseful code Philippe Mathieu-Daudé
2018-10-02 8:34 ` Thomas Huth
2018-10-01 22:09 ` [Qemu-devel] [RFC PATCH 14/15] hw/hppa/dino: " Philippe Mathieu-Daudé
2018-10-02 8:35 ` Thomas Huth
2018-10-01 22:09 ` [Qemu-devel] [RFC PATCH 15/15] hw/mips/malta: " Philippe Mathieu-Daudé
2018-10-02 8:36 ` Thomas Huth
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181001220942.2382-11-f4bug@amsat.org \
--to=f4bug@amsat.org \
--cc=atar4qemu@gmail.com \
--cc=clg@kaod.org \
--cc=ehabkost@redhat.com \
--cc=mark.cave-ayland@ilande.co.uk \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).