mirror of https://github.com/proxmox/mirror_qemu
Machine queue, 2016-06-17
-----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAABCAAGBQJXY/8MAAoJECgHk2+YTcWmAscQAJMtbrPFc43LBnA/m71qOWUm RbqAfSJNoDu9LXB/qo3AEilbSm2t6T6mCfyMdwemMSf02QpCzVlK46XE/fVTByHk iDK03445a3SSO6tvRcEHA0wqJv9ZvWP8wnU6+pXQ/XAqU60MexOetXdWFxdtIXab PP5tU0sx+hJY0H83DD6e/2RFGde+IH7vpSVqdgOWbEXe+d9TzNHd1capW4iqc40s Fjxqhcg7oMbs5BN9fLg+rihes9yvO09zDu+GlK452BJ3dwVysLhw5Ej2fPuVRAKh fIOAcLUlVo1wx9M3K+UNrKDWm4luv0fhGg/F5v8AuSuIevKRXqFejQIgQIHFBmsW u44NlRpwJZRAbJMTWaUWNdgibZj73szRWYlN4ViuqpTfADpr3S3oGkgEcD8WsBNM 8oP2v64pw6noDXgszN45aAGB7k1eH+ngGGR8j777n84E5WOWjzGoRtxkLEsm67jn MpB/A5GIIpFcDUTDyIfiiwOAxWsbLaMGbk2MzApQRccmp/y644VL1qRMMUKZRxzu ov/6tpWVJvkdqhPsNL0CLg1g8MbJyGuc0uJ9XLLRB3e4U0BPa7F+ROIekZxU6U+q rydY9lKeb4hOtixZzld2F9xo5FAnP+C34C/jR75HWuS4WWTUUNQiD4lwBbKkTQdl vOW8n8S2AA69xlO8nfpe =ciRM -----END PGP SIGNATURE----- Merge remote-tracking branch 'remotes/ehabkost/tags/machine-pull-request' into staging Machine queue, 2016-06-17 # gpg: Signature made Fri 17 Jun 2016 14:45:48 BST # gpg: using RSA key 0x2807936F984DC5A6 # gpg: Good signature from "Eduardo Habkost <ehabkost@redhat.com>" # Primary key fingerprint: 5A32 2FD5 ABC4 D3DB ACCF D1AA 2807 936F 984D C5A6 * remotes/ehabkost/tags/machine-pull-request: vnc: Wrap vnc initialization code with CONFIG_VNC qdev: Use GList for global properties Signed-off-by: Peter Maydell <peter.maydell@linaro.org>master
commit
da838dfc40
|
@ -1020,12 +1020,11 @@ void qdev_prop_set_ptr(DeviceState *dev, const char *name, void *value)
|
|||
*ptr = value;
|
||||
}
|
||||
|
||||
static QTAILQ_HEAD(, GlobalProperty) global_props =
|
||||
QTAILQ_HEAD_INITIALIZER(global_props);
|
||||
static GList *global_props;
|
||||
|
||||
void qdev_prop_register_global(GlobalProperty *prop)
|
||||
{
|
||||
QTAILQ_INSERT_TAIL(&global_props, prop, next);
|
||||
global_props = g_list_append(global_props, prop);
|
||||
}
|
||||
|
||||
void qdev_prop_register_global_list(GlobalProperty *props)
|
||||
|
@ -1039,10 +1038,11 @@ void qdev_prop_register_global_list(GlobalProperty *props)
|
|||
|
||||
int qdev_prop_check_globals(void)
|
||||
{
|
||||
GlobalProperty *prop;
|
||||
GList *l;
|
||||
int ret = 0;
|
||||
|
||||
QTAILQ_FOREACH(prop, &global_props, next) {
|
||||
for (l = global_props; l; l = l->next) {
|
||||
GlobalProperty *prop = l->data;
|
||||
ObjectClass *oc;
|
||||
DeviceClass *dc;
|
||||
if (prop->used) {
|
||||
|
@ -1073,9 +1073,10 @@ int qdev_prop_check_globals(void)
|
|||
static void qdev_prop_set_globals_for_type(DeviceState *dev,
|
||||
const char *typename)
|
||||
{
|
||||
GlobalProperty *prop;
|
||||
GList *l;
|
||||
|
||||
QTAILQ_FOREACH(prop, &global_props, next) {
|
||||
for (l = global_props; l; l = l->next) {
|
||||
GlobalProperty *prop = l->data;
|
||||
Error *err = NULL;
|
||||
|
||||
if (strcmp(typename, prop->driver) != 0) {
|
||||
|
|
|
@ -266,7 +266,6 @@ typedef struct GlobalProperty {
|
|||
const char *value;
|
||||
bool user_provided;
|
||||
bool used;
|
||||
QTAILQ_ENTRY(GlobalProperty) next;
|
||||
} GlobalProperty;
|
||||
|
||||
/*** Board API. This should go away once we have a machine config file. ***/
|
||||
|
|
2
vl.c
2
vl.c
|
@ -4564,8 +4564,10 @@ int main(int argc, char **argv, char **envp)
|
|||
os_setup_signal_handling();
|
||||
|
||||
/* init remote displays */
|
||||
#ifdef CONFIG_VNC
|
||||
qemu_opts_foreach(qemu_find_opts("vnc"),
|
||||
vnc_init_func, NULL, NULL);
|
||||
#endif
|
||||
if (show_vnc_port) {
|
||||
char *ret = vnc_display_local_addr("default");
|
||||
printf("VNC server running on '%s'\n", ret);
|
||||
|
|
Loading…
Reference in New Issue