Message ID | 1390515366-32236-6-git-send-email-wei.liu2@citrix.com |
---|---|
State | New |
Headers | show |
Il 23/01/2014 23:16, Wei Liu ha scritto: > - echo "CONFIG_XEN_PCI_PASSTHROUGH=y" >> "$config_target_mak" > + if test "$target_name" != "xenpv"; then > + echo "CONFIG_XEN_I386=y" >> $config_target_mak > + if test "$xen_pci_passthrough" = yes; then > + echo "CONFIG_XEN_PCI_PASSTHROUGH=y" >> "$config_target_mak" > + fi You can add CONFIG_XEN_PCI_PASSTHROUGH=$(CONFIG_XEN) to i386-softmmu.mak and x86_64-softmmu.mak, and drop this setting from config-target.mak too. Paolo
On Fri, Jan 24, 2014 at 08:38:19AM +0100, Paolo Bonzini wrote: > Il 23/01/2014 23:16, Wei Liu ha scritto: > >- echo "CONFIG_XEN_PCI_PASSTHROUGH=y" >> "$config_target_mak" > >+ if test "$target_name" != "xenpv"; then > >+ echo "CONFIG_XEN_I386=y" >> $config_target_mak > >+ if test "$xen_pci_passthrough" = yes; then > >+ echo "CONFIG_XEN_PCI_PASSTHROUGH=y" >> "$config_target_mak" > >+ fi > > You can add > > CONFIG_XEN_PCI_PASSTHROUGH=$(CONFIG_XEN) > > to i386-softmmu.mak and x86_64-softmmu.mak, and drop this setting > from config-target.mak too. > I'm afraid not. CONFIG_XEN is prerequiste for CONFIG_XEN_PCI_PASSTHROUGH but doens't imply the feature is enabled by the user. Wei. > Paolo
diff --git a/configure b/configure index 1e515be..324270c 100755 --- a/configure +++ b/configure @@ -4283,7 +4283,7 @@ supported_xen_target() { test "$xen" = "yes" || return 1 test "$target_softmmu" = "yes" || return 1 case "$target_name:$cpu" in - i386:i386 | i386:x86_64 | x86_64:i386 | x86_64:x86_64) + i386:i386 | i386:x86_64 | x86_64:i386 | x86_64:x86_64 | xenpv:*) return 0 ;; esac @@ -4443,6 +4443,9 @@ case "$target_name" in ;; unicore32) ;; + xenpv) + TARGET_ARCH=xenpv + ;; xtensa|xtensaeb) TARGET_ARCH=xtensa ;; @@ -4472,9 +4475,11 @@ echo "TARGET_ABI_DIR=$TARGET_ABI_DIR" >> $config_target_mak if supported_xen_target; then echo "CONFIG_XEN=y" >> $config_target_mak - echo "CONFIG_XEN_I386=y" >> $config_target_mak - if test "$xen_pci_passthrough" = yes; then - echo "CONFIG_XEN_PCI_PASSTHROUGH=y" >> "$config_target_mak" + if test "$target_name" != "xenpv"; then + echo "CONFIG_XEN_I386=y" >> $config_target_mak + if test "$xen_pci_passthrough" = yes; then + echo "CONFIG_XEN_PCI_PASSTHROUGH=y" >> "$config_target_mak" + fi fi fi if supported_kvm_target; then diff --git a/default-configs/xenpv-softmmu.mak b/default-configs/xenpv-softmmu.mak new file mode 100644 index 0000000..773f128 --- /dev/null +++ b/default-configs/xenpv-softmmu.mak @@ -0,0 +1,2 @@ +# Default configuration for xenpv-softmmu +# Yes it is empty as we don't need to include any device emulation code
The modification to configure is rebased on Paolo's change. Signed-off-by: Wei Liu <wei.liu2@citrix.com> --- configure | 13 +++++++++---- default-configs/xenpv-softmmu.mak | 2 ++ 2 files changed, 11 insertions(+), 4 deletions(-) create mode 100644 default-configs/xenpv-softmmu.mak