From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35127) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bzTm6-0008Cu-Tg for qemu-devel@nongnu.org; Wed, 26 Oct 2016 15:22:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bzTm5-0007Zn-05 for qemu-devel@nongnu.org; Wed, 26 Oct 2016 15:22:10 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48674) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1bzTm4-0007ZW-R0 for qemu-devel@nongnu.org; Wed, 26 Oct 2016 15:22:08 -0400 From: Eduardo Habkost Date: Wed, 26 Oct 2016 17:21:56 -0200 Message-Id: <1477509718-6969-3-git-send-email-ehabkost@redhat.com> In-Reply-To: <1477509718-6969-1-git-send-email-ehabkost@redhat.com> References: <1477509718-6969-1-git-send-email-ehabkost@redhat.com> Subject: [Qemu-devel] [PATCH 2/4] e1000e: No need to validate configuration on migration List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, Dmitry Fleytman , Jason Wang The user (or management software) is responsible for keeping the same configuration on both sides while migrating. Remove the configuration validation code at e1000e_post_load, and the unnecessary subsys_used/subsys_ven_used fields. Signed-off-by: Eduardo Habkost --- hw/net/e1000e.c | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/hw/net/e1000e.c b/hw/net/e1000e.c index df24e55..a932620 100644 --- a/hw/net/e1000e.c +++ b/hw/net/e1000e.c @@ -66,9 +66,6 @@ typedef struct E1000EState { uint16_t subsys_ven; uint16_t subsys; - uint16_t subsys_ven_used; - uint16_t subsys_used; - bool disable_vnet; E1000ECore core; @@ -424,9 +421,6 @@ static void e1000e_pci_realize(PCIDevice *pci_dev, Error **errp) pci_set_word(pci_dev->config + PCI_SUBSYSTEM_VENDOR_ID, s->subsys_ven); pci_set_word(pci_dev->config + PCI_SUBSYSTEM_ID, s->subsys); - s->subsys_ven_used = s->subsys_ven; - s->subsys_used = s->subsys; - /* Define IO/MMIO regions */ memory_region_init_io(&s->mmio, OBJECT(s), &mmio_ops, s, "e1000e-mmio", E1000E_MMIO_SIZE); @@ -531,14 +525,6 @@ static int e1000e_post_load(void *opaque, int version_id) trace_e1000e_cb_post_load(); - if ((s->subsys != s->subsys_used) || - (s->subsys_ven != s->subsys_ven_used)) { - fprintf(stderr, - "ERROR: Cannot migrate while device properties " - "(subsys/subsys_ven) differ"); - return -1; - } - return e1000e_core_post_load(&s->core); } -- 2.7.4