From patchwork Mon Oct 12 16:40:57 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: 529201 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 24FE41402B0 for ; Tue, 13 Oct 2015 03:43:40 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=0cqf/v90; dkim-atps=neutral Received: from localhost ([::1]:56603 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZlgCI-0007jJ-0q for incoming@patchwork.ozlabs.org; Mon, 12 Oct 2015 12:43:38 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59638) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZlgBS-0006Px-E7 for qemu-devel@nongnu.org; Mon, 12 Oct 2015 12:42:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZlgBR-00015Q-GR for qemu-devel@nongnu.org; Mon, 12 Oct 2015 12:42:46 -0400 Received: from mail-pa0-x22f.google.com ([2607:f8b0:400e:c03::22f]:36029) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZlgBR-00014m-Ad for qemu-devel@nongnu.org; Mon, 12 Oct 2015 12:42:45 -0400 Received: by pacex6 with SMTP id ex6so4334344pac.3 for ; Mon, 12 Oct 2015 09:42:44 -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=vFl5gNR3UFDUWfCh2XvmZtcnJzw2qfmE/oespljv9eo=; b=0cqf/v90nZHqAWK/1/GepUJ721+f2RfsWXz6vzmJ6NABQaNncrpDCu4/F8xmHiYbdA k/125+aNarZOT+i9x+rbdaxGrYNhg89QUlaj3ElRyREcASqkO8ewwV6AyQaT9E1vS6ZK LQuvT+OCB6Pc3biBO0LYm4NX1ubKZLMz1014lgA7Z56djjDeY+nNNvJumwoFGyHIkiSp lza5lSPx+LDhcw3eUU1LOpSm2wt+6uN43AaPS3KddByKRLw0rdim5pqd6tufwLmgyzsj cFNq2m9Czu1swzJiTVEmvPaQVJ34Lmj1SBcGkl51peoEI0m8fEit1zSaEms2BVosl4sK eYRQ== X-Received: by 10.68.197.168 with SMTP id iv8mr17565101pbc.81.1444668164757; Mon, 12 Oct 2015 09:42:44 -0700 (PDT) Received: from localhost (APoitiers-257-1-35-234.w90-38.abo.wanadoo.fr. [90.38.210.234]) by smtp.gmail.com with ESMTPSA id rp5sm19435746pab.0.2015.10.12.09.42.41 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 12 Oct 2015 09:42:43 -0700 (PDT) From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Date: Mon, 12 Oct 2015 18:40:57 +0200 Message-Id: <1444668104-22955-4-git-send-email-marcandre.lureau@redhat.com> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1444668104-22955-1-git-send-email-marcandre.lureau@redhat.com> References: <1444668104-22955-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:400e:c03::22f Cc: peter.maydell@linaro.org, drjones@redhat.com, claudio.fontana@huawei.com, stefanha@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , pbonzini@redhat.com, cam@cs.ualberta.ca Subject: [Qemu-devel] [PULL v2 03/50] msix: add VMSTATE_MSIX_TEST 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 ivshmem is going to use MSIX state conditionally. Signed-off-by: Marc-André Lureau Reviewed-by: Claudio Fontana --- include/hw/pci/msix.h | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/include/hw/pci/msix.h b/include/hw/pci/msix.h index 954d82b..72e5f93 100644 --- a/include/hw/pci/msix.h +++ b/include/hw/pci/msix.h @@ -46,12 +46,16 @@ void msix_unset_vector_notifiers(PCIDevice *dev); extern const VMStateDescription vmstate_msix; -#define VMSTATE_MSIX(_field, _state) { \ - .name = (stringify(_field)), \ - .size = sizeof(PCIDevice), \ - .vmsd = &vmstate_msix, \ - .flags = VMS_STRUCT, \ - .offset = vmstate_offset_value(_state, _field, PCIDevice), \ +#define VMSTATE_MSIX_TEST(_field, _state, _test) { \ + .name = (stringify(_field)), \ + .size = sizeof(PCIDevice), \ + .vmsd = &vmstate_msix, \ + .flags = VMS_STRUCT, \ + .offset = vmstate_offset_value(_state, _field, PCIDevice), \ + .field_exists = (_test) \ } +#define VMSTATE_MSIX(_f, _s) \ + VMSTATE_MSIX_TEST(_f, _s, NULL) + #endif