From 01ecdaa40e0c14b99ae7e81b5bfce9b6bd6e167c Mon Sep 17 00:00:00 2001 From: Thomas Huth Date: Wed, 10 May 2023 20:46:21 +0200 Subject: hw: Move the default NIC machine class setting from the x86 to the generic one We are going to re-use this setting for other targets, so let's move this to the main MachineClass. Message-Id: <20230512124033.502654-4-thuth@redhat.com> Acked-by: Paolo Bonzini Signed-off-by: Thomas Huth --- include/hw/boards.h | 1 + include/hw/i386/pc.h | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/hw/boards.h b/include/hw/boards.h index f4117fd..a385010 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -253,6 +253,7 @@ struct MachineClass { const char *default_machine_opts; const char *default_boot_order; const char *default_display; + const char *default_nic; GPtrArray *compat_props; const char *hw_version; ram_addr_t default_ram_size; diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 79e7558..c661e9c 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -93,7 +93,6 @@ struct PCMachineClass { /* Device configuration: */ bool pci_enabled; bool kvmclock_enabled; - const char *default_nic_model; /* Compat options: */ -- cgit v1.1 From 963e94a97b3052529678253c6e6efcf102ca3635 Mon Sep 17 00:00:00 2001 From: Thomas Huth Date: Wed, 10 May 2023 21:22:50 +0200 Subject: hw/char/parallel: Move TYPE_ISA_PARALLEL to the header file We are going to require the macro from other files, too, so move this #define to the header file. Message-Id: <20230512124033.502654-9-thuth@redhat.com> Acked-by: Paolo Bonzini Signed-off-by: Thomas Huth --- include/hw/char/parallel.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'include') diff --git a/include/hw/char/parallel.h b/include/hw/char/parallel.h index 0a23c0f..29d2876 100644 --- a/include/hw/char/parallel.h +++ b/include/hw/char/parallel.h @@ -4,6 +4,8 @@ #include "hw/isa/isa.h" #include "chardev/char.h" +#define TYPE_ISA_PARALLEL "isa-parallel" + void parallel_hds_isa_init(ISABus *bus, int n); bool parallel_mm_init(MemoryRegion *address_space, -- cgit v1.1