From: Paolo Bonzini <pbonzini@redhat.com>
To: Olaf Hering <olaf@aepfle.de>
Cc: Stefano Stabellini <sstabellini@kernel.org>,
Eduardo Habkost <ehabkost@redhat.com>,
"Michael S. Tsirkin" <mst@redhat.com>,
"open list:All patches CC here" <qemu-devel@nongnu.org>,
Paul Durrant <pdurrant@gmail.com>,
Anthony Perard <anthony.perard@citrix.com>,
Richard Henderson <rth@twiddle.net>
Subject: Re: [PATCH v2] hw/i386: disable smbus migration for xenfv
Date: Wed, 19 Feb 2020 09:05:49 +0100 [thread overview]
Message-ID: <49a2f35d-cc78-762b-39c3-0340bbebcf84@redhat.com> (raw)
In-Reply-To: <20200218204405.17047092.olaf@aepfle.de>
[-- Attachment #1.1: Type: text/plain, Size: 2388 bytes --]
On 18/02/20 20:44, Olaf Hering wrote:
> Am Tue, 18 Feb 2020 18:37:09 +0100
> schrieb Paolo Bonzini <pbonzini@redhat.com>:
>
>> On 18/02/20 18:27, Olaf Hering wrote:
>>> The approach below (making 'xenfv' an alias of 'pc') does not work:
>>> xen_enabled() is false when pc_i440fx_3_1_machine_options runs.
>> Don't use an alias, copy the 3.1 code into the xenfv machine type and/or
>> call the 3.1 functions from the xenfv machine type.
>
> In the end it may look like this.
>
> Let me know about any preferences regarding the naming of configure options and variables.
Has any version of Xen been released with a QEMU version above 3.1?
Paolo
>
> Olaf
>
> diff --git a/configure b/configure
> index 6f5d850949..65ca345fd6 100755
> --- a/configure
> +++ b/configure
> @@ -368,6 +368,7 @@ vnc_jpeg=""
> vnc_png=""
> xkbcommon=""
> xen=""
> +xen_hvm_pc_i440fx_version_3_1=""
> xen_ctrl_version=""
> xen_pci_passthrough=""
> linux_aio=""
> @@ -1162,6 +1163,10 @@ for opt do
> ;;
> --enable-xen-pci-passthrough) xen_pci_passthrough="yes"
> ;;
> + --disable-xenfv-i440fx-version-3_1) xen_hvm_pc_i440fx_version_3_1="no"
> + ;;
> + --enable-xenfv-i440fx-version-3_1) xen_hvm_pc_i440fx_version_3_1="yes"
> + ;;
> --disable-brlapi) brlapi="no"
> ;;
> --enable-brlapi) brlapi="yes"
> @@ -7836,6 +7841,9 @@ if supported_xen_target $target; then
> if test "$xen_pci_passthrough" = yes; then
> echo "CONFIG_XEN_PCI_PASSTHROUGH=y" >> "$config_target_mak"
> fi
> + if test "$xen_hvm_pc_i440fx_version_3_1" = yes; then
> + echo "CONFIG_XEN_HVM_PC_I440FX_VERSION_3_1=y" >> "$config_target_mak"
> + fi
> else
> echo "$target/config-devices.mak: CONFIG_XEN=n" >> $config_host_mak
> fi
> diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
> index fa12203079..83d1fcc0ba 100644
> --- a/hw/i386/pc_piix.c
> +++ b/hw/i386/pc_piix.c
> @@ -949,6 +949,11 @@ DEFINE_PC_MACHINE(isapc, "isapc", pc_init_isa,
> #ifdef CONFIG_XEN
> static void xenfv_machine_options(MachineClass *m)
> {
> +#ifdef CONFIG_XEN_HVM_PC_I440FX_VERSION_3_1
> + pc_i440fx_3_1_machine_options(m);
> +#else
> + pc_i440fx_4_2_machine_options(m);
> +#endif
> m->desc = "Xen Fully-virtualized PC";
> m->max_cpus = HVM_MAX_VCPUS;
> m->default_machine_opts = "accel=xen";
>
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2020-02-19 8:06 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-13 17:45 [PATCH v1] hw/i386: disable smbus migration for xenpv Olaf Hering
2020-01-13 17:46 ` [PATCH v1] hw/i386: disable smbus migration for xenfv Olaf Hering
2020-01-15 13:51 ` [PATCH v1] hw/i386: disable smbus migration for xenpv Michael S. Tsirkin
2020-01-16 18:03 ` [PATCH v2] hw/i386: disable smbus migration for xenfv Olaf Hering
2020-01-16 18:26 ` Paolo Bonzini
2020-01-16 18:33 ` Olaf Hering
2020-01-16 18:50 ` Paolo Bonzini
2020-01-17 9:22 ` Olaf Hering
2020-01-17 10:27 ` Paolo Bonzini
2020-01-17 13:06 ` Olaf Hering
2020-01-20 11:18 ` Paul Durrant
2020-01-27 9:09 ` Olaf Hering
2020-02-18 17:27 ` Olaf Hering
2020-02-18 17:37 ` Paolo Bonzini
2020-02-18 18:30 ` Olaf Hering
2020-02-18 19:44 ` Olaf Hering
2020-02-19 8:05 ` Paolo Bonzini [this message]
2020-02-19 8:13 ` Olaf Hering
2020-01-27 9:35 ` Paolo Bonzini
2020-01-27 13:26 ` Olaf Hering
2020-01-27 18:21 ` Paolo Bonzini
2020-02-19 11:35 ` Olaf Hering
2020-02-19 14:14 ` Olaf Hering
2020-02-20 10:50 ` Paolo Bonzini
2020-03-25 6:47 ` [PATCH v3] piix: fix xenfv regression, add compat machine xenfv-qemu4 Olaf Hering
2020-03-25 7:11 ` no-reply
2020-03-25 7:25 ` no-reply
2020-03-25 15:39 ` Paolo Bonzini
2020-03-25 15:45 ` Olaf Hering
2020-03-25 17:06 ` Paolo Bonzini
2020-03-27 15:19 ` Olaf Hering
2020-03-27 15:18 ` [PATCH v4] " Olaf Hering
2020-03-27 15:45 ` no-reply
2020-03-27 15:59 ` Paolo Bonzini
2020-03-28 7:09 ` Olaf Hering
2020-03-28 8:56 ` Paolo Bonzini
2020-04-06 16:00 ` Paolo Bonzini
2020-04-06 16:11 ` Olaf Hering
2020-03-27 16:01 ` no-reply
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=49a2f35d-cc78-762b-39c3-0340bbebcf84@redhat.com \
--to=pbonzini@redhat.com \
--cc=anthony.perard@citrix.com \
--cc=ehabkost@redhat.com \
--cc=mst@redhat.com \
--cc=olaf@aepfle.de \
--cc=pdurrant@gmail.com \
--cc=qemu-devel@nongnu.org \
--cc=rth@twiddle.net \
--cc=sstabellini@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).