Re: [Qemu-devel] [PATCH v7 08/38] libqos: Track QTestState with QPCIBus

2017-09-12 Thread Thomas Huth 
On 11.09.2017 19:19, Eric Blake wrote:
> When initializing a QPCIBus, track which QTestState the bus is
> associated with (so that a later patch can then explicitly use
> that test state for all communication on the bus, rather than
> blindly relying on global_qtest).  Update the initialization
> functions to take another parameter, and update all callers to
> pass in state (for now, most callers get away with passing the
> current global_qtest as the current state, although this required
> fixing the order of initialization to ensure qtest_start() is
> called before qpci_init*() in rtl8139-test, and provided an
> opportunity to pass in the allocator in e1000e-test).
> 
> Touch up some allocations to use g_new0() rather than g_malloc()
> while in the area, and simplify some code (all implementations
> of QOSOps provide a .init_allocator() that never fails).
> 
> Signed-off-by: Eric Blake 

Reviewed-by: Thomas Huth

Re: [Qemu-devel] [PATCH v7 08/38] libqos: Track QTestState with QPCIBus

2017-09-11 Thread John Snow 


On 09/11/2017 01:19 PM, Eric Blake wrote:
> When initializing a QPCIBus, track which QTestState the bus is
> associated with (so that a later patch can then explicitly use
> that test state for all communication on the bus, rather than
> blindly relying on global_qtest).  Update the initialization
> functions to take another parameter, and update all callers to
> pass in state (for now, most callers get away with passing the
> current global_qtest as the current state, although this required
> fixing the order of initialization to ensure qtest_start() is
> called before qpci_init*() in rtl8139-test, and provided an
> opportunity to pass in the allocator in e1000e-test).
> 
> Touch up some allocations to use g_new0() rather than g_malloc()
> while in the area, and simplify some code (all implementations
> of QOSOps provide a .init_allocator() that never fails).
> 
> Signed-off-by: Eric Blake 

Reviewed-by: John Snow

[Qemu-devel] [PATCH v7 08/38] libqos: Track QTestState with QPCIBus

2017-09-11 Thread Eric Blake 
When initializing a QPCIBus, track which QTestState the bus is
associated with (so that a later patch can then explicitly use
that test state for all communication on the bus, rather than
blindly relying on global_qtest).  Update the initialization
functions to take another parameter, and update all callers to
pass in state (for now, most callers get away with passing the
current global_qtest as the current state, although this required
fixing the order of initialization to ensure qtest_start() is
called before qpci_init*() in rtl8139-test, and provided an
opportunity to pass in the allocator in e1000e-test).

Touch up some allocations to use g_new0() rather than g_malloc()
while in the area, and simplify some code (all implementations
of QOSOps provide a .init_allocator() that never fails).

Signed-off-by: Eric Blake 

---
v7: use g_new0() instead of g_malloc(), drop dead conditionals
---
 tests/libqos/ahci.h   |  2 +-
 tests/libqos/libqos.h |  2 +-
 tests/libqos/pci-pc.h |  2 +-
 tests/libqos/pci-spapr.h  |  2 +-
 tests/libqos/pci.h|  1 +
 tests/ahci-test.c |  2 +-
 tests/e1000e-test.c   |  6 +++---
 tests/i440fx-test.c   |  2 +-
 tests/ide-test.c  |  2 +-
 tests/libqos/ahci.c   |  4 ++--
 tests/libqos/libqos.c | 10 +++---
 tests/libqos/pci-pc.c |  7 ---
 tests/libqos/pci-spapr.c  |  7 ---
 tests/q35-test.c  |  4 ++--
 tests/rtl8139-test.c  |  5 +++--
 tests/tco-test.c  |  2 +-
 tests/usb-hcd-ehci-test.c |  2 +-
 tests/vhost-user-test.c   |  4 ++--
 18 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/tests/libqos/ahci.h b/tests/libqos/ahci.h
index 5f9627bb0f..715ca1e226 100644
--- a/tests/libqos/ahci.h
+++ b/tests/libqos/ahci.h
@@ -571,7 +571,7 @@ void ahci_free(AHCIQState *ahci, uint64_t addr);
 void ahci_clean_mem(AHCIQState *ahci);

 /* Device management */
