[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 04/24] pc: remove short_root_bus property
From: |
Paolo Bonzini |
Subject: |
[PULL 04/24] pc: remove short_root_bus property |
Date: |
Tue, 3 Oct 2023 10:30:21 +0200 |
The property was only used on QEMU 1.6 machine types.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
hw/pci-host/i440fx.c | 8 --------
hw/pci-host/q35.c | 7 -------
include/hw/pci-host/q35.h | 1 -
3 files changed, 16 deletions(-)
diff --git a/hw/pci-host/i440fx.c b/hw/pci-host/i440fx.c
index 62d62876818..653cc3f1495 100644
--- a/hw/pci-host/i440fx.c
+++ b/hw/pci-host/i440fx.c
@@ -56,7 +56,6 @@ struct I440FXState {
uint64_t above_4g_mem_size;
uint64_t pci_hole64_size;
bool pci_hole64_fix;
- uint32_t short_root_bus;
char *pci_type;
};
@@ -351,19 +350,12 @@ static const TypeInfo i440fx_info = {
static const char *i440fx_pcihost_root_bus_path(PCIHostState *host_bridge,
PCIBus *rootbus)
{
- I440FXState *s = I440FX_PCI_HOST_BRIDGE(host_bridge);
-
- /* For backwards compat with old device paths */
- if (s->short_root_bus) {
- return "0000";
- }
return "0000:00";
}
static Property i440fx_props[] = {
DEFINE_PROP_SIZE(PCI_HOST_PROP_PCI_HOLE64_SIZE, I440FXState,
pci_hole64_size, I440FX_PCI_HOST_HOLE64_SIZE_DEFAULT),
- DEFINE_PROP_UINT32("short_root_bus", I440FXState, short_root_bus, 0),
DEFINE_PROP_SIZE(PCI_HOST_BELOW_4G_MEM_SIZE, I440FXState,
below_4g_mem_size, 0),
DEFINE_PROP_SIZE(PCI_HOST_ABOVE_4G_MEM_SIZE, I440FXState,
diff --git a/hw/pci-host/q35.c b/hw/pci-host/q35.c
index 91c46df9ae3..08534bc7cc0 100644
--- a/hw/pci-host/q35.c
+++ b/hw/pci-host/q35.c
@@ -73,12 +73,6 @@ static void q35_host_realize(DeviceState *dev, Error **errp)
static const char *q35_host_root_bus_path(PCIHostState *host_bridge,
PCIBus *rootbus)
{
- Q35PCIHost *s = Q35_HOST_DEVICE(host_bridge);
-
- /* For backwards compat with old device paths */
- if (s->mch.short_root_bus) {
- return "0000";
- }
return "0000:00";
}
@@ -181,7 +175,6 @@ static Property q35_host_props[] = {
MCH_HOST_BRIDGE_PCIEXBAR_DEFAULT),
DEFINE_PROP_SIZE(PCI_HOST_PROP_PCI_HOLE64_SIZE, Q35PCIHost,
mch.pci_hole64_size, Q35_PCI_HOST_HOLE64_SIZE_DEFAULT),
- DEFINE_PROP_UINT32("short_root_bus", Q35PCIHost, mch.short_root_bus, 0),
DEFINE_PROP_SIZE(PCI_HOST_BELOW_4G_MEM_SIZE, Q35PCIHost,
mch.below_4g_mem_size, 0),
DEFINE_PROP_SIZE(PCI_HOST_ABOVE_4G_MEM_SIZE, Q35PCIHost,
diff --git a/include/hw/pci-host/q35.h b/include/hw/pci-host/q35.h
index 1d98bbfe0dd..bafcbe67521 100644
--- a/include/hw/pci-host/q35.h
+++ b/include/hw/pci-host/q35.h
@@ -54,7 +54,6 @@ struct MCHPCIState {
uint64_t below_4g_mem_size;
uint64_t above_4g_mem_size;
uint64_t pci_hole64_size;
- uint32_t short_root_bus;
uint16_t ext_tseg_mbytes;
};
--
2.41.0
- [PULL 11/24] crypto: only include tls-cipher-suites in emulators, (continued)
- [PULL 11/24] crypto: only include tls-cipher-suites in emulators, Paolo Bonzini, 2023/10/03
- [PULL 12/24] ui/vnc: Require audiodev= to enable audio, Paolo Bonzini, 2023/10/03
- [PULL 05/24] make-release: do not ship dtc sources, Paolo Bonzini, 2023/10/03
- [PULL 10/24] scsi-disk: ensure that FORMAT UNIT commands are terminated, Paolo Bonzini, 2023/10/03
- [PULL 21/24] hw/ppc: Support machine-default audiodev with fallback, Paolo Bonzini, 2023/10/03
- [PULL 08/24] esp: use correct type for esp_dma_enable() in sysbus_esp_gpio_demux(), Paolo Bonzini, 2023/10/03
- [PULL 15/24] audio: return Error ** from audio_state_by_name, Paolo Bonzini, 2023/10/03
- [PULL 16/24] audio: commonize voice initialization, Paolo Bonzini, 2023/10/03
- [PULL 19/24] Introduce machine property "audiodev", Paolo Bonzini, 2023/10/03
- [PULL 17/24] audio: simplify flow in audio_init, Paolo Bonzini, 2023/10/03
- [PULL 04/24] pc: remove short_root_bus property,
Paolo Bonzini <=
- [PULL 22/24] vt82c686 machines: Support machine-default audiodev with fallback, Paolo Bonzini, 2023/10/03
- [PULL 20/24] hw/arm: Support machine-default audiodev with fallback, Paolo Bonzini, 2023/10/03
- [PULL 13/24] audio: Require AudioState in AUD_add_capture, Paolo Bonzini, 2023/10/03
- [PULL 14/24] audio: allow returning an error from the driver init, Paolo Bonzini, 2023/10/03
- [PULL 18/24] audio: remove QEMU_AUDIO_* and -audio-help support, Paolo Bonzini, 2023/10/03
- [PULL 24/24] audio: forbid default audiodev backend with -nodefaults, Paolo Bonzini, 2023/10/03
- [PULL 09/24] esp: restrict non-DMA transfer length to that of available data, Paolo Bonzini, 2023/10/03
- [PULL 23/24] audio: propagate Error * out of audio_init, Paolo Bonzini, 2023/10/03
- Re: [PULL 00/24] Audio, build system, misc fixes for 2023-10-03, Stefan Hajnoczi, 2023/10/03
- Re: [PULL 00/24] Audio, build system, misc fixes for 2023-10-03, Michael Tokarev, 2023/10/03