From: Paolo Bonzini <pbonzini@redhat.com>
To: Cao jin <caoj.fnst@cn.fujitsu.com>, qemu-devel@nongnu.org
Cc: Dmitry Fleytman <dmitry@daynix.com>,
Marcel Apfelbaum <marcel@redhat.com>,
Jason Wang <jasowang@redhat.com>,
Markus Armbruster <armbru@redhat.com>,
"Michael S. Tsirkin" <mst@redhat.com>
Subject: Re: [Qemu-devel] [PATCH 3/6] e1000e: fix for migration compatibility
Date: Thu, 18 Aug 2016 12:47:32 +0200 [thread overview]
Message-ID: <7b932d72-276c-912a-d1fb-85ed88e67dfa@redhat.com> (raw)
In-Reply-To: <1471444747-6277-4-git-send-email-caoj.fnst@cn.fujitsu.com>
On 17/08/2016 16:39, Cao jin wrote:
> commit 66bf7d58 removed internal msi state flag E1000E_USE_MSI, but it
> is used by intr_state which exists in vmstate. Restore it for migration
> to older QEMU versions
>
> CC: Dmitry Fleytman <dmitry@daynix.com>
> CC: Jason Wang <jasowang@redhat.com>
> CC: Markus Armbruster <armbru@redhat.com>
> CC: Marcel Apfelbaum <marcel@redhat.com>
> CC: Michael S. Tsirkin <mst@redhat.com>
> Signed-off-by: Cao jin <caoj.fnst@cn.fujitsu.com>
Not necessary. No released version of QEMU had e1000e and lacked commit
66bf7d58.
Paolo
> hw/net/e1000e.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/hw/net/e1000e.c b/hw/net/e1000e.c
> index 82a7be1..ba37fe9 100644
> --- a/hw/net/e1000e.c
> +++ b/hw/net/e1000e.c
> @@ -89,7 +89,8 @@ typedef struct E1000EState {
> #define E1000E_MSIX_TABLE (0x0000)
> #define E1000E_MSIX_PBA (0x2000)
>
> -#define E1000E_USE_MSIX BIT(0)
> +#define E1000E_USE_MSI BIT(0)
> +#define E1000E_USE_MSIX BIT(1)
>
> static uint64_t
> e1000e_mmio_read(void *opaque, hwaddr addr, unsigned size)
> @@ -470,6 +471,8 @@ static void e1000e_pci_realize(PCIDevice *pci_dev, Error **errp)
> ret = msi_init(PCI_DEVICE(s), 0xD0, 1, true, false, NULL);
> if (ret) {
> trace_e1000e_msi_init_fail(ret);
> + } else {
> + s->intr_state |= E1000E_USE_MSI;
> }
>
> if (e1000e_add_pm_capability(pci_dev, e1000e_pmrb_offset,
>
next prev parent reply other threads:[~2016-08-18 10:47 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-17 14:39 [Qemu-devel] [PATCH 0/6] Convert msix_init() to error Cao jin
2016-08-17 14:39 ` [Qemu-devel] [PATCH 1/6] msix_init: assert programming error Cao jin
2016-08-18 7:14 ` Markus Armbruster
2016-08-18 7:46 ` Cao jin
2016-08-17 14:39 ` [Qemu-devel] [PATCH 2/6] pci: Convert msix_init() to Error and fix callers to check it Cao jin
2016-08-18 7:55 ` Markus Armbruster
2016-08-19 8:11 ` Cao jin
2016-08-17 14:39 ` [Qemu-devel] [PATCH 3/6] e1000e: fix for migration compatibility Cao jin
2016-08-18 5:25 ` Dmitry Fleytman
2016-08-18 10:47 ` Paolo Bonzini [this message]
2016-08-18 13:11 ` Cao jin
2016-08-18 13:04 ` Paolo Bonzini
2016-08-18 13:25 ` Cao jin
2016-08-18 13:22 ` Paolo Bonzini
2016-08-17 14:39 ` [Qemu-devel] [PATCH 4/6] e1000e: drop unnecessary funtions Cao jin
2016-08-18 5:23 ` Dmitry Fleytman
2016-08-18 7:38 ` Cao jin
2016-08-17 14:39 ` [Qemu-devel] [PATCH 5/6] megasas: remove unnecessary megasas_use_msix() Cao jin
2016-08-17 14:39 ` [Qemu-devel] [PATCH 6/6] megasas: undo the overwrites of user configuration Cao jin
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=7b932d72-276c-912a-d1fb-85ed88e67dfa@redhat.com \
--to=pbonzini@redhat.com \
--cc=armbru@redhat.com \
--cc=caoj.fnst@cn.fujitsu.com \
--cc=dmitry@daynix.com \
--cc=jasowang@redhat.com \
--cc=marcel@redhat.com \
--cc=mst@redhat.com \
--cc=qemu-devel@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.