From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35187) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bzTm9-0008Eo-TW for qemu-devel@nongnu.org; Wed, 26 Oct 2016 15:22:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bzTm9-0007cJ-5T for qemu-devel@nongnu.org; Wed, 26 Oct 2016 15:22:13 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46890) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1bzTm9-0007bv-04 for qemu-devel@nongnu.org; Wed, 26 Oct 2016 15:22:13 -0400 From: Eduardo Habkost Date: Wed, 26 Oct 2016 17:21:58 -0200 Message-Id: <1477509718-6969-5-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 4/4] e1000e: Rename "subsys_ven" property to "subsys-vendor" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, Dmitry Fleytman , Jason Wang Follow the usual QOM property naming style, and make the property name clearer. This breaks command-line compatibility, but I am assuming the property is not being used in production by anybody. Signed-off-by: Eduardo Habkost --- hw/net/e1000e.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/hw/net/e1000e.c b/hw/net/e1000e.c index 5a711a7..0b27da3 100644 --- a/hw/net/e1000e.c +++ b/hw/net/e1000e.c @@ -63,7 +63,7 @@ typedef struct E1000EState { uint32_t ioaddr; - uint16_t subsys_ven; + uint16_t subsys_vendor; uint16_t subsys; bool has_vnet; @@ -418,7 +418,7 @@ static void e1000e_pci_realize(PCIDevice *pci_dev, Error **errp) pci_dev->config[PCI_CACHE_LINE_SIZE] = 0x10; pci_dev->config[PCI_INTERRUPT_PIN] = 1; - pci_set_word(pci_dev->config + PCI_SUBSYSTEM_VENDOR_ID, s->subsys_ven); + pci_set_word(pci_dev->config + PCI_SUBSYSTEM_VENDOR_ID, s->subsys_vendor); pci_set_word(pci_dev->config + PCI_SUBSYSTEM_ID, s->subsys); /* Define IO/MMIO regions */ @@ -524,7 +524,6 @@ static int e1000e_post_load(void *opaque, int version_id) E1000EState *s = opaque; trace_e1000e_cb_post_load(); - return e1000e_core_post_load(&s->core); } @@ -596,7 +595,7 @@ static const VMStateDescription e1000e_vmstate = { VMSTATE_UINT32(core.delayed_causes, E1000EState), VMSTATE_UINT16(subsys, E1000EState), - VMSTATE_UINT16(subsys_ven, E1000EState), + VMSTATE_UINT16(subsys_vendor, E1000EState), VMSTATE_E1000E_INTR_DELAY_TIMER(core.rdtr, E1000EState), VMSTATE_E1000E_INTR_DELAY_TIMER(core.radv, E1000EState), @@ -627,7 +626,7 @@ static const VMStateDescription e1000e_vmstate = { static Property e1000e_properties[] = { DEFINE_NIC_PROPERTIES(E1000EState, conf), DEFINE_PROP_BOOL("vnet", E1000EState, has_vnet, true), - DEFINE_PROP_UINT16("subsys_ven", E1000EState, subsys_ven, PCI_VENDOR_ID_INTEL), + DEFINE_PROP_UINT16("subsys-vendor", E1000EState, subsys_vendor, PCI_VENDOR_ID_INTEL), DEFINE_PROP_UINT16("subsys", E1000EState, subsys, 0), DEFINE_PROP_END_OF_LIST(), }; -- 2.7.4