From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40916) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WsU1N-0001tU-Oh for qemu-devel@nongnu.org; Thu, 05 Jun 2014 05:31:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WsU1E-0003ic-HK for qemu-devel@nongnu.org; Thu, 05 Jun 2014 05:31:41 -0400 Received: from mail-wg0-x233.google.com ([2a00:1450:400c:c00::233]:59514) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WsU1E-0003iY-Bd for qemu-devel@nongnu.org; Thu, 05 Jun 2014 05:31:32 -0400 Received: by mail-wg0-f51.google.com with SMTP id x13so769043wgg.22 for ; Thu, 05 Jun 2014 02:31:31 -0700 (PDT) Date: Thu, 5 Jun 2014 11:31:28 +0200 From: Stefan Hajnoczi Message-ID: <20140605093128.GG27366@stefanha-thinkpad.redhat.com> References: <1401947118-19973-1-git-send-email-akong@redhat.com> <1401947118-19973-4-git-send-email-akong@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1401947118-19973-4-git-send-email-akong@redhat.com> Subject: Re: [Qemu-devel] [PATCH v2 3/4] virtio-blk-test.c: add hotplug subtest List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Amos Kong Cc: mst@redhat.com, qemu-devel@nongnu.org, afaerber@suse.de On Thu, Jun 05, 2014 at 01:45:17PM +0800, Amos Kong wrote: > This patch adds a new subtest, it hotplugs 29 * 8 = 232 virtio-blk > devices to guest, and try to hot-unplug them. > > Note: the hot-unplug can't work without cooperation of guest OS. > > Signed-off-by: Amos Kong > --- > tests/virtio-blk-test.c | 38 ++++++++++++++++++++++++++++++++++++++ > 1 file changed, 38 insertions(+) > > diff --git a/tests/virtio-blk-test.c b/tests/virtio-blk-test.c > index 0fdec01..616599a 100644 > --- a/tests/virtio-blk-test.c > +++ b/tests/virtio-blk-test.c > @@ -7,11 +7,48 @@ > * See the COPYING file in the top-level directory. > */ > > +#include > #include > #include > #include "libqtest.h" > #include "qemu/osdep.h" > > +static void test_blk_hotplug(void) > +{ > + char addr[6]; > + char cmd[100]; > + int i, j; > + > + /* start with no network/block device, slots 3~0x1f are free */ > + qtest_start("-net none"); > + > + for (i = 3; i <= 0x1f; i++) { > + for (j = 7; j >= 0; j--) { > + sprintf(addr, "%x.%x", i, j); > + sprintf(cmd, "drive_add 0 if=none,file=/dev/null,id=drv-%s", addr); > + qmp_exec_hmp_cmd(cmd, "OK\r\n"); > + > + sprintf(cmd, "device_add virtio-blk-pci,id=dev-%s,drive=drv-%s," > + "addr=0x%s,multifunction=on", addr, addr, addr); > + qmp_exec_hmp_cmd(cmd, ""); > + } > + } > + > + /* hot-unplug doesn't work without cooperation of guest OS */ > + for (i = 3; i <= 0x1f; i++) { > + for (j = 7; j >= 0; j--) { > + sprintf(addr, "%x.%x", i, j); > + sprintf(cmd, "drive_del drv-%s", addr); > + qmp_exec_hmp_cmd(cmd, ""); > + > + sprintf(cmd, "device_del dev-%s", addr); > + qmp_exec_hmp_cmd(cmd, ""); > + } > + } All of this sprintf() usage makes me wonder about: qmp_exec_hmp_cmd(const char *expected_ret, const char *fmt, ...); This way callers don't need to manage formatting buffers themselves. Besides that: Reviewed-by: Stefan Hajnoczi