-QPCIDevice *get_ahci_device(uint32_t *fingerprint);
+QPCIDevice *get_ahci_device(QTestState *qts, uint32_t *fingerprint);
 void free_ahci_device(QPCIDevice *dev);
 void ahci_pci_enable(AHCIQState *ahci);
 void start_ahci_device(AHCIQState *ahci);
diff --git a/tests/libqos/libqos.h b/tests/libqos/libqos.h
index 231969766f..78e5c044a0 100644
--- a/tests/libqos/libqos.h
+++ b/tests/libqos/libqos.h
@@ -10,7 +10,7 @@ typedef struct QOSState QOSState;
 typedef struct QOSOps {
 QGuestAllocator *(*init_allocator)(QAllocOpts);
 void (*uninit_allocator)(QGuestAllocator *);
-QPCIBus *(*qpci_init)(QGuestAllocator *alloc);
+QPCIBus *(*qpci_init)(QTestState *qts, QGuestAllocator *alloc);
 void (*qpci_free)(QPCIBus *bus);
 void (*shutdown)(QOSState *);
 } QOSOps;
diff --git a/tests/libqos/pci-pc.h b/tests/libqos/pci-pc.h
index 9479b51642..491eeac756 100644
--- a/tests/libqos/pci-pc.h
+++ b/tests/libqos/pci-pc.h
@@ -16,7 +16,7 @@
 #include "libqos/pci.h"
 #include "libqos/malloc.h"

-QPCIBus *qpci_init_pc(QGuestAllocator *alloc);
+QPCIBus *qpci_init_pc(QTestState *qts, QGuestAllocator *alloc);
 void qpci_free_pc(QPCIBus *bus);

 #endif
diff --git a/tests/libqos/pci-spapr.h b/tests/libqos/pci-spapr.h
index 4192126d86..387686dfc8 100644
--- a/tests/libqos/pci-spapr.h
+++ b/tests/libqos/pci-spapr.h
@@ -11,7 +11,7 @@
 #include "libqos/malloc.h"
 #include "libqos/pci.h"

-QPCIBus *qpci_init_spapr(QGuestAllocator *alloc);
+QPCIBus *qpci_init_spapr(QTestState *qts, QGuestAllocator *alloc);
 void qpci_free_spapr(QPCIBus *bus);

 #endif
diff --git a/tests/libqos/pci.h b/tests/libqos/pci.h
index ed480614ff..429c382282 100644
--- a/tests/libqos/pci.h
+++ b/tests/libqos/pci.h
@@ -48,6 +48,7 @@ struct QPCIBus {
 void (*config_writel)(QPCIBus *bus, int devfn,
   uint8_t offset, uint32_t value);

+QTestState *qts;
 uint16_t pio_alloc_ptr;
 uint64_t mmio_alloc_ptr, mmio_limit;
 };
diff --git a/tests/ahci-test.c b/tests/ahci-test.c
index 999121bb7c..c94d1bd712 100644
--- a/tests/ahci-test.c
+++ b/tests/ahci-test.c
@@ -160,7 +160,7 @@ static AHCIQState *ahci_vboot(const char *cli, va_list ap)
 alloc_set_flags(s->parent->alloc, ALLOC_LEAK_ASSERT);

 /* Verify that we have an AHCI device present. */
-s->dev = get_ahci_device(>fingerprint);
+s->dev = get_ahci_device(s->parent->qts, >fingerprint);

 return s;
 }
diff --git a/tests/e1000e-test.c b/tests/e1000e-test.c
index c612dc64ec..d8085d944e 100644
--- a/tests/e1000e-test.c
+++ b/tests/e1000e-test.c
@@ -392,12 +392,12 @@ static void data_test_init(e1000e_device *d)
 qtest_start(cmdline);
 g_free(cmdline);

-test_bus = qpci_init_pc(NULL);
-g_assert_nonnull(test_bus);
-
 test_alloc = pc_alloc_init();
 g_assert_nonnull(test_alloc);

+test_bus = qpci_init_pc(global_qtest, test_alloc);
+g_assert_nonnull(test_bus);
+
 e1000e_device_init(test_bus, d);
 }

diff --git a/tests/i440fx-test.c b/tests/i440fx-test.c
index e9d05c87d1..4390e5591e 100644
--- a/tests/i440fx-test.c
+++