* [Qemu-devel] [PATCH] hw/i386/pc_q35.c: Avoid g_assert_cmpint() as it is not in glib 2.12
@ 2014-10-17 18:51 Peter Maydell
2014-10-18 2:58 ` Gonglei
0 siblings, 1 reply; 3+ messages in thread
From: Peter Maydell @ 2014-10-17 18:51 UTC (permalink / raw)
To: qemu-devel; +Cc: John Snow, Stefan Hajnoczi, patches
The function g_assert_cmpint() is not in glib 2.12, which is our current
minimum requirement. Rephrase the recently added assertion to avoid it.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
hw/i386/pc_q35.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
index bb0dc8e..e225c6d 100644
--- a/hw/i386/pc_q35.c
+++ b/hw/i386/pc_q35.c
@@ -254,7 +254,7 @@ static void pc_q35_init(MachineState *machine)
true, "ich9-ahci");
idebus[0] = qdev_get_child_bus(&ahci->qdev, "ide.0");
idebus[1] = qdev_get_child_bus(&ahci->qdev, "ide.1");
- g_assert_cmpint(MAX_SATA_PORTS, ==, ICH_AHCI(ahci)->ahci.ports);
+ g_assert(MAX_SATA_PORTS == ICH_AHCI(ahci)->ahci.ports);
ide_drive_get(hd, ICH_AHCI(ahci)->ahci.ports);
ahci_ide_create_devs(ahci, hd);
--
1.9.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [Qemu-devel] [PATCH] hw/i386/pc_q35.c: Avoid g_assert_cmpint() as it is not in glib 2.12
2014-10-17 18:51 [Qemu-devel] [PATCH] hw/i386/pc_q35.c: Avoid g_assert_cmpint() as it is not in glib 2.12 Peter Maydell
@ 2014-10-18 2:58 ` Gonglei
2014-10-22 11:06 ` Peter Maydell
0 siblings, 1 reply; 3+ messages in thread
From: Gonglei @ 2014-10-18 2:58 UTC (permalink / raw)
To: 'Peter Maydell', qemu-devel
Cc: 'John Snow', 'Stefan Hajnoczi', patches
> Subject: [Qemu-devel] [PATCH] hw/i386/pc_q35.c: Avoid g_assert_cmpint() as it
> is not in glib 2.12
>
> The function g_assert_cmpint() is not in glib 2.12, which is our current
> minimum requirement. Rephrase the recently added assertion to avoid it.
>
> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
> ---
> hw/i386/pc_q35.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
Reviewed-by: Gonglei <arei.gonglei@huawei.com>
Best regards,
-Gonglei
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [Qemu-devel] [PATCH] hw/i386/pc_q35.c: Avoid g_assert_cmpint() as it is not in glib 2.12
2014-10-18 2:58 ` Gonglei
@ 2014-10-22 11:06 ` Peter Maydell
0 siblings, 0 replies; 3+ messages in thread
From: Peter Maydell @ 2014-10-22 11:06 UTC (permalink / raw)
To: Gonglei; +Cc: John Snow, QEMU Developers, Stefan Hajnoczi, Patch Tracking
On 18 October 2014 03:58, Gonglei <arei.gonglei@hotmail.com> wrote:
>> Subject: [Qemu-devel] [PATCH] hw/i386/pc_q35.c: Avoid g_assert_cmpint() as it
>> is not in glib 2.12
>>
>> The function g_assert_cmpint() is not in glib 2.12, which is our current
>> minimum requirement. Rephrase the recently added assertion to avoid it.
>>
>> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
>> ---
>> hw/i386/pc_q35.c | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
> Reviewed-by: Gonglei <arei.gonglei@huawei.com>
Thanks. Applied to master.
-- PMM
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-10-22 11:06 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-10-17 18:51 [Qemu-devel] [PATCH] hw/i386/pc_q35.c: Avoid g_assert_cmpint() as it is not in glib 2.12 Peter Maydell
2014-10-18 2:58 ` Gonglei
2014-10-22 11:06 ` Peter Maydell
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).