Skip to content

Commit 8859f07

Browse files
committed
pc_basic_device_init: drop no_vmport arg
Now that we pass pcms anyway, we don't need the no_vmport arg any more. No functional change. Signed-off-by: Gerd Hoffmann <[email protected]> Message-id: [email protected]
1 parent c52e7bb commit 8859f07

File tree

4 files changed

+1
-5
lines changed

4 files changed

+1
-5
lines changed

hw/i386/pc.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1159,7 +1159,6 @@ void pc_basic_device_init(struct PCMachineState *pcms,
11591159
ISABus *isa_bus, qemu_irq *gsi,
11601160
ISADevice **rtc_state,
11611161
bool create_fdctrl,
1162-
bool no_vmport,
11631162
uint32_t hpet_irqs)
11641163
{
11651164
int i;
@@ -1226,7 +1225,7 @@ void pc_basic_device_init(struct PCMachineState *pcms,
12261225
i8257_dma_init(isa_bus, 0);
12271226

12281227
/* Super I/O */
1229-
pc_superio_init(isa_bus, create_fdctrl, no_vmport);
1228+
pc_superio_init(isa_bus, create_fdctrl, pcms->vmport != ON_OFF_AUTO_ON);
12301229
}
12311230

12321231
void pc_nic_init(PCMachineClass *pcmc, ISABus *isa_bus, PCIBus *pci_bus)

hw/i386/pc_piix.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,6 @@ static void pc_init1(MachineState *machine,
236236

237237
/* init basic PC hardware */
238238
pc_basic_device_init(pcms, isa_bus, x86ms->gsi, &rtc_state, true,
239-
(pcms->vmport != ON_OFF_AUTO_ON),
240239
0x4);
241240

242241
pc_nic_init(pcmc, isa_bus, pci_bus);

hw/i386/pc_q35.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,6 @@ static void pc_q35_init(MachineState *machine)
276276

277277
/* init basic PC hardware */
278278
pc_basic_device_init(pcms, isa_bus, x86ms->gsi, &rtc_state, !mc->no_floppy,
279-
(pcms->vmport != ON_OFF_AUTO_ON),
280279
0xff0104);
281280

282281
/* connect pm stuff to lpc */

include/hw/i386/pc.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,6 @@ void pc_basic_device_init(struct PCMachineState *pcms,
164164
ISABus *isa_bus, qemu_irq *gsi,
165165
ISADevice **rtc_state,
166166
bool create_fdctrl,
167-
bool no_vmport,
168167
uint32_t hpet_irqs);
169168
void pc_init_ne2k_isa(ISABus *bus, NICInfo *nd);
170169
void pc_cmos_init(PCMachineState *pcms,

0 commit comments

Comments
 (0)