From: Alex Williamson <alex.williamson@redhat.com>
To: Cole Robinson <crobinso@redhat.com>
Cc: mst@redhat.com, qemu-stable@nongnu.org, qemu-devel@nongnu.org,
bsd@redhat.com, pbonzini@redhat.com, david@gibson.dropbear.id.au
Subject: Re: [Qemu-devel] [PATCH v2] Fix pc migration from qemu <= 1.5
Date: Mon, 04 Nov 2013 21:19:42 -0700 [thread overview]
Message-ID: <1383625182.21055.99.camel@ul30vt.home> (raw)
In-Reply-To: <929fa6790ab298186744b719583a47a3a3872e96.1381260841.git.crobinso@redhat.com>
On Tue, 2013-10-08 at 15:35 -0400, Cole Robinson wrote:
> The following commit introduced a migration incompatibility:
>
> commit 568f0690fd9aa4d39d84b04c1a5dbb53a915c3fe
> Author: David Gibson <david@gibson.dropbear.id.au>
> Date: Thu Jun 6 18:48:49 2013 +1000
>
> pci: Replace pci_find_domain() with more general pci_root_bus_path()
>
> The issue is that i440fx savevm idstr went from 0000:00:00.0/I440FX to
> 0000:00.0/I440FX. Unfortunately we are stuck with the breakage for
> 1.6 machine types.
>
> Add a compat property to maintain the busted idstr for the 1.6 machine
> types, but revert to the old style format for 1.7+, and <= 1.5.
>
> Tested with migration from qemu 1.5, qemu 1.6, and qemu.git.
>
> Cc: qemu-stable@nongnu.org
> Signed-off-by: Cole Robinson <crobinso@redhat.com>
> ---
>
> v2:
> Drop needless 1.7 compat bits
>
> hw/pci-host/piix.c | 9 ++++++++-
> hw/pci-host/q35.c | 10 ++++++++--
> include/hw/i386/pc.h | 16 ++++++++++++++++
> include/hw/pci-host/q35.h | 1 +
> 4 files changed, 33 insertions(+), 3 deletions(-)
...
> diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
> index 9b2ddc4..79f6934 100644
> --- a/include/hw/i386/pc.h
> +++ b/include/hw/i386/pc.h
> @@ -230,6 +230,14 @@ int e820_add_entry(uint64_t, uint64_t, uint32_t);
> .driver = "e1000",\
> .property = "mitigation",\
> .value = "off",\
> + },{\
> + .driver = "i440FX-pcihost",\
> + .property = "short_root_bus",\
> + .value = stringify(1),\
> + },{\
> + .driver = "mch",\
> + .property = "short_root_bus",\
> + .value = stringify(1),\
This should be "q35-pcihost" in place of "mch". Same below. Otherwise
a q35 machine just fails with a property not found error. Thanks,
Alex
> }
>
> #define PC_COMPAT_1_5 \
> @@ -266,6 +274,14 @@ int e820_add_entry(uint64_t, uint64_t, uint32_t);
> .driver = TYPE_X86_CPU,\
> .property = "pmu",\
> .value = "on",\
> + },{\
> + .driver = "i440FX-pcihost",\
> + .property = "short_root_bus",\
> + .value = stringify(0),\
> + },{\
> + .driver = "mch",\
> + .property = "short_root_bus",\
> + .value = stringify(0),\
> }
>
> #define PC_COMPAT_1_4 \
next prev parent reply other threads:[~2013-11-05 4:19 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-08 19:35 [Qemu-devel] [PATCH v2] Fix pc migration from qemu <= 1.5 Cole Robinson
2013-10-09 2:10 ` Bandan Das
2013-11-05 4:19 ` Alex Williamson [this message]
2013-11-05 23:47 ` Cole Robinson
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=1383625182.21055.99.camel@ul30vt.home \
--to=alex.williamson@redhat.com \
--cc=bsd@redhat.com \
--cc=crobinso@redhat.com \
--cc=david@gibson.dropbear.id.au \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-stable@nongnu.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).