From: Andre Przywara <andre.przywara@arm.com>
To: Julien Thierry <julien.thierry@arm.com>
Cc: Sami.Mujawar@arm.com, will.deacon@arm.com,
kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org
Subject: Re: [PATCH kvmtool 03/16] brlock: fix build with KVM_BRLOCK_DEBUG
Date: Thu, 4 Apr 2019 14:43:40 +0100 [thread overview]
Message-ID: <20190404144340.78c81d9c@donnerap.cambridge.arm.com> (raw)
In-Reply-To: <1551947777-13044-4-git-send-email-julien.thierry@arm.com>
On Thu, 7 Mar 2019 08:36:04 +0000
Julien Thierry <julien.thierry@arm.com> wrote:
> Build breaks when using KVM_BRLOCK_DEBUG because the header was seamingly
> conceived to be included in a single .c file...
>
> Fix this by moving the definition of the read/write lock into the kvm
> struct.
>
> Signed-off-by: Julien Thierry <julien.thierry@arm.com>
Reviewed-by: Andre Przywara <andre.przywara@arm.com>
Cheers,
Andre.
> ---
> include/kvm/brlock.h | 10 ++++------
> include/kvm/kvm.h | 4 ++++
> kvm.c | 4 ++++
> 3 files changed, 12 insertions(+), 6 deletions(-)
>
> diff --git a/include/kvm/brlock.h b/include/kvm/brlock.h
> index 29f72e0..1862210 100644
> --- a/include/kvm/brlock.h
> +++ b/include/kvm/brlock.h
> @@ -21,13 +21,11 @@
>
> #include "kvm/rwsem.h"
>
> -DECLARE_RWSEM(brlock_sem);
> +#define br_read_lock(kvm) down_read(&(kvm)->brlock_sem);
> +#define br_read_unlock(kvm) up_read(&(kvm)->brlock_sem);
>
> -#define br_read_lock(kvm) down_read(&brlock_sem);
> -#define br_read_unlock(kvm) up_read(&brlock_sem);
> -
> -#define br_write_lock(kvm) down_write(&brlock_sem);
> -#define br_write_unlock(kvm) up_write(&brlock_sem);
> +#define br_write_lock(kvm) down_write(&(kvm)->brlock_sem);
> +#define br_write_unlock(kvm) up_write(&(kvm)->brlock_sem);
>
> #else
>
> diff --git a/include/kvm/kvm.h b/include/kvm/kvm.h
> index 1edacfd..7a73818 100644
> --- a/include/kvm/kvm.h
> +++ b/include/kvm/kvm.h
> @@ -81,6 +81,10 @@ struct kvm {
> int nr_disks;
>
> int vm_state;
> +
> +#ifdef KVM_BRLOCK_DEBUG
> + pthread_rwlock_t brlock_sem;
> +#endif
> };
>
> void kvm__set_dir(const char *fmt, ...);
> diff --git a/kvm.c b/kvm.c
> index d5249a0..57c4ff9 100644
> --- a/kvm.c
> +++ b/kvm.c
> @@ -160,6 +160,10 @@ struct kvm *kvm__new(void)
> kvm->sys_fd = -1;
> kvm->vm_fd = -1;
>
> +#ifdef KVM_BRLOCK_DEBUG
> + kvm->brlock_sem = (pthread_rwlock_t) PTHREAD_RWLOCK_INITIALIZER;
> +#endif
> +
> return kvm;
> }
>
next prev parent reply other threads:[~2019-04-04 13:43 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-07 8:36 [PATCH kvmtool 00/16] Support PCI BAR configuration Julien Thierry
2019-03-07 8:36 ` [PATCH kvmtool 01/16] Makefile: Only compile vesa for archs that need it Julien Thierry
2019-04-04 13:43 ` Andre Przywara
2019-03-07 8:36 ` [PATCH kvmtool 02/16] brlock: Always pass argument to br_read_lock/unlock Julien Thierry
2019-04-04 13:43 ` Andre Przywara
2019-03-07 8:36 ` [PATCH kvmtool 03/16] brlock: fix build with KVM_BRLOCK_DEBUG Julien Thierry
2019-04-04 13:43 ` Andre Przywara [this message]
2019-03-07 8:36 ` [PATCH kvmtool 04/16] pci: Fix BAR resource sizing arbitration Julien Thierry
2019-04-04 13:44 ` Andre Przywara
2019-03-07 8:36 ` [PATCH kvmtool 05/16] ioport: pci: Move port allocations to PCI devices Julien Thierry
2019-04-04 13:45 ` Andre Przywara
2019-04-30 9:50 ` Julien Thierry
2019-04-30 9:50 ` Julien Thierry
2019-03-07 8:36 ` [PATCH kvmtool 06/16] pci: Fix ioport allocation size Julien Thierry
2019-04-04 13:46 ` Andre Przywara
2019-03-07 8:36 ` [PATCH kvmtool 07/16] arm/pci: Fix PCI IO region Julien Thierry
2019-03-07 8:36 ` [PATCH kvmtool 08/16] arm/pci: Do not use first PCI IO space bytes for devices Julien Thierry
2019-04-05 15:31 ` Andre Przywara
2019-06-14 8:32 ` Julien Thierry
2019-03-07 8:36 ` [PATCH kvmtool 09/16] brlock: Use rwlock instead of pause Julien Thierry
2019-03-07 8:36 ` [PATCH kvmtool 10/16] ref_cnt: Add simple ref counting API Julien Thierry
2019-03-07 8:36 ` [PATCH kvmtool 11/16] mmio: Allow mmio callbacks to be called without locking Julien Thierry
2019-03-07 8:36 ` [PATCH kvmtool 12/16] ioport: Allow ioport " Julien Thierry
2019-03-07 8:36 ` [PATCH kvmtool 13/16] vfio: Add support for BAR configuration Julien Thierry
2019-03-07 8:36 ` [PATCH kvmtool 14/16] virtio/pci: Make memory and IO BARs independent Julien Thierry
2019-03-07 8:36 ` [PATCH kvmtool 15/16] virtio/pci: update virtio mapping when PCI BARs are reconfigured Julien Thierry
2019-03-07 8:36 ` [PATCH kvmtool 16/16] arm/fdt: Remove PCI probe only property Julien Thierry
2019-04-26 14:09 ` [PATCH kvmtool 00/16] Support PCI BAR configuration Will Deacon
2019-04-26 14:09 ` Will Deacon
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=20190404144340.78c81d9c@donnerap.cambridge.arm.com \
--to=andre.przywara@arm.com \
--cc=Sami.Mujawar@arm.com \
--cc=julien.thierry@arm.com \
--cc=kvm@vger.kernel.org \
--cc=kvmarm@lists.cs.columbia.edu \
--cc=will.deacon@arm.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).