Merge lp:~ubuntu-branches/ubuntu/maverick/libvirt/maverick-201009152343 into lp:ubuntu/maverick/libvirt
- Maverick (10.10)
- maverick-201009152343
- Merge into maverick
Proposed by
James Westby
Status: | Work in progress |
---|---|
Proposed branch: | lp:~ubuntu-branches/ubuntu/maverick/libvirt/maverick-201009152343 |
Merge into: | lp:ubuntu/maverick/libvirt |
Diff against target: |
2282 lines (+2266/-0) (has conflicts) 2 files modified
.pc/9026-Rebuild-network-filter-for-UML-guests-on-updates.patch/src/uml/uml_driver.c (+2211/-0) debian/patches/9026-Rebuild-network-filter-for-UML-guests-on-updates.patch (+55/-0) Conflict adding file .pc/9026-Rebuild-network-filter-for-UML-guests-on-updates.patch. Moved existing file to .pc/9026-Rebuild-network-filter-for-UML-guests-on-updates.patch.moved. Conflict adding file debian/patches/9026-Rebuild-network-filter-for-UML-guests-on-updates.patch. Moved existing file to debian/patches/9026-Rebuild-network-filter-for-UML-guests-on-updates.patch.moved. |
To merge this branch: | bzr merge lp:~ubuntu-branches/ubuntu/maverick/libvirt/maverick-201009152343 |
Related bugs: |
Commit message
Description of the change
The package history in the archive and the history in the bzr branch differ. As the archive is authoritative the history of lp:ubuntu/maverick/libvirt now reflects that and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/maverick/libvirt/maverick-201009152343. A merge should be performed if necessary.
To post a comment you must log in.
Unmerged revisions
- 105. By Soren Hansen
-
releasing version 0.8.3-1ubuntu11
- 104. By Soren Hansen
-
9026-Rebuild-
network- filter- for-UML- guests- on-updates. patch.
NWFilter updates are supposed to be immediate. Add this support to
the UML driver. - 103. By Soren Hansen
-
Merge previous work branch that diverged due to quilt madness.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === added directory '.pc/9026-Rebuild-network-filter-for-UML-guests-on-updates.patch' | |||
2 | === renamed directory '.pc/9026-Rebuild-network-filter-for-UML-guests-on-updates.patch' => '.pc/9026-Rebuild-network-filter-for-UML-guests-on-updates.patch.moved' | |||
3 | === added file '.pc/9026-Rebuild-network-filter-for-UML-guests-on-updates.patch/.timestamp' | |||
4 | === added directory '.pc/9026-Rebuild-network-filter-for-UML-guests-on-updates.patch/src' | |||
5 | === added directory '.pc/9026-Rebuild-network-filter-for-UML-guests-on-updates.patch/src/uml' | |||
6 | === added file '.pc/9026-Rebuild-network-filter-for-UML-guests-on-updates.patch/src/uml/uml_driver.c' | |||
7 | --- .pc/9026-Rebuild-network-filter-for-UML-guests-on-updates.patch/src/uml/uml_driver.c 1970-01-01 00:00:00 +0000 | |||
8 | +++ .pc/9026-Rebuild-network-filter-for-UML-guests-on-updates.patch/src/uml/uml_driver.c 2010-09-15 23:50:58 +0000 | |||
9 | @@ -0,0 +1,2211 @@ | |||
10 | 1 | /* | ||
11 | 2 | * uml_driver.c: core driver methods for managing UML guests | ||
12 | 3 | * | ||
13 | 4 | * Copyright (C) 2006-2010 Red Hat, Inc. | ||
14 | 5 | * Copyright (C) 2006-2008 Daniel P. Berrange | ||
15 | 6 | * | ||
16 | 7 | * This library is free software; you can redistribute it and/or | ||
17 | 8 | * modify it under the terms of the GNU Lesser General Public | ||
18 | 9 | * License as published by the Free Software Foundation; either | ||
19 | 10 | * version 2.1 of the License, or (at your option) any later version. | ||
20 | 11 | * | ||
21 | 12 | * This library is distributed in the hope that it will be useful, | ||
22 | 13 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
23 | 14 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
24 | 15 | * Lesser General Public License for more details. | ||
25 | 16 | * | ||
26 | 17 | * You should have received a copy of the GNU Lesser General Public | ||
27 | 18 | * License along with this library; if not, write to the Free Software | ||
28 | 19 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
29 | 20 | * | ||
30 | 21 | * Author: Daniel P. Berrange <berrange@redhat.com> | ||
31 | 22 | */ | ||
32 | 23 | |||
33 | 24 | #include <config.h> | ||
34 | 25 | |||
35 | 26 | #include <sys/types.h> | ||
36 | 27 | #include <sys/poll.h> | ||
37 | 28 | #include <dirent.h> | ||
38 | 29 | #include <limits.h> | ||
39 | 30 | #include <string.h> | ||
40 | 31 | #include <stdio.h> | ||
41 | 32 | #include <stdarg.h> | ||
42 | 33 | #include <stdlib.h> | ||
43 | 34 | #include <unistd.h> | ||
44 | 35 | #include <errno.h> | ||
45 | 36 | #include <sys/utsname.h> | ||
46 | 37 | #include <sys/stat.h> | ||
47 | 38 | #include <fcntl.h> | ||
48 | 39 | #include <signal.h> | ||
49 | 40 | #include <paths.h> | ||
50 | 41 | #include <pwd.h> | ||
51 | 42 | #include <stdio.h> | ||
52 | 43 | #include <sys/wait.h> | ||
53 | 44 | #include <sys/ioctl.h> | ||
54 | 45 | #include <sys/inotify.h> | ||
55 | 46 | #include <sys/un.h> | ||
56 | 47 | |||
57 | 48 | #include "uml_driver.h" | ||
58 | 49 | #include "uml_conf.h" | ||
59 | 50 | #include "event.h" | ||
60 | 51 | #include "buf.h" | ||
61 | 52 | #include "util.h" | ||
62 | 53 | #include "nodeinfo.h" | ||
63 | 54 | #include "stats_linux.h" | ||
64 | 55 | #include "capabilities.h" | ||
65 | 56 | #include "memory.h" | ||
66 | 57 | #include "uuid.h" | ||
67 | 58 | #include "domain_conf.h" | ||
68 | 59 | #include "datatypes.h" | ||
69 | 60 | #include "logging.h" | ||
70 | 61 | #include "domain_nwfilter.h" | ||
71 | 62 | |||
72 | 63 | #define VIR_FROM_THIS VIR_FROM_UML | ||
73 | 64 | |||
74 | 65 | /* For storing short-lived temporary files. */ | ||
75 | 66 | #define TEMPDIR LOCAL_STATE_DIR "/cache/libvirt" | ||
76 | 67 | |||
77 | 68 | typedef struct _umlDomainObjPrivate umlDomainObjPrivate; | ||
78 | 69 | typedef umlDomainObjPrivate *umlDomainObjPrivatePtr; | ||
79 | 70 | struct _umlDomainObjPrivate { | ||
80 | 71 | int monitor; | ||
81 | 72 | int monitorWatch; | ||
82 | 73 | }; | ||
83 | 74 | |||
84 | 75 | |||
85 | 76 | static int umlShutdown(void); | ||
86 | 77 | |||
87 | 78 | static void *umlDomainObjPrivateAlloc(void) | ||
88 | 79 | { | ||
89 | 80 | umlDomainObjPrivatePtr priv; | ||
90 | 81 | |||
91 | 82 | if (VIR_ALLOC(priv) < 0) | ||
92 | 83 | return NULL; | ||
93 | 84 | |||
94 | 85 | priv->monitor = -1; | ||
95 | 86 | priv->monitorWatch = -1; | ||
96 | 87 | |||
97 | 88 | return priv; | ||
98 | 89 | } | ||
99 | 90 | |||
100 | 91 | static void umlDomainObjPrivateFree(void *data) | ||
101 | 92 | { | ||
102 | 93 | umlDomainObjPrivatePtr priv = data; | ||
103 | 94 | |||
104 | 95 | VIR_FREE(priv); | ||
105 | 96 | } | ||
106 | 97 | |||
107 | 98 | |||
108 | 99 | static void umlDriverLock(struct uml_driver *driver) | ||
109 | 100 | { | ||
110 | 101 | virMutexLock(&driver->lock); | ||
111 | 102 | } | ||
112 | 103 | static void umlDriverUnlock(struct uml_driver *driver) | ||
113 | 104 | { | ||
114 | 105 | virMutexUnlock(&driver->lock); | ||
115 | 106 | } | ||
116 | 107 | |||
117 | 108 | |||
118 | 109 | static int umlOpenMonitor(struct uml_driver *driver, | ||
119 | 110 | virDomainObjPtr vm); | ||
120 | 111 | static int umlReadPidFile(struct uml_driver *driver, | ||
121 | 112 | virDomainObjPtr vm); | ||
122 | 113 | |||
123 | 114 | static int umlSetCloseExec(int fd) { | ||
124 | 115 | int flags; | ||
125 | 116 | if ((flags = fcntl(fd, F_GETFD)) < 0) | ||
126 | 117 | goto error; | ||
127 | 118 | flags |= FD_CLOEXEC; | ||
128 | 119 | if ((fcntl(fd, F_SETFD, flags)) < 0) | ||
129 | 120 | goto error; | ||
130 | 121 | return 0; | ||
131 | 122 | error: | ||
132 | 123 | VIR_ERROR0(_("Failed to set close-on-exec file descriptor flag")); | ||
133 | 124 | return -1; | ||
134 | 125 | } | ||
135 | 126 | |||
136 | 127 | static int umlStartVMDaemon(virConnectPtr conn, | ||
137 | 128 | struct uml_driver *driver, | ||
138 | 129 | virDomainObjPtr vm); | ||
139 | 130 | |||
140 | 131 | static void umlShutdownVMDaemon(virConnectPtr conn, | ||
141 | 132 | struct uml_driver *driver, | ||
142 | 133 | virDomainObjPtr vm); | ||
143 | 134 | |||
144 | 135 | |||
145 | 136 | static int umlMonitorCommand(const struct uml_driver *driver, | ||
146 | 137 | const virDomainObjPtr vm, | ||
147 | 138 | const char *cmd, | ||
148 | 139 | char **reply); | ||
149 | 140 | |||
150 | 141 | static struct uml_driver *uml_driver = NULL; | ||
151 | 142 | |||
152 | 143 | struct umlAutostartData { | ||
153 | 144 | struct uml_driver *driver; | ||
154 | 145 | virConnectPtr conn; | ||
155 | 146 | }; | ||
156 | 147 | |||
157 | 148 | static void | ||
158 | 149 | umlAutostartDomain(void *payload, const char *name ATTRIBUTE_UNUSED, void *opaque) | ||
159 | 150 | { | ||
160 | 151 | virDomainObjPtr vm = payload; | ||
161 | 152 | const struct umlAutostartData *data = opaque; | ||
162 | 153 | |||
163 | 154 | virDomainObjLock(vm); | ||
164 | 155 | if (vm->autostart && | ||
165 | 156 | !virDomainObjIsActive(vm)) { | ||
166 | 157 | virResetLastError(); | ||
167 | 158 | if (umlStartVMDaemon(data->conn, data->driver, vm) < 0) { | ||
168 | 159 | virErrorPtr err = virGetLastError(); | ||
169 | 160 | VIR_ERROR(_("Failed to autostart VM '%s': %s"), | ||
170 | 161 | vm->def->name, err ? err->message : _("unknown error")); | ||
171 | 162 | } | ||
172 | 163 | } | ||
173 | 164 | virDomainObjUnlock(vm); | ||
174 | 165 | } | ||
175 | 166 | |||
176 | 167 | static void | ||
177 | 168 | umlAutostartConfigs(struct uml_driver *driver) { | ||
178 | 169 | /* XXX: Figure out a better way todo this. The domain | ||
179 | 170 | * startup code needs a connection handle in order | ||
180 | 171 | * to lookup the bridge associated with a virtual | ||
181 | 172 | * network | ||
182 | 173 | */ | ||
183 | 174 | virConnectPtr conn = virConnectOpen(driver->privileged ? | ||
184 | 175 | "uml:///system" : | ||
185 | 176 | "uml:///session"); | ||
186 | 177 | /* Ignoring NULL conn which is mostly harmless here */ | ||
187 | 178 | |||
188 | 179 | struct umlAutostartData data = { driver, conn }; | ||
189 | 180 | |||
190 | 181 | virHashForEach(driver->domains.objs, umlAutostartDomain, &data); | ||
191 | 182 | |||
192 | 183 | if (conn) | ||
193 | 184 | virConnectClose(conn); | ||
194 | 185 | } | ||
195 | 186 | |||
196 | 187 | |||
197 | 188 | static int | ||
198 | 189 | umlIdentifyOneChrPTY(struct uml_driver *driver, | ||
199 | 190 | virDomainObjPtr dom, | ||
200 | 191 | virDomainChrDefPtr def, | ||
201 | 192 | const char *dev) | ||
202 | 193 | { | ||
203 | 194 | char *cmd; | ||
204 | 195 | char *res = NULL; | ||
205 | 196 | int retries = 0; | ||
206 | 197 | if (virAsprintf(&cmd, "config %s%d", dev, def->target.port) < 0) { | ||
207 | 198 | virReportOOMError(); | ||
208 | 199 | return -1; | ||
209 | 200 | } | ||
210 | 201 | requery: | ||
211 | 202 | if (umlMonitorCommand(driver, dom, cmd, &res) < 0) | ||
212 | 203 | return -1; | ||
213 | 204 | |||
214 | 205 | if (res && STRPREFIX(res, "pts:")) { | ||
215 | 206 | VIR_FREE(def->data.file.path); | ||
216 | 207 | if ((def->data.file.path = strdup(res + 4)) == NULL) { | ||
217 | 208 | virReportOOMError(); | ||
218 | 209 | VIR_FREE(res); | ||
219 | 210 | VIR_FREE(cmd); | ||
220 | 211 | return -1; | ||
221 | 212 | } | ||
222 | 213 | } else if (!res || STRPREFIX(res, "pts")) { | ||
223 | 214 | /* It can take a while to startup, so retry for | ||
224 | 215 | upto 5 seconds */ | ||
225 | 216 | /* XXX should do this in a better non-blocking | ||
226 | 217 | way somehow ...perhaps register a timer */ | ||
227 | 218 | if (retries++ < 50) { | ||
228 | 219 | usleep(1000*10); | ||
229 | 220 | goto requery; | ||
230 | 221 | } | ||
231 | 222 | } | ||
232 | 223 | |||
233 | 224 | VIR_FREE(cmd); | ||
234 | 225 | VIR_FREE(res); | ||
235 | 226 | return 0; | ||
236 | 227 | } | ||
237 | 228 | |||
238 | 229 | static int | ||
239 | 230 | umlIdentifyChrPTY(struct uml_driver *driver, | ||
240 | 231 | virDomainObjPtr dom) | ||
241 | 232 | { | ||
242 | 233 | int i; | ||
243 | 234 | |||
244 | 235 | if (dom->def->console && | ||
245 | 236 | dom->def->console->type == VIR_DOMAIN_CHR_TYPE_PTY) | ||
246 | 237 | if (umlIdentifyOneChrPTY(driver, dom, | ||
247 | 238 | dom->def->console, "con") < 0) | ||
248 | 239 | return -1; | ||
249 | 240 | |||
250 | 241 | for (i = 0 ; i < dom->def->nserials; i++) | ||
251 | 242 | if (dom->def->serials[i]->type == VIR_DOMAIN_CHR_TYPE_PTY && | ||
252 | 243 | umlIdentifyOneChrPTY(driver, dom, | ||
253 | 244 | dom->def->serials[i], "ssl") < 0) | ||
254 | 245 | return -1; | ||
255 | 246 | |||
256 | 247 | return 0; | ||
257 | 248 | } | ||
258 | 249 | |||
259 | 250 | static void | ||
260 | 251 | umlInotifyEvent(int watch, | ||
261 | 252 | int fd, | ||
262 | 253 | int events ATTRIBUTE_UNUSED, | ||
263 | 254 | void *data) | ||
264 | 255 | { | ||
265 | 256 | char buf[1024]; | ||
266 | 257 | struct inotify_event *e; | ||
267 | 258 | int got; | ||
268 | 259 | char *tmp, *name; | ||
269 | 260 | struct uml_driver *driver = data; | ||
270 | 261 | virDomainObjPtr dom; | ||
271 | 262 | |||
272 | 263 | umlDriverLock(driver); | ||
273 | 264 | if (watch != driver->inotifyWatch) | ||
274 | 265 | goto cleanup; | ||
275 | 266 | |||
276 | 267 | reread: | ||
277 | 268 | got = read(fd, buf, sizeof(buf)); | ||
278 | 269 | if (got == -1) { | ||
279 | 270 | if (errno == EINTR) | ||
280 | 271 | goto reread; | ||
281 | 272 | goto cleanup; | ||
282 | 273 | } | ||
283 | 274 | |||
284 | 275 | tmp = buf; | ||
285 | 276 | while (got) { | ||
286 | 277 | if (got < sizeof(struct inotify_event)) | ||
287 | 278 | goto cleanup; /* bad */ | ||
288 | 279 | |||
289 | 280 | e = (struct inotify_event *)tmp; | ||
290 | 281 | tmp += sizeof(struct inotify_event); | ||
291 | 282 | got -= sizeof(struct inotify_event); | ||
292 | 283 | |||
293 | 284 | if (got < e->len) | ||
294 | 285 | goto cleanup; | ||
295 | 286 | |||
296 | 287 | tmp += e->len; | ||
297 | 288 | got -= e->len; | ||
298 | 289 | |||
299 | 290 | name = (char *)&(e->name); | ||
300 | 291 | |||
301 | 292 | dom = virDomainFindByName(&driver->domains, name); | ||
302 | 293 | |||
303 | 294 | if (!dom) { | ||
304 | 295 | continue; | ||
305 | 296 | } | ||
306 | 297 | |||
307 | 298 | if (e->mask & IN_DELETE) { | ||
308 | 299 | VIR_DEBUG("Got inotify domain shutdown '%s'", name); | ||
309 | 300 | if (!virDomainObjIsActive(dom)) { | ||
310 | 301 | virDomainObjUnlock(dom); | ||
311 | 302 | continue; | ||
312 | 303 | } | ||
313 | 304 | |||
314 | 305 | umlShutdownVMDaemon(NULL, driver, dom); | ||
315 | 306 | } else if (e->mask & (IN_CREATE | IN_MODIFY)) { | ||
316 | 307 | VIR_DEBUG("Got inotify domain startup '%s'", name); | ||
317 | 308 | if (virDomainObjIsActive(dom)) { | ||
318 | 309 | virDomainObjUnlock(dom); | ||
319 | 310 | continue; | ||
320 | 311 | } | ||
321 | 312 | |||
322 | 313 | if (umlReadPidFile(driver, dom) < 0) { | ||
323 | 314 | virDomainObjUnlock(dom); | ||
324 | 315 | continue; | ||
325 | 316 | } | ||
326 | 317 | |||
327 | 318 | dom->def->id = driver->nextvmid++; | ||
328 | 319 | dom->state = VIR_DOMAIN_RUNNING; | ||
329 | 320 | |||
330 | 321 | if (umlOpenMonitor(driver, dom) < 0) { | ||
331 | 322 | VIR_WARN0("Could not open monitor for new domain"); | ||
332 | 323 | umlShutdownVMDaemon(NULL, driver, dom); | ||
333 | 324 | } else if (umlIdentifyChrPTY(driver, dom) < 0) { | ||
334 | 325 | VIR_WARN0("Could not identify charater devices for new domain"); | ||
335 | 326 | umlShutdownVMDaemon(NULL, driver, dom); | ||
336 | 327 | } | ||
337 | 328 | } | ||
338 | 329 | virDomainObjUnlock(dom); | ||
339 | 330 | } | ||
340 | 331 | |||
341 | 332 | cleanup: | ||
342 | 333 | umlDriverUnlock(driver); | ||
343 | 334 | } | ||
344 | 335 | |||
345 | 336 | /** | ||
346 | 337 | * umlStartup: | ||
347 | 338 | * | ||
348 | 339 | * Initialization function for the Uml daemon | ||
349 | 340 | */ | ||
350 | 341 | static int | ||
351 | 342 | umlStartup(int privileged) { | ||
352 | 343 | uid_t uid = geteuid(); | ||
353 | 344 | char *base = NULL; | ||
354 | 345 | char driverConf[PATH_MAX]; | ||
355 | 346 | char *userdir = NULL; | ||
356 | 347 | |||
357 | 348 | if (VIR_ALLOC(uml_driver) < 0) | ||
358 | 349 | return -1; | ||
359 | 350 | |||
360 | 351 | uml_driver->privileged = privileged; | ||
361 | 352 | |||
362 | 353 | if (virMutexInit(¨_driver->lock) < 0) { | ||
363 | 354 | VIR_FREE(uml_driver); | ||
364 | 355 | return -1; | ||
365 | 356 | } | ||
366 | 357 | umlDriverLock(uml_driver); | ||
367 | 358 | |||
368 | 359 | /* Don't have a dom0 so start from 1 */ | ||
369 | 360 | uml_driver->nextvmid = 1; | ||
370 | 361 | uml_driver->inotifyWatch = -1; | ||
371 | 362 | |||
372 | 363 | if (virDomainObjListInit(¨_driver->domains) < 0) | ||
373 | 364 | goto error; | ||
374 | 365 | |||
375 | 366 | userdir = virGetUserDirectory(uid); | ||
376 | 367 | if (!userdir) | ||
377 | 368 | goto error; | ||
378 | 369 | |||
379 | 370 | if (privileged) { | ||
380 | 371 | if (virAsprintf(¨_driver->logDir, | ||
381 | 372 | "%s/log/libvirt/uml", LOCAL_STATE_DIR) == -1) | ||
382 | 373 | goto out_of_memory; | ||
383 | 374 | |||
384 | 375 | if ((base = strdup (SYSCONF_DIR "/libvirt")) == NULL) | ||
385 | 376 | goto out_of_memory; | ||
386 | 377 | } else { | ||
387 | 378 | |||
388 | 379 | if (virAsprintf(¨_driver->logDir, | ||
389 | 380 | "%s/.libvirt/uml/log", userdir) == -1) | ||
390 | 381 | goto out_of_memory; | ||
391 | 382 | |||
392 | 383 | if (virAsprintf(&base, "%s/.libvirt", userdir) == -1) | ||
393 | 384 | goto out_of_memory; | ||
394 | 385 | } | ||
395 | 386 | |||
396 | 387 | if (virAsprintf(¨_driver->monitorDir, | ||
397 | 388 | "%s/.uml", userdir) == -1) | ||
398 | 389 | goto out_of_memory; | ||
399 | 390 | |||
400 | 391 | /* Configuration paths are either ~/.libvirt/uml/... (session) or | ||
401 | 392 | * /etc/libvirt/uml/... (system). | ||
402 | 393 | */ | ||
403 | 394 | if (snprintf (driverConf, sizeof(driverConf), "%s/uml.conf", base) == -1) | ||
404 | 395 | goto out_of_memory; | ||
405 | 396 | driverConf[sizeof(driverConf)-1] = '\0'; | ||
406 | 397 | |||
407 | 398 | if (virAsprintf(¨_driver->configDir, "%s/uml", base) == -1) | ||
408 | 399 | goto out_of_memory; | ||
409 | 400 | |||
410 | 401 | if (virAsprintf(¨_driver->autostartDir, "%s/uml/autostart", base) == -1) | ||
411 | 402 | goto out_of_memory; | ||
412 | 403 | |||
413 | 404 | VIR_FREE(base); | ||
414 | 405 | |||
415 | 406 | if ((uml_driver->caps = umlCapsInit()) == NULL) | ||
416 | 407 | goto out_of_memory; | ||
417 | 408 | |||
418 | 409 | uml_driver->caps->privateDataAllocFunc = umlDomainObjPrivateAlloc; | ||
419 | 410 | uml_driver->caps->privateDataFreeFunc = umlDomainObjPrivateFree; | ||
420 | 411 | |||
421 | 412 | if ((uml_driver->inotifyFD = inotify_init()) < 0) { | ||
422 | 413 | VIR_ERROR0(_("cannot initialize inotify")); | ||
423 | 414 | goto error; | ||
424 | 415 | } | ||
425 | 416 | |||
426 | 417 | if (virFileMakePath(uml_driver->monitorDir) != 0) { | ||
427 | 418 | char ebuf[1024]; | ||
428 | 419 | VIR_ERROR(_("Failed to create monitor directory %s: %s"), | ||
429 | 420 | uml_driver->monitorDir, virStrerror(errno, ebuf, sizeof ebuf)); | ||
430 | 421 | goto error; | ||
431 | 422 | } | ||
432 | 423 | |||
433 | 424 | VIR_INFO("Adding inotify watch on %s", uml_driver->monitorDir); | ||
434 | 425 | if (inotify_add_watch(uml_driver->inotifyFD, | ||
435 | 426 | uml_driver->monitorDir, | ||
436 | 427 | IN_CREATE | IN_MODIFY | IN_DELETE) < 0) { | ||
437 | 428 | goto error; | ||
438 | 429 | } | ||
439 | 430 | |||
440 | 431 | if ((uml_driver->inotifyWatch = | ||
441 | 432 | virEventAddHandle(uml_driver->inotifyFD, POLLIN, | ||
442 | 433 | umlInotifyEvent, uml_driver, NULL)) < 0) | ||
443 | 434 | goto error; | ||
444 | 435 | |||
445 | 436 | if (virDomainLoadAllConfigs(uml_driver->caps, | ||
446 | 437 | ¨_driver->domains, | ||
447 | 438 | uml_driver->configDir, | ||
448 | 439 | uml_driver->autostartDir, | ||
449 | 440 | 0, NULL, NULL) < 0) | ||
450 | 441 | goto error; | ||
451 | 442 | |||
452 | 443 | umlAutostartConfigs(uml_driver); | ||
453 | 444 | |||
454 | 445 | umlDriverUnlock(uml_driver); | ||
455 | 446 | VIR_FREE(userdir); | ||
456 | 447 | |||
457 | 448 | return 0; | ||
458 | 449 | |||
459 | 450 | out_of_memory: | ||
460 | 451 | VIR_ERROR0(_("umlStartup: out of memory")); | ||
461 | 452 | |||
462 | 453 | error: | ||
463 | 454 | VIR_FREE(userdir); | ||
464 | 455 | VIR_FREE(base); | ||
465 | 456 | umlDriverUnlock(uml_driver); | ||
466 | 457 | umlShutdown(); | ||
467 | 458 | return -1; | ||
468 | 459 | } | ||
469 | 460 | |||
470 | 461 | /** | ||
471 | 462 | * umlReload: | ||
472 | 463 | * | ||
473 | 464 | * Function to restart the Uml daemon, it will recheck the configuration | ||
474 | 465 | * files and update its state and the networking | ||
475 | 466 | */ | ||
476 | 467 | static int | ||
477 | 468 | umlReload(void) { | ||
478 | 469 | if (!uml_driver) | ||
479 | 470 | return 0; | ||
480 | 471 | |||
481 | 472 | umlDriverLock(uml_driver); | ||
482 | 473 | virDomainLoadAllConfigs(uml_driver->caps, | ||
483 | 474 | ¨_driver->domains, | ||
484 | 475 | uml_driver->configDir, | ||
485 | 476 | uml_driver->autostartDir, | ||
486 | 477 | 0, NULL, NULL); | ||
487 | 478 | |||
488 | 479 | umlAutostartConfigs(uml_driver); | ||
489 | 480 | umlDriverUnlock(uml_driver); | ||
490 | 481 | |||
491 | 482 | return 0; | ||
492 | 483 | } | ||
493 | 484 | |||
494 | 485 | /** | ||
495 | 486 | * umlActive: | ||
496 | 487 | * | ||
497 | 488 | * Checks if the Uml daemon is active, i.e. has an active domain or | ||
498 | 489 | * an active network | ||
499 | 490 | * | ||
500 | 491 | * Returns 1 if active, 0 otherwise | ||
501 | 492 | */ | ||
502 | 493 | static int | ||
503 | 494 | umlActive(void) { | ||
504 | 495 | int active = 0; | ||
505 | 496 | |||
506 | 497 | if (!uml_driver) | ||
507 | 498 | return 0; | ||
508 | 499 | |||
509 | 500 | umlDriverLock(uml_driver); | ||
510 | 501 | active = virDomainObjListNumOfDomains(¨_driver->domains, 1); | ||
511 | 502 | umlDriverUnlock(uml_driver); | ||
512 | 503 | |||
513 | 504 | return active; | ||
514 | 505 | } | ||
515 | 506 | |||
516 | 507 | static void | ||
517 | 508 | umlShutdownOneVM(void *payload, const char *name ATTRIBUTE_UNUSED, void *opaque) | ||
518 | 509 | { | ||
519 | 510 | virDomainObjPtr dom = payload; | ||
520 | 511 | struct uml_driver *driver = opaque; | ||
521 | 512 | |||
522 | 513 | virDomainObjLock(dom); | ||
523 | 514 | if (virDomainObjIsActive(dom)) | ||
524 | 515 | umlShutdownVMDaemon(NULL, driver, dom); | ||
525 | 516 | virDomainObjUnlock(dom); | ||
526 | 517 | } | ||
527 | 518 | |||
528 | 519 | /** | ||
529 | 520 | * umlShutdown: | ||
530 | 521 | * | ||
531 | 522 | * Shutdown the Uml daemon, it will stop all active domains and networks | ||
532 | 523 | */ | ||
533 | 524 | static int | ||
534 | 525 | umlShutdown(void) { | ||
535 | 526 | if (!uml_driver) | ||
536 | 527 | return -1; | ||
537 | 528 | |||
538 | 529 | umlDriverLock(uml_driver); | ||
539 | 530 | if (uml_driver->inotifyWatch != -1) | ||
540 | 531 | virEventRemoveHandle(uml_driver->inotifyWatch); | ||
541 | 532 | close(uml_driver->inotifyFD); | ||
542 | 533 | virCapabilitiesFree(uml_driver->caps); | ||
543 | 534 | |||
544 | 535 | /* shutdown active VMs | ||
545 | 536 | * XXX allow them to stay around & reconnect */ | ||
546 | 537 | virHashForEach(uml_driver->domains.objs, umlShutdownOneVM, uml_driver); | ||
547 | 538 | |||
548 | 539 | virDomainObjListDeinit(¨_driver->domains); | ||
549 | 540 | |||
550 | 541 | VIR_FREE(uml_driver->logDir); | ||
551 | 542 | VIR_FREE(uml_driver->configDir); | ||
552 | 543 | VIR_FREE(uml_driver->autostartDir); | ||
553 | 544 | VIR_FREE(uml_driver->monitorDir); | ||
554 | 545 | |||
555 | 546 | if (uml_driver->brctl) | ||
556 | 547 | brShutdown(uml_driver->brctl); | ||
557 | 548 | |||
558 | 549 | umlDriverUnlock(uml_driver); | ||
559 | 550 | virMutexDestroy(¨_driver->lock); | ||
560 | 551 | VIR_FREE(uml_driver); | ||
561 | 552 | |||
562 | 553 | return 0; | ||
563 | 554 | } | ||
564 | 555 | |||
565 | 556 | |||
566 | 557 | static int umlReadPidFile(struct uml_driver *driver, | ||
567 | 558 | virDomainObjPtr vm) | ||
568 | 559 | { | ||
569 | 560 | int rc = -1; | ||
570 | 561 | FILE *file; | ||
571 | 562 | char *pidfile = NULL; | ||
572 | 563 | int retries = 0; | ||
573 | 564 | |||
574 | 565 | vm->pid = -1; | ||
575 | 566 | if (virAsprintf(&pidfile, "%s/%s/pid", | ||
576 | 567 | driver->monitorDir, vm->def->name) < 0) { | ||
577 | 568 | virReportOOMError(); | ||
578 | 569 | return -1; | ||
579 | 570 | } | ||
580 | 571 | |||
581 | 572 | reopen: | ||
582 | 573 | if (!(file = fopen(pidfile, "r"))) { | ||
583 | 574 | if (errno == ENOENT && | ||
584 | 575 | retries++ < 50) { | ||
585 | 576 | usleep(1000 * 100); | ||
586 | 577 | goto reopen; | ||
587 | 578 | } | ||
588 | 579 | goto cleanup; | ||
589 | 580 | } | ||
590 | 581 | |||
591 | 582 | if (fscanf(file, "%d", &vm->pid) != 1) { | ||
592 | 583 | errno = EINVAL; | ||
593 | 584 | fclose(file); | ||
594 | 585 | goto cleanup; | ||
595 | 586 | } | ||
596 | 587 | |||
597 | 588 | if (fclose(file) < 0) | ||
598 | 589 | goto cleanup; | ||
599 | 590 | |||
600 | 591 | rc = 0; | ||
601 | 592 | |||
602 | 593 | cleanup: | ||
603 | 594 | if (rc != 0) | ||
604 | 595 | virReportSystemError(errno, | ||
605 | 596 | _("failed to read pid: %s"), | ||
606 | 597 | pidfile); | ||
607 | 598 | VIR_FREE(pidfile); | ||
608 | 599 | return rc; | ||
609 | 600 | } | ||
610 | 601 | |||
611 | 602 | static int umlMonitorAddress(const struct uml_driver *driver, | ||
612 | 603 | virDomainObjPtr vm, | ||
613 | 604 | struct sockaddr_un *addr) { | ||
614 | 605 | char *sockname; | ||
615 | 606 | int retval = 0; | ||
616 | 607 | |||
617 | 608 | if (virAsprintf(&sockname, "%s/%s/mconsole", | ||
618 | 609 | driver->monitorDir, vm->def->name) < 0) { | ||
619 | 610 | virReportOOMError(); | ||
620 | 611 | return -1; | ||
621 | 612 | } | ||
622 | 613 | |||
623 | 614 | memset(addr, 0, sizeof *addr); | ||
624 | 615 | addr->sun_family = AF_UNIX; | ||
625 | 616 | if (virStrcpyStatic(addr->sun_path, sockname) == NULL) { | ||
626 | 617 | umlReportError(VIR_ERR_INTERNAL_ERROR, | ||
627 | 618 | _("Unix path %s too long for destination"), sockname); | ||
628 | 619 | retval = -1; | ||
629 | 620 | } | ||
630 | 621 | VIR_FREE(sockname); | ||
631 | 622 | return retval; | ||
632 | 623 | } | ||
633 | 624 | |||
634 | 625 | static int umlOpenMonitor(struct uml_driver *driver, | ||
635 | 626 | virDomainObjPtr vm) { | ||
636 | 627 | struct sockaddr_un addr; | ||
637 | 628 | struct stat sb; | ||
638 | 629 | int retries = 0; | ||
639 | 630 | umlDomainObjPrivatePtr priv = vm->privateData; | ||
640 | 631 | |||
641 | 632 | if (umlMonitorAddress(driver, vm, &addr) < 0) | ||
642 | 633 | return -1; | ||
643 | 634 | |||
644 | 635 | VIR_DEBUG("Dest address for monitor is '%s'", addr.sun_path); | ||
645 | 636 | restat: | ||
646 | 637 | if (stat(addr.sun_path, &sb) < 0) { | ||
647 | 638 | if (errno == ENOENT && | ||
648 | 639 | retries++ < 50) { | ||
649 | 640 | usleep(1000 * 100); | ||
650 | 641 | goto restat; | ||
651 | 642 | } | ||
652 | 643 | return -1; | ||
653 | 644 | } | ||
654 | 645 | |||
655 | 646 | if ((priv->monitor = socket(PF_UNIX, SOCK_DGRAM, 0)) < 0) { | ||
656 | 647 | virReportSystemError(errno, | ||
657 | 648 | "%s", _("cannot open socket")); | ||
658 | 649 | return -1; | ||
659 | 650 | } | ||
660 | 651 | |||
661 | 652 | memset(addr.sun_path, 0, sizeof addr.sun_path); | ||
662 | 653 | sprintf(addr.sun_path + 1, "libvirt-uml-%u", vm->pid); | ||
663 | 654 | VIR_DEBUG("Reply address for monitor is '%s'", addr.sun_path+1); | ||
664 | 655 | if (bind(priv->monitor, (struct sockaddr *)&addr, sizeof addr) < 0) { | ||
665 | 656 | virReportSystemError(errno, | ||
666 | 657 | "%s", _("cannot bind socket")); | ||
667 | 658 | close(priv->monitor); | ||
668 | 659 | priv->monitor = -1; | ||
669 | 660 | return -1; | ||
670 | 661 | } | ||
671 | 662 | |||
672 | 663 | return 0; | ||
673 | 664 | } | ||
674 | 665 | |||
675 | 666 | |||
676 | 667 | #define MONITOR_MAGIC 0xcafebabe | ||
677 | 668 | #define MONITOR_BUFLEN 512 | ||
678 | 669 | #define MONITOR_VERSION 2 | ||
679 | 670 | |||
680 | 671 | struct monitor_request { | ||
681 | 672 | uint32_t magic; | ||
682 | 673 | uint32_t version; | ||
683 | 674 | uint32_t length; | ||
684 | 675 | char data[MONITOR_BUFLEN]; | ||
685 | 676 | }; | ||
686 | 677 | |||
687 | 678 | struct monitor_response { | ||
688 | 679 | uint32_t error; | ||
689 | 680 | uint32_t extra; | ||
690 | 681 | uint32_t length; | ||
691 | 682 | char data[MONITOR_BUFLEN]; | ||
692 | 683 | }; | ||
693 | 684 | |||
694 | 685 | |||
695 | 686 | static int umlMonitorCommand(const struct uml_driver *driver, | ||
696 | 687 | const virDomainObjPtr vm, | ||
697 | 688 | const char *cmd, | ||
698 | 689 | char **reply) | ||
699 | 690 | { | ||
700 | 691 | struct monitor_request req; | ||
701 | 692 | struct monitor_response res; | ||
702 | 693 | char *retdata = NULL; | ||
703 | 694 | int retlen = 0, ret = 0; | ||
704 | 695 | struct sockaddr_un addr; | ||
705 | 696 | unsigned int addrlen; | ||
706 | 697 | umlDomainObjPrivatePtr priv = vm->privateData; | ||
707 | 698 | |||
708 | 699 | VIR_DEBUG("Run command '%s'", cmd); | ||
709 | 700 | |||
710 | 701 | *reply = NULL; | ||
711 | 702 | |||
712 | 703 | if (umlMonitorAddress(driver, vm, &addr) < 0) | ||
713 | 704 | return -1; | ||
714 | 705 | |||
715 | 706 | memset(&req, 0, sizeof(req)); | ||
716 | 707 | req.magic = MONITOR_MAGIC; | ||
717 | 708 | req.version = MONITOR_VERSION; | ||
718 | 709 | req.length = strlen(cmd); | ||
719 | 710 | if (req.length > (MONITOR_BUFLEN-1)) { | ||
720 | 711 | virReportSystemError(EINVAL, | ||
721 | 712 | _("cannot send too long command %s (%d bytes)"), | ||
722 | 713 | cmd, req.length); | ||
723 | 714 | return -1; | ||
724 | 715 | } | ||
725 | 716 | if (virStrcpyStatic(req.data, cmd) == NULL) { | ||
726 | 717 | umlReportError(VIR_ERR_INTERNAL_ERROR, | ||
727 | 718 | _("Command %s too long for destination"), cmd); | ||
728 | 719 | return -1; | ||
729 | 720 | } | ||
730 | 721 | |||
731 | 722 | if (sendto(priv->monitor, &req, sizeof req, 0, | ||
732 | 723 | (struct sockaddr *)&addr, sizeof addr) != (sizeof req)) { | ||
733 | 724 | virReportSystemError(errno, | ||
734 | 725 | _("cannot send command %s"), | ||
735 | 726 | cmd); | ||
736 | 727 | return -1; | ||
737 | 728 | } | ||
738 | 729 | |||
739 | 730 | do { | ||
740 | 731 | ssize_t nbytes; | ||
741 | 732 | addrlen = sizeof(addr); | ||
742 | 733 | nbytes = recvfrom(priv->monitor, &res, sizeof res, 0, | ||
743 | 734 | (struct sockaddr *)&addr, &addrlen); | ||
744 | 735 | if (nbytes < 0) { | ||
745 | 736 | if (errno == EAGAIN || errno == EINTR) | ||
746 | 737 | continue; | ||
747 | 738 | virReportSystemError(errno, _("cannot read reply %s"), cmd); | ||
748 | 739 | goto error; | ||
749 | 740 | } | ||
750 | 741 | /* Ensure res.length is safe to read before validating its value. */ | ||
751 | 742 | if (nbytes < offsetof(struct monitor_request, data) || | ||
752 | 743 | nbytes < offsetof(struct monitor_request, data) + res.length) { | ||
753 | 744 | virReportSystemError(0, _("incomplete reply %s"), cmd); | ||
754 | 745 | goto error; | ||
755 | 746 | } | ||
756 | 747 | |||
757 | 748 | if (VIR_REALLOC_N(retdata, retlen + res.length) < 0) { | ||
758 | 749 | virReportOOMError(); | ||
759 | 750 | goto error; | ||
760 | 751 | } | ||
761 | 752 | memcpy(retdata + retlen, res.data, res.length); | ||
762 | 753 | retlen += res.length - 1; | ||
763 | 754 | retdata[retlen] = '\0'; | ||
764 | 755 | |||
765 | 756 | if (res.error) | ||
766 | 757 | ret = -1; | ||
767 | 758 | |||
768 | 759 | } while (res.extra); | ||
769 | 760 | |||
770 | 761 | VIR_DEBUG("Command reply is '%s'", NULLSTR(retdata)); | ||
771 | 762 | |||
772 | 763 | if (ret < 0) | ||
773 | 764 | VIR_FREE(retdata); | ||
774 | 765 | else | ||
775 | 766 | *reply = retdata; | ||
776 | 767 | |||
777 | 768 | return ret; | ||
778 | 769 | |||
779 | 770 | error: | ||
780 | 771 | VIR_FREE(retdata); | ||
781 | 772 | return -1; | ||
782 | 773 | } | ||
783 | 774 | |||
784 | 775 | |||
785 | 776 | static int umlCleanupTapDevices(virConnectPtr conn ATTRIBUTE_UNUSED, | ||
786 | 777 | virDomainObjPtr vm) { | ||
787 | 778 | int i; | ||
788 | 779 | int err; | ||
789 | 780 | int ret = 0; | ||
790 | 781 | brControl *brctl = NULL; | ||
791 | 782 | VIR_ERROR0(_("Cleanup tap")); | ||
792 | 783 | if (brInit(&brctl) < 0) | ||
793 | 784 | return -1; | ||
794 | 785 | |||
795 | 786 | for (i = 0 ; i < vm->def->nnets ; i++) { | ||
796 | 787 | virDomainNetDefPtr def = vm->def->nets[i]; | ||
797 | 788 | |||
798 | 789 | if (def->type != VIR_DOMAIN_NET_TYPE_BRIDGE && | ||
799 | 790 | def->type != VIR_DOMAIN_NET_TYPE_NETWORK) | ||
800 | 791 | continue; | ||
801 | 792 | |||
802 | 793 | VIR_ERROR(_("Cleanup '%s'"), def->ifname); | ||
803 | 794 | err = brDeleteTap(brctl, def->ifname); | ||
804 | 795 | if (err) { | ||
805 | 796 | VIR_ERROR(_("Cleanup failed %d"), err); | ||
806 | 797 | ret = -1; | ||
807 | 798 | } | ||
808 | 799 | } | ||
809 | 800 | VIR_ERROR0(_("Cleanup tap done")); | ||
810 | 801 | brShutdown(brctl); | ||
811 | 802 | return ret; | ||
812 | 803 | } | ||
813 | 804 | |||
814 | 805 | static int umlStartVMDaemon(virConnectPtr conn, | ||
815 | 806 | struct uml_driver *driver, | ||
816 | 807 | virDomainObjPtr vm) { | ||
817 | 808 | const char **argv = NULL, **tmp; | ||
818 | 809 | const char **progenv = NULL; | ||
819 | 810 | int i, ret; | ||
820 | 811 | pid_t pid; | ||
821 | 812 | char *logfile; | ||
822 | 813 | int logfd = -1; | ||
823 | 814 | struct stat sb; | ||
824 | 815 | fd_set keepfd; | ||
825 | 816 | char ebuf[1024]; | ||
826 | 817 | umlDomainObjPrivatePtr priv = vm->privateData; | ||
827 | 818 | |||
828 | 819 | FD_ZERO(&keepfd); | ||
829 | 820 | |||
830 | 821 | if (virDomainObjIsActive(vm)) { | ||
831 | 822 | umlReportError(VIR_ERR_INTERNAL_ERROR, "%s", | ||
832 | 823 | _("VM is already active")); | ||
833 | 824 | return -1; | ||
834 | 825 | } | ||
835 | 826 | |||
836 | 827 | if (!vm->def->os.kernel) { | ||
837 | 828 | umlReportError(VIR_ERR_INTERNAL_ERROR, "%s", | ||
838 | 829 | _("no kernel specified")); | ||
839 | 830 | return -1; | ||
840 | 831 | } | ||
841 | 832 | /* Make sure the binary we are about to try exec'ing exists. | ||
842 | 833 | * Technically we could catch the exec() failure, but that's | ||
843 | 834 | * in a sub-process so its hard to feed back a useful error | ||
844 | 835 | */ | ||
845 | 836 | if (stat(vm->def->os.kernel, &sb) < 0) { | ||
846 | 837 | virReportSystemError(errno, | ||
847 | 838 | _("Cannot find UML kernel %s"), | ||
848 | 839 | vm->def->os.kernel); | ||
849 | 840 | return -1; | ||
850 | 841 | } | ||
851 | 842 | |||
852 | 843 | if (virFileMakePath(driver->logDir) != 0) { | ||
853 | 844 | virReportSystemError(errno, | ||
854 | 845 | _("cannot create log directory %s"), | ||
855 | 846 | driver->logDir); | ||
856 | 847 | return -1; | ||
857 | 848 | } | ||
858 | 849 | |||
859 | 850 | if (virAsprintf(&logfile, "%s/%s.log", | ||
860 | 851 | driver->logDir, vm->def->name) < 0) { | ||
861 | 852 | virReportOOMError(); | ||
862 | 853 | return -1; | ||
863 | 854 | } | ||
864 | 855 | |||
865 | 856 | if ((logfd = open(logfile, O_CREAT | O_TRUNC | O_WRONLY, | ||
866 | 857 | S_IRUSR | S_IWUSR)) < 0) { | ||
867 | 858 | virReportSystemError(errno, | ||
868 | 859 | _("failed to create logfile %s"), | ||
869 | 860 | logfile); | ||
870 | 861 | VIR_FREE(logfile); | ||
871 | 862 | return -1; | ||
872 | 863 | } | ||
873 | 864 | VIR_FREE(logfile); | ||
874 | 865 | |||
875 | 866 | if (umlSetCloseExec(logfd) < 0) { | ||
876 | 867 | virReportSystemError(errno, | ||
877 | 868 | "%s", _("Unable to set VM logfile close-on-exec flag")); | ||
878 | 869 | close(logfd); | ||
879 | 870 | return -1; | ||
880 | 871 | } | ||
881 | 872 | |||
882 | 873 | if (umlBuildCommandLine(conn, driver, vm, &keepfd, | ||
883 | 874 | &argv, &progenv) < 0) { | ||
884 | 875 | close(logfd); | ||
885 | 876 | virDomainConfVMNWFilterTeardown(vm); | ||
886 | 877 | umlCleanupTapDevices(conn, vm); | ||
887 | 878 | return -1; | ||
888 | 879 | } | ||
889 | 880 | |||
890 | 881 | tmp = progenv; | ||
891 | 882 | while (*tmp) { | ||
892 | 883 | if (safewrite(logfd, *tmp, strlen(*tmp)) < 0) | ||
893 | 884 | VIR_WARN("Unable to write envv to logfile: %s", | ||
894 | 885 | virStrerror(errno, ebuf, sizeof ebuf)); | ||
895 | 886 | if (safewrite(logfd, " ", 1) < 0) | ||
896 | 887 | VIR_WARN("Unable to write envv to logfile: %s", | ||
897 | 888 | virStrerror(errno, ebuf, sizeof ebuf)); | ||
898 | 889 | tmp++; | ||
899 | 890 | } | ||
900 | 891 | tmp = argv; | ||
901 | 892 | while (*tmp) { | ||
902 | 893 | if (safewrite(logfd, *tmp, strlen(*tmp)) < 0) | ||
903 | 894 | VIR_WARN("Unable to write argv to logfile: %s", | ||
904 | 895 | virStrerror(errno, ebuf, sizeof ebuf)); | ||
905 | 896 | if (safewrite(logfd, " ", 1) < 0) | ||
906 | 897 | VIR_WARN("Unable to write argv to logfile: %s", | ||
907 | 898 | virStrerror(errno, ebuf, sizeof ebuf)); | ||
908 | 899 | tmp++; | ||
909 | 900 | } | ||
910 | 901 | if (safewrite(logfd, "\n", 1) < 0) | ||
911 | 902 | VIR_WARN("Unable to write argv to logfile: %s", | ||
912 | 903 | virStrerror(errno, ebuf, sizeof ebuf)); | ||
913 | 904 | |||
914 | 905 | priv->monitor = -1; | ||
915 | 906 | |||
916 | 907 | ret = virExecDaemonize(argv, progenv, &keepfd, &pid, | ||
917 | 908 | -1, &logfd, &logfd, | ||
918 | 909 | VIR_EXEC_CLEAR_CAPS, | ||
919 | 910 | NULL, NULL, NULL); | ||
920 | 911 | close(logfd); | ||
921 | 912 | |||
922 | 913 | /* | ||
923 | 914 | * At the moment, the only thing that populates keepfd is | ||
924 | 915 | * umlBuildCommandLineChr. We want to close every fd it opens. | ||
925 | 916 | */ | ||
926 | 917 | for (i = 0; i < FD_SETSIZE; i++) | ||
927 | 918 | if (FD_ISSET(i, &keepfd)) | ||
928 | 919 | close(i); | ||
929 | 920 | |||
930 | 921 | for (i = 0 ; argv[i] ; i++) | ||
931 | 922 | VIR_FREE(argv[i]); | ||
932 | 923 | VIR_FREE(argv); | ||
933 | 924 | |||
934 | 925 | for (i = 0 ; progenv[i] ; i++) | ||
935 | 926 | VIR_FREE(progenv[i]); | ||
936 | 927 | VIR_FREE(progenv); | ||
937 | 928 | |||
938 | 929 | if (ret < 0) { | ||
939 | 930 | virDomainConfVMNWFilterTeardown(vm); | ||
940 | 931 | umlCleanupTapDevices(conn, vm); | ||
941 | 932 | } | ||
942 | 933 | |||
943 | 934 | |||
944 | 935 | /* NB we don't mark it running here - we do that async | ||
945 | 936 | with inotify */ | ||
946 | 937 | /* XXX what if someone else tries to start it again | ||
947 | 938 | before we get the inotification ? Sounds like | ||
948 | 939 | trouble.... */ | ||
949 | 940 | |||
950 | 941 | return ret; | ||
951 | 942 | } | ||
952 | 943 | |||
953 | 944 | static void umlShutdownVMDaemon(virConnectPtr conn ATTRIBUTE_UNUSED, | ||
954 | 945 | struct uml_driver *driver ATTRIBUTE_UNUSED, | ||
955 | 946 | virDomainObjPtr vm) | ||
956 | 947 | { | ||
957 | 948 | int ret; | ||
958 | 949 | umlDomainObjPrivatePtr priv = vm->privateData; | ||
959 | 950 | |||
960 | 951 | if (!virDomainObjIsActive(vm)) | ||
961 | 952 | return; | ||
962 | 953 | |||
963 | 954 | virKillProcess(vm->pid, SIGTERM); | ||
964 | 955 | |||
965 | 956 | if (priv->monitor != -1) | ||
966 | 957 | close(priv->monitor); | ||
967 | 958 | priv->monitor = -1; | ||
968 | 959 | |||
969 | 960 | if ((ret = waitpid(vm->pid, NULL, 0)) != vm->pid) { | ||
970 | 961 | VIR_WARN("Got unexpected pid %d != %d", | ||
971 | 962 | ret, vm->pid); | ||
972 | 963 | } | ||
973 | 964 | |||
974 | 965 | vm->pid = -1; | ||
975 | 966 | vm->def->id = -1; | ||
976 | 967 | vm->state = VIR_DOMAIN_SHUTOFF; | ||
977 | 968 | |||
978 | 969 | virDomainConfVMNWFilterTeardown(vm); | ||
979 | 970 | umlCleanupTapDevices(conn, vm); | ||
980 | 971 | |||
981 | 972 | if (vm->newDef) { | ||
982 | 973 | virDomainDefFree(vm->def); | ||
983 | 974 | vm->def = vm->newDef; | ||
984 | 975 | vm->def->id = -1; | ||
985 | 976 | vm->newDef = NULL; | ||
986 | 977 | } | ||
987 | 978 | } | ||
988 | 979 | |||
989 | 980 | |||
990 | 981 | static virDrvOpenStatus umlOpen(virConnectPtr conn, | ||
991 | 982 | virConnectAuthPtr auth ATTRIBUTE_UNUSED, | ||
992 | 983 | int flags ATTRIBUTE_UNUSED) { | ||
993 | 984 | if (conn->uri == NULL) { | ||
994 | 985 | if (uml_driver == NULL) | ||
995 | 986 | return VIR_DRV_OPEN_DECLINED; | ||
996 | 987 | |||
997 | 988 | conn->uri = xmlParseURI(uml_driver->privileged ? | ||
998 | 989 | "uml:///system" : | ||
999 | 990 | "uml:///session"); | ||
1000 | 991 | if (!conn->uri) { | ||
1001 | 992 | virReportOOMError(); | ||
1002 | 993 | return VIR_DRV_OPEN_ERROR; | ||
1003 | 994 | } | ||
1004 | 995 | } else { | ||
1005 | 996 | if (conn->uri->scheme == NULL || | ||
1006 | 997 | STRNEQ (conn->uri->scheme, "uml")) | ||
1007 | 998 | return VIR_DRV_OPEN_DECLINED; | ||
1008 | 999 | |||
1009 | 1000 | /* Allow remote driver to deal with URIs with hostname server */ | ||
1010 | 1001 | if (conn->uri->server != NULL) | ||
1011 | 1002 | return VIR_DRV_OPEN_DECLINED; | ||
1012 | 1003 | |||
1013 | 1004 | |||
1014 | 1005 | /* Check path and tell them correct path if they made a mistake */ | ||
1015 | 1006 | if (uml_driver->privileged) { | ||
1016 | 1007 | if (STRNEQ (conn->uri->path, "/system") && | ||
1017 | 1008 | STRNEQ (conn->uri->path, "/session")) { | ||
1018 | 1009 | umlReportError(VIR_ERR_INTERNAL_ERROR, | ||
1019 | 1010 | _("unexpected UML URI path '%s', try uml:///system"), | ||
1020 | 1011 | conn->uri->path); | ||
1021 | 1012 | return VIR_DRV_OPEN_ERROR; | ||
1022 | 1013 | } | ||
1023 | 1014 | } else { | ||
1024 | 1015 | if (STRNEQ (conn->uri->path, "/session")) { | ||
1025 | 1016 | umlReportError(VIR_ERR_INTERNAL_ERROR, | ||
1026 | 1017 | _("unexpected UML URI path '%s', try uml:///session"), | ||
1027 | 1018 | conn->uri->path); | ||
1028 | 1019 | return VIR_DRV_OPEN_ERROR; | ||
1029 | 1020 | } | ||
1030 | 1021 | } | ||
1031 | 1022 | |||
1032 | 1023 | /* URI was good, but driver isn't active */ | ||
1033 | 1024 | if (uml_driver == NULL) { | ||
1034 | 1025 | umlReportError(VIR_ERR_INTERNAL_ERROR, "%s", | ||
1035 | 1026 | _("uml state driver is not active")); | ||
1036 | 1027 | return VIR_DRV_OPEN_ERROR; | ||
1037 | 1028 | } | ||
1038 | 1029 | } | ||
1039 | 1030 | |||
1040 | 1031 | conn->privateData = uml_driver; | ||
1041 | 1032 | |||
1042 | 1033 | return VIR_DRV_OPEN_SUCCESS; | ||
1043 | 1034 | } | ||
1044 | 1035 | |||
1045 | 1036 | static int umlClose(virConnectPtr conn) { | ||
1046 | 1037 | /*struct uml_driver *driver = conn->privateData;*/ | ||
1047 | 1038 | |||
1048 | 1039 | conn->privateData = NULL; | ||
1049 | 1040 | |||
1050 | 1041 | return 0; | ||
1051 | 1042 | } | ||
1052 | 1043 | |||
1053 | 1044 | static const char *umlGetType(virConnectPtr conn ATTRIBUTE_UNUSED) { | ||
1054 | 1045 | return "UML"; | ||
1055 | 1046 | } | ||
1056 | 1047 | |||
1057 | 1048 | |||
1058 | 1049 | static int umlIsSecure(virConnectPtr conn ATTRIBUTE_UNUSED) | ||
1059 | 1050 | { | ||
1060 | 1051 | /* Trivially secure, since always inside the daemon */ | ||
1061 | 1052 | return 1; | ||
1062 | 1053 | } | ||
1063 | 1054 | |||
1064 | 1055 | |||
1065 | 1056 | static int umlIsEncrypted(virConnectPtr conn ATTRIBUTE_UNUSED) | ||
1066 | 1057 | { | ||
1067 | 1058 | /* Not encrypted, but remote driver takes care of that */ | ||
1068 | 1059 | return 0; | ||
1069 | 1060 | } | ||
1070 | 1061 | |||
1071 | 1062 | |||
1072 | 1063 | static char *umlGetCapabilities(virConnectPtr conn) { | ||
1073 | 1064 | struct uml_driver *driver = (struct uml_driver *)conn->privateData; | ||
1074 | 1065 | char *xml; | ||
1075 | 1066 | |||
1076 | 1067 | umlDriverLock(driver); | ||
1077 | 1068 | if ((xml = virCapabilitiesFormatXML(driver->caps)) == NULL) | ||
1078 | 1069 | virReportOOMError(); | ||
1079 | 1070 | umlDriverUnlock(driver); | ||
1080 | 1071 | |||
1081 | 1072 | return xml; | ||
1082 | 1073 | } | ||
1083 | 1074 | |||
1084 | 1075 | |||
1085 | 1076 | |||
1086 | 1077 | static int umlGetProcessInfo(unsigned long long *cpuTime, int pid) { | ||
1087 | 1078 | char proc[PATH_MAX]; | ||
1088 | 1079 | FILE *pidinfo; | ||
1089 | 1080 | unsigned long long usertime, systime; | ||
1090 | 1081 | |||
1091 | 1082 | if (snprintf(proc, sizeof(proc), "/proc/%d/stat", pid) >= (int)sizeof(proc)) { | ||
1092 | 1083 | return -1; | ||
1093 | 1084 | } | ||
1094 | 1085 | |||
1095 | 1086 | if (!(pidinfo = fopen(proc, "r"))) { | ||
1096 | 1087 | /*printf("cannot read pid info");*/ | ||
1097 | 1088 | /* VM probably shut down, so fake 0 */ | ||
1098 | 1089 | *cpuTime = 0; | ||
1099 | 1090 | return 0; | ||
1100 | 1091 | } | ||
1101 | 1092 | |||
1102 | 1093 | if (fscanf(pidinfo, "%*d %*s %*c %*d %*d %*d %*d %*d %*u %*u %*u %*u %*u %llu %llu", &usertime, &systime) != 2) { | ||
1103 | 1094 | umlDebug("not enough arg"); | ||
1104 | 1095 | fclose(pidinfo); | ||
1105 | 1096 | return -1; | ||
1106 | 1097 | } | ||
1107 | 1098 | |||
1108 | 1099 | /* We got jiffies | ||
1109 | 1100 | * We want nanoseconds | ||
1110 | 1101 | * _SC_CLK_TCK is jiffies per second | ||
1111 | 1102 | * So calulate thus.... | ||
1112 | 1103 | */ | ||
1113 | 1104 | *cpuTime = 1000ull * 1000ull * 1000ull * (usertime + systime) / (unsigned long long)sysconf(_SC_CLK_TCK); | ||
1114 | 1105 | |||
1115 | 1106 | umlDebug("Got %llu %llu %llu", usertime, systime, *cpuTime); | ||
1116 | 1107 | |||
1117 | 1108 | fclose(pidinfo); | ||
1118 | 1109 | |||
1119 | 1110 | return 0; | ||
1120 | 1111 | } | ||
1121 | 1112 | |||
1122 | 1113 | |||
1123 | 1114 | static virDomainPtr umlDomainLookupByID(virConnectPtr conn, | ||
1124 | 1115 | int id) { | ||
1125 | 1116 | struct uml_driver *driver = (struct uml_driver *)conn->privateData; | ||
1126 | 1117 | virDomainObjPtr vm; | ||
1127 | 1118 | virDomainPtr dom = NULL; | ||
1128 | 1119 | |||
1129 | 1120 | umlDriverLock(driver); | ||
1130 | 1121 | vm = virDomainFindByID(&driver->domains, id); | ||
1131 | 1122 | umlDriverUnlock(driver); | ||
1132 | 1123 | |||
1133 | 1124 | if (!vm) { | ||
1134 | 1125 | umlReportError(VIR_ERR_NO_DOMAIN, NULL); | ||
1135 | 1126 | goto cleanup; | ||
1136 | 1127 | } | ||
1137 | 1128 | |||
1138 | 1129 | dom = virGetDomain(conn, vm->def->name, vm->def->uuid); | ||
1139 | 1130 | if (dom) dom->id = vm->def->id; | ||
1140 | 1131 | |||
1141 | 1132 | cleanup: | ||
1142 | 1133 | if (vm) | ||
1143 | 1134 | virDomainObjUnlock(vm); | ||
1144 | 1135 | return dom; | ||
1145 | 1136 | } | ||
1146 | 1137 | |||
1147 | 1138 | static virDomainPtr umlDomainLookupByUUID(virConnectPtr conn, | ||
1148 | 1139 | const unsigned char *uuid) { | ||
1149 | 1140 | struct uml_driver *driver = (struct uml_driver *)conn->privateData; | ||
1150 | 1141 | virDomainObjPtr vm; | ||
1151 | 1142 | virDomainPtr dom = NULL; | ||
1152 | 1143 | |||
1153 | 1144 | umlDriverLock(driver); | ||
1154 | 1145 | vm = virDomainFindByUUID(&driver->domains, uuid); | ||
1155 | 1146 | umlDriverUnlock(driver); | ||
1156 | 1147 | |||
1157 | 1148 | if (!vm) { | ||
1158 | 1149 | umlReportError(VIR_ERR_NO_DOMAIN, NULL); | ||
1159 | 1150 | goto cleanup; | ||
1160 | 1151 | } | ||
1161 | 1152 | |||
1162 | 1153 | dom = virGetDomain(conn, vm->def->name, vm->def->uuid); | ||
1163 | 1154 | if (dom) dom->id = vm->def->id; | ||
1164 | 1155 | |||
1165 | 1156 | cleanup: | ||
1166 | 1157 | if (vm) | ||
1167 | 1158 | virDomainObjUnlock(vm); | ||
1168 | 1159 | return dom; | ||
1169 | 1160 | } | ||
1170 | 1161 | |||
1171 | 1162 | static virDomainPtr umlDomainLookupByName(virConnectPtr conn, | ||
1172 | 1163 | const char *name) { | ||
1173 | 1164 | struct uml_driver *driver = (struct uml_driver *)conn->privateData; | ||
1174 | 1165 | virDomainObjPtr vm; | ||
1175 | 1166 | virDomainPtr dom = NULL; | ||
1176 | 1167 | |||
1177 | 1168 | umlDriverLock(driver); | ||
1178 | 1169 | vm = virDomainFindByName(&driver->domains, name); | ||
1179 | 1170 | umlDriverUnlock(driver); | ||
1180 | 1171 | |||
1181 | 1172 | if (!vm) { | ||
1182 | 1173 | umlReportError(VIR_ERR_NO_DOMAIN, NULL); | ||
1183 | 1174 | goto cleanup; | ||
1184 | 1175 | } | ||
1185 | 1176 | |||
1186 | 1177 | dom = virGetDomain(conn, vm->def->name, vm->def->uuid); | ||
1187 | 1178 | if (dom) dom->id = vm->def->id; | ||
1188 | 1179 | |||
1189 | 1180 | cleanup: | ||
1190 | 1181 | if (vm) | ||
1191 | 1182 | virDomainObjUnlock(vm); | ||
1192 | 1183 | return dom; | ||
1193 | 1184 | } | ||
1194 | 1185 | |||
1195 | 1186 | |||
1196 | 1187 | static int umlDomainIsActive(virDomainPtr dom) | ||
1197 | 1188 | { | ||
1198 | 1189 | struct uml_driver *driver = dom->conn->privateData; | ||
1199 | 1190 | virDomainObjPtr obj; | ||
1200 | 1191 | int ret = -1; | ||
1201 | 1192 | |||
1202 | 1193 | umlDriverLock(driver); | ||
1203 | 1194 | obj = virDomainFindByUUID(&driver->domains, dom->uuid); | ||
1204 | 1195 | umlDriverUnlock(driver); | ||
1205 | 1196 | if (!obj) { | ||
1206 | 1197 | umlReportError(VIR_ERR_NO_DOMAIN, NULL); | ||
1207 | 1198 | goto cleanup; | ||
1208 | 1199 | } | ||
1209 | 1200 | ret = virDomainObjIsActive(obj); | ||
1210 | 1201 | |||
1211 | 1202 | cleanup: | ||
1212 | 1203 | if (obj) | ||
1213 | 1204 | virDomainObjUnlock(obj); | ||
1214 | 1205 | return ret; | ||
1215 | 1206 | } | ||
1216 | 1207 | |||
1217 | 1208 | |||
1218 | 1209 | static int umlDomainIsPersistent(virDomainPtr dom) | ||
1219 | 1210 | { | ||
1220 | 1211 | struct uml_driver *driver = dom->conn->privateData; | ||
1221 | 1212 | virDomainObjPtr obj; | ||
1222 | 1213 | int ret = -1; | ||
1223 | 1214 | |||
1224 | 1215 | umlDriverLock(driver); | ||
1225 | 1216 | obj = virDomainFindByUUID(&driver->domains, dom->uuid); | ||
1226 | 1217 | umlDriverUnlock(driver); | ||
1227 | 1218 | if (!obj) { | ||
1228 | 1219 | umlReportError(VIR_ERR_NO_DOMAIN, NULL); | ||
1229 | 1220 | goto cleanup; | ||
1230 | 1221 | } | ||
1231 | 1222 | ret = obj->persistent; | ||
1232 | 1223 | |||
1233 | 1224 | cleanup: | ||
1234 | 1225 | if (obj) | ||
1235 | 1226 | virDomainObjUnlock(obj); | ||
1236 | 1227 | return ret; | ||
1237 | 1228 | } | ||
1238 | 1229 | |||
1239 | 1230 | |||
1240 | 1231 | static int umlGetVersion(virConnectPtr conn, unsigned long *version) { | ||
1241 | 1232 | struct uml_driver *driver = conn->privateData; | ||
1242 | 1233 | struct utsname ut; | ||
1243 | 1234 | int ret = -1; | ||
1244 | 1235 | |||
1245 | 1236 | umlDriverLock(driver); | ||
1246 | 1237 | |||
1247 | 1238 | if (driver->umlVersion == 0) { | ||
1248 | 1239 | uname(&ut); | ||
1249 | 1240 | |||
1250 | 1241 | if (virParseVersionString(ut.release, &driver->umlVersion) < 0) { | ||
1251 | 1242 | umlReportError(VIR_ERR_INTERNAL_ERROR, | ||
1252 | 1243 | _("cannot parse version %s"), ut.release); | ||
1253 | 1244 | goto cleanup; | ||
1254 | 1245 | } | ||
1255 | 1246 | } | ||
1256 | 1247 | |||
1257 | 1248 | *version = driver->umlVersion; | ||
1258 | 1249 | ret = 0; | ||
1259 | 1250 | |||
1260 | 1251 | cleanup: | ||
1261 | 1252 | umlDriverUnlock(driver); | ||
1262 | 1253 | return ret; | ||
1263 | 1254 | } | ||
1264 | 1255 | |||
1265 | 1256 | static int umlListDomains(virConnectPtr conn, int *ids, int nids) { | ||
1266 | 1257 | struct uml_driver *driver = conn->privateData; | ||
1267 | 1258 | int n; | ||
1268 | 1259 | |||
1269 | 1260 | umlDriverLock(driver); | ||
1270 | 1261 | n = virDomainObjListGetActiveIDs(&driver->domains, ids, nids); | ||
1271 | 1262 | umlDriverUnlock(driver); | ||
1272 | 1263 | |||
1273 | 1264 | return n; | ||
1274 | 1265 | } | ||
1275 | 1266 | static int umlNumDomains(virConnectPtr conn) { | ||
1276 | 1267 | struct uml_driver *driver = conn->privateData; | ||
1277 | 1268 | int n; | ||
1278 | 1269 | |||
1279 | 1270 | umlDriverLock(driver); | ||
1280 | 1271 | n = virDomainObjListNumOfDomains(&driver->domains, 1); | ||
1281 | 1272 | umlDriverUnlock(driver); | ||
1282 | 1273 | |||
1283 | 1274 | return n; | ||
1284 | 1275 | } | ||
1285 | 1276 | static virDomainPtr umlDomainCreate(virConnectPtr conn, const char *xml, | ||
1286 | 1277 | unsigned int flags) { | ||
1287 | 1278 | struct uml_driver *driver = conn->privateData; | ||
1288 | 1279 | virDomainDefPtr def; | ||
1289 | 1280 | virDomainObjPtr vm = NULL; | ||
1290 | 1281 | virDomainPtr dom = NULL; | ||
1291 | 1282 | |||
1292 | 1283 | virCheckFlags(0, NULL); | ||
1293 | 1284 | |||
1294 | 1285 | umlDriverLock(driver); | ||
1295 | 1286 | if (!(def = virDomainDefParseString(driver->caps, xml, | ||
1296 | 1287 | VIR_DOMAIN_XML_INACTIVE))) | ||
1297 | 1288 | goto cleanup; | ||
1298 | 1289 | |||
1299 | 1290 | if (virDomainObjIsDuplicate(&driver->domains, def, 1) < 0) | ||
1300 | 1291 | goto cleanup; | ||
1301 | 1292 | |||
1302 | 1293 | if (!(vm = virDomainAssignDef(driver->caps, | ||
1303 | 1294 | &driver->domains, | ||
1304 | 1295 | def, false))) | ||
1305 | 1296 | goto cleanup; | ||
1306 | 1297 | def = NULL; | ||
1307 | 1298 | |||
1308 | 1299 | if (umlStartVMDaemon(conn, driver, vm) < 0) { | ||
1309 | 1300 | virDomainRemoveInactive(&driver->domains, | ||
1310 | 1301 | vm); | ||
1311 | 1302 | vm = NULL; | ||
1312 | 1303 | goto cleanup; | ||
1313 | 1304 | } | ||
1314 | 1305 | |||
1315 | 1306 | dom = virGetDomain(conn, vm->def->name, vm->def->uuid); | ||
1316 | 1307 | if (dom) dom->id = vm->def->id; | ||
1317 | 1308 | |||
1318 | 1309 | cleanup: | ||
1319 | 1310 | virDomainDefFree(def); | ||
1320 | 1311 | if (vm) | ||
1321 | 1312 | virDomainObjUnlock(vm); | ||
1322 | 1313 | umlDriverUnlock(driver); | ||
1323 | 1314 | return dom; | ||
1324 | 1315 | } | ||
1325 | 1316 | |||
1326 | 1317 | |||
1327 | 1318 | static int umlDomainShutdown(virDomainPtr dom) { | ||
1328 | 1319 | struct uml_driver *driver = dom->conn->privateData; | ||
1329 | 1320 | virDomainObjPtr vm; | ||
1330 | 1321 | char *info = NULL; | ||
1331 | 1322 | int ret = -1; | ||
1332 | 1323 | |||
1333 | 1324 | umlDriverLock(driver); | ||
1334 | 1325 | vm = virDomainFindByID(&driver->domains, dom->id); | ||
1335 | 1326 | umlDriverUnlock(driver); | ||
1336 | 1327 | if (!vm) { | ||
1337 | 1328 | umlReportError(VIR_ERR_INVALID_DOMAIN, | ||
1338 | 1329 | _("no domain with matching id %d"), dom->id); | ||
1339 | 1330 | goto cleanup; | ||
1340 | 1331 | } | ||
1341 | 1332 | |||
1342 | 1333 | #if 0 | ||
1343 | 1334 | if (umlMonitorCommand(driver, vm, "system_powerdown", &info) < 0) { | ||
1344 | 1335 | umlReportError(VIR_ERR_OPERATION_FAILED, "%s", | ||
1345 | 1336 | _("shutdown operation failed")); | ||
1346 | 1337 | goto cleanup; | ||
1347 | 1338 | } | ||
1348 | 1339 | ret = 0; | ||
1349 | 1340 | #endif | ||
1350 | 1341 | |||
1351 | 1342 | cleanup: | ||
1352 | 1343 | VIR_FREE(info); | ||
1353 | 1344 | if (vm) | ||
1354 | 1345 | virDomainObjUnlock(vm); | ||
1355 | 1346 | return ret; | ||
1356 | 1347 | } | ||
1357 | 1348 | |||
1358 | 1349 | |||
1359 | 1350 | static int umlDomainDestroy(virDomainPtr dom) { | ||
1360 | 1351 | struct uml_driver *driver = dom->conn->privateData; | ||
1361 | 1352 | virDomainObjPtr vm; | ||
1362 | 1353 | int ret = -1; | ||
1363 | 1354 | |||
1364 | 1355 | umlDriverLock(driver); | ||
1365 | 1356 | vm = virDomainFindByID(&driver->domains, dom->id); | ||
1366 | 1357 | if (!vm) { | ||
1367 | 1358 | umlReportError(VIR_ERR_INVALID_DOMAIN, | ||
1368 | 1359 | _("no domain with matching id %d"), dom->id); | ||
1369 | 1360 | goto cleanup; | ||
1370 | 1361 | } | ||
1371 | 1362 | |||
1372 | 1363 | umlShutdownVMDaemon(dom->conn, driver, vm); | ||
1373 | 1364 | if (!vm->persistent) { | ||
1374 | 1365 | virDomainRemoveInactive(&driver->domains, | ||
1375 | 1366 | vm); | ||
1376 | 1367 | vm = NULL; | ||
1377 | 1368 | } | ||
1378 | 1369 | ret = 0; | ||
1379 | 1370 | |||
1380 | 1371 | cleanup: | ||
1381 | 1372 | if (vm) | ||
1382 | 1373 | virDomainObjUnlock(vm); | ||
1383 | 1374 | umlDriverUnlock(driver); | ||
1384 | 1375 | return ret; | ||
1385 | 1376 | } | ||
1386 | 1377 | |||
1387 | 1378 | |||
1388 | 1379 | static char *umlDomainGetOSType(virDomainPtr dom) { | ||
1389 | 1380 | struct uml_driver *driver = dom->conn->privateData; | ||
1390 | 1381 | virDomainObjPtr vm; | ||
1391 | 1382 | char *type = NULL; | ||
1392 | 1383 | |||
1393 | 1384 | umlDriverLock(driver); | ||
1394 | 1385 | vm = virDomainFindByUUID(&driver->domains, dom->uuid); | ||
1395 | 1386 | umlDriverUnlock(driver); | ||
1396 | 1387 | if (!vm) { | ||
1397 | 1388 | umlReportError(VIR_ERR_INVALID_DOMAIN, "%s", | ||
1398 | 1389 | _("no domain with matching uuid")); | ||
1399 | 1390 | goto cleanup; | ||
1400 | 1391 | } | ||
1401 | 1392 | |||
1402 | 1393 | if (!(type = strdup(vm->def->os.type))) | ||
1403 | 1394 | virReportOOMError(); | ||
1404 | 1395 | |||
1405 | 1396 | cleanup: | ||
1406 | 1397 | if (vm) | ||
1407 | 1398 | virDomainObjUnlock(vm); | ||
1408 | 1399 | return type; | ||
1409 | 1400 | } | ||
1410 | 1401 | |||
1411 | 1402 | /* Returns max memory in kb, 0 if error */ | ||
1412 | 1403 | static unsigned long umlDomainGetMaxMemory(virDomainPtr dom) { | ||
1413 | 1404 | struct uml_driver *driver = dom->conn->privateData; | ||
1414 | 1405 | virDomainObjPtr vm; | ||
1415 | 1406 | unsigned long ret = 0; | ||
1416 | 1407 | |||
1417 | 1408 | umlDriverLock(driver); | ||
1418 | 1409 | vm = virDomainFindByUUID(&driver->domains, dom->uuid); | ||
1419 | 1410 | umlDriverUnlock(driver); | ||
1420 | 1411 | |||
1421 | 1412 | if (!vm) { | ||
1422 | 1413 | char uuidstr[VIR_UUID_STRING_BUFLEN]; | ||
1423 | 1414 | |||
1424 | 1415 | virUUIDFormat(dom->uuid, uuidstr); | ||
1425 | 1416 | umlReportError(VIR_ERR_INVALID_DOMAIN, | ||
1426 | 1417 | _("no domain with matching uuid '%s'"), uuidstr); | ||
1427 | 1418 | goto cleanup; | ||
1428 | 1419 | } | ||
1429 | 1420 | ret = vm->def->maxmem; | ||
1430 | 1421 | |||
1431 | 1422 | cleanup: | ||
1432 | 1423 | if (vm) | ||
1433 | 1424 | virDomainObjUnlock(vm); | ||
1434 | 1425 | return ret; | ||
1435 | 1426 | } | ||
1436 | 1427 | |||
1437 | 1428 | static int umlDomainSetMaxMemory(virDomainPtr dom, unsigned long newmax) { | ||
1438 | 1429 | struct uml_driver *driver = dom->conn->privateData; | ||
1439 | 1430 | virDomainObjPtr vm; | ||
1440 | 1431 | int ret = -1; | ||
1441 | 1432 | |||
1442 | 1433 | umlDriverLock(driver); | ||
1443 | 1434 | vm = virDomainFindByUUID(&driver->domains, dom->uuid); | ||
1444 | 1435 | umlDriverUnlock(driver); | ||
1445 | 1436 | |||
1446 | 1437 | if (!vm) { | ||
1447 | 1438 | char uuidstr[VIR_UUID_STRING_BUFLEN]; | ||
1448 | 1439 | |||
1449 | 1440 | virUUIDFormat(dom->uuid, uuidstr); | ||
1450 | 1441 | umlReportError(VIR_ERR_INVALID_DOMAIN, | ||
1451 | 1442 | _("no domain with matching uuid '%s'"), uuidstr); | ||
1452 | 1443 | goto cleanup; | ||
1453 | 1444 | } | ||
1454 | 1445 | |||
1455 | 1446 | if (newmax < vm->def->memory) { | ||
1456 | 1447 | umlReportError(VIR_ERR_INVALID_ARG, "%s", | ||
1457 | 1448 | _("cannot set max memory lower than current memory")); | ||
1458 | 1449 | goto cleanup; | ||
1459 | 1450 | } | ||
1460 | 1451 | |||
1461 | 1452 | vm->def->maxmem = newmax; | ||
1462 | 1453 | ret = 0; | ||
1463 | 1454 | |||
1464 | 1455 | cleanup: | ||
1465 | 1456 | if (vm) | ||
1466 | 1457 | virDomainObjUnlock(vm); | ||
1467 | 1458 | return ret; | ||
1468 | 1459 | } | ||
1469 | 1460 | |||
1470 | 1461 | static int umlDomainSetMemory(virDomainPtr dom, unsigned long newmem) { | ||
1471 | 1462 | struct uml_driver *driver = dom->conn->privateData; | ||
1472 | 1463 | virDomainObjPtr vm; | ||
1473 | 1464 | int ret = -1; | ||
1474 | 1465 | |||
1475 | 1466 | umlDriverLock(driver); | ||
1476 | 1467 | vm = virDomainFindByUUID(&driver->domains, dom->uuid); | ||
1477 | 1468 | umlDriverUnlock(driver); | ||
1478 | 1469 | |||
1479 | 1470 | if (!vm) { | ||
1480 | 1471 | char uuidstr[VIR_UUID_STRING_BUFLEN]; | ||
1481 | 1472 | |||
1482 | 1473 | virUUIDFormat(dom->uuid, uuidstr); | ||
1483 | 1474 | umlReportError(VIR_ERR_INVALID_DOMAIN, | ||
1484 | 1475 | _("no domain with matching uuid '%s'"), uuidstr); | ||
1485 | 1476 | goto cleanup; | ||
1486 | 1477 | } | ||
1487 | 1478 | |||
1488 | 1479 | if (virDomainObjIsActive(vm)) { | ||
1489 | 1480 | umlReportError(VIR_ERR_NO_SUPPORT, "%s", | ||
1490 | 1481 | _("cannot set memory of an active domain")); | ||
1491 | 1482 | goto cleanup; | ||
1492 | 1483 | } | ||
1493 | 1484 | |||
1494 | 1485 | if (newmem > vm->def->maxmem) { | ||
1495 | 1486 | umlReportError(VIR_ERR_INVALID_ARG, "%s", | ||
1496 | 1487 | _("cannot set memory higher than max memory")); | ||
1497 | 1488 | goto cleanup; | ||
1498 | 1489 | } | ||
1499 | 1490 | |||
1500 | 1491 | vm->def->memory = newmem; | ||
1501 | 1492 | ret = 0; | ||
1502 | 1493 | |||
1503 | 1494 | cleanup: | ||
1504 | 1495 | if (vm) | ||
1505 | 1496 | virDomainObjUnlock(vm); | ||
1506 | 1497 | return ret; | ||
1507 | 1498 | } | ||
1508 | 1499 | |||
1509 | 1500 | static int umlDomainGetInfo(virDomainPtr dom, | ||
1510 | 1501 | virDomainInfoPtr info) { | ||
1511 | 1502 | struct uml_driver *driver = dom->conn->privateData; | ||
1512 | 1503 | virDomainObjPtr vm; | ||
1513 | 1504 | int ret = -1; | ||
1514 | 1505 | |||
1515 | 1506 | umlDriverLock(driver); | ||
1516 | 1507 | vm = virDomainFindByUUID(&driver->domains, dom->uuid); | ||
1517 | 1508 | umlDriverUnlock(driver); | ||
1518 | 1509 | |||
1519 | 1510 | if (!vm) { | ||
1520 | 1511 | umlReportError(VIR_ERR_INVALID_DOMAIN, "%s", | ||
1521 | 1512 | _("no domain with matching uuid")); | ||
1522 | 1513 | goto cleanup; | ||
1523 | 1514 | } | ||
1524 | 1515 | |||
1525 | 1516 | info->state = vm->state; | ||
1526 | 1517 | |||
1527 | 1518 | if (!virDomainObjIsActive(vm)) { | ||
1528 | 1519 | info->cpuTime = 0; | ||
1529 | 1520 | } else { | ||
1530 | 1521 | if (umlGetProcessInfo(&(info->cpuTime), vm->pid) < 0) { | ||
1531 | 1522 | umlReportError(VIR_ERR_OPERATION_FAILED, "%s", | ||
1532 | 1523 | _("cannot read cputime for domain")); | ||
1533 | 1524 | goto cleanup; | ||
1534 | 1525 | } | ||
1535 | 1526 | } | ||
1536 | 1527 | |||
1537 | 1528 | info->maxMem = vm->def->maxmem; | ||
1538 | 1529 | info->memory = vm->def->memory; | ||
1539 | 1530 | info->nrVirtCpu = vm->def->vcpus; | ||
1540 | 1531 | ret = 0; | ||
1541 | 1532 | |||
1542 | 1533 | cleanup: | ||
1543 | 1534 | if (vm) | ||
1544 | 1535 | virDomainObjUnlock(vm); | ||
1545 | 1536 | return ret; | ||
1546 | 1537 | } | ||
1547 | 1538 | |||
1548 | 1539 | |||
1549 | 1540 | static char *umlDomainDumpXML(virDomainPtr dom, | ||
1550 | 1541 | int flags ATTRIBUTE_UNUSED) { | ||
1551 | 1542 | struct uml_driver *driver = dom->conn->privateData; | ||
1552 | 1543 | virDomainObjPtr vm; | ||
1553 | 1544 | char *ret = NULL; | ||
1554 | 1545 | |||
1555 | 1546 | umlDriverLock(driver); | ||
1556 | 1547 | vm = virDomainFindByUUID(&driver->domains, dom->uuid); | ||
1557 | 1548 | umlDriverUnlock(driver); | ||
1558 | 1549 | |||
1559 | 1550 | if (!vm) { | ||
1560 | 1551 | umlReportError(VIR_ERR_INVALID_DOMAIN, "%s", | ||
1561 | 1552 | _("no domain with matching uuid")); | ||
1562 | 1553 | goto cleanup; | ||
1563 | 1554 | } | ||
1564 | 1555 | |||
1565 | 1556 | ret = virDomainDefFormat((flags & VIR_DOMAIN_XML_INACTIVE) && vm->newDef ? | ||
1566 | 1557 | vm->newDef : vm->def, | ||
1567 | 1558 | flags); | ||
1568 | 1559 | |||
1569 | 1560 | cleanup: | ||
1570 | 1561 | if (vm) | ||
1571 | 1562 | virDomainObjUnlock(vm); | ||
1572 | 1563 | return ret; | ||
1573 | 1564 | } | ||
1574 | 1565 | |||
1575 | 1566 | |||
1576 | 1567 | static int umlListDefinedDomains(virConnectPtr conn, | ||
1577 | 1568 | char **const names, int nnames) { | ||
1578 | 1569 | struct uml_driver *driver = conn->privateData; | ||
1579 | 1570 | int n; | ||
1580 | 1571 | |||
1581 | 1572 | umlDriverLock(driver); | ||
1582 | 1573 | n = virDomainObjListGetInactiveNames(&driver->domains, names, nnames); | ||
1583 | 1574 | umlDriverUnlock(driver); | ||
1584 | 1575 | |||
1585 | 1576 | return n; | ||
1586 | 1577 | } | ||
1587 | 1578 | |||
1588 | 1579 | static int umlNumDefinedDomains(virConnectPtr conn) { | ||
1589 | 1580 | struct uml_driver *driver = conn->privateData; | ||
1590 | 1581 | int n; | ||
1591 | 1582 | |||
1592 | 1583 | umlDriverLock(driver); | ||
1593 | 1584 | n = virDomainObjListNumOfDomains(&driver->domains, 0); | ||
1594 | 1585 | umlDriverUnlock(driver); | ||
1595 | 1586 | |||
1596 | 1587 | return n; | ||
1597 | 1588 | } | ||
1598 | 1589 | |||
1599 | 1590 | |||
1600 | 1591 | static int umlDomainStartWithFlags(virDomainPtr dom, unsigned int flags) { | ||
1601 | 1592 | struct uml_driver *driver = dom->conn->privateData; | ||
1602 | 1593 | virDomainObjPtr vm; | ||
1603 | 1594 | int ret = -1; | ||
1604 | 1595 | |||
1605 | 1596 | virCheckFlags(0, -1); | ||
1606 | 1597 | |||
1607 | 1598 | umlDriverLock(driver); | ||
1608 | 1599 | vm = virDomainFindByUUID(&driver->domains, dom->uuid); | ||
1609 | 1600 | |||
1610 | 1601 | if (!vm) { | ||
1611 | 1602 | umlReportError(VIR_ERR_INVALID_DOMAIN, "%s", | ||
1612 | 1603 | _("no domain with matching uuid")); | ||
1613 | 1604 | goto cleanup; | ||
1614 | 1605 | } | ||
1615 | 1606 | |||
1616 | 1607 | ret = umlStartVMDaemon(dom->conn, driver, vm); | ||
1617 | 1608 | |||
1618 | 1609 | cleanup: | ||
1619 | 1610 | if (vm) | ||
1620 | 1611 | virDomainObjUnlock(vm); | ||
1621 | 1612 | umlDriverUnlock(driver); | ||
1622 | 1613 | return ret; | ||
1623 | 1614 | } | ||
1624 | 1615 | |||
1625 | 1616 | static int umlDomainStart(virDomainPtr dom) { | ||
1626 | 1617 | return umlDomainStartWithFlags(dom, 0); | ||
1627 | 1618 | } | ||
1628 | 1619 | |||
1629 | 1620 | static virDomainPtr umlDomainDefine(virConnectPtr conn, const char *xml) { | ||
1630 | 1621 | struct uml_driver *driver = conn->privateData; | ||
1631 | 1622 | virDomainDefPtr def; | ||
1632 | 1623 | virDomainObjPtr vm = NULL; | ||
1633 | 1624 | virDomainPtr dom = NULL; | ||
1634 | 1625 | |||
1635 | 1626 | umlDriverLock(driver); | ||
1636 | 1627 | if (!(def = virDomainDefParseString(driver->caps, xml, | ||
1637 | 1628 | VIR_DOMAIN_XML_INACTIVE))) | ||
1638 | 1629 | goto cleanup; | ||
1639 | 1630 | |||
1640 | 1631 | if (virDomainObjIsDuplicate(&driver->domains, def, 0) < 0) | ||
1641 | 1632 | goto cleanup; | ||
1642 | 1633 | |||
1643 | 1634 | if (!(vm = virDomainAssignDef(driver->caps, | ||
1644 | 1635 | &driver->domains, | ||
1645 | 1636 | def, false))) | ||
1646 | 1637 | goto cleanup; | ||
1647 | 1638 | def = NULL; | ||
1648 | 1639 | vm->persistent = 1; | ||
1649 | 1640 | |||
1650 | 1641 | if (virDomainSaveConfig(driver->configDir, | ||
1651 | 1642 | vm->newDef ? vm->newDef : vm->def) < 0) { | ||
1652 | 1643 | virDomainRemoveInactive(&driver->domains, | ||
1653 | 1644 | vm); | ||
1654 | 1645 | vm = NULL; | ||
1655 | 1646 | goto cleanup; | ||
1656 | 1647 | } | ||
1657 | 1648 | |||
1658 | 1649 | dom = virGetDomain(conn, vm->def->name, vm->def->uuid); | ||
1659 | 1650 | if (dom) dom->id = vm->def->id; | ||
1660 | 1651 | |||
1661 | 1652 | cleanup: | ||
1662 | 1653 | virDomainDefFree(def); | ||
1663 | 1654 | if (vm) | ||
1664 | 1655 | virDomainObjUnlock(vm); | ||
1665 | 1656 | umlDriverUnlock(driver); | ||
1666 | 1657 | return dom; | ||
1667 | 1658 | } | ||
1668 | 1659 | |||
1669 | 1660 | static int umlDomainUndefine(virDomainPtr dom) { | ||
1670 | 1661 | struct uml_driver *driver = dom->conn->privateData; | ||
1671 | 1662 | virDomainObjPtr vm; | ||
1672 | 1663 | int ret = -1; | ||
1673 | 1664 | |||
1674 | 1665 | umlDriverLock(driver); | ||
1675 | 1666 | vm = virDomainFindByUUID(&driver->domains, dom->uuid); | ||
1676 | 1667 | if (!vm) { | ||
1677 | 1668 | umlReportError(VIR_ERR_INVALID_DOMAIN, "%s", | ||
1678 | 1669 | _("no domain with matching uuid")); | ||
1679 | 1670 | goto cleanup; | ||
1680 | 1671 | } | ||
1681 | 1672 | |||
1682 | 1673 | if (virDomainObjIsActive(vm)) { | ||
1683 | 1674 | umlReportError(VIR_ERR_INTERNAL_ERROR, "%s", | ||
1684 | 1675 | _("cannot delete active domain")); | ||
1685 | 1676 | goto cleanup; | ||
1686 | 1677 | } | ||
1687 | 1678 | |||
1688 | 1679 | if (!vm->persistent) { | ||
1689 | 1680 | umlReportError(VIR_ERR_INTERNAL_ERROR, "%s", | ||
1690 | 1681 | _("cannot undefine transient domain")); | ||
1691 | 1682 | goto cleanup; | ||
1692 | 1683 | } | ||
1693 | 1684 | |||
1694 | 1685 | if (virDomainDeleteConfig(driver->configDir, driver->autostartDir, vm) < 0) | ||
1695 | 1686 | goto cleanup; | ||
1696 | 1687 | |||
1697 | 1688 | virDomainRemoveInactive(&driver->domains, | ||
1698 | 1689 | vm); | ||
1699 | 1690 | vm = NULL; | ||
1700 | 1691 | ret = 0; | ||
1701 | 1692 | |||
1702 | 1693 | cleanup: | ||
1703 | 1694 | if (vm) | ||
1704 | 1695 | virDomainObjUnlock(vm); | ||
1705 | 1696 | umlDriverUnlock(driver); | ||
1706 | 1697 | return ret; | ||
1707 | 1698 | } | ||
1708 | 1699 | |||
1709 | 1700 | |||
1710 | 1701 | static int umlDomainAttachUmlDisk(struct uml_driver *driver, | ||
1711 | 1702 | virDomainObjPtr vm, | ||
1712 | 1703 | virDomainDiskDefPtr disk) | ||
1713 | 1704 | { | ||
1714 | 1705 | int i; | ||
1715 | 1706 | char *cmd = NULL; | ||
1716 | 1707 | char *reply = NULL; | ||
1717 | 1708 | |||
1718 | 1709 | for (i = 0 ; i < vm->def->ndisks ; i++) { | ||
1719 | 1710 | if (STREQ(vm->def->disks[i]->dst, disk->dst)) { | ||
1720 | 1711 | umlReportError(VIR_ERR_OPERATION_FAILED, | ||
1721 | 1712 | _("target %s already exists"), disk->dst); | ||
1722 | 1713 | return -1; | ||
1723 | 1714 | } | ||
1724 | 1715 | } | ||
1725 | 1716 | |||
1726 | 1717 | if (!disk->src) { | ||
1727 | 1718 | umlReportError(VIR_ERR_INTERNAL_ERROR, | ||
1728 | 1719 | "%s", _("disk source path is missing")); | ||
1729 | 1720 | goto error; | ||
1730 | 1721 | } | ||
1731 | 1722 | |||
1732 | 1723 | if (virAsprintf(&cmd, "config %s=%s", disk->dst, disk->src) < 0) { | ||
1733 | 1724 | virReportOOMError(); | ||
1734 | 1725 | return -1; | ||
1735 | 1726 | } | ||
1736 | 1727 | |||
1737 | 1728 | if (umlMonitorCommand(driver, vm, cmd, &reply) < 0) | ||
1738 | 1729 | goto error; | ||
1739 | 1730 | |||
1740 | 1731 | if (VIR_REALLOC_N(vm->def->disks, vm->def->ndisks+1) < 0) { | ||
1741 | 1732 | virReportOOMError(); | ||
1742 | 1733 | goto error; | ||
1743 | 1734 | } | ||
1744 | 1735 | |||
1745 | 1736 | virDomainDiskInsertPreAlloced(vm->def, disk); | ||
1746 | 1737 | |||
1747 | 1738 | VIR_FREE(reply); | ||
1748 | 1739 | VIR_FREE(cmd); | ||
1749 | 1740 | |||
1750 | 1741 | return 0; | ||
1751 | 1742 | |||
1752 | 1743 | error: | ||
1753 | 1744 | |||
1754 | 1745 | VIR_FREE(reply); | ||
1755 | 1746 | VIR_FREE(cmd); | ||
1756 | 1747 | |||
1757 | 1748 | return -1; | ||
1758 | 1749 | } | ||
1759 | 1750 | |||
1760 | 1751 | |||
1761 | 1752 | static int umlDomainAttachDevice(virDomainPtr dom, const char *xml) | ||
1762 | 1753 | { | ||
1763 | 1754 | struct uml_driver *driver = dom->conn->privateData; | ||
1764 | 1755 | virDomainObjPtr vm; | ||
1765 | 1756 | virDomainDeviceDefPtr dev = NULL; | ||
1766 | 1757 | int ret = -1; | ||
1767 | 1758 | |||
1768 | 1759 | umlDriverLock(driver); | ||
1769 | 1760 | |||
1770 | 1761 | vm = virDomainFindByUUID(&driver->domains, dom->uuid); | ||
1771 | 1762 | if (!vm) { | ||
1772 | 1763 | char uuidstr[VIR_UUID_STRING_BUFLEN]; | ||
1773 | 1764 | virUUIDFormat(dom->uuid, uuidstr); | ||
1774 | 1765 | umlReportError(VIR_ERR_NO_DOMAIN, | ||
1775 | 1766 | _("no domain with matching uuid '%s'"), uuidstr); | ||
1776 | 1767 | goto cleanup; | ||
1777 | 1768 | } | ||
1778 | 1769 | |||
1779 | 1770 | if (!virDomainObjIsActive(vm)) { | ||
1780 | 1771 | umlReportError(VIR_ERR_OPERATION_INVALID, | ||
1781 | 1772 | "%s", _("cannot attach device on inactive domain")); | ||
1782 | 1773 | goto cleanup; | ||
1783 | 1774 | } | ||
1784 | 1775 | |||
1785 | 1776 | dev = virDomainDeviceDefParse(driver->caps, vm->def, xml, | ||
1786 | 1777 | VIR_DOMAIN_XML_INACTIVE); | ||
1787 | 1778 | |||
1788 | 1779 | if (dev == NULL) | ||
1789 | 1780 | goto cleanup; | ||
1790 | 1781 | |||
1791 | 1782 | if (dev->type == VIR_DOMAIN_DEVICE_DISK) { | ||
1792 | 1783 | if (dev->data.disk->bus == VIR_DOMAIN_DISK_BUS_UML) { | ||
1793 | 1784 | ret = umlDomainAttachUmlDisk(driver, vm, dev->data.disk); | ||
1794 | 1785 | if (ret == 0) | ||
1795 | 1786 | dev->data.disk = NULL; | ||
1796 | 1787 | } else { | ||
1797 | 1788 | umlReportError(VIR_ERR_CONFIG_UNSUPPORTED, | ||
1798 | 1789 | _("disk bus '%s' cannot be hotplugged."), | ||
1799 | 1790 | virDomainDiskBusTypeToString(dev->data.disk->bus)); | ||
1800 | 1791 | } | ||
1801 | 1792 | } else { | ||
1802 | 1793 | umlReportError(VIR_ERR_CONFIG_UNSUPPORTED, | ||
1803 | 1794 | _("device type '%s' cannot be attached"), | ||
1804 | 1795 | virDomainDeviceTypeToString(dev->type)); | ||
1805 | 1796 | goto cleanup; | ||
1806 | 1797 | } | ||
1807 | 1798 | |||
1808 | 1799 | cleanup: | ||
1809 | 1800 | |||
1810 | 1801 | virDomainDeviceDefFree(dev); | ||
1811 | 1802 | if (vm) | ||
1812 | 1803 | virDomainObjUnlock(vm); | ||
1813 | 1804 | umlDriverUnlock(driver); | ||
1814 | 1805 | return ret; | ||
1815 | 1806 | } | ||
1816 | 1807 | |||
1817 | 1808 | |||
1818 | 1809 | static int umlDomainAttachDeviceFlags(virDomainPtr dom, | ||
1819 | 1810 | const char *xml, | ||
1820 | 1811 | unsigned int flags) { | ||
1821 | 1812 | if (flags & VIR_DOMAIN_DEVICE_MODIFY_CONFIG) { | ||
1822 | 1813 | umlReportError(VIR_ERR_OPERATION_INVALID, | ||
1823 | 1814 | "%s", _("cannot modify the persistent configuration of a domain")); | ||
1824 | 1815 | return -1; | ||
1825 | 1816 | } | ||
1826 | 1817 | |||
1827 | 1818 | return umlDomainAttachDevice(dom, xml); | ||
1828 | 1819 | } | ||
1829 | 1820 | |||
1830 | 1821 | |||
1831 | 1822 | static int umlDomainDetachUmlDisk(struct uml_driver *driver, | ||
1832 | 1823 | virDomainObjPtr vm, | ||
1833 | 1824 | virDomainDeviceDefPtr dev) | ||
1834 | 1825 | { | ||
1835 | 1826 | int i, ret = -1; | ||
1836 | 1827 | virDomainDiskDefPtr detach = NULL; | ||
1837 | 1828 | char *cmd; | ||
1838 | 1829 | char *reply; | ||
1839 | 1830 | |||
1840 | 1831 | for (i = 0 ; i < vm->def->ndisks ; i++) { | ||
1841 | 1832 | if (STREQ(vm->def->disks[i]->dst, dev->data.disk->dst)) { | ||
1842 | 1833 | break; | ||
1843 | 1834 | } | ||
1844 | 1835 | } | ||
1845 | 1836 | |||
1846 | 1837 | if (i == vm->def->ndisks) { | ||
1847 | 1838 | umlReportError(VIR_ERR_OPERATION_FAILED, | ||
1848 | 1839 | _("disk %s not found"), dev->data.disk->dst); | ||
1849 | 1840 | return -1; | ||
1850 | 1841 | } | ||
1851 | 1842 | |||
1852 | 1843 | detach = vm->def->disks[i]; | ||
1853 | 1844 | |||
1854 | 1845 | if (virAsprintf(&cmd, "remove %s", detach->dst) < 0) { | ||
1855 | 1846 | virReportOOMError(); | ||
1856 | 1847 | return -1; | ||
1857 | 1848 | } | ||
1858 | 1849 | |||
1859 | 1850 | if (umlMonitorCommand(driver, vm, cmd, &reply) < 0) | ||
1860 | 1851 | goto cleanup; | ||
1861 | 1852 | |||
1862 | 1853 | virDomainDiskRemove(vm->def, i); | ||
1863 | 1854 | |||
1864 | 1855 | virDomainDiskDefFree(detach); | ||
1865 | 1856 | |||
1866 | 1857 | ret = 0; | ||
1867 | 1858 | |||
1868 | 1859 | VIR_FREE(reply); | ||
1869 | 1860 | |||
1870 | 1861 | cleanup: | ||
1871 | 1862 | VIR_FREE(cmd); | ||
1872 | 1863 | |||
1873 | 1864 | return ret; | ||
1874 | 1865 | } | ||
1875 | 1866 | |||
1876 | 1867 | |||
1877 | 1868 | static int umlDomainDetachDevice(virDomainPtr dom, const char *xml) { | ||
1878 | 1869 | struct uml_driver *driver = dom->conn->privateData; | ||
1879 | 1870 | virDomainObjPtr vm; | ||
1880 | 1871 | virDomainDeviceDefPtr dev = NULL; | ||
1881 | 1872 | int ret = -1; | ||
1882 | 1873 | |||
1883 | 1874 | umlDriverLock(driver); | ||
1884 | 1875 | vm = virDomainFindByUUID(&driver->domains, dom->uuid); | ||
1885 | 1876 | if (!vm) { | ||
1886 | 1877 | char uuidstr[VIR_UUID_STRING_BUFLEN]; | ||
1887 | 1878 | virUUIDFormat(dom->uuid, uuidstr); | ||
1888 | 1879 | umlReportError(VIR_ERR_NO_DOMAIN, | ||
1889 | 1880 | _("no domain with matching uuid '%s'"), uuidstr); | ||
1890 | 1881 | goto cleanup; | ||
1891 | 1882 | } | ||
1892 | 1883 | |||
1893 | 1884 | if (!virDomainObjIsActive(vm)) { | ||
1894 | 1885 | umlReportError(VIR_ERR_OPERATION_INVALID, | ||
1895 | 1886 | "%s", _("cannot detach device on inactive domain")); | ||
1896 | 1887 | goto cleanup; | ||
1897 | 1888 | } | ||
1898 | 1889 | |||
1899 | 1890 | dev = virDomainDeviceDefParse(driver->caps, vm->def, xml, | ||
1900 | 1891 | VIR_DOMAIN_XML_INACTIVE); | ||
1901 | 1892 | if (dev == NULL) | ||
1902 | 1893 | goto cleanup; | ||
1903 | 1894 | |||
1904 | 1895 | if (dev->type == VIR_DOMAIN_DEVICE_DISK && | ||
1905 | 1896 | dev->data.disk->device == VIR_DOMAIN_DISK_DEVICE_DISK) { | ||
1906 | 1897 | if (dev->data.disk->bus == VIR_DOMAIN_DISK_BUS_UML) | ||
1907 | 1898 | ret = umlDomainDetachUmlDisk(driver, vm, dev); | ||
1908 | 1899 | else { | ||
1909 | 1900 | umlReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", | ||
1910 | 1901 | _("This type of disk cannot be hot unplugged")); | ||
1911 | 1902 | } | ||
1912 | 1903 | } else { | ||
1913 | 1904 | umlReportError(VIR_ERR_CONFIG_UNSUPPORTED, | ||
1914 | 1905 | "%s", _("This type of device cannot be hot unplugged")); | ||
1915 | 1906 | } | ||
1916 | 1907 | |||
1917 | 1908 | cleanup: | ||
1918 | 1909 | virDomainDeviceDefFree(dev); | ||
1919 | 1910 | if (vm) | ||
1920 | 1911 | virDomainObjUnlock(vm); | ||
1921 | 1912 | umlDriverUnlock(driver); | ||
1922 | 1913 | return ret; | ||
1923 | 1914 | } | ||
1924 | 1915 | |||
1925 | 1916 | |||
1926 | 1917 | static int umlDomainDetachDeviceFlags(virDomainPtr dom, | ||
1927 | 1918 | const char *xml, | ||
1928 | 1919 | unsigned int flags) { | ||
1929 | 1920 | if (flags & VIR_DOMAIN_DEVICE_MODIFY_CONFIG) { | ||
1930 | 1921 | umlReportError(VIR_ERR_OPERATION_INVALID, | ||
1931 | 1922 | "%s", _("cannot modify the persistent configuration of a domain")); | ||
1932 | 1923 | return -1; | ||
1933 | 1924 | } | ||
1934 | 1925 | |||
1935 | 1926 | return umlDomainDetachDevice(dom, xml); | ||
1936 | 1927 | } | ||
1937 | 1928 | |||
1938 | 1929 | |||
1939 | 1930 | static int umlDomainGetAutostart(virDomainPtr dom, | ||
1940 | 1931 | int *autostart) { | ||
1941 | 1932 | struct uml_driver *driver = dom->conn->privateData; | ||
1942 | 1933 | virDomainObjPtr vm; | ||
1943 | 1934 | int ret = -1; | ||
1944 | 1935 | |||
1945 | 1936 | umlDriverLock(driver); | ||
1946 | 1937 | vm = virDomainFindByUUID(&driver->domains, dom->uuid); | ||
1947 | 1938 | |||
1948 | 1939 | if (!vm) { | ||
1949 | 1940 | umlReportError(VIR_ERR_INVALID_DOMAIN, "%s", | ||
1950 | 1941 | _("no domain with matching uuid")); | ||
1951 | 1942 | goto cleanup; | ||
1952 | 1943 | } | ||
1953 | 1944 | |||
1954 | 1945 | *autostart = vm->autostart; | ||
1955 | 1946 | ret = 0; | ||
1956 | 1947 | |||
1957 | 1948 | cleanup: | ||
1958 | 1949 | if (vm) | ||
1959 | 1950 | virDomainObjUnlock(vm); | ||
1960 | 1951 | umlDriverUnlock(driver); | ||
1961 | 1952 | return ret; | ||
1962 | 1953 | } | ||
1963 | 1954 | |||
1964 | 1955 | static int umlDomainSetAutostart(virDomainPtr dom, | ||
1965 | 1956 | int autostart) { | ||
1966 | 1957 | struct uml_driver *driver = dom->conn->privateData; | ||
1967 | 1958 | virDomainObjPtr vm; | ||
1968 | 1959 | char *configFile = NULL, *autostartLink = NULL; | ||
1969 | 1960 | int ret = -1; | ||
1970 | 1961 | |||
1971 | 1962 | umlDriverLock(driver); | ||
1972 | 1963 | vm = virDomainFindByUUID(&driver->domains, dom->uuid); | ||
1973 | 1964 | |||
1974 | 1965 | if (!vm) { | ||
1975 | 1966 | umlReportError(VIR_ERR_INVALID_DOMAIN, "%s", | ||
1976 | 1967 | _("no domain with matching uuid")); | ||
1977 | 1968 | goto cleanup; | ||
1978 | 1969 | } | ||
1979 | 1970 | |||
1980 | 1971 | if (!vm->persistent) { | ||
1981 | 1972 | umlReportError(VIR_ERR_INTERNAL_ERROR, "%s", | ||
1982 | 1973 | _("cannot set autostart for transient domain")); | ||
1983 | 1974 | goto cleanup; | ||
1984 | 1975 | } | ||
1985 | 1976 | |||
1986 | 1977 | autostart = (autostart != 0); | ||
1987 | 1978 | |||
1988 | 1979 | if (vm->autostart != autostart) { | ||
1989 | 1980 | if ((configFile = virDomainConfigFile(driver->configDir, vm->def->name)) == NULL) | ||
1990 | 1981 | goto cleanup; | ||
1991 | 1982 | if ((autostartLink = virDomainConfigFile(driver->autostartDir, vm->def->name)) == NULL) | ||
1992 | 1983 | goto cleanup; | ||
1993 | 1984 | |||
1994 | 1985 | if (autostart) { | ||
1995 | 1986 | int err; | ||
1996 | 1987 | |||
1997 | 1988 | if ((err = virFileMakePath(driver->autostartDir))) { | ||
1998 | 1989 | virReportSystemError(err, | ||
1999 | 1990 | _("cannot create autostart directory %s"), | ||
2000 | 1991 | driver->autostartDir); | ||
2001 | 1992 | goto cleanup; | ||
2002 | 1993 | } | ||
2003 | 1994 | |||
2004 | 1995 | if (symlink(configFile, autostartLink) < 0) { | ||
2005 | 1996 | virReportSystemError(errno, | ||
2006 | 1997 | _("Failed to create symlink '%s to '%s'"), | ||
2007 | 1998 | autostartLink, configFile); | ||
2008 | 1999 | goto cleanup; | ||
2009 | 2000 | } | ||
2010 | 2001 | } else { | ||
2011 | 2002 | if (unlink(autostartLink) < 0 && errno != ENOENT && errno != ENOTDIR) { | ||
2012 | 2003 | virReportSystemError(errno, | ||
2013 | 2004 | _("Failed to delete symlink '%s'"), | ||
2014 | 2005 | autostartLink); | ||
2015 | 2006 | goto cleanup; | ||
2016 | 2007 | } | ||
2017 | 2008 | } | ||
2018 | 2009 | |||
2019 | 2010 | vm->autostart = autostart; | ||
2020 | 2011 | } | ||
2021 | 2012 | ret = 0; | ||
2022 | 2013 | |||
2023 | 2014 | cleanup: | ||
2024 | 2015 | VIR_FREE(configFile); | ||
2025 | 2016 | VIR_FREE(autostartLink); | ||
2026 | 2017 | if (vm) | ||
2027 | 2018 | virDomainObjUnlock(vm); | ||
2028 | 2019 | umlDriverUnlock(driver); | ||
2029 | 2020 | return ret; | ||
2030 | 2021 | } | ||
2031 | 2022 | |||
2032 | 2023 | |||
2033 | 2024 | static int | ||
2034 | 2025 | umlDomainBlockPeek (virDomainPtr dom, | ||
2035 | 2026 | const char *path, | ||
2036 | 2027 | unsigned long long offset, size_t size, | ||
2037 | 2028 | void *buffer, | ||
2038 | 2029 | unsigned int flags ATTRIBUTE_UNUSED) | ||
2039 | 2030 | { | ||
2040 | 2031 | struct uml_driver *driver = dom->conn->privateData; | ||
2041 | 2032 | virDomainObjPtr vm; | ||
2042 | 2033 | int fd = -1, ret = -1, i; | ||
2043 | 2034 | |||
2044 | 2035 | umlDriverLock(driver); | ||
2045 | 2036 | vm = virDomainFindByUUID(&driver->domains, dom->uuid); | ||
2046 | 2037 | umlDriverUnlock(driver); | ||
2047 | 2038 | |||
2048 | 2039 | if (!vm) { | ||
2049 | 2040 | umlReportError(VIR_ERR_INVALID_DOMAIN, "%s", | ||
2050 | 2041 | _("no domain with matching uuid")); | ||
2051 | 2042 | goto cleanup; | ||
2052 | 2043 | } | ||
2053 | 2044 | |||
2054 | 2045 | if (!path || path[0] == '\0') { | ||
2055 | 2046 | umlReportError(VIR_ERR_INVALID_ARG, "%s", | ||
2056 | 2047 | _("NULL or empty path")); | ||
2057 | 2048 | goto cleanup; | ||
2058 | 2049 | } | ||
2059 | 2050 | |||
2060 | 2051 | /* Check the path belongs to this domain. */ | ||
2061 | 2052 | for (i = 0 ; i < vm->def->ndisks ; i++) { | ||
2062 | 2053 | if (vm->def->disks[i]->src != NULL && | ||
2063 | 2054 | STREQ (vm->def->disks[i]->src, path)) { | ||
2064 | 2055 | ret = 0; | ||
2065 | 2056 | break; | ||
2066 | 2057 | } | ||
2067 | 2058 | } | ||
2068 | 2059 | |||
2069 | 2060 | if (ret == 0) { | ||
2070 | 2061 | ret = -1; | ||
2071 | 2062 | /* The path is correct, now try to open it and get its size. */ | ||
2072 | 2063 | fd = open (path, O_RDONLY); | ||
2073 | 2064 | if (fd == -1) { | ||
2074 | 2065 | virReportSystemError(errno, | ||
2075 | 2066 | _("cannot open %s"), path); | ||
2076 | 2067 | goto cleanup; | ||
2077 | 2068 | } | ||
2078 | 2069 | |||
2079 | 2070 | /* Seek and read. */ | ||
2080 | 2071 | /* NB. Because we configure with AC_SYS_LARGEFILE, off_t should | ||
2081 | 2072 | * be 64 bits on all platforms. | ||
2082 | 2073 | */ | ||
2083 | 2074 | if (lseek (fd, offset, SEEK_SET) == (off_t) -1 || | ||
2084 | 2075 | saferead (fd, buffer, size) == (ssize_t) -1) { | ||
2085 | 2076 | virReportSystemError(errno, | ||
2086 | 2077 | _("cannot read %s"), path); | ||
2087 | 2078 | goto cleanup; | ||
2088 | 2079 | } | ||
2089 | 2080 | |||
2090 | 2081 | ret = 0; | ||
2091 | 2082 | } else { | ||
2092 | 2083 | umlReportError(VIR_ERR_INVALID_ARG, "%s", | ||
2093 | 2084 | _("invalid path")); | ||
2094 | 2085 | } | ||
2095 | 2086 | |||
2096 | 2087 | cleanup: | ||
2097 | 2088 | if (fd >= 0) close (fd); | ||
2098 | 2089 | if (vm) | ||
2099 | 2090 | virDomainObjUnlock(vm); | ||
2100 | 2091 | return ret; | ||
2101 | 2092 | } | ||
2102 | 2093 | |||
2103 | 2094 | |||
2104 | 2095 | |||
2105 | 2096 | static virDriver umlDriver = { | ||
2106 | 2097 | VIR_DRV_UML, | ||
2107 | 2098 | "UML", | ||
2108 | 2099 | umlOpen, /* open */ | ||
2109 | 2100 | umlClose, /* close */ | ||
2110 | 2101 | NULL, /* supports_feature */ | ||
2111 | 2102 | umlGetType, /* type */ | ||
2112 | 2103 | umlGetVersion, /* version */ | ||
2113 | 2104 | NULL, /* libvirtVersion (impl. in libvirt.c) */ | ||
2114 | 2105 | virGetHostname, /* getHostname */ | ||
2115 | 2106 | NULL, /* getMaxVcpus */ | ||
2116 | 2107 | nodeGetInfo, /* nodeGetInfo */ | ||
2117 | 2108 | umlGetCapabilities, /* getCapabilities */ | ||
2118 | 2109 | umlListDomains, /* listDomains */ | ||
2119 | 2110 | umlNumDomains, /* numOfDomains */ | ||
2120 | 2111 | umlDomainCreate, /* domainCreateXML */ | ||
2121 | 2112 | umlDomainLookupByID, /* domainLookupByID */ | ||
2122 | 2113 | umlDomainLookupByUUID, /* domainLookupByUUID */ | ||
2123 | 2114 | umlDomainLookupByName, /* domainLookupByName */ | ||
2124 | 2115 | NULL, /* domainSuspend */ | ||
2125 | 2116 | NULL, /* domainResume */ | ||
2126 | 2117 | umlDomainShutdown, /* domainShutdown */ | ||
2127 | 2118 | NULL, /* domainReboot */ | ||
2128 | 2119 | umlDomainDestroy, /* domainDestroy */ | ||
2129 | 2120 | umlDomainGetOSType, /* domainGetOSType */ | ||
2130 | 2121 | umlDomainGetMaxMemory, /* domainGetMaxMemory */ | ||
2131 | 2122 | umlDomainSetMaxMemory, /* domainSetMaxMemory */ | ||
2132 | 2123 | umlDomainSetMemory, /* domainSetMemory */ | ||
2133 | 2124 | umlDomainGetInfo, /* domainGetInfo */ | ||
2134 | 2125 | NULL, /* domainSave */ | ||
2135 | 2126 | NULL, /* domainRestore */ | ||
2136 | 2127 | NULL, /* domainCoreDump */ | ||
2137 | 2128 | NULL, /* domainSetVcpus */ | ||
2138 | 2129 | NULL, /* domainPinVcpu */ | ||
2139 | 2130 | NULL, /* domainGetVcpus */ | ||
2140 | 2131 | NULL, /* domainGetMaxVcpus */ | ||
2141 | 2132 | NULL, /* domainGetSecurityLabel */ | ||
2142 | 2133 | NULL, /* nodeGetSecurityModel */ | ||
2143 | 2134 | umlDomainDumpXML, /* domainDumpXML */ | ||
2144 | 2135 | NULL, /* domainXMLFromNative */ | ||
2145 | 2136 | NULL, /* domainXMLToNative */ | ||
2146 | 2137 | umlListDefinedDomains, /* listDefinedDomains */ | ||
2147 | 2138 | umlNumDefinedDomains, /* numOfDefinedDomains */ | ||
2148 | 2139 | umlDomainStart, /* domainCreate */ | ||
2149 | 2140 | umlDomainStartWithFlags, /* domainCreateWithFlags */ | ||
2150 | 2141 | umlDomainDefine, /* domainDefineXML */ | ||
2151 | 2142 | umlDomainUndefine, /* domainUndefine */ | ||
2152 | 2143 | umlDomainAttachDevice, /* domainAttachDevice */ | ||
2153 | 2144 | umlDomainAttachDeviceFlags, /* domainAttachDeviceFlags */ | ||
2154 | 2145 | umlDomainDetachDevice, /* domainDetachDevice */ | ||
2155 | 2146 | umlDomainDetachDeviceFlags, /* domainDetachDeviceFlags */ | ||
2156 | 2147 | NULL, /* domainUpdateDeviceFlags */ | ||
2157 | 2148 | umlDomainGetAutostart, /* domainGetAutostart */ | ||
2158 | 2149 | umlDomainSetAutostart, /* domainSetAutostart */ | ||
2159 | 2150 | NULL, /* domainGetSchedulerType */ | ||
2160 | 2151 | NULL, /* domainGetSchedulerParameters */ | ||
2161 | 2152 | NULL, /* domainSetSchedulerParameters */ | ||
2162 | 2153 | NULL, /* domainMigratePrepare */ | ||
2163 | 2154 | NULL, /* domainMigratePerform */ | ||
2164 | 2155 | NULL, /* domainMigrateFinish */ | ||
2165 | 2156 | NULL, /* domainBlockStats */ | ||
2166 | 2157 | NULL, /* domainInterfaceStats */ | ||
2167 | 2158 | NULL, /* domainMemoryStats */ | ||
2168 | 2159 | umlDomainBlockPeek, /* domainBlockPeek */ | ||
2169 | 2160 | NULL, /* domainMemoryPeek */ | ||
2170 | 2161 | NULL, /* domainGetBlockInfo */ | ||
2171 | 2162 | nodeGetCellsFreeMemory, /* nodeGetCellsFreeMemory */ | ||
2172 | 2163 | nodeGetFreeMemory, /* getFreeMemory */ | ||
2173 | 2164 | NULL, /* domainEventRegister */ | ||
2174 | 2165 | NULL, /* domainEventDeregister */ | ||
2175 | 2166 | NULL, /* domainMigratePrepare2 */ | ||
2176 | 2167 | NULL, /* domainMigrateFinish2 */ | ||
2177 | 2168 | NULL, /* nodeDeviceDettach */ | ||
2178 | 2169 | NULL, /* nodeDeviceReAttach */ | ||
2179 | 2170 | NULL, /* nodeDeviceReset */ | ||
2180 | 2171 | NULL, /* domainMigratePrepareTunnel */ | ||
2181 | 2172 | umlIsEncrypted, /* isEncrypted */ | ||
2182 | 2173 | umlIsSecure, /* isSecure */ | ||
2183 | 2174 | umlDomainIsActive, /* domainIsActive */ | ||
2184 | 2175 | umlDomainIsPersistent, /* domainIsPersistent */ | ||
2185 | 2176 | NULL, /* cpuCompare */ | ||
2186 | 2177 | NULL, /* cpuBaseline */ | ||
2187 | 2178 | NULL, /* domainGetJobInfo */ | ||
2188 | 2179 | NULL, /* domainAbortJob */ | ||
2189 | 2180 | NULL, /* domainMigrateSetMaxDowntime */ | ||
2190 | 2181 | NULL, /* domainEventRegisterAny */ | ||
2191 | 2182 | NULL, /* domainEventDeregisterAny */ | ||
2192 | 2183 | NULL, /* domainManagedSave */ | ||
2193 | 2184 | NULL, /* domainHasManagedSaveImage */ | ||
2194 | 2185 | NULL, /* domainManagedSaveRemove */ | ||
2195 | 2186 | NULL, /* domainSnapshotCreateXML */ | ||
2196 | 2187 | NULL, /* domainSnapshotDumpXML */ | ||
2197 | 2188 | NULL, /* domainSnapshotNum */ | ||
2198 | 2189 | NULL, /* domainSnapshotListNames */ | ||
2199 | 2190 | NULL, /* domainSnapshotLookupByName */ | ||
2200 | 2191 | NULL, /* domainHasCurrentSnapshot */ | ||
2201 | 2192 | NULL, /* domainSnapshotCurrent */ | ||
2202 | 2193 | NULL, /* domainRevertToSnapshot */ | ||
2203 | 2194 | NULL, /* domainSnapshotDelete */ | ||
2204 | 2195 | NULL, /* qemuDomainMonitorCommand */ | ||
2205 | 2196 | }; | ||
2206 | 2197 | |||
2207 | 2198 | |||
2208 | 2199 | static virStateDriver umlStateDriver = { | ||
2209 | 2200 | .name = "UML", | ||
2210 | 2201 | .initialize = umlStartup, | ||
2211 | 2202 | .cleanup = umlShutdown, | ||
2212 | 2203 | .reload = umlReload, | ||
2213 | 2204 | .active = umlActive, | ||
2214 | 2205 | }; | ||
2215 | 2206 | |||
2216 | 2207 | int umlRegister(void) { | ||
2217 | 2208 | virRegisterDriver(¨Driver); | ||
2218 | 2209 | virRegisterStateDriver(¨StateDriver); | ||
2219 | 2210 | return 0; | ||
2220 | 2211 | } | ||
2221 | 0 | 2212 | ||
2222 | === added file 'debian/patches/9026-Rebuild-network-filter-for-UML-guests-on-updates.patch' | |||
2223 | --- debian/patches/9026-Rebuild-network-filter-for-UML-guests-on-updates.patch 1970-01-01 00:00:00 +0000 | |||
2224 | +++ debian/patches/9026-Rebuild-network-filter-for-UML-guests-on-updates.patch 2010-09-15 23:50:58 +0000 | |||
2225 | @@ -0,0 +1,55 @@ | |||
2226 | 1 | From daa597d7b0a147ae8942390345b90f444185e9df Mon Sep 17 00:00:00 2001 | ||
2227 | 2 | From: Soren Hansen <soren@linux2go.dk> | ||
2228 | 3 | Date: Mon, 13 Sep 2010 23:25:53 +0200 | ||
2229 | 4 | Subject: [PATCH] Rebuild network filter for UML guests on updates | ||
2230 | 5 | |||
2231 | 6 | When nwfilter support was added to UML, I didn't realise the UML driver | ||
2232 | 7 | needed instrumentation to make updating nwfilters on the fly work. This | ||
2233 | 8 | patch adds this bit of glue. | ||
2234 | 9 | |||
2235 | 10 | Signed-off-by: Soren Hansen <soren@linux2go.dk> | ||
2236 | 11 | --- | ||
2237 | 12 | src/uml/uml_driver.c | 18 ++++++++++++++++++ | ||
2238 | 13 | 1 files changed, 18 insertions(+), 0 deletions(-) | ||
2239 | 14 | |||
2240 | 15 | diff --git a/src/uml/uml_driver.c b/src/uml/uml_driver.c | ||
2241 | 16 | index 40345d5..9101928 100644 | ||
2242 | 17 | --- a/src/uml/uml_driver.c | ||
2243 | 18 | +++ b/src/uml/uml_driver.c | ||
2244 | 19 | @@ -2198,6 +2198,18 @@ static virDriver umlDriver = { | ||
2245 | 20 | NULL, /* qemuDomainMonitorCommand */ | ||
2246 | 21 | }; | ||
2247 | 22 | |||
2248 | 23 | +static int | ||
2249 | 24 | +umlVMFilterRebuild(virConnectPtr conn ATTRIBUTE_UNUSED, | ||
2250 | 25 | + virHashIterator iter, void *data) | ||
2251 | 26 | +{ | ||
2252 | 27 | + struct uml_driver *driver = uml_driver; | ||
2253 | 28 | + | ||
2254 | 29 | + umlDriverLock(driver); | ||
2255 | 30 | + virHashForEach(uml_driver->domains.objs, iter, data); | ||
2256 | 31 | + umlDriverUnlock(driver); | ||
2257 | 32 | + | ||
2258 | 33 | + return 0; | ||
2259 | 34 | +} | ||
2260 | 35 | |||
2261 | 36 | static virStateDriver umlStateDriver = { | ||
2262 | 37 | .name = "UML", | ||
2263 | 38 | @@ -2207,8 +2219,14 @@ static virStateDriver umlStateDriver = { | ||
2264 | 39 | .active = umlActive, | ||
2265 | 40 | }; | ||
2266 | 41 | |||
2267 | 42 | +static virNWFilterCallbackDriver umlCallbackDriver = { | ||
2268 | 43 | + .name = "UML", | ||
2269 | 44 | + .vmFilterRebuild = umlVMFilterRebuild, | ||
2270 | 45 | +}; | ||
2271 | 46 | + | ||
2272 | 47 | int umlRegister(void) { | ||
2273 | 48 | virRegisterDriver(¨Driver); | ||
2274 | 49 | virRegisterStateDriver(¨StateDriver); | ||
2275 | 50 | + virNWFilterRegisterCallbackDriver(¨CallbackDriver); | ||
2276 | 51 | return 0; | ||
2277 | 52 | } | ||
2278 | 53 | -- | ||
2279 | 54 | 1.7.1 | ||
2280 | 55 | |||
2281 | 0 | 56 | ||
2282 | === renamed file 'debian/patches/9026-Rebuild-network-filter-for-UML-guests-on-updates.patch' => 'debian/patches/9026-Rebuild-network-filter-for-UML-guests-on-updates.patch.moved' |