From patchwork Tue Sep 15 16:07:24 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= X-Patchwork-Id: 517973 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 7168914018C for ; Wed, 16 Sep 2015 02:11:32 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=z/E1u5fn; dkim-atps=neutral Received: from localhost ([::1]:44170 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZbspO-0000NW-39 for incoming@patchwork.ozlabs.org; Tue, 15 Sep 2015 12:11:30 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56749) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zbsmh-0004AZ-L3 for qemu-devel@nongnu.org; Tue, 15 Sep 2015 12:08:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zbsme-0005JW-Ez for qemu-devel@nongnu.org; Tue, 15 Sep 2015 12:08:43 -0400 Received: from mail-qk0-x232.google.com ([2607:f8b0:400d:c09::232]:36556) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zbsme-0005J8-5S for qemu-devel@nongnu.org; Tue, 15 Sep 2015 12:08:40 -0400 Received: by qkcf65 with SMTP id f65so74227513qkc.3 for ; Tue, 15 Sep 2015 09:08:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=ukmY+IpgMU7sUZwiRm/hlrZPvmFf5uYJaaVOceUgEzM=; b=z/E1u5fnqsQ+zR8e99BPvozvUsLo3xaaaz0OMHFHli97znrw/cLQXAJ8w6PKpvCvLz 1p2xZdh/d3GeaVXOHuv6wCrzkTCccVlewiTSStQGi/qKZFg0Bu4hxED7UiKZj0BfMiZE 7RD+DAd4fGqUZTTZRxy5oPVlJcojZo/nc7lWR6WHHT3I4ropSzU6jAWcEuGU8Pm/icMe 0Ju4oLuGHVnRBopk395VALJ03myfBABzFuazQ4L9ri2CITBzhqY9/oULxdPaTgCHnaWx cLGIGJs8yZcdNsTRqn1WYo8KHszDM8R4QRtuhD++2Sw40izzPwD2JrHG222wu5LJ5jjx ZbBg== X-Received: by 10.55.198.11 with SMTP id b11mr32878063qkj.53.1442333319501; Tue, 15 Sep 2015 09:08:39 -0700 (PDT) Received: from localhost (bne75-h02-31-39-163-232.dsl.sta.abo.bbox.fr. [31.39.163.232]) by smtp.gmail.com with ESMTPSA id u45sm8221206qge.14.2015.09.15.09.08.37 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 15 Sep 2015 09:08:38 -0700 (PDT) From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Date: Tue, 15 Sep 2015 18:07:24 +0200 Message-Id: <1442333283-13119-8-git-send-email-marcandre.lureau@redhat.com> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1442333283-13119-1-git-send-email-marcandre.lureau@redhat.com> References: <1442333283-13119-1-git-send-email-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400d:c09::232 Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , drjones@redhat.com, cam@cs.ualberta.ca, stefanha@redhat.com Subject: [Qemu-devel] [PATCH v3 07/46] ivshmem: remove superflous ivshmem_attr field X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Marc-André Lureau Signed-off-by: Marc-André Lureau --- hw/misc/ivshmem.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/hw/misc/ivshmem.c b/hw/misc/ivshmem.c index fbeb731..5e4b2cc 100644 --- a/hw/misc/ivshmem.c +++ b/hw/misc/ivshmem.c @@ -85,7 +85,6 @@ typedef struct IVShmemState { MemoryRegion bar; MemoryRegion ivshmem; uint64_t ivshmem_size; /* size of shared memory region */ - uint32_t ivshmem_attr; uint32_t ivshmem_64bit; int shm_fd; /* shared memory file descriptor */ @@ -345,7 +344,7 @@ static int check_shm_size(IVShmemState *s, int fd) { /* create the shared memory BAR when we are not using the server, so we can * create the BAR and map the memory immediately */ -static void create_shared_memory_BAR(IVShmemState *s, int fd) { +static void create_shared_memory_BAR(IVShmemState *s, int fd, uint8_t attr) { void * ptr; @@ -359,7 +358,7 @@ static void create_shared_memory_BAR(IVShmemState *s, int fd) { memory_region_add_subregion(&s->bar, 0, &s->ivshmem); /* region for shared memory */ - pci_register_bar(PCI_DEVICE(s), 2, s->ivshmem_attr, &s->bar); + pci_register_bar(PCI_DEVICE(s), 2, attr, &s->bar); } static void ivshmem_add_eventfd(IVShmemState *s, int posn, int i) @@ -714,6 +713,8 @@ static int pci_ivshmem_init(PCIDevice *dev) { IVShmemState *s = IVSHMEM(dev); uint8_t *pci_conf; + uint8_t attr = PCI_BASE_ADDRESS_SPACE_MEMORY | + PCI_BASE_ADDRESS_MEM_PREFETCH;; if (s->sizearg == NULL) s->ivshmem_size = 4 << 20; /* 4 MB default */ @@ -768,10 +769,8 @@ static int pci_ivshmem_init(PCIDevice *dev) &s->ivshmem_mmio); memory_region_init(&s->bar, OBJECT(s), "ivshmem-bar2-container", s->ivshmem_size); - s->ivshmem_attr = PCI_BASE_ADDRESS_SPACE_MEMORY | - PCI_BASE_ADDRESS_MEM_PREFETCH; if (s->ivshmem_64bit) { - s->ivshmem_attr |= PCI_BASE_ADDRESS_MEM_TYPE_64; + attr |= PCI_BASE_ADDRESS_MEM_TYPE_64; } if ((s->server_chr != NULL) && @@ -798,7 +797,7 @@ static int pci_ivshmem_init(PCIDevice *dev) /* allocate/initialize space for interrupt handling */ s->peers = g_malloc0(s->nb_peers * sizeof(Peer)); - pci_register_bar(dev, 2, s->ivshmem_attr, &s->bar); + pci_register_bar(dev, 2, attr, &s->bar); s->eventfd_chr = g_malloc0(s->vectors * sizeof(CharDriverState *)); @@ -835,8 +834,7 @@ static int pci_ivshmem_init(PCIDevice *dev) exit(1); } - create_shared_memory_BAR(s, fd); - + create_shared_memory_BAR(s, fd, attr); } dev->config_write = ivshmem_write_config;