* [PATCH v2] hw/arm: Adjust some coding styles about memory hotplug
@ 2020-01-17 6:38 Keqian Zhu
2020-01-17 9:46 ` Igor Mammedov
2020-01-17 11:07 ` Peter Maydell
0 siblings, 2 replies; 4+ messages in thread
From: Keqian Zhu @ 2020-01-17 6:38 UTC (permalink / raw)
To: qemu-devel
Cc: Peter Maydell, Michael S. Tsirkin, Shameer Kolothum, qemu-arm,
Igor Mammedov, wanghaibin.wang, zhukeqian
From: zhukeqian <zhukeqian1@huawei.com>
There is extra indent in ACPI GED plug cb. And we can use
existing helper function to trigger hotplug handler plug.
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Signed-off-by: Keqian Zhu <zhukeqian1@huawei.com>
---
v1->v2:
- Add Igor's R-b
Cc: Shameer Kolothum <shameerali.kolothum.thodi@huawei.com>
Cc: "Michael S. Tsirkin" <mst@redhat.com>
Cc: Igor Mammedov <imammedo@redhat.com>
Cc: Peter Maydell <peter.maydell@linaro.org>
---
hw/acpi/generic_event_device.c | 2 +-
hw/arm/virt.c | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/hw/acpi/generic_event_device.c b/hw/acpi/generic_event_device.c
index 9cee90cc70..55eb29d80a 100644
--- a/hw/acpi/generic_event_device.c
+++ b/hw/acpi/generic_event_device.c
@@ -175,7 +175,7 @@ static void acpi_ged_device_plug_cb(HotplugHandler *hotplug_dev,
AcpiGedState *s = ACPI_GED(hotplug_dev);
if (object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM)) {
- acpi_memory_plug_cb(hotplug_dev, &s->memhp_state, dev, errp);
+ acpi_memory_plug_cb(hotplug_dev, &s->memhp_state, dev, errp);
} else {
error_setg(errp, "virt: device plug request for unsupported device"
" type: %s", object_get_typename(OBJECT(dev)));
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index 39ab5f47e0..656b0081c2 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -1934,7 +1934,6 @@ static void virt_memory_pre_plug(HotplugHandler *hotplug_dev, DeviceState *dev,
static void virt_memory_plug(HotplugHandler *hotplug_dev,
DeviceState *dev, Error **errp)
{
- HotplugHandlerClass *hhc;
VirtMachineState *vms = VIRT_MACHINE(hotplug_dev);
Error *local_err = NULL;
@@ -1943,8 +1942,9 @@ static void virt_memory_plug(HotplugHandler *hotplug_dev,
goto out;
}
- hhc = HOTPLUG_HANDLER_GET_CLASS(vms->acpi_dev);
- hhc->plug(HOTPLUG_HANDLER(vms->acpi_dev), dev, &error_abort);
+ hotplug_handler_plug(HOTPLUG_HANDLER(vms->acpi_dev),
+ dev, &error_abort);
+
out:
error_propagate(errp, local_err);
}
--
2.19.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v2] hw/arm: Adjust some coding styles about memory hotplug
2020-01-17 6:38 [PATCH v2] hw/arm: Adjust some coding styles about memory hotplug Keqian Zhu
@ 2020-01-17 9:46 ` Igor Mammedov
2020-01-17 11:07 ` Peter Maydell
1 sibling, 0 replies; 4+ messages in thread
From: Igor Mammedov @ 2020-01-17 9:46 UTC (permalink / raw)
To: Keqian Zhu
Cc: Peter Maydell, Michael S. Tsirkin, qemu-devel, Shameer Kolothum,
qemu-arm, wanghaibin.wang
On Fri, 17 Jan 2020 14:38:22 +0800
Keqian Zhu <zhukeqian1@huawei.com> wrote:
> From: zhukeqian <zhukeqian1@huawei.com>
>
> There is extra indent in ACPI GED plug cb. And we can use
> existing helper function to trigger hotplug handler plug.
>
> Reviewed-by: Igor Mammedov <imammedo@redhat.com>
> Signed-off-by: Keqian Zhu <zhukeqian1@huawei.com>
> ---
>
> v1->v2:
> - Add Igor's R-b
FYI one does not need to repost v2 for the purpose of
picking up tags, usually maintainer takes care of that
when patch is queued
>
> Cc: Shameer Kolothum <shameerali.kolothum.thodi@huawei.com>
> Cc: "Michael S. Tsirkin" <mst@redhat.com>
> Cc: Igor Mammedov <imammedo@redhat.com>
> Cc: Peter Maydell <peter.maydell@linaro.org>
> ---
> hw/acpi/generic_event_device.c | 2 +-
> hw/arm/virt.c | 6 +++---
> 2 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/hw/acpi/generic_event_device.c b/hw/acpi/generic_event_device.c
> index 9cee90cc70..55eb29d80a 100644
> --- a/hw/acpi/generic_event_device.c
> +++ b/hw/acpi/generic_event_device.c
> @@ -175,7 +175,7 @@ static void acpi_ged_device_plug_cb(HotplugHandler *hotplug_dev,
> AcpiGedState *s = ACPI_GED(hotplug_dev);
>
> if (object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM)) {
> - acpi_memory_plug_cb(hotplug_dev, &s->memhp_state, dev, errp);
> + acpi_memory_plug_cb(hotplug_dev, &s->memhp_state, dev, errp);
> } else {
> error_setg(errp, "virt: device plug request for unsupported device"
> " type: %s", object_get_typename(OBJECT(dev)));
> diff --git a/hw/arm/virt.c b/hw/arm/virt.c
> index 39ab5f47e0..656b0081c2 100644
> --- a/hw/arm/virt.c
> +++ b/hw/arm/virt.c
> @@ -1934,7 +1934,6 @@ static void virt_memory_pre_plug(HotplugHandler *hotplug_dev, DeviceState *dev,
> static void virt_memory_plug(HotplugHandler *hotplug_dev,
> DeviceState *dev, Error **errp)
> {
> - HotplugHandlerClass *hhc;
> VirtMachineState *vms = VIRT_MACHINE(hotplug_dev);
> Error *local_err = NULL;
>
> @@ -1943,8 +1942,9 @@ static void virt_memory_plug(HotplugHandler *hotplug_dev,
> goto out;
> }
>
> - hhc = HOTPLUG_HANDLER_GET_CLASS(vms->acpi_dev);
> - hhc->plug(HOTPLUG_HANDLER(vms->acpi_dev), dev, &error_abort);
> + hotplug_handler_plug(HOTPLUG_HANDLER(vms->acpi_dev),
> + dev, &error_abort);
> +
> out:
> error_propagate(errp, local_err);
> }
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v2] hw/arm: Adjust some coding styles about memory hotplug
2020-01-17 6:38 [PATCH v2] hw/arm: Adjust some coding styles about memory hotplug Keqian Zhu
2020-01-17 9:46 ` Igor Mammedov
@ 2020-01-17 11:07 ` Peter Maydell
2020-01-19 10:49 ` zhukeqian
1 sibling, 1 reply; 4+ messages in thread
From: Peter Maydell @ 2020-01-17 11:07 UTC (permalink / raw)
To: Keqian Zhu
Cc: Michael S. Tsirkin, QEMU Developers, Shameer Kolothum, qemu-arm,
wanghaibin.wang, Igor Mammedov
On Fri, 17 Jan 2020 at 06:41, Keqian Zhu <zhukeqian1@huawei.com> wrote:
>
> From: zhukeqian <zhukeqian1@huawei.com>
>
> There is extra indent in ACPI GED plug cb. And we can use
> existing helper function to trigger hotplug handler plug.
>
> Reviewed-by: Igor Mammedov <imammedo@redhat.com>
> Signed-off-by: Keqian Zhu <zhukeqian1@huawei.com>
> ---
>
> v1->v2:
> - Add Igor's R-b
>
> Cc: Shameer Kolothum <shameerali.kolothum.thodi@huawei.com>
> Cc: "Michael S. Tsirkin" <mst@redhat.com>
> Cc: Igor Mammedov <imammedo@redhat.com>
> Cc: Peter Maydell <peter.maydell@linaro.org>
> ---
> hw/acpi/generic_event_device.c | 2 +-
> hw/arm/virt.c | 6 +++---
> 2 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/hw/acpi/generic_event_device.c b/hw/acpi/generic_event_device.c
> index 9cee90cc70..55eb29d80a 100644
> --- a/hw/acpi/generic_event_device.c
> +++ b/hw/acpi/generic_event_device.c
> @@ -175,7 +175,7 @@ static void acpi_ged_device_plug_cb(HotplugHandler *hotplug_dev,
> AcpiGedState *s = ACPI_GED(hotplug_dev);
>
> if (object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM)) {
> - acpi_memory_plug_cb(hotplug_dev, &s->memhp_state, dev, errp);
> + acpi_memory_plug_cb(hotplug_dev, &s->memhp_state, dev, errp);
> } else {
> error_setg(errp, "virt: device plug request for unsupported device"
> " type: %s", object_get_typename(OBJECT(dev)));
> diff --git a/hw/arm/virt.c b/hw/arm/virt.c
> index 39ab5f47e0..656b0081c2 100644
> --- a/hw/arm/virt.c
> +++ b/hw/arm/virt.c
> @@ -1934,7 +1934,6 @@ static void virt_memory_pre_plug(HotplugHandler *hotplug_dev, DeviceState *dev,
> static void virt_memory_plug(HotplugHandler *hotplug_dev,
> DeviceState *dev, Error **errp)
> {
> - HotplugHandlerClass *hhc;
> VirtMachineState *vms = VIRT_MACHINE(hotplug_dev);
> Error *local_err = NULL;
>
> @@ -1943,8 +1942,9 @@ static void virt_memory_plug(HotplugHandler *hotplug_dev,
> goto out;
> }
>
> - hhc = HOTPLUG_HANDLER_GET_CLASS(vms->acpi_dev);
> - hhc->plug(HOTPLUG_HANDLER(vms->acpi_dev), dev, &error_abort);
> + hotplug_handler_plug(HOTPLUG_HANDLER(vms->acpi_dev),
> + dev, &error_abort);
> +
> out:
> error_propagate(errp, local_err);
> }
These two changes are unrelated (one is just a whitespace
fixup, and it's in an entirely different file to the other
one, which is making an actual code change). I think they
should not be in the same patch.
thanks
-- PMM
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v2] hw/arm: Adjust some coding styles about memory hotplug
2020-01-17 11:07 ` Peter Maydell
@ 2020-01-19 10:49 ` zhukeqian
0 siblings, 0 replies; 4+ messages in thread
From: zhukeqian @ 2020-01-19 10:49 UTC (permalink / raw)
To: Peter Maydell
Cc: Michael S. Tsirkin, QEMU Developers, Shameer Kolothum, qemu-arm,
wanghaibin.wang, Igor Mammedov
On 2020/1/17 19:07, Peter Maydell wrote:
> On Fri, 17 Jan 2020 at 06:41, Keqian Zhu <zhukeqian1@huawei.com> wrote:
>>
>> From: zhukeqian <zhukeqian1@huawei.com>
>>
>> There is extra indent in ACPI GED plug cb. And we can use
>> existing helper function to trigger hotplug handler plug.
>>
>> Reviewed-by: Igor Mammedov <imammedo@redhat.com>
>> Signed-off-by: Keqian Zhu <zhukeqian1@huawei.com>
>> ---
>>
>> v1->v2:
>> - Add Igor's R-b
>>
>> Cc: Shameer Kolothum <shameerali.kolothum.thodi@huawei.com>
>> Cc: "Michael S. Tsirkin" <mst@redhat.com>
>> Cc: Igor Mammedov <imammedo@redhat.com>
>> Cc: Peter Maydell <peter.maydell@linaro.org>
>> ---
>> hw/acpi/generic_event_device.c | 2 +-
>> hw/arm/virt.c | 6 +++---
>> 2 files changed, 4 insertions(+), 4 deletions(-)
>>
>> diff --git a/hw/acpi/generic_event_device.c b/hw/acpi/generic_event_device.c
>> index 9cee90cc70..55eb29d80a 100644
>> --- a/hw/acpi/generic_event_device.c
>> +++ b/hw/acpi/generic_event_device.c
>> @@ -175,7 +175,7 @@ static void acpi_ged_device_plug_cb(HotplugHandler *hotplug_dev,
>> AcpiGedState *s = ACPI_GED(hotplug_dev);
>>
>> if (object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM)) {
>> - acpi_memory_plug_cb(hotplug_dev, &s->memhp_state, dev, errp);
>> + acpi_memory_plug_cb(hotplug_dev, &s->memhp_state, dev, errp);
>> } else {
>> error_setg(errp, "virt: device plug request for unsupported device"
>> " type: %s", object_get_typename(OBJECT(dev)));
>> diff --git a/hw/arm/virt.c b/hw/arm/virt.c
>> index 39ab5f47e0..656b0081c2 100644
>> --- a/hw/arm/virt.c
>> +++ b/hw/arm/virt.c
>> @@ -1934,7 +1934,6 @@ static void virt_memory_pre_plug(HotplugHandler *hotplug_dev, DeviceState *dev,
>> static void virt_memory_plug(HotplugHandler *hotplug_dev,
>> DeviceState *dev, Error **errp)
>> {
>> - HotplugHandlerClass *hhc;
>> VirtMachineState *vms = VIRT_MACHINE(hotplug_dev);
>> Error *local_err = NULL;
>>
>> @@ -1943,8 +1942,9 @@ static void virt_memory_plug(HotplugHandler *hotplug_dev,
>> goto out;
>> }
>>
>> - hhc = HOTPLUG_HANDLER_GET_CLASS(vms->acpi_dev);
>> - hhc->plug(HOTPLUG_HANDLER(vms->acpi_dev), dev, &error_abort);
>> + hotplug_handler_plug(HOTPLUG_HANDLER(vms->acpi_dev),
>> + dev, &error_abort);
>> +
>> out:
>> error_propagate(errp, local_err);
>> }
>
> These two changes are unrelated (one is just a whitespace
> fixup, and it's in an entirely different file to the other
> one, which is making an actual code change). I think they
> should not be in the same patch.
>
> thanks
> -- PMM
>
Ok, I will reform this patch.
Thanks,
Keqian
> .
>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-01-19 10:50 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-01-17 6:38 [PATCH v2] hw/arm: Adjust some coding styles about memory hotplug Keqian Zhu
2020-01-17 9:46 ` Igor Mammedov
2020-01-17 11:07 ` Peter Maydell
2020-01-19 10:49 ` zhukeqian
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.