[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 13/20] pc_basic_device_init: drop no_vmport arg
From: |
Gerd Hoffmann |
Subject: |
[PATCH v4 13/20] pc_basic_device_init: drop no_vmport arg |
Date: |
Wed, 24 Jun 2020 13:30:19 +0200 |
Now that we pass pcms anyway, we don't need the no_vmport arg any more.
No functional change.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
include/hw/i386/pc.h | 1 -
hw/i386/pc.c | 3 +--
hw/i386/pc_piix.c | 1 -
hw/i386/pc_q35.c | 1 -
4 files changed, 1 insertion(+), 5 deletions(-)
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
index 3512dcfd3d27..283754f42bd5 100644
--- a/include/hw/i386/pc.h
+++ b/include/hw/i386/pc.h
@@ -164,7 +164,6 @@ void pc_basic_device_init(struct PCMachineState *pcms,
ISABus *isa_bus, qemu_irq *gsi,
ISADevice **rtc_state,
bool create_fdctrl,
- bool no_vmport,
uint32_t hpet_irqs);
void pc_init_ne2k_isa(ISABus *bus, NICInfo *nd);
void pc_cmos_init(PCMachineState *pcms,
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index dfe8ba07e982..ba88e1dfb80f 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -1180,7 +1180,6 @@ void pc_basic_device_init(struct PCMachineState *pcms,
ISABus *isa_bus, qemu_irq *gsi,
ISADevice **rtc_state,
bool create_fdctrl,
- bool no_vmport,
uint32_t hpet_irqs)
{
int i;
@@ -1247,7 +1246,7 @@ void pc_basic_device_init(struct PCMachineState *pcms,
i8257_dma_init(isa_bus, 0);
/* Super I/O */
- pc_superio_init(isa_bus, create_fdctrl, no_vmport);
+ pc_superio_init(isa_bus, create_fdctrl, pcms->vmport != ON_OFF_AUTO_ON);
}
void pc_nic_init(PCMachineClass *pcmc, ISABus *isa_bus, PCIBus *pci_bus)
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index 1242ed811804..2752b108001c 100644
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -236,7 +236,6 @@ static void pc_init1(MachineState *machine,
/* init basic PC hardware */
pc_basic_device_init(pcms, isa_bus, x86ms->gsi, &rtc_state, true,
- (pcms->vmport != ON_OFF_AUTO_ON),
0x4);
pc_nic_init(pcmc, isa_bus, pci_bus);
diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
index 25dc40896673..b8c8eaa691f6 100644
--- a/hw/i386/pc_q35.c
+++ b/hw/i386/pc_q35.c
@@ -276,7 +276,6 @@ static void pc_q35_init(MachineState *machine)
/* init basic PC hardware */
pc_basic_device_init(pcms, isa_bus, x86ms->gsi, &rtc_state, !mc->no_floppy,
- (pcms->vmport != ON_OFF_AUTO_ON),
0xff0104);
/* connect pm stuff to lpc */
--
2.18.4
- [PATCH v4 12/20] pc_basic_device_init: drop has_pit arg, (continued)
- [PATCH v4 12/20] pc_basic_device_init: drop has_pit arg, Gerd Hoffmann, 2020/06/24
- [PATCH v4 20/20] audio: set default value for pcspk.iobase property, Gerd Hoffmann, 2020/06/24
- [PATCH v4 08/20] audio: deprecate -soundhw gus, Gerd Hoffmann, 2020/06/24
- [PATCH v4 14/20] softmmu: initialize spice and audio earlier, Gerd Hoffmann, 2020/06/24
- [PATCH v4 07/20] audio: deprecate -soundhw cs4231a, Gerd Hoffmann, 2020/06/24
- [PATCH v4 05/20] audio: deprecate -soundhw es1370, Gerd Hoffmann, 2020/06/24
- [PATCH v4 01/20] stubs: add isa_create_simple, Gerd Hoffmann, 2020/06/24
- [PATCH v4 18/20] audio: add soundhw deprecation notice, Gerd Hoffmann, 2020/06/24
- [PATCH v4 13/20] pc_basic_device_init: drop no_vmport arg,
Gerd Hoffmann <=
- [PATCH v4 03/20] audio: add deprecated_register_soundhw, Gerd Hoffmann, 2020/06/24
- [PATCH v4 04/20] audio: deprecate -soundhw ac97, Gerd Hoffmann, 2020/06/24
- [PATCH v4 15/20] audio: rework pcspk_init(), Gerd Hoffmann, 2020/06/24
- [PATCH v4 16/20] audio: create pcspk device early, Gerd Hoffmann, 2020/06/24