![Blue Swirl](/assets/img/avatar_default.png)
Problem: Our file sys-queue.h is a copy of the BSD file, but there are some additions and it's not entirely compatible. Because of that, there have been conflicts with system headers on BSD systems. Some hacks have been introduced in the commits15cc923584
,f40d753718
,96555a96d7
and3990d09adf
but the fixes were fragile. Solution: Avoid the conflict entirely by renaming the functions and the file. Revert the previous hacks. Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
83 lines
2.3 KiB
C
83 lines
2.3 KiB
C
/*
|
|
* QEMU device hotplug helpers
|
|
*
|
|
* Copyright (c) 2004 Fabrice Bellard
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
* of this software and associated documentation files (the "Software"), to deal
|
|
* in the Software without restriction, including without limitation the rights
|
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
* copies of the Software, and to permit persons to whom the Software is
|
|
* furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice shall be included in
|
|
* all copies or substantial portions of the Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
* THE SOFTWARE.
|
|
*/
|
|
|
|
#include "hw.h"
|
|
#include "boards.h"
|
|
#include "net.h"
|
|
#include "block_int.h"
|
|
#include "sysemu.h"
|
|
|
|
DriveInfo *add_init_drive(const char *optstr)
|
|
{
|
|
int fatal_error;
|
|
DriveInfo *dinfo;
|
|
QemuOpts *opts;
|
|
|
|
opts = drive_add(NULL, "%s", optstr);
|
|
if (!opts)
|
|
return NULL;
|
|
|
|
dinfo = drive_init(opts, current_machine, &fatal_error);
|
|
if (!dinfo) {
|
|
qemu_opts_del(opts);
|
|
return NULL;
|
|
}
|
|
|
|
return dinfo;
|
|
}
|
|
|
|
void destroy_nic(dev_match_fn *match_fn, void *arg)
|
|
{
|
|
int i;
|
|
NICInfo *nic;
|
|
|
|
for (i = 0; i < MAX_NICS; i++) {
|
|
nic = &nd_table[i];
|
|
if (nic->used) {
|
|
if (nic->private && match_fn(nic->private, arg)) {
|
|
qemu_del_vlan_client(nic->vc);
|
|
net_client_uninit(nic);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
void destroy_bdrvs(dev_match_fn *match_fn, void *arg)
|
|
{
|
|
DriveInfo *dinfo;
|
|
struct BlockDriverState *bs;
|
|
|
|
QTAILQ_FOREACH(dinfo, &drives, next) {
|
|
bs = dinfo->bdrv;
|
|
if (bs) {
|
|
if (bs->private && match_fn(bs->private, arg)) {
|
|
drive_uninit(bs);
|
|
bdrv_delete(bs);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|