From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:55812)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <pbonzini@redhat.com>) id 1XWlnJ-0003ld-3h
	for qemu-devel@nongnu.org; Wed, 24 Sep 2014 08:35:47 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <pbonzini@redhat.com>) id 1XWlnC-0002Gv-Vl
	for qemu-devel@nongnu.org; Wed, 24 Sep 2014 08:35:41 -0400
Received: from mx1.redhat.com ([209.132.183.28]:55949)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <pbonzini@redhat.com>) id 1XWlnC-0002FE-NN
	for qemu-devel@nongnu.org; Wed, 24 Sep 2014 08:35:34 -0400
Message-ID: <5422BA84.1040606@redhat.com>
Date: Wed, 24 Sep 2014 14:35:16 +0200
From: Paolo Bonzini <pbonzini@redhat.com>
MIME-Version: 1.0
References: <1411559299-19042-1-git-send-email-imammedo@redhat.com>
	<1411559299-19042-4-git-send-email-imammedo@redhat.com>
In-Reply-To: <1411559299-19042-4-git-send-email-imammedo@redhat.com>
Content-Type: text/plain; charset=iso-8859-15
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] [PATCH 03/30] test: virtio-rng: check if
	hot-plug/unplug works
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Igor Mammedov <imammedo@redhat.com>, qemu-devel@nongnu.org
Cc: dmitry@daynix.com, borntraeger@de.ibm.com, mst@redhat.com, agraf@suse.de, cornelia.huck@de.ibm.com, kraxel@redhat.com, amit.shah@redhat.com, rth@twiddle.net

Il 24/09/2014 13:47, Igor Mammedov ha scritto:
> Signed-off-by: Igor Mammedov <imammedo@redhat.com>
> ---
>  tests/virtio-rng-test.c | 38 ++++++++++++++++++++++++++++++++++++++
>  1 file changed, 38 insertions(+)
> 
> diff --git a/tests/virtio-rng-test.c b/tests/virtio-rng-test.c
> index 402c206..7f62f84 100644
> --- a/tests/virtio-rng-test.c
> +++ b/tests/virtio-rng-test.c
> @@ -12,17 +12,55 @@
>  #include "libqtest.h"
>  #include "qemu/osdep.h"
>  
> +#define PCI_SLOT_HP             0x06
> +#define ACPI_PCIHP_ADDR         0xae00
> +#define PCI_EJ_BASE             0x0008
> +
>  /* Tests only initialization so far. TODO: Replace with functional tests */
>  static void pci_nop(void)
>  {
>  }
>  
> +static void hotplug(void)
> +{
> +    QDict *response;
> +
> +    response = qmp("{\"execute\": \"device_add\","

Remember that, for all these tests, you can use '' strings instead of "".

> +                   " \"arguments\": {"
> +                   "   \"driver\": \"virtio-rng-pci\","
> +                   "   \"addr\": \"" stringify(PCI_SLOT_HP) "\","
> +                   "   \"id\": \"rng1\""
> +                   "}}");
> +
> +    g_assert(response);
> +    g_assert(!qdict_haskey(response, "error"));
> +    QDECREF(response);
> +
> +    response = qmp("{\"execute\": \"device_del\","
> +                   " \"arguments\": {"
> +                   "   \"id\": \"rng1\""
> +                   "}}");
> +
> +    g_assert(response);
> +    g_assert(!qdict_haskey(response, "error"));
> +    QDECREF(response);
> +
> +    outb(ACPI_PCIHP_ADDR + PCI_EJ_BASE, 1 << PCI_SLOT_HP);

Please replace this with a callback in tests/libqos/pci.h (with the
implementation in tests/libqos/pci-pc.c).

Paolo

> +    response = qmp("");
> +    g_assert(response);
> +    g_assert(qdict_haskey(response, "event"));
> +    g_assert(!strcmp(qdict_get_str(response, "event"), "DEVICE_DELETED"));
> +    QDECREF(response);
> +}
> +
>  int main(int argc, char **argv)
>  {
>      int ret;
>  
>      g_test_init(&argc, &argv, NULL);
>      qtest_add_func("/virtio/rng/pci/nop", pci_nop);
> +    qtest_add_func("/virtio/rng/pci/hotplug", hotplug);
>  
>      qtest_start("-device virtio-rng-pci");
>      ret = g_test_run();
>