[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH v3 0/5] coroutine: Clean up includes
From: |
Markus Armbruster |
Subject: |
Re: [PATCH v3 0/5] coroutine: Clean up includes |
Date: |
Thu, 22 Dec 2022 11:02:30 +0100 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) |
Markus Armbruster <armbru@redhat.com> writes:
> Philippe Mathieu-Daudé <philmd@linaro.org> writes:
>
>> On 21/12/22 14:14, Markus Armbruster wrote:
>>> v3:
>>> * PATCH 4: Unnecessary hunks dropped
>>> v2:
>>> * Rebased
>>> * PATCH 4: Rewritten [Paolo]
>>> * PATCH 5: New
>>> Markus Armbruster (5):
>>> coroutine: Clean up superfluous inclusion of qemu/coroutine.h
>>> coroutine: Move coroutine_fn to qemu/osdep.h, trim includes
>>> coroutine: Clean up superfluous inclusion of qemu/lockable.h
>>> coroutine: Split qemu/coroutine-core.h off qemu/coroutine.h
>>> coroutine: Use Coroutine typedef name instead of structure tag
>>
>> I had to add:
>>
>> -- >8 --
>> diff --git a/hw/pci/pci-hmp-cmds.c b/hw/pci/pci-hmp-cmds.c
>> index fb7591d6ab..b09fce9377 100644
>> --- a/hw/pci/pci-hmp-cmds.c
>> +++ b/hw/pci/pci-hmp-cmds.c
>> @@ -15,6 +15,7 @@
>>
>> #include "qemu/osdep.h"
>> #include "hw/pci/pci.h"
>> +#include "hw/pci/pci_device.h"
>> #include "monitor/hmp.h"
>> #include "monitor/monitor.h"
>> #include "pci-internal.h"
>> diff --git a/hw/virtio/virtio-qmp.c b/hw/virtio/virtio-qmp.c
>> index 8e7282658f..3d4497da99 100644
>> --- a/hw/virtio/virtio-qmp.c
>> +++ b/hw/virtio/virtio-qmp.c
>> @@ -11,6 +11,7 @@
>>
>> #include "qemu/osdep.h"
>> #include "hw/virtio/virtio.h"
>> +#include "hw/virtio/vhost.h"
>> #include "virtio-qmp.h"
>>
>> ---
>>
>> Otherwise I get:
>>
>> ../hw/pci/pci-hmp-cmds.c: In function ‘pcibus_dev_print’:
>> ../hw/pci/pci-hmp-cmds.c:129:31: error: invalid use of incomplete typedef
>> ‘PCIDevice’
>> 129 | int class = pci_get_word(d->config + PCI_CLASS_DEVICE);
>> | ^~
>>
>> ../hw/virtio/virtio-qmp.c:187:19: error: ‘VHOST_USER_F_PROTOCOL_FEATURES’
>> undeclared here (not in a function);
>> did you mean ‘VHOST_USER_PROTOCOL_F_RARP’?
>> 187 | FEATURE_ENTRY(VHOST_USER_F_PROTOCOL_FEATURES, \
>> | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>>
>>
>> Maybe some recently merged change?
>
> Yes. I'll rebase.
To avoid confusion: this series doesn't need a rebase. "[PATCH 0/5]
include/hw/pci include/hw/cxl: Clean up includes" does.
[...]
- [PATCH v3 4/5] coroutine: Split qemu/coroutine-core.h off qemu/coroutine.h, (continued)
- [PATCH v3 5/5] coroutine: Use Coroutine typedef name instead of structure tag, Markus Armbruster, 2022/12/21
- [PATCH v3 2/5] coroutine: Move coroutine_fn to qemu/osdep.h, trim includes, Markus Armbruster, 2022/12/21
- [PATCH v3 1/5] coroutine: Clean up superfluous inclusion of qemu/coroutine.h, Markus Armbruster, 2022/12/21
- Re: [PATCH v3 0/5] coroutine: Clean up includes, Philippe Mathieu-Daudé, 2022/12/21