From patchwork Wed May 22 16:07:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1103449 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=vivier.eu Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 458Hqn3c0pz9s55 for ; Thu, 23 May 2019 02:18:29 +1000 (AEST) Received: from localhost ([127.0.0.1]:47390 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hTTwg-000205-8V for incoming@patchwork.ozlabs.org; Wed, 22 May 2019 12:18:26 -0400 Received: from eggs.gnu.org ([209.51.188.92]:57809) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hTTnI-0002Xj-Kp for qemu-devel@nongnu.org; Wed, 22 May 2019 12:08:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hTTnE-0004qR-SC for qemu-devel@nongnu.org; Wed, 22 May 2019 12:08:42 -0400 Received: from mout.kundenserver.de ([212.227.17.10]:47827) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hTTn2-0004Co-5p; Wed, 22 May 2019 12:08:28 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue108 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MQ5jC-1hGC5U0D8i-00M2WB; Wed, 22 May 2019 18:07:32 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Wed, 22 May 2019 18:07:15 +0200 Message-Id: <20190522160723.31484-2-laurent@vivier.eu> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190522160723.31484-1-laurent@vivier.eu> References: <20190522160723.31484-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:RMi5HTURvFvdxGe93BOeChtzHT4SQolFxxyjn4qxM628gfPOrQm 9CzKi3I0voJlrGHPjHQwMWhuYDfkpy+FQPDdvn+SM5PE+4se3u3zykeXqbqneXfvEP1sDi1 BskIPvYECJC5dnA7RjcYVwHxxEaphkhBLA+1Qd8J/GI2eILGeUq71TjZ1fzgEFheVbcwnhE 5NgGjmhUQkRhiTFJHKgnw== X-UI-Out-Filterresults: notjunk:1; V03:K0:mFBRIQu3+8M=:iyEpLawWpc5VYp9Z0Cue6k l2yOr05OejsDO47E2wV0hkYVWSLE9TFlp4RDIN7xNJkEw12JGW6G7Ul6J6U5nq2EsTfHETiVF xJsiC/1V3rxDr09fCaUhrCqA484CuMT4Cn/Uwzm0anH9rNl1XzXVmZ0qlonXqFUsm42CusYQU wfJH6ZA2gsN/vNOj0OktSx/rDU7cTWO8WYI1vwCThqKKr9ukmYC5i60cRvDUbeBbCRuVvDWfp jILAGKFqz1O8ZKPRM6vLhyRswS2JYabEnDS8tFmMN8bvpwT5HoGrwvG+YGPJMnEaIaI7I19GM OzYhTZ/TgzZaG3yEjE+nC0ryfDBT9zmFhR525RvWbHE5vOdz7EUFM0bxKBVoJrEKV1PqgiRDM cZ/l23TtJQjofiWo85ybsaL1PqnBuSrlnWL9UYOUub2koGNC9EAE942WcXLPIoIRTyThY9WSv SgMwmaxMvquBNdf/kTN5eL2I1MZj1H/z/tix1wU3Ae/FGvRMHHoL5CAy0WEqstPDSqNwGddnp I3MZnEfuxYSGATKqlKXoqUdKazXzFq5QidfmE9YB2EAm0NJWR01yYc0DjdGSLeC50ehn+PhS3 Yw4xz6/DkPTJjAb3lBeghAH2JyRfNgG9b4C6uJlyarrxvM2vm3QmfaymabnftKxHL36bNOTnM 0AZ7VKhYnp2BI10qVGmlyBxHagbK2TCvuUbn1aDjG3jxtV8x61z5PzaKB3iuKd3qm8v7BFoBM sM9mNmL2YBAAATkRyxRiKywnYxkmx+FMjKcIA0658ntffdKqEfn6sxtsGks= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.227.17.10 Subject: [Qemu-devel] [PULL 1/9] hw/virtio/virtio-mmio: Convert DPRINTF to trace and log X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Tony Krowiak , Eric Farman , Farhan Ali , Pierre Morel , Juan Quintela , qemu-trivial@nongnu.org, =?utf-8?q?Alex_Benn=C3=A9e?= , Cornelia Huck , Michael Tokarev , Alex Williamson , Yuval Shaia , Laurent Vivier , Halil Pasic , Christian Borntraeger , qemu-s390x@nongnu.org, "Michael S. Tsirkin" , =?utf-8?q?Philippe_Mathieu-Dau?= =?utf-8?b?ZMOp?= , Boxuan Li , "Dr. David Alan Gilbert" Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Boxuan Li Use traces for debug message and qemu_log_mask for errors. Signed-off-by: Boxuan Li Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé Reviewed-by: Alex Bennée Reviewed-by: Yuval Shaia Message-Id: <20190503154424.73933-1-liboxuan@connect.hku.hk> Signed-off-by: Laurent Vivier --- hw/virtio/trace-events | 7 +++++++ hw/virtio/virtio-mmio.c | 44 ++++++++++++++++++++--------------------- 2 files changed, 28 insertions(+), 23 deletions(-) diff --git a/hw/virtio/trace-events b/hw/virtio/trace-events index 60c649c4bc96..e28ba48da621 100644 --- a/hw/virtio/trace-events +++ b/hw/virtio/trace-events @@ -46,3 +46,10 @@ virtio_balloon_handle_output(const char *name, uint64_t gpa) "section name: %s g virtio_balloon_get_config(uint32_t num_pages, uint32_t actual) "num_pages: %d actual: %d" virtio_balloon_set_config(uint32_t actual, uint32_t oldactual) "actual: %d oldactual: %d" virtio_balloon_to_target(uint64_t target, uint32_t num_pages) "balloon target: 0x%"PRIx64" num_pages: %d" + +# virtio-mmio.c +virtio_mmio_read(uint64_t offset) "virtio_mmio_read offset 0x%" PRIx64 +virtio_mmio_write_offset(uint64_t offset, uint64_t value) "virtio_mmio_write offset 0x%" PRIx64 " value 0x%" PRIx64 +virtio_mmio_guest_page(uint64_t size, int shift) "guest page size 0x%" PRIx64 " shift %d" +virtio_mmio_queue_write(uint64_t value, int max_size) "mmio_queue write 0x%" PRIx64 " max %d" +virtio_mmio_setting_irq(int level) "virtio_mmio setting IRQ %d" diff --git a/hw/virtio/virtio-mmio.c b/hw/virtio/virtio-mmio.c index 5807aa87fe8e..96c762f0bf88 100644 --- a/hw/virtio/virtio-mmio.c +++ b/hw/virtio/virtio-mmio.c @@ -27,16 +27,8 @@ #include "sysemu/kvm.h" #include "hw/virtio/virtio-bus.h" #include "qemu/error-report.h" - -/* #define DEBUG_VIRTIO_MMIO */ - -#ifdef DEBUG_VIRTIO_MMIO - -#define DPRINTF(fmt, ...) \ -do { printf("virtio_mmio: " fmt , ## __VA_ARGS__); } while (0) -#else -#define DPRINTF(fmt, ...) do {} while (0) -#endif +#include "qemu/log.h" +#include "trace.h" /* QOM macros */ /* virtio-mmio-bus */ @@ -107,7 +99,7 @@ static uint64_t virtio_mmio_read(void *opaque, hwaddr offset, unsigned size) VirtIOMMIOProxy *proxy = (VirtIOMMIOProxy *)opaque; VirtIODevice *vdev = virtio_bus_get_device(&proxy->bus); - DPRINTF("virtio_mmio_read offset 0x%x\n", (int)offset); + trace_virtio_mmio_read(offset); if (!vdev) { /* If no backend is present, we treat most registers as @@ -144,7 +136,9 @@ static uint64_t virtio_mmio_read(void *opaque, hwaddr offset, unsigned size) } } if (size != 4) { - DPRINTF("wrong size access to register!\n"); + qemu_log_mask(LOG_GUEST_ERROR, + "%s: wrong size access to register!\n", + __func__); return 0; } switch (offset) { @@ -182,10 +176,12 @@ static uint64_t virtio_mmio_read(void *opaque, hwaddr offset, unsigned size) case VIRTIO_MMIO_QUEUE_ALIGN: case VIRTIO_MMIO_QUEUE_NOTIFY: case VIRTIO_MMIO_INTERRUPT_ACK: - DPRINTF("read of write-only register\n"); + qemu_log_mask(LOG_GUEST_ERROR, + "%s: read of write-only register\n", + __func__); return 0; default: - DPRINTF("bad register offset\n"); + qemu_log_mask(LOG_GUEST_ERROR, "%s: bad register offset\n", __func__); return 0; } return 0; @@ -197,8 +193,7 @@ static void virtio_mmio_write(void *opaque, hwaddr offset, uint64_t value, VirtIOMMIOProxy *proxy = (VirtIOMMIOProxy *)opaque; VirtIODevice *vdev = virtio_bus_get_device(&proxy->bus); - DPRINTF("virtio_mmio_write offset 0x%x value 0x%" PRIx64 "\n", - (int)offset, value); + trace_virtio_mmio_write_offset(offset, value); if (!vdev) { /* If no backend is present, we just make all registers @@ -226,7 +221,9 @@ static void virtio_mmio_write(void *opaque, hwaddr offset, uint64_t value, return; } if (size != 4) { - DPRINTF("wrong size access to register!\n"); + qemu_log_mask(LOG_GUEST_ERROR, + "%s: wrong size access to register!\n", + __func__); return; } switch (offset) { @@ -246,8 +243,7 @@ static void virtio_mmio_write(void *opaque, hwaddr offset, uint64_t value, if (proxy->guest_page_shift > 31) { proxy->guest_page_shift = 0; } - DPRINTF("guest page size %" PRIx64 " shift %d\n", value, - proxy->guest_page_shift); + trace_virtio_mmio_guest_page(value, proxy->guest_page_shift); break; case VIRTIO_MMIO_QUEUE_SEL: if (value < VIRTIO_QUEUE_MAX) { @@ -255,7 +251,7 @@ static void virtio_mmio_write(void *opaque, hwaddr offset, uint64_t value, } break; case VIRTIO_MMIO_QUEUE_NUM: - DPRINTF("mmio_queue write %d max %d\n", (int)value, VIRTQUEUE_MAX_SIZE); + trace_virtio_mmio_queue_write(value, VIRTQUEUE_MAX_SIZE); virtio_queue_set_num(vdev, vdev->queue_sel, value); /* Note: only call this function for legacy devices */ virtio_queue_update_rings(vdev, vdev->queue_sel); @@ -303,11 +299,13 @@ static void virtio_mmio_write(void *opaque, hwaddr offset, uint64_t value, case VIRTIO_MMIO_DEVICE_FEATURES: case VIRTIO_MMIO_QUEUE_NUM_MAX: case VIRTIO_MMIO_INTERRUPT_STATUS: - DPRINTF("write to readonly register\n"); + qemu_log_mask(LOG_GUEST_ERROR, + "%s: write to readonly register\n", + __func__); break; default: - DPRINTF("bad register offset\n"); + qemu_log_mask(LOG_GUEST_ERROR, "%s: bad register offset\n", __func__); } } @@ -327,7 +325,7 @@ static void virtio_mmio_update_irq(DeviceState *opaque, uint16_t vector) return; } level = (atomic_read(&vdev->isr) != 0); - DPRINTF("virtio_mmio setting IRQ %d\n", level); + trace_virtio_mmio_setting_irq(level); qemu_set_irq(proxy->irq, level); } From patchwork Wed May 22 16:07:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1103434 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=vivier.eu Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 458HdP5KzTz9sBp for ; Thu, 23 May 2019 02:09:29 +1000 (AEST) Received: from localhost ([127.0.0.1]:47217 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hTTnz-0002Ra-KL for incoming@patchwork.ozlabs.org; Wed, 22 May 2019 12:09:27 -0400 Received: from eggs.gnu.org ([209.51.188.92]:57470) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hTTmu-00029M-Ac for qemu-devel@nongnu.org; Wed, 22 May 2019 12:08:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hTTmr-0003mM-Ve for qemu-devel@nongnu.org; Wed, 22 May 2019 12:08:19 -0400 Received: from mout.kundenserver.de ([212.227.17.24]:45063) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hTTmr-0003b0-8C; Wed, 22 May 2019 12:08:17 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue108 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MZTua-1h6oR11uZa-00WRq1; Wed, 22 May 2019 18:07:33 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Wed, 22 May 2019 18:07:16 +0200 Message-Id: <20190522160723.31484-3-laurent@vivier.eu> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190522160723.31484-1-laurent@vivier.eu> References: <20190522160723.31484-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:jljocFWONHU390H0jNzDJadl4tUZ4KnZQsilBGFp50u0xC8Xc4w H2zUlzVa6E5/9/OQFsK3po0aAitkWEvRGFZV8FPmsXJl4qtZrY68k+LE+HkZ4se90ETqmq4 AOUiI4wbp4InOBH912tWnuWGQJxOTqmkCcSuK3U1HfbXMj2G+nooNjcnL2UDZMxkY6YFTm2 P0Cf88U7/k/HQ1TVSqgNA== X-UI-Out-Filterresults: notjunk:1; V03:K0:U6HlSEZRSVU=:kkXsYqQMRrO15L7XkI9nyK KhwP0ogsHg0nmpLlI+1WJW5+2cbPFD7NT4oN/ukk4duMC1bxOogfmnSvu8k/nnImoFCtMGpwm bWfa1em/WuQeeSuVh/rVWvKBf//+S8rutgdBnT3ucsWbA5uRKRfPRVzGS8nW2E3VJJJ7NHMY7 XbcdrJN5b4H/q3d47ofJcB9qQvgP1nIV7KKBrq1DRt751JklRrc2ebLbskJB+WPrgWAk3ezqV QYJyUwclLZvlBYiBVwCFjuy+TMwPy+xr235r5Z1lEKLFRKNPENZY1wCOPWyPaZutCJlpdN9t8 SA+zROC/VXNVzMkJ61njtWfu2NoXAEX/xaebI2IoKP2OiRZL0PvGb2SZa34ibBw5khSEzVymS PX++Zum+Fv7yQ34xaGCacvF2CAIMnpXeuaWhoM66cByoqYvI47aqSJ3e8Yfd/VPfwL287q5Lw JnM6h4qqonBe9UnUqct5J1A5Hod9hCoQdxdTrYK0b38acqFdEctYW/kQoHhjkgo5klvQsQU1Q VenIOFbk0oUP9M/eLRVDmLtV3xEywNin+yurJzo/YjGNJyd+Jh+6UIPGmThqbypGJTIXwqcB1 ttdNYX6tDFCHs3YYDp2+Jf3OWTmaYLZdic5Gq7AjZcWub4Pd8rQpbYEgJcVAIa2pbjMDaUSx/ qHMSKz0l1TBRFC12HLtLKM4W4ObQ5o8blNSihcW/StD2IF9nogw5bZ7hUyshoHkVUQnQ0/Vfs LtVe3m2SxQiTrkAJ/R0OXVzqaxJgUB3cj8uCxD1HPj3H2w0CcKrhgyqEHD0= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.227.17.24 Subject: [Qemu-devel] [PULL 2/9] roms: Correct the EDK2_BASETOOLS_OPTFLAGS variable description X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Tony Krowiak , Eric Farman , Farhan Ali , Pierre Morel , Juan Quintela , qemu-trivial@nongnu.org, Laszlo Ersek , Cornelia Huck , Michael Tokarev , Alex Williamson , Laurent Vivier , Halil Pasic , Christian Borntraeger , qemu-s390x@nongnu.org, "Michael S. Tsirkin" , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , "Dr. David Alan Gilbert" Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé In commit 1cab464136b4 we incorrectly described the EDK2_BASETOOLS_OPTFLAGS can pass CPPFLAGS and CFLAGS options to the EDK2 build tools, but it only expands the CFLAGS (not to the CPPFLAGS). Update the description to be more accurate. Reported-by: Laszlo Ersek Reviewed-by: Laszlo Ersek Signed-off-by: Philippe Mathieu-Daudé Message-Id: <20190506141923.12183-2-philmd@redhat.com> Signed-off-by: Laurent Vivier --- roms/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roms/Makefile b/roms/Makefile index 0ce84a45ad57..ea6aec56abdd 100644 --- a/roms/Makefile +++ b/roms/Makefile @@ -121,8 +121,8 @@ build-efi-roms: build-pxe-roms $(patsubst %,bin-i386-efi/%.efidrv,$(pxerom_targets)) \ $(patsubst %,bin-x86_64-efi/%.efidrv,$(pxerom_targets)) -# Build scripts can pass compiler/linker flags to the EDK2 build tools -# via the EDK2_BASETOOLS_OPTFLAGS (CPPFLAGS and CFLAGS) and +# Build scripts can pass compiler/linker flags to the EDK2 +# build tools via the EDK2_BASETOOLS_OPTFLAGS (CFLAGS) and # EDK2_BASETOOLS_LDFLAGS (LDFLAGS) environment variables. # # Example: From patchwork Wed May 22 16:07:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1103438 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=vivier.eu Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 458Hhl4L7Kz9s9N for ; Thu, 23 May 2019 02:12:23 +1000 (AEST) Received: from localhost ([127.0.0.1]:47282 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hTTqn-0004p5-HQ for incoming@patchwork.ozlabs.org; Wed, 22 May 2019 12:12:21 -0400 Received: from eggs.gnu.org ([209.51.188.92]:57676) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hTTn6-0002Lt-IW for qemu-devel@nongnu.org; Wed, 22 May 2019 12:08:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hTTn5-0004P4-LA for qemu-devel@nongnu.org; Wed, 22 May 2019 12:08:32 -0400 Received: from mout.kundenserver.de ([212.227.17.24]:59251) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hTTn0-00049w-Mr; Wed, 22 May 2019 12:08:27 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue108 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MbizQ-1gw4y03Q58-00dJan; Wed, 22 May 2019 18:07:35 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Wed, 22 May 2019 18:07:17 +0200 Message-Id: <20190522160723.31484-4-laurent@vivier.eu> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190522160723.31484-1-laurent@vivier.eu> References: <20190522160723.31484-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:8/OIAyrTkqTcAuQg62h07r/34My5u/HfOdVK+CMrqTqlSdimxTP ZN9Imj4FsLcoo6w8E/ebCTO63T8oC+fMWRQFtcUR82YJDFZ7UdjM1F62hTVMdvzZAM6JJS3 2jBe0h1O3cdmu4SKox2QqqB347ea+ISL4mSoHkdHw2pSnmPjwL9EDppgZtEixxcvTc653ef +F4LRdCfRqcsnNfuI58Mg== X-UI-Out-Filterresults: notjunk:1; V03:K0:+bZ/mQYuGLo=:WTfh+LileZT1teCRAgNj+l 3CUWrZhNnyvhTqRaamczEFyclLbNnqEPSwA45I1k57+3nJZyKZ3fnGL26sKaECFisP2lj5CNm 29gWpXuLfRHL+qRmf80kRO5Rbl0rs03hqxmeFxgdGWQmGn7HK1gzib45/kA4Gx6a9hlemdq44 qlcctoMSPs00LS6CbpDSeuFT0JgyyTuOUJkH7aGtK8jKHfDf0bz1iM7CX5pGxvs5BArZGVbYn 8IsK5m/8DpdehiUG9bFMWxsadP7hCL6dAXMiy2JRo6SrnoQRHnpdQ9jpZvc2rFAbiMLzJEWF1 ZoBCLK5jAQrB5/QZgHdSQ0KYROvb0+aVHGNb7bA9bSpurTk+ZPLF9Ud0KkoeHqHto07/HUJ7B uCEgYsGdlT9Z6LPZS+yuMM9Tt67ZpQBmPQ2WDu6v41UyhGX4bj1H9H83IsTBwURYFCc0Q9Mq8 hb85tF8UNKHbd2RMusVT8N7Nx9GKd5nsRO61qvEtwGSpiKbJwWOUGJ1m3ordjSrqEKTS3HGiC emB4/SkwS5wTmrRCmJOnpBW1DuQSLMW3iJ+ghPJjZhQFm58RO+9/sAgAMv11JXNdzHj0D2J2w TokD2EN8VrEFmjTU+A4Wyu+rA0NhYVNQx5MGcpCo7p/XDA4dGCKxW/NyfSPvXEiIEg/XC/isV QYAiXicPcvVIAbUUWYm9/JldIBw2sGG2bpUrZJ+fIiYxOevk5C1FCWQyUipBLYRgvjBitVqzL H7VrxprWILQXdkq1HUmCX6pjGP1aiLhPNF2BVOUZslzsfUIPiYxyEkK+2HA= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.227.17.24 Subject: [Qemu-devel] [PULL 3/9] roms: List and describe the Makefile 'clean' rule X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Tony Krowiak , Eric Farman , Farhan Ali , Pierre Morel , Juan Quintela , qemu-trivial@nongnu.org, Laszlo Ersek , Cornelia Huck , Michael Tokarev , Alex Williamson , Laurent Vivier , Halil Pasic , Christian Borntraeger , qemu-s390x@nongnu.org, "Michael S. Tsirkin" , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , "Dr. David Alan Gilbert" Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé Reviewed-by: Laszlo Ersek Signed-off-by: Philippe Mathieu-Daudé Message-Id: <20190506141923.12183-3-philmd@redhat.com> Signed-off-by: Laurent Vivier --- roms/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/roms/Makefile b/roms/Makefile index ea6aec56abdd..078d3fb70563 100644 --- a/roms/Makefile +++ b/roms/Makefile @@ -62,6 +62,8 @@ default: @echo " u-boot.e500 -- update u-boot.e500" @echo " u-boot.sam460 -- update u-boot.sam460" @echo " efi -- update UEFI (edk2) platform firmware" + @echo " clean -- delete the files generated by the previous" \ + "build targets" bios: build-seabios-config-seabios-128k build-seabios-config-seabios-256k cp seabios/builds/seabios-128k/bios.bin ../pc-bios/bios.bin From patchwork Wed May 22 16:07:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1103433 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=vivier.eu Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 458Hd723nsz9s9N for ; Thu, 23 May 2019 02:09:15 +1000 (AEST) Received: from localhost ([127.0.0.1]:47211 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hTTnk-0002BG-Ui for incoming@patchwork.ozlabs.org; Wed, 22 May 2019 12:09:12 -0400 Received: from eggs.gnu.org ([209.51.188.92]:57435) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hTTms-00028S-2N for qemu-devel@nongnu.org; Wed, 22 May 2019 12:08:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hTTmr-0003kH-80 for qemu-devel@nongnu.org; Wed, 22 May 2019 12:08:18 -0400 Received: from mout.kundenserver.de ([212.227.17.13]:54831) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hTTmh-0003CK-It; Wed, 22 May 2019 12:08:08 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue108 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MsZ3N-1gfEN10tKN-00u1Um; Wed, 22 May 2019 18:07:36 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Wed, 22 May 2019 18:07:18 +0200 Message-Id: <20190522160723.31484-5-laurent@vivier.eu> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190522160723.31484-1-laurent@vivier.eu> References: <20190522160723.31484-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:pelZVAYvf6bAcdi/TzvnuphvuJvZb8gP2K002+yyYudFzfaUbKN PwWHwqQUXmDumrsI2Tz+ssQVte5zBpCzw6gDComtbsQazy+0RhgN80zi5fc7hwbAaxPef40 qQ0lYlZ/6sVhAcRPfzp3pXB8bX3she3Eg5vtRsLK57Noj+i/V4CitY+d0+2WTLM8Oix6I2I gZxerAYGYcGdC6KfvhPIw== X-UI-Out-Filterresults: notjunk:1; V03:K0:nmtVPSIdWAk=:gsrEu+6Bw1rRqXegeJ+yuY h0CJuDBwncxJNG9/de+in6VHsbXoaMtkSgyRLgPEQNaFeP52Tt5x4lWLKSnP9OeprYu9MURXz G6WPYA1OtPrQH62GtQSbfNoRVMfIryqFPRh2XxndgUzKrlqJFidsXh2RtkC258lLiKFIscdBo 0zMf7734C5cJ6RGpi3zfoaszbUl4fgO0N/4diZ35soCdjbXYtDtBjXr2gAz4avGs88STGR7YV yOul0/5wdTYevvaZL3mVa+pgAf39zsAzZ4ikeuvxDoUmj14ji8QYn/haLdtcZycSuzMv+DxzZ dXtoLud28UGx4cgJWeotT7BlMJMvrqqWuzvegzRj8sU43ZP7rdoo1tTJETnhAc64xssW71dt+ Gurry32bCRUEck0QGRf357rX+vp4uXVU3N9v/OIqJaCfOLHGiWj5IylhP8YpmMa08f+DgXhrl Vu9uWPmzsmfcusWOn4bND3v31MFjU9MuKaBOmFjlTO/JreuX5Jt3jA1qmZphcRHIREGpnFxuP k16+twS5nazxaMrx/CtCn4YUhzU1aKwSLxuu6OyMETWO1tSevD5bh8XE9g/WRwixK6ACgH21k x6BcaWwrcA85SmfeHTRGqLJuCvimfIaOy+XQ5FxXzP5/pAuKL51oT99OxIp22iLFPdUtkwoso mn/1qWqWyAYeHwcbjn35+RfcjRjYVL2J0lDTTlyXZT8YGIRAOkNjnJIoJXd5lW2efKgeHAmDm 3Ew/MFL4mIfnTBSHJ+qHrUIAWB+ZynCr9/bw2g== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.227.17.13 Subject: [Qemu-devel] [PULL 4/9] migration: Fix typo in migrate_add_blocker() error message X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Tony Krowiak , Eric Farman , Farhan Ali , Pierre Morel , Juan Quintela , qemu-trivial@nongnu.org, Cornelia Huck , Michael Tokarev , Alex Williamson , Laurent Vivier , Halil Pasic , Christian Borntraeger , qemu-s390x@nongnu.org, "Michael S. Tsirkin" , Stefano Garzarella , "Dr. David Alan Gilbert" , Greg Kurz Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Greg Kurz Signed-off-by: Greg Kurz Reviewed-by: Stefano Garzarella Reviewed-by: Dr. David Alan Gilbert Message-Id: <155800428514.543845.17558475870097990036.stgit@bahia.lan> Signed-off-by: Laurent Vivier --- migration/migration.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/migration/migration.c b/migration/migration.c index d0a0f68f11ea..2865ae3fa948 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -1728,7 +1728,7 @@ int migrate_add_blocker(Error *reason, Error **errp) if (only_migratable) { error_propagate_prepend(errp, error_copy(reason), "disallowing migration blocker " - "(--only_migratable) for: "); + "(--only-migratable) for: "); return -EACCES; } From patchwork Wed May 22 16:07:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1103445 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=vivier.eu Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 458HmC3vWhz9sBp for ; Thu, 23 May 2019 02:15:23 +1000 (AEST) Received: from localhost ([127.0.0.1]:47327 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hTTth-0007sA-8B for incoming@patchwork.ozlabs.org; Wed, 22 May 2019 12:15:21 -0400 Received: from eggs.gnu.org ([209.51.188.92]:57591) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hTTn0-0002Fm-L7 for qemu-devel@nongnu.org; Wed, 22 May 2019 12:08:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hTTmy-00046T-Jj for qemu-devel@nongnu.org; Wed, 22 May 2019 12:08:26 -0400 Received: from mout.kundenserver.de ([212.227.17.24]:39203) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hTTmr-0003ez-7X; Wed, 22 May 2019 12:08:17 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue108 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MDhth-1hJp0g2KKF-00AoFw; Wed, 22 May 2019 18:07:37 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Wed, 22 May 2019 18:07:19 +0200 Message-Id: <20190522160723.31484-6-laurent@vivier.eu> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190522160723.31484-1-laurent@vivier.eu> References: <20190522160723.31484-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:EboM5bLhVbaTJbzNJC58lF0QE6eE+F8rNig+cpgie+zRoBFje6T kRY43Wv/DcETbmZhnIcNtTqvXVNX3rYGytD4sq4q2ALiu00v9SShyLrUayu0bZ9uUisKyrO XY4w2NaJUFjWCynoK0bnLZ6QXZQsdDltrGta7AXAr7Q1EL2S/4RFs6G2EWemQ4juL2wrvSl 9A2VyXocbBWIovfZoAq5A== X-UI-Out-Filterresults: notjunk:1; V03:K0:1ZOO6PsmXp0=:teG4d6o+OCyQIf9HtR+ZbS jHkLr+bABLrv9Aqw8cVkqZjmX8a2HG5sBTVSbGZi/VKTHkbx2lkS3oOjPb/FuGDMqV3HQiQNI GiTy/QkAkzIVLvGTumj09+gubu/RFaAIEgNn2GN4uwX/wUMgmZtYu+Vjy61WSh9DFAXIVcWY4 nIrEBTXJm1g5YW3PQLJOmz49yatkeQLyn6JjFPgQUjKgOjn3/Eu863H45PqdeCLYL5ugDHYR4 x/EQzpBRDM6+cAwku82cK6N0xZ+a23ETJ3LBOiTRMHb17owX+Vv2RtMHhzYv/9NfWrZn/rA0V y8rQxS8AS5RPEI25Vt3DSojVOqam258NzUEcvCOVSx5wG6m5HvqORSOgAfEkKZs3zn5ZXhmKu iV1SGVEhevyCCZVmaE65hcFND3J36QRN1sSqb9WFc6g+zWpGjHY6R1g6EfEXtLG2JjR3ZGgbr zfGBbcYtEeqKyy4SWD4QDtmCO8QOJ41/wA9ZAJZoncEu7mwzozZIzYXJGhYqSFu44CrLjdGqK CBPUFOLphtZ1B9vumV7J1fgBnuGL4pwoFmyIq0+Cgd+Uu/MSkQZhaXqwvS8yASNzxEAXqA36I OEu4+t3yaNd4u1WjTiw6jPRzaq7mrDToXaSArOF0VcyBTRCSDY0oWTO1DUyigdj/c26f+7xX5 JLDS0ov9yGp2NkUQa+i0Og6B7SiFHCyc7t3EMRjksa2sJShMBJXY/LM7bXcHOXCs1nDgRVEEb P8BVHe0zsJScxVphFonDDUAaCSKZL7qyuf1KUQ== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.227.17.24 Subject: [Qemu-devel] [PULL 5/9] configure: Fix spelling of sdl-image in --help X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Tony Krowiak , Eric Farman , Farhan Ali , Pierre Morel , Juan Quintela , qemu-trivial@nongnu.org, Markus Armbruster , Cornelia Huck , Michael Tokarev , Alex Williamson , Laurent Vivier , Halil Pasic , Christian Borntraeger , qemu-s390x@nongnu.org, "Michael S. Tsirkin" , Thomas Huth , "Dr. David Alan Gilbert" Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Markus Armbruster Fixes: a442fe2f2b2f20e7be0934277e9400b844b11999 Cc: qemu-trivial@nongnu.org Signed-off-by: Markus Armbruster Reviewed-by: Thomas Huth Message-Id: <20190517183246.11933-1-armbru@redhat.com> Signed-off-by: Laurent Vivier --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index d2fc3463022e..cef51b2a0b7d 100755 --- a/configure +++ b/configure @@ -1745,7 +1745,7 @@ disabled with --disable-FEATURE, default is enabled if available: gcrypt libgcrypt cryptography support auth-pam PAM access control sdl SDL UI - sdl_image SDL Image support for icons + sdl-image SDL Image support for icons gtk gtk UI vte vte support for the gtk UI curses curses UI From patchwork Wed May 22 16:07:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1103450 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=vivier.eu Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 458Hqv2KfQz9s00 for ; Thu, 23 May 2019 02:18:35 +1000 (AEST) Received: from localhost ([127.0.0.1]:47392 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hTTwn-000290-7J for incoming@patchwork.ozlabs.org; Wed, 22 May 2019 12:18:33 -0400 Received: from eggs.gnu.org ([209.51.188.92]:57702) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hTTn8-0002O3-IK for qemu-devel@nongnu.org; Wed, 22 May 2019 12:08:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hTTn7-0004Uh-JL for qemu-devel@nongnu.org; Wed, 22 May 2019 12:08:34 -0400 Received: from mout.kundenserver.de ([212.227.17.24]:40769) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hTTmz-00045p-4Z; Wed, 22 May 2019 12:08:25 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue108 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MuDTn-1gdaTf45r3-00uZSg; Wed, 22 May 2019 18:07:39 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Wed, 22 May 2019 18:07:20 +0200 Message-Id: <20190522160723.31484-7-laurent@vivier.eu> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190522160723.31484-1-laurent@vivier.eu> References: <20190522160723.31484-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:6/5e76T1+hru2DLQJ56rOSKbhJRipSr30E2IAEPyFGEo9bmDiHC TLqHMaIZkD8fI/l3CVWOr0g4N+Xt7N34g24fXLSd476aA23FKd+JOpBgdeBwLlEeRj3U+mx Dcrn28jQThU/am7tSB59sfhbo4VeK0E8p7VQtzTk1RXqVncKxYVEk/PSKDGM+S7TlBzKEi/ pRAFkIv2fP/Gr98tp8G1Q== X-UI-Out-Filterresults: notjunk:1; V03:K0:l6hggI84yA4=:OUi4ZpRUC00/2bO2CZSbzB 3y16jgQhxJVWfuqaoylrUI0iAxZChkvrdoMeVUGGIHIFOZGtL0MkTzBZhVEJqfJL2hn7OK4Mb X/A8I0jrGuoqn1UXc/+yMA4XNfA/FEax/2+WogbpYQ23Y2y1yWvkd7iXwLP9e8n0/d6tHZqlu YV6qXCTESdf0UMCgkBG5P8hrcswHfhUD2MaYWoqROTnRj2uLc+ICr4pj8n/msmjzohskwifFR 4XaLCy6+qkpjQ3EcA65rtRFUu02VaE0nQa6rED2N07DpRtMrOxJ32usdz3QmTD6fLP2m3C1Z7 RvWSb/OkfeqAue+1kHDksiul6yb7e1Rff34VLLYHdyxYB7yRQck/ubHtNfabxcArTRJ/GlDEg r7y0nOU/JFgpNcJ+0JavSD1BkzgQs8wCZtzUAjK/JP6qkvaoSR4TSqtaaGTQ25lWRhJ1GXiJX LvOuvd/2iN7GtQM65Dx3BoNd49FpHN/qlWPcDb2vlkuz0dZ97EWFUW7859TfbbkmxefuqFV8x 9HmNTswgCuiPb1XiqRWR1woN4/Rm0XulLFHrCzfx6BnJmGN0mu1a9bNaRgjte2yYzBCqJ00GG 2/zMQluvF+Wo2P99FY6B9tXqhV1XMZJlqR6OiN+ZoA7FJAe5Zzw0EqtJIazQnrx+8nbirKVJb 0+LkXxThb/G1CRPeBQ6mXqt48VmhJWtbNp7yS5WOxHV9TXDOzMBFSCJKwY/R3ypXg6z9pD0Et MF3ly+Z3ysH0/T5QunnTvMn28J0gUGD2bpLZYz1g0iAXiu2EuEgzrXldeAk= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.227.17.24 Subject: [Qemu-devel] [PULL 6/9] vfio: pci: make "vfio-pci-nohotplug" as MACRO X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Tony Krowiak , Eric Farman , Farhan Ali , Pierre Morel , Juan Quintela , qemu-trivial@nongnu.org, Li Qiang , Cornelia Huck , Michael Tokarev , Alex Williamson , Laurent Vivier , Halil Pasic , Christian Borntraeger , qemu-s390x@nongnu.org, "Michael S. Tsirkin" , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Eric Auger , "Dr. David Alan Gilbert" Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Li Qiang The QOMConventions recommends we should use TYPE_FOO for a TypeInfo's name. Though "vfio-pci-nohotplug" is not used in other parts, for consistency we should make this change. CC: qemu-trivial@nongnu.org Signed-off-by: Li Qiang Message-Id: <20190521151543.92274-2-liq3ea@163.com> Acked-by: Alex Williamson Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Eric Auger Signed-off-by: Laurent Vivier --- hw/vfio/pci.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c index 8cecb53d5cf6..08729e5875a9 100644 --- a/hw/vfio/pci.c +++ b/hw/vfio/pci.c @@ -40,6 +40,8 @@ #define TYPE_VFIO_PCI "vfio-pci" #define PCI_VFIO(obj) OBJECT_CHECK(VFIOPCIDevice, obj, TYPE_VFIO_PCI) +#define TYPE_VIFO_PCI_NOHOTPLUG "vfio-pci-nohotplug" + static void vfio_disable_interrupts(VFIOPCIDevice *vdev); static void vfio_mmap_set_enabled(VFIOPCIDevice *vdev, bool enabled); @@ -3304,8 +3306,8 @@ static void vfio_pci_nohotplug_dev_class_init(ObjectClass *klass, void *data) } static const TypeInfo vfio_pci_nohotplug_dev_info = { - .name = "vfio-pci-nohotplug", - .parent = "vfio-pci", + .name = TYPE_VIFO_PCI_NOHOTPLUG, + .parent = TYPE_VFIO_PCI, .instance_size = sizeof(VFIOPCIDevice), .class_init = vfio_pci_nohotplug_dev_class_init, }; From patchwork Wed May 22 16:07:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1103435 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=vivier.eu Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 458Hf96xhcz9sMr for ; Thu, 23 May 2019 02:10:09 +1000 (AEST) Received: from localhost ([127.0.0.1]:47232 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hTTod-00032L-T0 for incoming@patchwork.ozlabs.org; Wed, 22 May 2019 12:10:07 -0400 Received: from eggs.gnu.org ([209.51.188.92]:57820) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hTTnK-0002Zc-Gj for qemu-devel@nongnu.org; Wed, 22 May 2019 12:08:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hTTnG-0004wG-PR for qemu-devel@nongnu.org; Wed, 22 May 2019 12:08:44 -0400 Received: from mout.kundenserver.de ([217.72.192.73]:41293) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hTTnC-0004ap-QZ; Wed, 22 May 2019 12:08:40 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue108 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MrhHm-1gos6y1rvQ-00nhqB; Wed, 22 May 2019 18:07:40 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Wed, 22 May 2019 18:07:21 +0200 Message-Id: <20190522160723.31484-8-laurent@vivier.eu> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190522160723.31484-1-laurent@vivier.eu> References: <20190522160723.31484-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:ISkYsZZcLEhBQxePiuhedggg9+OK6RS/cKPT7v9zPW9vmVCDPZB B1nWbPLOfZY+hDFDy4SqutQaiXoZ+r1vI4va8y/MwC86FKQFZeivWyaWlpQyOl4xqm+S/3S 4nPoaZZKzilkWo65bSrzUKsyk5bPhahTQooJ/fIo1df7Y3h7S2C2Bk4csTYxBvSSr88Vkg6 gg52exdX5uY7fcZro2q1g== X-UI-Out-Filterresults: notjunk:1; V03:K0:6NK3qLo6RIU=:2Kdr/3X4iNL8kDM9kQk8uP hMOz/2CGDoJVuTOoRQG2WyqZyofomhNhXJFE2DUh7hlKKYqYigNjH2xWb45zVjbE98PVJTiF8 /w5ZODp2qA4bdUfs9jqEp1fUkTBkuH6tD6ULCsPLfQNg8hViCpOby3X+zjMso1zudjeIEqFOn gZ7v3yAsub8uGfoj6vCiPBaYi0qsX+tlrJlQItVT/OAk2s9cJJCo/Dsqo0l+wV97cs+5ireOk shZIM1YjN7SEsDJ7/A8dDp89Izvr9jrrSZV7WWK+DMVdSpfN+hqDSEnpmLLM4YAeFZG2DWQTw WpHEvGKPzeszZGhATJK+5AcqgCWqo9v6rQdHE4I6BqJ9Cy9wqIX+GQq2migENf0Srv+qW0WuT a6PW5BCP0PCXhYfFInBKc2wn+l+XpTvhV5FFYxD4HU47DiYtXfd5pVho2dWFeFN77SNfxHLFS LQiQ7ajFSVrmjs+tHG7bKs4cz6dEQcfN8LBX0xdkeBXBO5FQmPmPKsOlO1WfxmGNyOP9+JFQh 5jdzC/Xe5p2PZc2MNpWCLHcQGpedXW9aQeebRemTIX2s2sBjclyz4RIPNHlxBS7uxEFMppQBB m0FgBO27O7E2qesXngPmpVuTIMGBjR+/6UA5boJPo79xnVeetEjSPMvehxOo0OmbhDQ21RLoT NNmRyDCs3lJsqFYA92jkZkEUvz0XmqGw247l629avq6IjXyeEu0v9hyN4GCRkwdBXfDZRv5MZ t437ROw62YNSGU74fB19dFiIzy3UIvm/KeooB6Fr83Z/7KYr4aMfn7DewjE= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 217.72.192.73 Subject: [Qemu-devel] [PULL 7/9] hw: vfio: drop TYPE_FOO MACRO in VMStateDescription X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Tony Krowiak , Eric Farman , Farhan Ali , Pierre Morel , Juan Quintela , qemu-trivial@nongnu.org, Li Qiang , Cornelia Huck , Michael Tokarev , Alex Williamson , Laurent Vivier , Halil Pasic , Christian Borntraeger , qemu-s390x@nongnu.org, "Michael S. Tsirkin" , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Eric Auger , "Dr. David Alan Gilbert" Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Li Qiang It's recommended that VMStateDescription names are decoupled from QOM type names as the latter may freely change without consideration of migration compatibility. Link: https://lists.gnu.org/archive/html/qemu-devel/2018-10/msg02175.html CC: qemu-trivial@nongnu.org Signed-off-by: Li Qiang Message-Id: <20190521151543.92274-3-liq3ea@163.com> Acked-by: Alex Williamson Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Eric Auger Signed-off-by: Laurent Vivier --- hw/vfio/amd-xgbe.c | 2 +- hw/vfio/ap.c | 2 +- hw/vfio/calxeda-xgmac.c | 2 +- hw/vfio/ccw.c | 2 +- hw/vfio/platform.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/hw/vfio/amd-xgbe.c b/hw/vfio/amd-xgbe.c index ee64a3b4a2e4..1b06c0f3ea9d 100644 --- a/hw/vfio/amd-xgbe.c +++ b/hw/vfio/amd-xgbe.c @@ -26,7 +26,7 @@ static void amd_xgbe_realize(DeviceState *dev, Error **errp) } static const VMStateDescription vfio_platform_amd_xgbe_vmstate = { - .name = TYPE_VFIO_AMD_XGBE, + .name = "vfio-amd-xgbe", .unmigratable = 1, }; diff --git a/hw/vfio/ap.c b/hw/vfio/ap.c index d8b79ebe53ae..564751650fc1 100644 --- a/hw/vfio/ap.c +++ b/hw/vfio/ap.c @@ -155,7 +155,7 @@ static void vfio_ap_reset(DeviceState *dev) } static const VMStateDescription vfio_ap_vmstate = { - .name = VFIO_AP_DEVICE_TYPE, + .name = "vfio-ap", .unmigratable = 1, }; diff --git a/hw/vfio/calxeda-xgmac.c b/hw/vfio/calxeda-xgmac.c index e7767c4b021b..6cc608b6cabd 100644 --- a/hw/vfio/calxeda-xgmac.c +++ b/hw/vfio/calxeda-xgmac.c @@ -26,7 +26,7 @@ static void calxeda_xgmac_realize(DeviceState *dev, Error **errp) } static const VMStateDescription vfio_platform_calxeda_xgmac_vmstate = { - .name = TYPE_VFIO_CALXEDA_XGMAC, + .name = "vfio-calxeda-xgmac", .unmigratable = 1, }; diff --git a/hw/vfio/ccw.c b/hw/vfio/ccw.c index 31dd3a2a87b6..d9e39552e237 100644 --- a/hw/vfio/ccw.c +++ b/hw/vfio/ccw.c @@ -468,7 +468,7 @@ static Property vfio_ccw_properties[] = { }; static const VMStateDescription vfio_ccw_vmstate = { - .name = TYPE_VFIO_CCW, + .name = "vfio-ccw", .unmigratable = 1, }; diff --git a/hw/vfio/platform.c b/hw/vfio/platform.c index 398db38f14d9..e59a0234dd87 100644 --- a/hw/vfio/platform.c +++ b/hw/vfio/platform.c @@ -697,7 +697,7 @@ out: } static const VMStateDescription vfio_platform_vmstate = { - .name = TYPE_VFIO_PLATFORM, + .name = "vfio-platform", .unmigratable = 1, }; From patchwork Wed May 22 16:07:22 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1103444 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=vivier.eu Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 458Hm71ZsJz9sBp for ; Thu, 23 May 2019 02:15:19 +1000 (AEST) Received: from localhost ([127.0.0.1]:47325 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hTTtd-0007hF-7E for incoming@patchwork.ozlabs.org; Wed, 22 May 2019 12:15:17 -0400 Received: from eggs.gnu.org ([209.51.188.92]:57695) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hTTn8-0002NZ-7O for qemu-devel@nongnu.org; Wed, 22 May 2019 12:08:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hTTn6-0004R6-95 for qemu-devel@nongnu.org; Wed, 22 May 2019 12:08:33 -0400 Received: from mout.kundenserver.de ([217.72.192.74]:44495) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hTTn5-0004MV-W7; Wed, 22 May 2019 12:08:32 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue108 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MvJwN-1gcTU43eTp-00rGba; Wed, 22 May 2019 18:07:42 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Wed, 22 May 2019 18:07:22 +0200 Message-Id: <20190522160723.31484-9-laurent@vivier.eu> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190522160723.31484-1-laurent@vivier.eu> References: <20190522160723.31484-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:+ZChZFfv+eCwtpcDNMLO86V5TAbr9pktjbX2aXPLYuF3TJoCCZe ALr0kcPcWykJ5tQM2eoNiWbZtJB/5Hu1u9fdM4+f+SdnocSHi1HgNcNegzL+6fwjkY5WE39 ZzNDQDmFlzd5CHwqOQUqOBwjcmxQua70HuWmk+rQG0DpIfjRmEkBfxloi7fze7NnPGxGeWr BX5mKa6l+pZVpDkXI6R0Q== X-UI-Out-Filterresults: notjunk:1; V03:K0:VOaKk3DyyEU=:EwbnMNB9XruZpw5CFtMOm8 QUdGs7/vbOpeGF1Y5Hx4oZ28B4BO5mnqmo6+P0YjgZVTeNnOZzYkNcEFrXYpbV5oxb7StiM5b NK/azhBBOS551b6kk0Evb7a0kwPZcnXPvGzupf4eEqxDBBfA8CO4VyxR/41CdQw0ThJ4zF4sl 43La3HQdWgNO1h8yxqPCnQ/qSFDonOmJe30QsdLawvEKizYFiaZA+GSaBB0vt1Y5oimg16EOh q+ygPXz7DqGxLKqsVmaoM3KbqSyXCRousNAGFNuqrGs+0p3N8xv3uh9TevtnVTcxboeTqpea6 Vcd65AZrPxua0tBLOlnwcxb3UmaPNz8Tmn4Mgw6oiIcatv5WDxWm72ohII9dPrMbJ+09pixyb GZhdeKV/EZ6wnbyvXkOEHrUOAdjc1SQsAS+AscX4TnvGbebkGa5TtUNyEspF6ppBo+MNre6gP 10Z5NEuo7o/EtRflX2rP19rRidVZM5HFW8MhVTFAdasiHZwSvhO61IJIKLr8J8MDbkxmtiIZO 9jM3S40/6CUH6qGfYM088TKXa+Mk61i+tzdD8M1lCRhVV7FhnAlxa06JeUXVCQT6eCV7p3wdo qUH0ef3mr6cXY60QeYN9Y5tzf/vUTAUbkFDqhWyANYajhvGea1mgW7gRv6VwrKdXQlslBzMfU spVmMMsx8TtIQzXL3AcIU0nab7H4d8RqbxK/Fdhm+sJcJHqHAFHsKj58ELElcRwRjtJz6FXeD P91cpyg/bxDyyosPgDcA7FR4DLtnmK4eUDhVStGRBpP7cM/+bTMFaGMjfUQ= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 217.72.192.74 Subject: [Qemu-devel] [PULL 8/9] vfio: platform: fix a typo X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Tony Krowiak , Eric Farman , Farhan Ali , Pierre Morel , Juan Quintela , qemu-trivial@nongnu.org, Li Qiang , Cornelia Huck , Michael Tokarev , Alex Williamson , Laurent Vivier , Halil Pasic , Christian Borntraeger , qemu-s390x@nongnu.org, "Michael S. Tsirkin" , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Eric Auger , "Dr. David Alan Gilbert" Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Li Qiang 'eventd' should be 'eventfd'. CC: qemu-trivial@nongnu.org Signed-off-by: Li Qiang Message-Id: <20190521151543.92274-4-liq3ea@163.com> Acked-by: Alex Williamson Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Eric Auger Signed-off-by: Laurent Vivier --- hw/vfio/platform.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/vfio/platform.c b/hw/vfio/platform.c index e59a0234dd87..d52d6552e089 100644 --- a/hw/vfio/platform.c +++ b/hw/vfio/platform.c @@ -72,7 +72,7 @@ static VFIOINTp *vfio_init_intp(VFIODevice *vbasedev, g_free(intp->interrupt); g_free(intp); error_setg_errno(errp, -ret, - "failed to initialize trigger eventd notifier"); + "failed to initialize trigger eventfd notifier"); return NULL; } if (vfio_irq_is_automasked(intp)) { @@ -84,7 +84,7 @@ static VFIOINTp *vfio_init_intp(VFIODevice *vbasedev, g_free(intp->unmask); g_free(intp); error_setg_errno(errp, -ret, - "failed to initialize resample eventd notifier"); + "failed to initialize resample eventfd notifier"); return NULL; } } From patchwork Wed May 22 16:07:23 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1103451 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=vivier.eu Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 458HtG3Z1Vz9s00 for ; Thu, 23 May 2019 02:20:38 +1000 (AEST) Received: from localhost ([127.0.0.1]:47424 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hTTym-0003mu-HG for incoming@patchwork.ozlabs.org; Wed, 22 May 2019 12:20:36 -0400 Received: from eggs.gnu.org ([209.51.188.92]:57823) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hTTnK-0002Zh-KX for qemu-devel@nongnu.org; Wed, 22 May 2019 12:08:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hTTnH-0004z9-UU for qemu-devel@nongnu.org; Wed, 22 May 2019 12:08:46 -0400 Received: from mout.kundenserver.de ([217.72.192.75]:44271) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hTTn5-0004KQ-KP; Wed, 22 May 2019 12:08:32 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue108 [212.227.15.183]) with ESMTPSA (Nemesis) id 1Mwwm5-1gjc5k1Idf-00yPCy; Wed, 22 May 2019 18:07:43 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Wed, 22 May 2019 18:07:23 +0200 Message-Id: <20190522160723.31484-10-laurent@vivier.eu> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190522160723.31484-1-laurent@vivier.eu> References: <20190522160723.31484-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:Zm70E0oI1ZM4VhuVrV6GSk5Zq65TW0Q3iF4E6XyH5HYqU2h0Zao p4Gh7WkJ1AE9pUSvPRL1YlWNjrdzSYh8FdCjmvRMoLCfw9KPU6Sok0uV4hNy7xUIW5nVKVy kgkuWwcQ1s8zkijGCMNf5/Uv+hnybRRMj1xn1q4Qt3h6JkXZOaXqh9QjxGORSu44MxI8AS9 EEGIaFA2aQgx2F7Zb5H0g== X-UI-Out-Filterresults: notjunk:1; V03:K0:VV0Ai4aLcXk=:8ScUNQP4QVS+RbxOT+RGB1 DiH86TvntWrDcy6rkHA7MLa0q2RhoJ12YrN9iwFQyBaxqw3jlFoyQjYB2lDw5vsGEuJraMWFO izMyWb2xxbEhPbUe4gdPINcujXzFXZPsOBBfoZpG0ESB6iixJlMCsOtVTnAtdsdSFpNklt57H kH7UYP61j4KR2X2N4xPtTbBNFu5vu0b6sk5yfSoOcmVni0chi8PKms5djeeXxJme6cUA1hFP0 ZCwpXwqt30loKwCQNPHFK73AIpJ+rxK8CAFhnzVbzsiwoxVnsQjLoYLp6ixKDBcXs9v2MHBwT 7huYWRKS1hxe6LznLJynCIbkYz+KSQkVmaJv/IR230HiRaJfUzl+TxyrOjzUcjjVRYfVirJCZ RKqXlAJrJizmxyLedx+qb1xLDUtMSqrtfyBOeoROHjOK286vIFNi/BfNNL5aLt86Ul303hCof naf0G/OUEoXH2EKkccneqxqwXtveUERP7VVQ1gQbLgBGMywcl6YaD6dle4A0RaqdnPkOwyNhb dfh9z59kJczNq8IYTRXLlfBVz7QKNCB6CL6tHKX2vnXXyIpUkaKsrzq0yLS9oLWGNZS2emHw2 s+I9IqZj9NtzEF9sGofEwg1Tf1aTaMILtCE1q1tN2WUM5D4nkljRp68yvW6aJ/r3MhkKVYMvY FNGqAGH5WAO0zUxXZeUG60i0eBJtYzhrUHQp96z9cUWZ2dudwUoNXlqP33IcKe27jk9KU+cfI EHPESqNzJ0yrQIc+sXd2VVnW5kW3ijnKGioTYgsjd1ajNDDrt3bkmwR369g= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 217.72.192.75 Subject: [Qemu-devel] [PULL 9/9] pci: msix: move 'MSIX_CAP_LENGTH' to header file X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Tony Krowiak , Eric Farman , Farhan Ali , Pierre Morel , Juan Quintela , qemu-trivial@nongnu.org, Li Qiang , Cornelia Huck , Michael Tokarev , Alex Williamson , Laurent Vivier , Halil Pasic , Christian Borntraeger , qemu-s390x@nongnu.org, "Michael S. Tsirkin" , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Eric Auger , "Dr. David Alan Gilbert" Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Li Qiang 'MSIX_CAP_LENGTH' is defined in two .c file. Move it to hw/pci/msix.h file to reduce duplicated code. CC: qemu-trivial@nongnu.org Signed-off-by: Li Qiang Message-Id: <20190521151543.92274-5-liq3ea@163.com> Acked-by: Alex Williamson Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Eric Auger Signed-off-by: Laurent Vivier --- hw/pci/msix.c | 2 -- hw/vfio/pci.c | 2 -- include/hw/pci/msix.h | 2 ++ 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/hw/pci/msix.c b/hw/pci/msix.c index 4e336416a78a..d39dcf32e8c9 100644 --- a/hw/pci/msix.c +++ b/hw/pci/msix.c @@ -24,8 +24,6 @@ #include "qapi/error.h" #include "trace.h" -#define MSIX_CAP_LENGTH 12 - /* MSI enable bit and maskall bit are in byte 1 in FLAGS register */ #define MSIX_CONTROL_OFFSET (PCI_MSIX_FLAGS + 1) #define MSIX_ENABLE_MASK (PCI_MSIX_FLAGS_ENABLE >> 8) diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c index 08729e5875a9..8e555db12ec0 100644 --- a/hw/vfio/pci.c +++ b/hw/vfio/pci.c @@ -35,8 +35,6 @@ #include "trace.h" #include "qapi/error.h" -#define MSIX_CAP_LENGTH 12 - #define TYPE_VFIO_PCI "vfio-pci" #define PCI_VFIO(obj) OBJECT_CHECK(VFIOPCIDevice, obj, TYPE_VFIO_PCI) diff --git a/include/hw/pci/msix.h b/include/hw/pci/msix.h index 1f27658d352f..08acfa836e49 100644 --- a/include/hw/pci/msix.h +++ b/include/hw/pci/msix.h @@ -4,6 +4,8 @@ #include "qemu-common.h" #include "hw/pci/pci.h" +#define MSIX_CAP_LENGTH 12 + void msix_set_message(PCIDevice *dev, int vector, MSIMessage msg); MSIMessage msix_get_message(PCIDevice *dev, unsigned int vector); int msix_init(PCIDevice *dev, unsigned short nentries,