From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:40085)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <dmitry@daynix.com>) id 1baFpX-0001QA-Bq
	for qemu-devel@nongnu.org; Thu, 18 Aug 2016 01:25:30 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <dmitry@daynix.com>) id 1baFpV-00085C-E9
	for qemu-devel@nongnu.org; Thu, 18 Aug 2016 01:25:26 -0400
Received: from mail-wm0-x241.google.com ([2a00:1450:400c:c09::241]:34267)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <dmitry@daynix.com>) id 1baFpV-000858-7f
	for qemu-devel@nongnu.org; Thu, 18 Aug 2016 01:25:25 -0400
Received: by mail-wm0-x241.google.com with SMTP id q128so2944081wma.1
	for <qemu-devel@nongnu.org>; Wed, 17 Aug 2016 22:25:25 -0700 (PDT)
Content-Type: text/plain;
	charset=us-ascii
Mime-Version: 1.0 (1.0)
From: Dmitry Fleytman <dmitry@daynix.com>
In-Reply-To: <1471444747-6277-4-git-send-email-caoj.fnst@cn.fujitsu.com>
Date: Thu, 18 Aug 2016 08:25:22 +0300
Content-Transfer-Encoding: quoted-printable
Message-Id: <96799672-0756-4574-B617-BF7883978231@daynix.com>
References: <1471444747-6277-1-git-send-email-caoj.fnst@cn.fujitsu.com>
	<1471444747-6277-4-git-send-email-caoj.fnst@cn.fujitsu.com>
Subject: Re: [Qemu-devel] [PATCH 3/6] e1000e: fix for migration compatibility
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Cao jin <caoj.fnst@cn.fujitsu.com>
Cc: qemu-devel@nongnu.org, Jason Wang <jasowang@redhat.com>, Markus Armbruster <armbru@redhat.com>, Marcel Apfelbaum <marcel@redhat.com>, "Michael S. Tsirkin" <mst@redhat.com>

Acked-by: Dmitry Fleytman <dmitry@daynix.com>

> On 17 Aug 2016, at 17:39, Cao jin <caoj.fnst@cn.fujitsu.com> wrote:
>=20
> 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
>=20
> 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>
> ---
> hw/net/e1000e.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>=20
> 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)
>=20
> -#define E1000E_USE_MSIX    BIT(0)
> +#define E1000E_USE_MSI     BIT(0)
> +#define E1000E_USE_MSIX    BIT(1)
>=20
> static uint64_t
> e1000e_mmio_read(void *opaque, hwaddr addr, unsigned size)
> @@ -470,6 +471,8 @@ static void e1000e_pci_realize(PCIDevice *pci_dev, Err=
or **errp)
>     ret =3D msi_init(PCI_DEVICE(s), 0xD0, 1, true, false, NULL);
>     if (ret) {
>         trace_e1000e_msi_init_fail(ret);
> +    } else {
> +        s->intr_state |=3D E1000E_USE_MSI;
>     }
>=20
>     if (e1000e_add_pm_capability(pci_dev, e1000e_pmrb_offset,
> --=20
> 2.1.0
>=20
>=20
>=20