hw: Include the VMWare devices only in the x86 targets
PATCH 1/1 hw: Include the VMWare devices only in the x86 targets
It seems a little bit weird that the para-virtualized x86 VMWare devices "vmware-svga" and "vmxnet3" also show up in non-x86 targets. They are likely pretty useless there (since the guest OSes likely do not have any drivers for those enabled), so let's change this and only enable those devices by default for the classical x86 targets.
---
...ate-Pseudo-encoding.txt => vnc-ledstate-pseudo-encoding.rst} | 0
hw/display/Kconfig | 2 +-
hw/net/Kconfig | 2 +-
3 files changed, 2 insertions(+), 2 deletions(-)
rename docs/interop/{vnc-ledstate-Pseudo-encoding.txt => vnc-ledstate-pseudo-encoding.rst} (100%)docs/interop/vnc-ledstate-pseudo-encoding.rst renamed from docs/interop/vnc-ledstate-Pseudo-encoding.txt +0 -0
hw/display/Kconfig +1 -1
@@ -55,7 +55,7 @@ config VGA_MMIO config VMWARE_VGA bool - default y if PCI_DEVICES + default y if PCI_DEVICES && PC_PCI depends on PCI select VGA
hw/net/Kconfig +1 -1
@@ -51,7 +51,7 @@ config RTL8139_PCI config VMXNET3_PCI bool - default y if PCI_DEVICES + default y if PCI_DEVICES && PC_PCI depends on PCI config SMC91C111
Signature · 1 line
2.31.1
docs/interop/vnc-ledstate-pseudo-encoding.rst
Quoted 15 lines · Thomas Huth
It seems a little bit weird that the para-virtualized x86 VMWare devices "vmware-svga" and "vmxnet3" also show up in non-x86 targets. They are likely pretty useless there (since the guest OSes likely do not have any drivers for those enabled), so let's change this and only enable those devices by default for the classical x86 targets.
Signed-off-by Thomas Huth <[email protected]>--- ...ate-Pseudo-encoding.txt => vnc-ledstate-pseudo-encoding.rst} | 0rename
docs/interop/{vnc-ledstate-Pseudo-encoding.txt=>vnc-ledstate-pseudo-encoding.rst} (100%)docs/interop/vnc-ledstate-pseudo-encoding.rst renamed from docs/interop/vnc-ledstate-Pseudo-encoding.txt +0
-0
Unrelated change ;)
Quoted 18 lines
hw/display/Kconfig +1
-1@@ -55,7 +55,7 @@ config VGA_MMIO config VMWARE_VGA bool - default y if PCI_DEVICES + default y if PCI_DEVICES && PC_PCI depends on PCI select VGAhw/net/Kconfig +0
-0
hw/net/Kconfig config RTL8139_PCI · line 55
Quoted 6 lines
hw/net/Kconfig +1
-1@@ -51,7 +51,7 @@ config RTL8139_PCI config VMXNET3_PCI bool - default y if PCI_DEVICES + default y if PCI_DEVICES && PC_PCI depends on PCI
I'm not sure what PC_PCI is for, it seems inherited from the first Makefile conversion.
Are you sure you want to build this by default if the PC machine is selected? An user could select it an non-X86 arch.
Maybe we want:
- depends on PCI
+ depends on PCI && (I386 || X86_64)
?
Quoted 12 lines · Philippe Mathieu-Daudé
Quoted 11 lines · Thomas Huth
It seems a little bit weird that the para-virtualized x86 VMWare devices "vmware-svga" and "vmxnet3" also show up in non-x86 targets. They are likely pretty useless there (since the guest OSes likely do not have any drivers for those enabled), so let's change this and only enable those devices by default for the classical x86 targets.
Signed-off-by Thomas Huth <[email protected]>---
...ate-Pseudo-encoding.txt =>vnc-ledstate-pseudo-encoding.rst} | 0
renamedocs/interop/{vnc-ledstate-Pseudo-encoding.txt=>vnc-ledstate-pseudo-encoding.rst} (100%)
Quoted 6 lines
docs/interop/vnc-ledstate-pseudo-encoding.rst
Quoted 4 lines
docs/interop/vnc-ledstate-pseudo-encoding.rst renamed from docs/interop/vnc-ledstate-Pseudo-encoding.txt +0
-0Unrelated change ;)
Yeah, sorry, just noticed it after sending the patch ... please ignore that part.
Quoted 28 lines
Quoted 16 lines
hw/display/Kconfig +0
-0@@ -55,7 +55,7 @@ config VGA_MMIOconfig
VMWARE_VGA
bool
- default y ifPCI_DEVICES
+ default y ifPCI_DEVICES&&PC_PCI
depends on PCI
select VGAhw/net/Kconfig +0
-0@@ -51,7 +51,7 @@ config RTL8139_PCIQuoted 5 lines
config
VMXNET3_PCI
bool
- default y ifPCI_DEVICES
+ default y ifPCI_DEVICES&&PC_PCI
depends on PCII'm not sure what
PC_PCIis for, it seems inherited from the firstMakefileconversion.Are you sure you want to build this by default if the PC machine is selected? An user could select it an non-X86 arch.
Quoted 6 lines
Maybe we want:
- depends on PCI
+ depends on PCI && (I386 ||X86_64)?
It does not seem to be a hard dependency - apparently the devices compile fine for non-x86 and I can also run:
qemu-system-ppc64 -device vmware-vga -device vmxnet3
and the guest sees these two PCI devices - it just can't use them since it has no drivers.
So for the unlikely case that someone still wants to use these devices on non-x86 machines, I think it's better to add the test to the "default y" line instead of the "depends on" line, so that users still have a chance to enable it in their config file before compiling.
Thomas
Philippe Mathieu-Daudé
Reviewed-byQuoted 57 lines · Thomas Huth
Quoted 12 lines · Philippe Mathieu-Daudé
Quoted 11 lines · Thomas Huth
It seems a little bit weird that the para-virtualized x86 VMWare devices "vmware-svga" and "vmxnet3" also show up in non-x86 targets. They are likely pretty useless there (since the guest OSes likely do not have any drivers for those enabled), so let's change this and only enable those devices by default for the classical x86 targets.
Signed-off-by Thomas Huth <[email protected]>---
...ate-Pseudo-encoding.txt =>vnc-ledstate-pseudo-encoding.rst} | 0
renamedocs/interop/{vnc-ledstate-Pseudo-encoding.txt=>vnc-ledstate-pseudo-encoding.rst} (100%)Quoted 6 lines
docs/interop/vnc-ledstate-pseudo-encoding.rst
Quoted 4 lines
docs/interop/vnc-ledstate-pseudo-encoding.rst renamed from docs/interop/vnc-ledstate-Pseudo-encoding.txt +0
-0Unrelated change ;)
Yeah, sorry, just noticed it after sending the patch ... please ignore that part.
Quoted 28 lines
Quoted 16 lines
hw/display/Kconfig +0
-0@@ -55,7 +55,7 @@ config VGA_MMIOconfig
VMWARE_VGA
bool
- default y ifPCI_DEVICES
+ default y ifPCI_DEVICES&&PC_PCI
depends on PCI
select VGAhw/net/Kconfig +0
-0@@ -51,7 +51,7 @@ config RTL8139_PCIQuoted 5 lines
config
VMXNET3_PCI
bool
- default y ifPCI_DEVICES
+ default y ifPCI_DEVICES&&PC_PCI
depends on PCII'm not sure what
PC_PCIis for, it seems inherited from the firstMakefileconversion.Are you sure you want to build this by default if the PC machine is selected? An user could select it an non-X86 arch.
Quoted 6 lines
Maybe we want:
- depends on PCI
+ depends on PCI && (I386 ||X86_64)?
Quoted 7 lines
It does not seem to be a hard dependency - apparently the devices compile fine for non-x86 and I can also run:
qemu-system-ppc64 -device vmware-vga -device vmxnet3
and the guest sees these two PCI devices - it just can't use them since it has no drivers.
So for the unlikely case that someone still wants to use these devices on non-x86 machines, I think it's better to add the test to the "default y" line instead of the "depends on" line, so that users still have a chance to enable it in their config file before compiling.
OK then,
docs/interop/vnc-ledstate-pseudo-encoding.rst
Quoted 18 lines · Thomas Huth
It seems a little bit weird that the para-virtualized x86 VMWare devices "vmware-svga" and "vmxnet3" also show up in non-x86 targets. They are likely pretty useless there (since the guest OSes likely do not have any drivers for those enabled), so let's change this and only enable those devices by default for the classical x86 targets.
Signed-off-by Thomas Huth <[email protected]>--- ...ate-Pseudo-encoding.txt => vnc-ledstate-pseudo-encoding.rst} | 0 hw/display/Kconfig | 2 +- hw/net/Kconfig | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-)rename
docs/interop/{vnc-ledstate-Pseudo-encoding.txt=>vnc-ledstate-pseudo-encoding.rst} (100%)docs/interop/vnc-ledstate-pseudo-encoding.rst renamed from docs/interop/vnc-ledstate-Pseudo-encoding.txt +0
-0
Sorry, that change in the docs directory does not belong to this patch, please ignore that part.
Thomas