From 8492cd20849a2ddd561f63f0fed48d7d618f8352 Mon Sep 17 00:00:00 2001 From: "Daniel P. Berrange" Date: Thu, 4 Dec 2008 21:00:50 +0000 Subject: [PATCH] Stub out node device APIs in test driver --- ChangeLog | 5 +++++ src/test.c | 27 +++++++++++++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/ChangeLog b/ChangeLog index a456ac88ef..45c3450519 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Thu Dec 4 21:00:41 GMT 2008 Daniel P. Berrange + + * src/test.c: Stub out node device APIs to avoid activating + the daemon + Thu Dec 4 20:58:41 GMT 2008 Daniel P. Berrange * src/test.c: Add locking for thread safety diff --git a/src/test.c b/src/test.c index 6a50c39ca8..a634561e93 100644 --- a/src/test.c +++ b/src/test.c @@ -3222,6 +3222,22 @@ cleanup: } +static virDrvOpenStatus testDevMonOpen(virConnectPtr conn, + virConnectAuthPtr auth ATTRIBUTE_UNUSED, + int flags ATTRIBUTE_UNUSED) { + if (STRNEQ(conn->driver->name, "Test")) + return VIR_DRV_OPEN_DECLINED; + + conn->devMonPrivateData = conn->privateData; + return VIR_DRV_OPEN_SUCCESS; +} + +static int testDevMonClose(virConnectPtr conn) { + conn->devMonPrivateData = NULL; + return 0; +} + + static virDriver testDriver = { VIR_DRV_TEST, "Test", @@ -3345,6 +3361,14 @@ static virStorageDriver testStorageDriver = { .volGetPath = testStorageVolumeGetPath, }; +static virDeviceMonitor testDevMonitor = { + .name = "Test", + .open = testDevMonOpen, + .close = testDevMonClose, +}; + + + /** * testRegister: * @@ -3359,5 +3383,8 @@ testRegister(void) return -1; if (virRegisterStorageDriver(&testStorageDriver) < 0) return -1; + if (virRegisterDeviceMonitor(&testDevMonitor) < 0) + return -1; + return 0; }